From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 01:58:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 08:58:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5607 - /vtigercrm/trunk/modules/HelpDesk/ListTickets.php Message-ID: <20060501085800.B51D16800F1@vtiger.fosslabs.com> Author: don Date: Mon May 1 02:57:56 2006 New Revision: 5607 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/HelpDesk/ListTickets.php Modified: vtigercrm/trunk/modules/HelpDesk/ListTickets.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 01:58:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 08:58:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5608 - /vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php Message-ID: <20060501085850.C96D96800F1@vtiger.fosslabs.com> Author: don Date: Mon May 1 02:58:46 2006 New Revision: 5608 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php Modified: vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 01:59:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 08:59:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5609 - /vtigercrm/trunk/modules/HelpDesk/Save.php Message-ID: <20060501085917.84A9C6800F1@vtiger.fosslabs.com> Author: don Date: Mon May 1 02:59:13 2006 New Revision: 5609 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/HelpDesk/Save.php Modified: vtigercrm/trunk/modules/HelpDesk/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 02:00:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:00:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5610 - /vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Message-ID: <20060501090043.59FFC5FB0CC@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:00:39 2006 New Revision: 5610 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 02:03:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:03:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5611 - /vtigercrm/trunk/modules/HelpDesk/Forms.php Message-ID: <20060501090335.145DC6951E1@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:03:31 2006 New Revision: 5611 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/HelpDesk/Forms.php Modified: vtigercrm/trunk/modules/HelpDesk/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 02:06:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:06:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5612 - /vtigercrm/trunk/modules/Faq/Faq.php Message-ID: <20060501090631.CB3D96951E1@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:06:27 2006 New Revision: 5612 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Faq/Faq.php Modified: vtigercrm/trunk/modules/Faq/Faq.php ============================================================================== --- vtigercrm/trunk/modules/Faq/Faq.php (original) +++ vtigercrm/trunk/modules/Faq/Faq.php Mon May 1 03:06:27 2006 @@ -84,9 +84,11 @@ var $default_sort_order = 'DESC'; function Faq() { - $this->log =LoggerManager::getLogger('account'); + $this->log =LoggerManager::getLogger('faq'); + $this->log->debug("Entering Faq() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Faq'); + $this->log->debug("Exiting Faq method ..."); } /** Function to get the list of comments for the given FAQ id @@ -95,13 +97,18 @@ **/ function getFAQComments($faqid) { + global $log; + $log->debug("Entering getFAQComments(".$faqid.") method ..."); global $mod_strings; $sql = "select * from faqcomments where faqid=".$faqid; $result = $this->db->query($sql); $noofrows = $this->db->num_rows($result); if($noofrows == 0) + { + $log->debug("Exiting getFAQComments method ..."); return ''; + } $list .= '
'; for($i=0;$i<$noofrows;$i++) @@ -116,6 +123,7 @@ } } $list .= '
'; + $log->debug("Exiting getFAQComments method ..."); return $list; } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 02:29:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:29:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5613 - /vtigercrm/trunk/modules/Invoice/Invoice.php Message-ID: <20060501092957.D9E8F6AB602@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:29:53 2006 New Revision: 5613 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Invoice/Invoice.php Modified: vtigercrm/trunk/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.php (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.php Mon May 1 03:29:53 2006 @@ -104,29 +104,39 @@ function Invoice() { $this->log =LoggerManager::getLogger('Invoice'); + $this->log->debug("Entering Invoice() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Invoice'); + $this->log->debug("Exiting Invoice method ..."); } function get_summary_text() { + global $log; + $log->debug("Entering get_summary_text() method ..."); + $log->debug("Exiting get_summary_text method ..."); return $this->name; } function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; require_once('modules/Activities/Activity.php'); - $focus = new Activity(); + $focus = new Activity(); $button = ''; $returnset = '&return_module=Invoice&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Invoice','Activities',$focus,$query,$button,$returnset); } function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, crmentity.createdtime, crmentity.description, users.user_name @@ -143,10 +153,13 @@ and seactivityrel.crmid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Exiting get_history method ..."); return getHistory('Invoice',$query,$id); } function get_attachments($id) { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); // Armando L?scher 18.10.2005 -> ?visibleDescription // Desc: Inserted crm2.createdtime, notes.notecontent description, users.user_name // Inserted inner join users on crm2.smcreatorid= users.id @@ -177,6 +190,7 @@ inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid inner join users on crm2.smcreatorid= users.id where crmentity.crmid=".$id; + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('Invoice',$query,$id); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 02:33:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:33:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5614 - /vtigercrm/trunk/modules/Notes/Note.php Message-ID: <20060501093344.63D306AB602@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:33:40 2006 New Revision: 5614 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Notes/Note.php Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 02:37:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:37:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5615 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.php Message-ID: <20060501093754.E5A586AB602@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:37:51 2006 New Revision: 5615 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Mon May 1 03:37:51 2006 @@ -60,12 +60,16 @@ function PriceBook() { $this->log =LoggerManager::getLogger('pricebook'); + $this->log->debug("Entering PriceBook() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PriceBooks'); + $this->log->debug("Exiting PriceBook method ..."); } function get_pricebook_products($id) { + global $log; + $log->debug("Entering get_pricebook_products(".$id.") method ..."); global $app_strings; require_once('modules/Products/Product.php'); $focus = new Product(); @@ -75,10 +79,13 @@ $returnset = '&return_module=PriceBooks&return_action=DetailView&return_id='.$id; $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid,pricebookproductrel.listprice from products inner join pricebookproductrel on products.productid = pricebookproductrel.productid inner join crmentity on crmentity.crmid = products.productid inner join pricebook on pricebook.pricebookid = pricebookproductrel.pricebookid where pricebook.pricebookid = '.$id.' and crmentity.deleted = 0'; + $log->debug("Exiting get_pricebook_products method ..."); return getPriceBookRelatedProducts($query,$focus,$returnset); } function get_pricebook_noproduct($id) - { + { + global $log; + $log->debug("Entering get_pricebook_noproduct(".$id.") method ..."); $query = "select crmentity.crmid, pricebook.* from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid where crmentity.deleted=0"; $result = $this->db->query($query); $no_count = $this->db->num_rows($result); @@ -88,19 +95,23 @@ $result_pb = $this->db->query($pb_query); if($no_count == $this->db->num_rows($result_pb)) { + $log->debug("Exiting get_pricebook_noproduct method ..."); return false; } elseif($this->db->num_rows($result_pb) == 0) { + $log->debug("Exiting get_pricebook_noproduct method ..."); return true; } elseif($this->db->num_rows($result_pb) < $no_count) { + $log->debug("Exiting get_pricebook_noproduct method ..."); return true; } } else { + $log->debug("Exiting get_pricebook_noproduct method ..."); return false; } } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 03:16:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 10:16:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5616 - /vtigercrm/trunk/modules/Vendors/Vendor.php Message-ID: <20060501101640.D00FA6CFFB9@vtiger.fosslabs.com> Author: don Date: Mon May 1 04:16:37 2006 New Revision: 5616 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Vendors/Vendor.php Modified: vtigercrm/trunk/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.php (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.php Mon May 1 04:16:37 2006 @@ -66,12 +66,16 @@ function Vendor() { $this->log =LoggerManager::getLogger('vendor'); + $this->log->debug("Entering Vendor() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Vendors'); + $this->log->debug("Exiting Vendor method ..."); } function get_products($id) { + global $log; + $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; require_once('modules/Products/Product.php'); $focus = new Product(); @@ -81,10 +85,13 @@ $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid,vendor.vendorname from products inner join crmentity on crmentity.crmid = products.productid left outer join vendor on vendor.vendorid = products.vendor_id where vendor.vendorid = '.$id.' and crmentity.deleted = 0'; + $log->debug("Exiting get_products method ..."); return GetRelatedList('Vendors','Products',$focus,$query,$button,$returnset); } function get_purchase_orders($id) { + global $log; + $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); $focus = new Order(); @@ -94,10 +101,13 @@ $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, purchaseorder.*,vendor.vendorname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.vendorid=".$id; + $log->debug("Exiting get_purchase_orders method ..."); return GetRelatedList('Vendors','PurchaseOrder',$focus,$query,$button,$returnset); } function get_contacts($id) { + global $log; + $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; require_once('modules/Contacts/Contact.php'); $focus = new Contact(); @@ -106,6 +116,7 @@ $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; $query = 'SELECT contactdetails.*, crmentity.crmid, crmentity.smownerid,vendorcontactrel.vendorid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid inner join vendorcontactrel on vendorcontactrel.contactid=contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where crmentity.deleted=0 and vendorcontactrel.vendorid = '.$id; + $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Vendor','Contacts',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 03:18:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 10:18:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5617 - /vtigercrm/trunk/modules/Products/Product.php Message-ID: <20060501101846.DD3606ECFB1@vtiger.fosslabs.com> Author: don Date: Mon May 1 04:18:42 2006 New Revision: 5617 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Products/Product.php Modified: vtigercrm/trunk/modules/Products/Product.php ============================================================================== --- vtigercrm/trunk/modules/Products/Product.php (original) +++ vtigercrm/trunk/modules/Products/Product.php Mon May 1 04:18:42 2006 @@ -89,12 +89,16 @@ function Product() { $this->log =LoggerManager::getLogger('product'); + $this->log->debug("Entering Product() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Products'); + $this->log->debug("Exiting Product method ..."); } function get_attachments($id) - { + { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); // Armando L?scher 18.10.2005 -> ?visibleDescription // Desc: Inserted crmentity.createdtime, notes.notecontent description, users.user_name // Inserted inner join users on crmentity.smcreatorid= users.id @@ -126,17 +130,23 @@ inner join users on crmentity.smcreatorid= users.id where crmentity.crmid=".$id; + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('Products',$query,$id); } function get_opportunities($id) - { + { + global $log; + $log->debug("Entering get_opportunities(".$id.") method ..."); $query = 'select potential.potentialid, potential.potentialname, potential.potentialtype, products.productid, products.productname, products.qty_per_unit, products.unit_price, products.expiry_date from potential inner join products on potential.productid = products.productid left join potentialgrouprelation on potential.potentialid=potentialgrouprelation.potentialid left join groups on groups.groupname=potentialgrouprelation.groupname where crmentity.deleted=0 and products.productid='.$id; + $log->debug("Exiting get_opportunities method ..."); renderRelatedPotentials($query); } function get_tickets($id) { + global $log; + $log->debug("Entering get_tickets(".$id.") method ..."); global $mod_strings; require_once('modules/HelpDesk/HelpDesk.php'); $focus = new HelpDesk(); @@ -146,12 +156,15 @@ $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; $query = "select users.user_name, users.id, products.productid,products.productname, troubletickets.ticketid, troubletickets.parent_id, troubletickets.title, troubletickets.status, troubletickets.priority, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from troubletickets inner join crmentity on crmentity.crmid = troubletickets.ticketid left join products on products.productid=troubletickets.product_id left join users on users.id=crmentity.smownerid left join ticketgrouprelation on troubletickets.ticketid=ticketgrouprelation.ticketid left join groups on groups.groupname=ticketgrouprelation.groupname where crmentity.deleted=0 and products.productid=".$id; + $log->debug("Exiting get_tickets method ..."); return GetRelatedList('Products','HelpDesk',$focus,$query,$button,$returnset); } function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; require_once('modules/Activities/Activity.php'); @@ -164,10 +177,13 @@ $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name,recurringevents.recurringtype from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Products','Activities',$focus,$query,$button,$returnset); } function get_quotes($id) - { + { + global $log; + $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; require_once('modules/Quotes/Quote.php'); $focus = new Quote(); @@ -177,10 +193,13 @@ $query = "select crmentity.*, quotes.*,potential.potentialname,account.accountname,quotesproductrel.productid from quotes inner join crmentity on crmentity.crmid=quotes.quoteid inner join quotesproductrel on quotesproductrel.quoteid=quotes.quoteid left outer join account on account.accountid=quotes.accountid left outer join potential on potential.potentialid=quotes.potentialid left join quotegrouprelation on quotes.quoteid=quotegrouprelation.quoteid left join groups on groups.groupname=quotegrouprelation.groupname where crmentity.deleted=0 and quotesproductrel.productid=".$id; + $log->debug("Exiting get_quotes method ..."); return GetRelatedList('Products','Quotes',$focus,$query,$button,$returnset); } function get_purchase_orders($id) { + global $log; + $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); $focus = new Order(); @@ -190,10 +209,13 @@ $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, purchaseorder.*,products.productname,poproductrel.productid from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid inner join poproductrel on poproductrel.purchaseorderid=purchaseorder.purchaseorderid inner join products on products.productid=poproductrel.productid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and products.productid=".$id; + $log->debug("Exiting get_purchase_orders method ..."); return GetRelatedList('Products','PurchaseOrder',$focus,$query,$button,$returnset); } function get_salesorder($id) { + global $log; + $log->debug("Entering get_salesorder(".$id.") method ..."); global $app_strings; require_once('modules/SalesOrder/SalesOrder.php'); $focus = new SalesOrder(); @@ -202,10 +224,13 @@ $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, salesorder.*, products.productname as productname, account.accountname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid inner join soproductrel on soproductrel.salesorderid=salesorder.salesorderid inner join products on products.productid=soproductrel.productid left outer join account on account.accountid=salesorder.accountid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and products.productid = ".$id; + $log->debug("Exiting get_salesorder method ..."); return GetRelatedList('Products','SalesOrder',$focus,$query,$button,$returnset); } function get_invoices($id) { + global $log; + $log->debug("Entering get_invoices(".$id.") method ..."); global $app_strings; require_once('modules/Invoice/Invoice.php'); $focus = new Invoice(); @@ -215,10 +240,13 @@ $query = "select crmentity.*, invoice.*, invoiceproductrel.quantity, account.accountname from invoice inner join crmentity on crmentity.crmid=invoice.invoiceid left outer join account on account.accountid=invoice.accountid inner join invoiceproductrel on invoiceproductrel.invoiceid=invoice.invoiceid left join invoicegrouprelation on invoice.invoiceid=invoicegrouprelation.invoiceid left join groups on groups.groupname=invoicegrouprelation.groupname where crmentity.deleted=0 and invoiceproductrel.productid=".$id; + $log->debug("Exiting get_invoices method ..."); return GetRelatedList('Products','Invoice',$focus,$query,$button,$returnset); } function get_product_pricebooks($id) { + global $log; + $log->debug("Entering get_product_pricebooks(".$id.") method ..."); global $mod_strings; require_once('modules/PriceBooks/PriceBook.php'); $focus = new PriceBook(); @@ -227,19 +255,25 @@ $query = 'select crmentity.crmid, pricebook.*,pricebookproductrel.productid as prodid from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid inner join pricebookproductrel on pricebookproductrel.pricebookid=pricebook.pricebookid where crmentity.deleted=0 and pricebookproductrel.productid='.$id; + $log->debug("Exiting get_product_pricebooks method ..."); return GetRelatedList('Products','PriceBooks',$focus,$query,$button,$returnset); } function product_novendor() { + global $log; + $log->debug("Entering product_novendor() method ..."); $query = "SELECT products.productname,crmentity.deleted from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0 and products.vendor_id=''"; $result=$this->db->query($query); + $log->debug("Exiting product_novendor method ..."); return $this->db->num_rows($result); } function create_export_query(&$order_by, &$where) { + global $log; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); if($this->checkIfCustomTableExists('productcf')) { @@ -333,6 +367,7 @@ if(!empty($order_by)) $query .= " ORDER BY $order_by"; + $log->debug("Exiting create_export_query method ..."); return $query; } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 03:23:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 10:23:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5618 - /vtigercrm/trunk/modules/Emails/Save.php Message-ID: <20060501102326.98B706F9743@vtiger.fosslabs.com> Author: don Date: Mon May 1 04:23:22 2006 New Revision: 5618 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Emails/Save.php Modified: vtigercrm/trunk/modules/Emails/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 03:31:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 10:31:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5619 - /vtigercrm/trunk/modules/Emails/mailbox.php Message-ID: <20060501103136.58E736F9740@vtiger.fosslabs.com> Author: don Date: Mon May 1 04:31:32 2006 New Revision: 5619 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Emails/mailbox.php Modified: vtigercrm/trunk/modules/Emails/mailbox.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mailbox.php (original) +++ vtigercrm/trunk/modules/Emails/mailbox.php Mon May 1 04:31:32 2006 @@ -254,16 +254,22 @@ function get_mime_type(&$structure) { + global $log; + $log->debug("Entering get_mime_type(".$structure.") method ..."); $primary_mime_type = array("TEXT", "MULTIPART","MESSAGE", "APPLICATION", "AUDIO","IMAGE", "VIDEO", "OTHER"); if($structure->subtype) { + $log->debug("Exiting get_mime_type method ..."); return $primary_mime_type[(int) $structure->type] . '/' .$structure->subtype; } + $log->debug("Exiting get_mime_type method ..."); return "TEXT/PLAIN"; } function get_part($stream, $msg_number, $mime_type, $structure = false,$part_number = false) { + global $log; + $log->debug("Entering get_part(".$stream.", ".$msg_number.", ".$mime_type.", ".$structure.",".$part_number.") method ..."); if(!$structure) { $structure = imap_fetchstructure($stream, $msg_number); @@ -275,10 +281,13 @@ } $text = imap_fetchbody($stream, $msg_number, $part_number); if($structure->encoding == 3) { + $log->debug("Exiting get_part method ..."); return imap_base64($text); } else if($structure->encoding == 4) { + $log->debug("Exiting get_part method ..."); return imap_qprint($text); } else { + $log->debug("Exiting get_part method ..."); return $text; } } @@ -291,11 +300,13 @@ } $data = get_part($stream, $msg_number, $mime_type, $sub_structure,$prefix . ($index + 1)); if($data) { + $log->debug("Exiting get_part method ..."); return $data; } } // END OF WHILE } // END OF MULTIPART } // END OF STRUTURE + $log->debug("Exiting get_part method ..."); return false; } // END OF FUNCTION @@ -327,6 +338,8 @@ function transformHTML($str) { + global $log; + $log->debug("Entering transformHTML(".$str.") method ..."); if ((strpos($str,"\n"; if ((strpos($str,"\n". $str; } + $log->debug("Exiting transformHTML method ..."); return $str; } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 04:20:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:20:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5620 - /vtigercrm/trunk/modules/Emails/Email.php Message-ID: <20060501112009.E35FC6F974D@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:20:06 2006 New Revision: 5620 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Emails/Email.php Modified: vtigercrm/trunk/modules/Emails/Email.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Email.php (original) +++ vtigercrm/trunk/modules/Emails/Email.php Mon May 1 05:20:06 2006 @@ -79,8 +79,11 @@ function Email() { $this->log = LoggerManager::getLogger('email'); + $this->log->debug("Entering Email() method ..."); + $this->log = LoggerManager::getLogger('email'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Emails'); + $this->log->debug("Exiting Email method ..."); } var $new_schema = true; @@ -93,6 +96,7 @@ function get_contacts($id) { global $log; + $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; global $app_strings; @@ -103,6 +107,7 @@ $query = 'select contactdetails.accountid, contactdetails.contactid, contactdetails.firstname,contactdetails.lastname, contactdetails.department, contactdetails.title, contactdetails.email, contactdetails.phone, contactdetails.emailoptout, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from contactdetails inner join cntactivityrel on cntactivityrel.contactid=contactdetails.contactid inner join crmentity on crmentity.crmid = contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where cntactivityrel.activityid='.PearDatabase::quote($id).' and crmentity.deleted=0'; $log->info("Contact Related List for Email is Displayed"); + $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Emails','Contacts',$focus,$query,$button,$returnset); } @@ -113,6 +118,8 @@ */ function get_users($id) { + global $log; + $log->debug("Entering get_users(".$id.") method ..."); global $adb; global $mod_strings; global $app_strings; @@ -164,6 +171,7 @@ if($entries_list != '') $return_data = array("header"=>$header, "entries"=>$entries); + $log->debug("Exiting get_users method ..."); return $return_data; } @@ -173,6 +181,7 @@ function get_attachments($id) { global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); $query = "select notes.title,'Notes ' ActivityType, notes.filename, attachments.type FileType,crm2.modifiedtime lastmodified, seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid, @@ -198,6 +207,7 @@ where crmentity.crmid=".PearDatabase::quote($id); $log->info("Notes&Attachments Related List for Email is Displayed"); + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('Emails',$query,$id); } @@ -205,9 +215,12 @@ * Returns a list of the Emails to be exported */ function create_export_query(&$order_by, &$where) - { + { + global $log; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); $query = 'SELECT activity.activityid, activity.subject, activity.activitytype, attachments.name as filename, crmentity.description as email_content FROM activity inner join crmentity on crmentity.crmid=activity.activityid left join seattachmentsrel on activity.activityid=seattachmentsrel.crmid left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid where activity.activitytype="Emails" and crmentity.deleted=0'; + $log->debug("Exiting create_export_query method ..."); return $query; } @@ -216,8 +229,11 @@ */ function set_emails_contact_invitee_relationship($email_id, $contact_id) { + global $log; + $log->debug("Entering set_emails_contact_invitee_relationship(".$email_id.",". $contact_id.") method ..."); $query = "insert into $this->rel_contacts_table (contactid,activityid) values('$contact_id','$email_id')"; $this->db->query($query,true,"Error setting email to contact relationship: "."
$query"); + $log->debug("Exiting set_emails_contact_invitee_relationship method ..."); } /** @@ -225,8 +241,11 @@ */ function set_emails_se_invitee_relationship($email_id, $contact_id) { + global $log; + $log->debug("Entering set_emails_se_invitee_relationship(".$email_id.",". $contact_id.") method ..."); $query = "insert into $this->rel_serel_table (crmid,activityid) values('$contact_id','$email_id')"; $this->db->query($query,true,"Error setting email to contact relationship: "."
$query"); + $log->debug("Exiting set_emails_se_invitee_relationship method ..."); } /** @@ -234,8 +253,11 @@ */ function set_emails_user_invitee_relationship($email_id, $user_id) { + global $log; + $log->debug("Entering set_emails_user_invitee_relationship(".$email_id.",". $user_id.") method ..."); $query = "insert into $this->rel_users_table (smid,activityid) values ('$user_id', '$email_id')"; $this->db->query($query,true,"Error setting email to user relationship: "."
$query"); + $log->debug("Exiting set_emails_user_invitee_relationship method ..."); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 04:22:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:22:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5621 - /vtigercrm/trunk/modules/Leads/Save.php Message-ID: <20060501112237.325FA6F974D@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:22:33 2006 New Revision: 5621 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Leads/Save.php Modified: vtigercrm/trunk/modules/Leads/Save.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Save.php (original) +++ vtigercrm/trunk/modules/Leads/Save.php Mon May 1 05:22:33 2006 @@ -73,6 +73,7 @@ //Code to save the custom field info into database function save_customfields($entity_id) { + $log->debug("Entering save_customfields(".$entity_id.") method ..."); $log->debug("save custom field invoked ".$entity_id); global $adb; $dbquery="select * from customfields where module='Leads'"; @@ -146,5 +147,6 @@ } } + $log->debug("Exiting save_customfields method ..."); } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 04:23:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:23:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5622 - /vtigercrm/trunk/modules/Leads/result.php Message-ID: <20060501112325.D6D4B6F974D@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:23:21 2006 New Revision: 5622 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Leads/result.php Modified: vtigercrm/trunk/modules/Leads/result.php ============================================================================== --- vtigercrm/trunk/modules/Leads/result.php (original) +++ vtigercrm/trunk/modules/Leads/result.php Mon May 1 05:23:21 2006 @@ -117,7 +117,10 @@ //echo $description; function deleteFile($filename) { + global $log; + $log->debug("Entering deleteFile(".$filename.") method ..."); unlink($filename); + $log->debug("Exiting deleteFile method ..."); } @@ -202,6 +205,8 @@ function insert2DB($salutation,$firstname,$lastname,$company,$designation,$leadsrc,$industry,$annualrevenue,$licensekey,$phone,$mobile,$fax,$email,$yahooid,$website,$leadstatus,$rating,$empct) { + global $log; + $log->debug("Entering insert2DB(".$salutation.",".$firstname.",".$lastname.",".$company.",".$designation.",".$leadsrc.",".$industry.",".$annualrevenue.",".$licensekey.",".$phone.",".$mobile.",".$fax.",".$email.",".$yahooid.",".$website.",".$leadstatus.",".$rating.",".$empct.") method ..."); $id = create_guid(); $date_entered = date('YmdHis'); $date_modified = date('YmdHis'); @@ -212,6 +217,7 @@ $sql = "INSERT INTO leads (id,date_entered,date_modified,modified_user_id,assigned_user_id,salutation,first_name,last_name,company,designation,lead_source,industry,annual_revenue,license_key,phone,mobile,fax,email,yahoo_id,website,lead_status,rating,employees) VALUES ('$id',".$adb->formatString('leads','date_entered',$date_entered).",".$adb->formatString('leads','date_modified',$date_modified).",'$modified_user_id','$assigned_user_id','$salutation','$firstname','$lastname','$company','$designation','$leadsrc','$industry','$annualrevenue','$licensekey','$phone','$mobile','$fax','$email','$yahooid','$website','$leadstatus','$rating','$empcount')"; $result = $adb->query($sql); + $log->debug("Exiting insert2DB method ..."); return $id; } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 04:23:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:23:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5623 - /vtigercrm/trunk/modules/Leads/ListViewTop.php Message-ID: <20060501112356.42A0B6F974D@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:23:52 2006 New Revision: 5623 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Leads/ListViewTop.php Modified: vtigercrm/trunk/modules/Leads/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListViewTop.php (original) +++ vtigercrm/trunk/modules/Leads/ListViewTop.php Mon May 1 05:23:52 2006 @@ -22,6 +22,8 @@ function getNewLeads() { + global $log; + $log->debug("Entering getNewLeads() method ..."); require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); require_once("include/utils/utils.php"); @@ -119,10 +121,13 @@ $entries[$lead_fields['LEAD_ID']]=$value; } $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); + $log->debug("Exiting getNewLeads method ..."); return $values; } function getLeadView($lead_view) { + global $log; + $log->debug("Entering getLeadView(".$lead_view.") method ..."); $today = date("Y-m-d", time()); if($lead_view == 'Today') @@ -150,6 +155,7 @@ $LEAD_VIEW_SELECT_OPTION .= ''; $LEAD_VIEW_SELECT_OPTION .= ''; + $log->debug("Exiting getLeadView method ..."); return $LEAD_VIEW_SELECT_OPTION; } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 04:25:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:25:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5624 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060501112543.857786D90A6@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:25:39 2006 New Revision: 5624 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Mon May 1 05:25:39 2006 @@ -144,30 +144,38 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Lead() { + function Lead() { $this->log = LoggerManager::getLogger('lead'); + $this->log->debug("Entering Lead() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Leads'); + $this->log->debug("Exiting Lead method ..."); } // Mike Crowe Mod --------------------------------------------------------Default ordering for us function getSortOrder() { + global $log; + $log->debug("Entering getSortOrder() method ..."); if(isset($_REQUEST['sorder'])) $sorder = $_REQUEST['sorder']; else $sorder = (($_SESSION['LEADS_SORT_ORDER'] != '')?($_SESSION['LEADS_SORT_ORDER']):($this->default_sort_order)); + $log->debug("Exiting getSortOrder method ..."); return $sorder; } function getOrderBy() { + global $log; + $log->debug("Entering getOrderBy() method ..."); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; else $order_by = (($_SESSION['LEADS_ORDER_BY'] != '')?($_SESSION['LEADS_ORDER_BY']):($this->default_order_by)); + $log->debug("Exiting getOrderBy method ..."); return $order_by; } // Mike Crowe Mod -------------------------------------------------------- @@ -176,6 +184,8 @@ function create_export_query(&$order_by, &$where) { + global $log; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); if($this->checkIfCustomTableExists('leadscf')) { @@ -219,6 +229,7 @@ if(!empty($order_by)) $query .= " ORDER BY $order_by"; + $log->debug("Exiting create_export_query method ..."); return $query; } @@ -228,6 +239,8 @@ */ function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; $focus = new Activity(); @@ -243,6 +256,7 @@ // First, get the list of IDs. $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name,recurringevents.recurringtype from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus !='' && activity.eventstatus = 'Planned')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Leads','Activities',$focus,$query,$button,$returnset); } @@ -250,6 +264,8 @@ */ function get_emails($id) { + + $log->debug("Entering get_emails(".$id.") method ..."); global $mod_strings; require_once('include/RelatedListView.php'); @@ -265,11 +281,14 @@ $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; $query ="select activity.activityid, activity.subject, activity.semodule, activity.activitytype, activity.date_start, activity.status, activity.priority, crmentity.crmid,crmentity.smownerid,crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid inner join users on users.id=crmentity.smownerid where activity.activitytype='Emails' and crmentity.deleted=0 and seactivityrel.crmid=".$id; + $log->debug("Exiting get_emails method ..."); return GetRelatedList('Leads','Emails',$focus,$query,$button,$returnset); } function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT activity.activityid, activity.subject, activity.status, activity.eventstatus, activity.activitytype, contactdetails.contactid, contactdetails.firstname, contactdetails.lastname, crmentity.modifiedtime, @@ -287,11 +306,14 @@ and seactivityrel.crmid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Exiting get_history method ..."); return getHistory('Leads',$query,$id); } function get_attachments($id) { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); // Armando L?scher 18.10.2005 -> ?visibleDescription // Desc: Inserted crm2.createdtime, notes.notecontent description, users.user_name // Inserted inner join users on crm2.smcreatorid= users.id @@ -324,11 +346,14 @@ where crmentity.crmid=".$id." order by createdtime desc"; + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('Leads',$query,$id); } function get_products($id) { + global $log; + $log->debug("Entering get_products(".$id.") method ..."); require_once('modules/Products/Product.php'); global $mod_strings; global $app_strings; @@ -344,18 +369,24 @@ $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid from products inner join seproductsrel on products.productid = seproductsrel.productid inner join crmentity on crmentity.crmid = products.productid inner join leaddetails on leaddetails.leadid = seproductsrel.crmid where leaddetails.leadid = '.$id.' and crmentity.deleted = 0'; + $log->debug("Exiting get_products method ..."); return GetRelatedList('Leads','Products',$focus,$query,$button,$returnset); } function get_lead_field_options($list_option) { + global $log; + $log->debug("Entering get_lead_field_options(".$list_option.") method ..."); $comboFieldArray = getComboArray($this->combofieldNames); + $log->debug("Exiting get_lead_field_options method ..."); return $comboFieldArray[$list_option]; } //Used By vtigerCRM Word Plugin function getColumnNames_Lead() { + global $log; + $log->debug("Entering getColumnNames_Lead() method ..."); $sql1 = "select fieldlabel from field where tabid=7"; $result = $this->db->query($sql1); $numRows = $this->db->num_rows($result); @@ -366,6 +397,7 @@ $custom_fields[$i] = strtoupper($custom_fields[$i]); } $mergeflds = $custom_fields; + $log->debug("Exiting getColumnNames_Lead method ..."); return $mergeflds; } //End From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 04:26:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:26:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5625 - /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Message-ID: <20060501112633.A11636D90A6@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:26:29 2006 New Revision: 5625 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Mon May 1 05:26:29 2006 @@ -58,7 +58,7 @@ function getInsertValues($type,$type_id) { global $id,$adb,$log; - + $log->debug("Entering getInsertValues(".$type.",".$type_id.") method ..."); $sql_convert_lead="select * from convertleadmapping "; $convert_result = $adb->query($sql_convert_lead); $noofrows = $adb->num_rows($convert_result); @@ -66,7 +66,7 @@ for($i=0;$i<$noofrows;$i++) { $flag="false"; - $log->info("In convertleadmapping function"); + $log->info("In convertleadmapping function"); $lead_id=$adb->query_result($convert_result,$i,"leadfid"); //Getting the relatd customfields for Accounts/Contact/potential from convertleadmapping table $account_id_val=$adb->query_result($convert_result,$i,"accountfid"); @@ -135,6 +135,7 @@ $log->debug("columns to be inserted are ".$type_insert_column); $log->debug("columns to be inserted are ".$insert_value); $values = array ($type_insert_column,$insert_value); + $log->debug("Exiting getInsertValues method ..."); return $values; } //function Ends @@ -142,7 +143,7 @@ function getRelatedNotesAttachments($id,$accountid) { global $adb,$log,$id; - + $log->debug("Entering getRelatedNotesAttachments(".$id.",".$accountid.") method ..."); $sql_lead_notes ="select * from senotesrel where crmid=".$id; $lead_notes_result = $adb->query($sql_lead_notes); @@ -176,13 +177,14 @@ $sql_insert_account_attachment="insert into seattachmentsrel(crmid,attachmentsid) values (".$accountid.",".$lead_related_attachment_id.")"; $adb->query($sql_insert_account_attachment); } + $log->debug("Exiting getRelatedNotesAttachments method ..."); } function getRelatedActivities($accountid,$contact_id) { global $adb,$log,$id; - + $log->debug("Entering getRelatedActivities(".$accountid.",".$contact_id.") method ..."); $sql_lead_activity="select * from seactivityrel where crmid=".$id; $lead_activity_result = $adb->query($sql_lead_activity); $noofrows = $adb->num_rows($lead_activity_result); @@ -213,7 +215,7 @@ $sql_insert_account_activity="insert into seactivityrel(crmid,activityid) values (".$contact_id.",".$lead_related_activity_id.")"; $adb->query($sql_insert_account_activity); } } - + $log->debug("Exiting getRelatedActivities method ..."); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 06:33:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 13:33:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5626 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060501133304.1F5066FF4EE@vtiger.fosslabs.com> Author: don Date: Mon May 1 07:32:58 2006 New Revision: 5626 Log: Added pref view in header.tpl-ahmed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon May 1 07:32:58 2006 @@ -27,7 +27,7 @@ - +
My Preferences My Preferences Logout ({$CURRENT_USER})
From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 06:36:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 13:36:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5627 - /vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Message-ID: <20060501133648.9A6D2702BF7@vtiger.fosslabs.com> Author: don Date: Mon May 1 07:36:44 2006 New Revision: 5627 Log: Added the primary email id Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Mon May 1 07:36:44 2006 @@ -1,4 +1,5 @@ + @@ -20,6 +21,7 @@ + @@ -39,7 +41,7 @@   My Details - My Mail Server Details + My Mail Server Details   @@ -62,13 +64,16 @@ {$EDIT_BUTTON} +   + + {* {$CHANGE_PW_BUTTON}*} My Details - User Name + *User Name {$USER_NAME} Admin @@ -82,16 +87,17 @@ {$GROUPASSIGNED} - Last Name + *Last Name {$LAST_NAME} - My Role + *My Role {$ROLEASSIGNED} - Password - - My Status + *E-Mail Id + {$EMAIL1} + {* *} + *My Status {$STATUS}   @@ -249,3 +255,58 @@ {$JAVASCRIPT} +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Change Password

Enter Current Password :
Enter New Password :
Confirm New Password :
 
+    + +
 
+
+
+ From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 06:39:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 01 May 2006 13:39:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5628 - /vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Message-ID: <20060501133902.CBD43702BF7@vtiger.fosslabs.com> Author: don Date: Mon May 1 07:38:59 2006 New Revision: 5628 Log: Added the primary email id Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Mon May 1 07:38:59 2006 @@ -256,7 +256,6 @@ {$JAVASCRIPT}
-
@@ -286,7 +285,6 @@
Change Password
 
-
- - - - - - - - - - {include file='SettingsMenu.tpl'} - -
- - - - -
{$MOD.LBL_USER_MANAGEMENT}
- - - - - - - - - - - - - - - - - - - - -
- {$USER_IMAGE} - {$EDIT_BUTTON} - {$CHANGE_PW_BUTTON} - {$LOGIN_HISTORY_BUTTON} - {$DUPLICATE_BUTTON} - {$DELETE_BUTTON} - {$LIST_MAILSERVER_BUTTON} - {$CHANGE_HOMEPAGE_BUTTON} - {$LISTROLES_BUTTON} -
 
- -
-
- - - - - - - - - - - -
- - - - - - - - -
 {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} 
-
-
- - - -
 
- - - - - - - - - - - {if $MODE eq 'edit'} - - - - - - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$UMOD.LBL_USER_INFORMATION}
*{$UMOD.LBL_USER_NAME} {$USER_NAME}{$UMOD.LBL_ADMIN}
*{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
{$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}*{$UMOD.LBL_LAST_NAME}{$LAST_NAME}
*{$UMOD.LBL_USER_ROLE}{$ROLEASSIGNED} {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED}
*{$UMOD.LBL_EMAIL}{$EMAIL1}*{$UMOD.LBL_STATUS}{$STATUS}
 
{$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
*{$UMOD.LBL_COLOR}{$COLORASSIGNED}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
 
-
-
-
- - - -
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$UMOD.LBL_USER_MORE_INFN}
{$UMOD.LBL_TITLE}{$TITLE}{$UMOD.LBL_OFFICE_PHONE}{$PHONE_WORK}
{$UMOD.LBL_DEPARTMENT}{$DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}{$PHONE_MOBILE}
{$UMOD.LBL_REPORTS_TO}{$REPORTS_TO_NAME}{$REPORTS_TO_ID} {$UMOD.LBL_OTHER_PHONE}{$PHONE_OTHER}
{$UMOD.LBL_OTHER_EMAIL}{$EMAIL2}{$UMOD.LBL_FAX}{$PHONE_FAX}
{$UMOD.LBL_YAHOO_ID}{$YAHOO_ID}{$UMOD.LBL_HOME_PHONE}{$PHONE_HOME}
{$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}  
{$UMOD.LBL_SIGNATURE}{$SIGNATURE}{$UMOD.LBL_NOTES}{$DESCRIPTION} -
 
-
-
-
- - - -
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$UMOD.LBL_USER_ADDR_INFN}
{$UMOD.LBL_ADDRESS}{$ADDRESS_STREET}  
{$UMOD.LBL_CITY}{$ADDRESS_CITY}  
{$UMOD.LBL_STATE}{$ADDRESS_STATE}  
{$UMOD.LBL_POSTAL_CODE}{$ADDRESS_POSTALCODE}  
{$UMOD.LBL_COUNTRY}{$ADDRESS_COUNTRY}  
 
-
-
-
 
-
- -
-
- -
-
- - - - -{$JAVASCRIPT} - {include file='SettingsSubMenu.tpl'} + + + + + + + + + + + + {include file='SettingsMenu.tpl'} + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + {$MOD.LBL_SETTINGS} + > {$MOD.LBL_USER_MANAGEMENT} +
+
{$USER_NAME}
+ Detail View of {$FIRST_NAME} {$LAST_NAME} +
+
 
+ {$EDIT_BUTTON} + {$CHANGE_PW_BUTTON} + {$LOGIN_HISTORY_BUTTON} + {$DUPLICATE_BUTTON} + {$DELETE_BUTTON} + {$LIST_MAILSERVER_BUTTON} + {$CHANGE_HOMEPAGE_BUTTON} + {$LISTROLES_BUTTON} +
 
+ + + + + + + + + + + +
+ + + + + + + + +
 {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} 
+
+
+ + + +
 
+ + + + + + + + + + + {if $MODE eq 'edit'} + + + + + + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$UMOD.LBL_USER_INFORMATION}
*{$UMOD.LBL_USER_NAME} {$USER_NAME}{$UMOD.LBL_ADMIN}
*{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
{$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}*{$UMOD.LBL_LAST_NAME}{$LAST_NAME}
*{$UMOD.LBL_USER_ROLE}{$ROLEASSIGNED} {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED}
*{$UMOD.LBL_EMAIL}{$EMAIL1}*{$UMOD.LBL_STATUS}{$STATUS}
 
{$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
*{$UMOD.LBL_COLOR}{$COLORASSIGNED}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
 
+
+
+
+ + + +
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$UMOD.LBL_USER_MORE_INFN}
{$UMOD.LBL_TITLE}{$TITLE}{$UMOD.LBL_OFFICE_PHONE}{$PHONE_WORK}
{$UMOD.LBL_DEPARTMENT}{$DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}{$PHONE_MOBILE}
{$UMOD.LBL_REPORTS_TO}{$REPORTS_TO_NAME}{$REPORTS_TO_ID} {$UMOD.LBL_OTHER_PHONE}{$PHONE_OTHER}
{$UMOD.LBL_OTHER_EMAIL}{$EMAIL2}{$UMOD.LBL_FAX}{$PHONE_FAX}
{$UMOD.LBL_YAHOO_ID}{$YAHOO_ID}{$UMOD.LBL_HOME_PHONE}{$PHONE_HOME}
{$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}  
{$UMOD.LBL_SIGNATURE}{$SIGNATURE}{$UMOD.LBL_NOTES}{$DESCRIPTION} +
 
+
+
+
+ + + +
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$UMOD.LBL_USER_ADDR_INFN}
{$UMOD.LBL_ADDRESS}{$ADDRESS_STREET}  
{$UMOD.LBL_CITY}{$ADDRESS_CITY}  
{$UMOD.LBL_STATE}{$ADDRESS_STATE}  
{$UMOD.LBL_POSTAL_CODE}{$ADDRESS_POSTALCODE}  
{$UMOD.LBL_COUNTRY}{$ADDRESS_COUNTRY}  
 
+
+
+
 
+ + + +
+ +
+
+ + + + +{$JAVASCRIPT} + {include file='SettingsSubMenu.tpl'} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 00:32:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 07:32:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5639 - /vtigercrm/trunk/Smarty/templates/UserListView.tpl Message-ID: <20060502073204.3D040702E07@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 01:31:49 2006 New Revision: 5639 Log: Added the UI Changes in userlistview.tpl - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Tue May 2 01:31:49 2006 @@ -3,79 +3,78 @@ {include file='SettingsMenu.tpl'} -
- - - - - -
{$MOD.LBL_USER_MANAGEMENT}
- - - - - - - - - - - - - -
-{if $USER_IMAGES neq ''} - - -
-[X] Close -
-{foreach item=imagename from=$USER_IMAGES} - {$imagename} -{/foreach} -
-
-{/if} -
{$RECORD_COUNTS} - - {$NAVIGATION} -
-
 
- - + -{foreach item=header from=$LIST_HEADER} - -{/foreach} - -{section name=entries loop=$LIST_ENTRIES} - - {foreach item=listvalues from=$LIST_ENTRIES[entries]} - - {/foreach} - -{/section} -
+ + -
{$header}
{$listvalues}
- -
- - - - - - - - - - - -
{$CMOD.LBL_STATISTICS}
{$CMOD.LBL_TOTAL}{$USER_COUNT.user} {$CMOD.LBL_USERS}
{$CMOD.LBL_ADMIN}{$USER_COUNT.admin} {$CMOD.LBL_USERS}
{$CMOD.LBL_OTHERS}{$USER_COUNT.nonadmin} {$CMOD.LBL_USERS}
-
-
+ + + + + + + + + + + +
+ + {$MOD.LBL_SETTINGS} + > {$MOD.LBL_USER_MANAGEMENT} +
+
+ + + + + + + + + + {$NAVIGATION} + +
 {$MOD.LBL_USER_MANAGEMENT} + +
 
{$RECORD_COUNTS} 
+
+
+ + + + + + + + + + + +
+ {$CMOD.LBL_STATISTICS}
{$CMOD.LBL_TOTAL}{$USER_COUNT.user} {$CMOD.LBL_USERS}
{$CMOD.LBL_ADMIN} : {$USER_COUNT.admin} {$CMOD.LBL_USERS}
{$CMOD.LBL_OTHERS}{$USER_COUNT.nonadmin} {$CMOD.LBL_USERS}
+
+ + + + {foreach item=header from=$LIST_HEADER} + + {/foreach} + + {section name=entries loop=$LIST_ENTRIES} + + {foreach item=listvalues from=$LIST_ENTRIES[entries]} + + {/foreach} + + {/section} + +
{$header}
{$listvalues}
+
+
From vtiger-tickets at vtiger.fosslabs.com Tue May 2 01:10:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 08:10:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23194=3A_?= =?utf-8?q?massdelete_in_ListView_shows_hacking_attempt?= In-Reply-To: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> References: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> Message-ID: <085.b68339f49568a4b4f01c565fed239676@vtiger.fosslabs.com> #194: massdelete in ListView shows hacking attempt ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: philip Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: worksforme | Keywords: massdelete ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => worksforme * status: new => closed Comment: No module specified, also this will not work in mozilla version less than 1.5 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 01:13:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 08:13:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23194=3A_?= =?utf-8?q?massdelete_in_ListView_shows_hacking_attempt?= In-Reply-To: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> References: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> Message-ID: <085.21eb500712841a734baded70649c8beb@vtiger.fosslabs.com> #194: massdelete in ListView shows hacking attempt ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: philip Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: worksforme | Keywords: massdelete ---------------------------+------------------------------------------------ -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 01:21:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 08:21:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23561=3A_?= =?utf-8?q?listview_broken_in_IE?= In-Reply-To: <076.8118f2181b324708891dc5c04b35521f@vtiger.fosslabs.com> References: <076.8118f2181b324708891dc5c04b35521f@vtiger.fosslabs.com> Message-ID: <085.3e68399ecf9f5d26189b1d0b780a4be2@vtiger.fosslabs.com> #561: listview broken in IE --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 01:24:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 08:24:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23259=3A_?= =?utf-8?q?New_User_-_Reports_To_-_CSS_Not_applied_properly?= In-Reply-To: <076.8733a323192caf9065436361d9d6cd14@vtiger.fosslabs.com> References: <076.8733a323192caf9065436361d9d6cd14@vtiger.fosslabs.com> Message-ID: <085.83de5401d86ca80a8297a71d4196e565@vtiger.fosslabs.com> #259: New User - Reports To - CSS Not applied properly ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 01:25:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 08:25:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5640 - in /vtigercrm/trunk: Smarty/templates/GlobalListView.tpl modules/Home/UnifiedSearch.php Message-ID: <20060502082504.0E3E0702DED@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 02:24:55 2006 New Revision: 5640 Log: * Modified to display the search criteria in Header and added the function docs Modified: vtigercrm/trunk/Smarty/templates/GlobalListView.tpl vtigercrm/trunk/modules/Home/UnifiedSearch.php Modified: vtigercrm/trunk/Smarty/templates/GlobalListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GlobalListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GlobalListView.tpl Tue May 2 02:24:55 2006 @@ -49,7 +49,7 @@ - + -
{$MODULE}{$MODULE}{$SEARCH_CRITERIA}
- - - - - - - - - -

- {$MOD.LBL_SETTINGS} - > {$UMOD.LBL_EMAIL_TEMPLATES_LIST} -
-
 
- - - - - - - - - - - - - {**} - - - - - - - - {foreach item=template from=$TEMPLATES} - - - - - - - - {/foreach} - - - - - -
 
  -
-
 
{$UMOD.LBL_TEMPLATE_HEADER}{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_TEMPLATE_TOOLS}
- {if $template.foldername == "Public"} - - {else} - - {/if} -  {$template.templatename}{$template.description}View Sample Email
- -  {$UMOD.LBL_TEMPLATE_PRIVATE} -        -  {$UMOD.LBL_TEMPLATE_PUBLIC} - - - -
- -
 
- - - - - - -{$JAVASCRIPT} -{include file='SettingsSubMenu.tpl'} - - + + + + + + + + + {include file='SettingsMenu.tpl'} + + +
+ + + + + + + + + + + +

+ {$MOD.LBL_SETTINGS} + > {$UMOD.LBL_EMAIL_TEMPLATES_LIST} +
+
 
+ + + + + + + + + + + + + {**} + + + + + + +
 
  +
+
 
+ + + + + + + + + {foreach item=template from=$TEMPLATES} + + + + + + + + {/foreach} + +
{$UMOD.LBL_TEMPLATE_HEADER}{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_TEMPLATE_TOOLS}
+ {if $template.foldername == "Public"} + + {else} + + {/if} +  {$template.templatename}{$template.description}View Sample Email
+
+ +  {$UMOD.LBL_TEMPLATE_PRIVATE} +        +  {$UMOD.LBL_TEMPLATE_PUBLIC} + + + +
+ +
 
+ + +
+ +{$JAVASCRIPT} +{include file='SettingsSubMenu.tpl'} + + From vtiger-tickets at vtiger.fosslabs.com Tue May 2 04:59:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 11:59:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23596=3A_?= =?utf-8?q?CompanyInformation_Edit/Detail_view_in_IE?= In-Reply-To: <076.727e2445c9d30d2feff16293f90f0d90@vtiger.fosslabs.com> References: <076.727e2445c9d30d2feff16293f90f0d90@vtiger.fosslabs.com> Message-ID: <085.f2a76295fe242a446a7bd65248ba7aa6@vtiger.fosslabs.com> #596: CompanyInformation Edit/Detail view in IE --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:00:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:00:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5654 - /vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Message-ID: <20060502120015.64B79702E36@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:00:10 2006 New Revision: 5654 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Tue May 2 06:00:10 2006 @@ -1,88 +1,88 @@ - - - - - - {include file='SettingsMenu.tpl'} - - -
- - - - - - - - - - - -

- {$MOD.LBL_SETTINGS} - > {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}" -
-
 
- - - - - - - - - - - - - - - - - - - -
 
- - - - -
- - {$TEMPLATENAME}
- {$TEMPLATENAME} Template -
-
  
- - - - - - - - - - - - - - - - - - - - - -
{$UMOD.LBL_FOLDER}{$FOLDERNAME}
  
{$UMOD.LBL_SUBJECT}{$DESCRIPTION}
  
{$UMOD.LBL_MESSAGE}{$BODY}
-
-
 
- - - -
- -{$JAVASCRIPT} -{include file='SettingsSubMenu.tpl'} - - + + + + + + {include file='SettingsMenu.tpl'} + + +
+ + + + + + + + + + + +

+ {$MOD.LBL_SETTINGS} + > {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}" +
+
 
+ + + + + + + + + + + + + + + + + + + +
 
+ + + + +
+ + {$TEMPLATENAME}
+ {$TEMPLATENAME} Template +
+
  
+ + + + + + + + + + + + + + + + + + + + + +
{$UMOD.LBL_FOLDER}{$FOLDERNAME}
  
{$UMOD.LBL_SUBJECT}{$DESCRIPTION}
  
{$UMOD.LBL_MESSAGE}{$BODY}
+
+
 
+ + + +
+ +{$JAVASCRIPT} +{include file='SettingsSubMenu.tpl'} + + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:03:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:03:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5655 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060502120330.B8F79702E41@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:03:24 2006 New Revision: 5655 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Tue May 2 06:03:24 2006 @@ -1,298 +1,298 @@ - - - - - - - - - {include file='SettingsMenu.tpl'} - - -
-
- - - - - - - - - - - - - - - - - - - - - - -

- {if $EMODE eq 'edit'} - {$MOD.LBL_SETTINGS} - > Communication Templates > Editing Email Templates > {$TEMPLATENAME} - {else} - {$MOD.LBL_SETTINGS} - > Communication Templates > Creating Email Templates > New - {/if} -
-
 
- - - - - - - - - - - - - -
 
- - - - - - -
- - - *{$UMOD.LBL_TEMPLATE_NAME}
-

- Description:
-

- *Folder: - -
- -
- -
- {if $EMODE eq 'edit'} - - {else} - - {/if} -
- -
  
- - - - - - - - - - - - - - - - - - -
*{$UMOD.LBL_TEMPLATE_SUBJECT} - - - - - - - - - - - - - - - - - -
{$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}
Available Merge Fields
 
{$UMOD.LBL_SELECT_FIELD_TYPE}
 
{$UMOD.LBL_SELECT_FIELD}
 
{$UMOD.LBL_MERGE_FIELD_VALUE}
({$UMOD.LBL_COPY_AND_PASTE_MERGE_FIELD})
- - -
  
{$UMOD.LBL_TEMPLATE_MESSAGE} - -
-
-
 
 
-    - {if $EMODE eq 'edit'} - - {else} - - {/if} -  
- -
-
- - - -{$JAVASCRIPT} -{include file='SettingsSubMenu.tpl'} - + + + + + + + + + {include file='SettingsMenu.tpl'} + + +
+
+ + + + + + + + + + + + + + + + + + + + + + +

+ {if $EMODE eq 'edit'} + {$MOD.LBL_SETTINGS} + > Communication Templates > Editing Email Templates > {$TEMPLATENAME} + {else} + {$MOD.LBL_SETTINGS} + > Communication Templates > Creating Email Templates > New + {/if} +
+
 
+ + + + + + + + + + + + + +
 
+ + + + + + +
+ + + *{$UMOD.LBL_TEMPLATE_NAME}
+
+ Description:
+

+ *Folder: + +
+ +
+ +
+ {if $EMODE eq 'edit'} + + {else} + + {/if} +
+ +
  
+ + + + + + + + + + + + + + + + + + +
*{$UMOD.LBL_TEMPLATE_SUBJECT} + + + + + + + + + + + + + + + + + +
{$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}
Available Merge Fields
 
{$UMOD.LBL_SELECT_FIELD_TYPE}
 
{$UMOD.LBL_SELECT_FIELD}
 
{$UMOD.LBL_MERGE_FIELD_VALUE}
({$UMOD.LBL_COPY_AND_PASTE_MERGE_FIELD})
+ + +
  
{$UMOD.LBL_TEMPLATE_MESSAGE} + +
+
+
 
 
+    + {if $EMODE eq 'edit'} + + {else} + + {/if} +  
+ +
+
+ + + +{$JAVASCRIPT} +{include file='SettingsSubMenu.tpl'} + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:04:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:04:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5656 - /vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Message-ID: <20060502120411.25127702E41@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:04:04 2006 New Revision: 5656 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Tue May 2 06:04:04 2006 @@ -1,101 +1,101 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
- - - - - - - - - - - - - - - - - -

-{$MOD.LBL_SETTINGS} {$UMOD.LBL_MAILMERGE_TEMPLATES_ATTACHMENT} -
-
 
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$UMOD.LBL_TEMPLATE_DETAILS}
{$UMOD.LBL_DESCRIPTION} :

- - {$UMOD.LBL_SELECT_MODULE}
- Select a module to assign this Template -
{$UMOD.LBL_MODULENAMES} :

- - {$UMOD.LBL_UPLOAD} -
{$UMOD.LBL_MERGE_FILE}
(Eg - .doc, .rtf files)
-   -   -
 
-

-
 
-
- {include file='SettingsSubMenu.tpl'} - + + + + + {include file='SettingsMenu.tpl'} + + +
+ + + + + + + + + + + + + + + + + +

+{$MOD.LBL_SETTINGS} {$UMOD.LBL_MAILMERGE_TEMPLATES_ATTACHMENT} +
+
 
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 {$UMOD.LBL_TEMPLATE_DETAILS}
{$UMOD.LBL_DESCRIPTION} :

+ + {$UMOD.LBL_SELECT_MODULE}
+ Select a module to assign this Template +
{$UMOD.LBL_MODULENAMES} :

+ + {$UMOD.LBL_UPLOAD} +
{$UMOD.LBL_MERGE_FILE}
(Eg - .doc, .rtf files)
+   +   +
 
+

+
 
+
+ {include file='SettingsSubMenu.tpl'} + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:07:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:07:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5657 - /vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Message-ID: <20060502120756.117CD702E41@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:07:51 2006 New Revision: 5657 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Tue May 2 06:07:51 2006 @@ -71,44 +71,48 @@ - - + - +
 
+ + - + - - {**} + {**} - - - - - - - - - {foreach item=template from=$WORDTEMPLATES} - - - - - - - - - - {/foreach} - -
 
  -
+
+
 
 
{$UMOD.LBL_FILE}{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_MODULENAMES}{$UMOD.LBL_DOWNLOAD}{$UMOD.LBL_FILE_TYPE}
{$template.filename}{$template.description}{$template.module}{$UMOD.LBL_DOWNLOAD_NOW}{$template.filetype}
- + + + + + + + + + + + {foreach item=template from=$WORDTEMPLATES} + + + + + + + + + {/foreach} +
{$UMOD.LBL_FILE}{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_MODULENAMES}{$UMOD.LBL_DOWNLOAD}{$UMOD.LBL_FILE_TYPE}
{$template.filename}{$template.description}{$template.module}{$UMOD.LBL_DOWNLOAD_NOW}{$template.filetype}
+ + + +   From vtiger-tickets at vtiger.fosslabs.com Tue May 2 05:12:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:12:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23734=3A_?= =?utf-8?q?Issue_in_Rss_UI?= In-Reply-To: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com> References: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com> Message-ID: <085.843a30d43c54a87864f670278499247e@vtiger.fosslabs.com> #734: Issue in Rss UI ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jeri Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * owner: Ela => jeri -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:12:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:12:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5658 - /vtigercrm/trunk/modules/Settings/CreateCustomField.php Message-ID: <20060502121243.AA0C4702E3A@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:12:38 2006 New Revision: 5658 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Tue May 2 06:12:38 2006 @@ -119,7 +119,7 @@ -
+
From vtiger-tickets at vtiger.fosslabs.com Tue May 2 05:15:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:15:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23563=3A_?= =?utf-8?q?emailtemplate_detailview_in_IE?= In-Reply-To: <076.ee4a4557db76341e3ee0c500cd78cd8a@vtiger.fosslabs.com> References: <076.ee4a4557db76341e3ee0c500cd78cd8a@vtiger.fosslabs.com> Message-ID: <085.641abc6eb8097ff0cbbd5d19c13d18db@vtiger.fosslabs.com> #563: emailtemplate detailview in IE --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 05:16:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:16:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23576=3A_?= =?utf-8?q?Notes_Search_in_IE?= In-Reply-To: <076.b5fc216a689fc534703bad146e060008@vtiger.fosslabs.com> References: <076.b5fc216a689fc534703bad146e060008@vtiger.fosslabs.com> Message-ID: <085.3a45fb3076f8ebcc7d529dbe69bda90f@vtiger.fosslabs.com> #576: Notes Search in IE --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: --------------------------------+------------------------------------------- Changes (by ela): * resolution: => invalid * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 05:17:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:17:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23558=3A_?= =?utf-8?q?no_label_for_attchment?= In-Reply-To: <076.0c01366cfeb80db86c51e75c9ef4322b@vtiger.fosslabs.com> References: <076.0c01366cfeb80db86c51e75c9ef4322b@vtiger.fosslabs.com> Message-ID: <085.53817bfdf00590ece95ba3d060d7a6df@vtiger.fosslabs.com> #558: no label for attchment --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:17:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:17:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5659 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060502121758.44C9F702E49@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:17:53 2006 New Revision: 5659 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Tue May 2 06:17:53 2006 @@ -190,19 +190,20 @@
Add Field
+
- +
{**} - +
- - -
+ -
+
From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:24:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:24:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5660 - /vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Message-ID: <20060502122430.A8DA6702E33@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:24:24 2006 New Revision: 5660 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Tue May 2 06:24:24 2006 @@ -1,129 +1,129 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
- - - - - - - - -

-{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} -
-
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$ORGANIZATIONNAME}

-
{$MOD.LBL_ORGANIZATION_NAME} : {$ORGANIZATIONNAME}
{$MOD.LBL_ORGANIZATION_ADDRESS} : {$ORGANIZATIONADDRESS}
{$MOD.LBL_ORGANIZATION_CITY} : {$ORGANIZATIONCITY}
{$MOD.LBL_ORGANIZATION_STATE} : {$ORGANIZATIONSTATE}
{$MOD.LBL_ORGANIZATION_CODE} : {$ORGANIZATIONCODE}
{$MOD.LBL_ORGANIZATION_COUNTRY} : {$ORGANIZATIONCOUNTRY}

- - - - - - - - - - - - - - - -
{$MOD.LBL_ORGANIZATION_PHONE} : {$ORGANIZATIONPHONE}{$MOD.LBL_ORGANIZATION_WEBSITE} : {$ORGANIZATIONWEBSITE}
{$MOD.LBL_ORGANIZATION_FAX} : {$ORGANIZATIONFAX}{$MOD.LBL_ORGANIZATION_LOGO} : {$ORGANIZATIONLOGONAME}

- -    -
-
- - -
 
-
-
- {include file='SettingsSubMenu.tpl'} -{literal} - -{/literal} + + + + + {include file='SettingsMenu.tpl'} + + +
+ + + + + + + + +

+{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 {$ORGANIZATIONNAME}

+
{$MOD.LBL_ORGANIZATION_NAME} : {$ORGANIZATIONNAME}
{$MOD.LBL_ORGANIZATION_ADDRESS} : {$ORGANIZATIONADDRESS}
{$MOD.LBL_ORGANIZATION_CITY} : {$ORGANIZATIONCITY}
{$MOD.LBL_ORGANIZATION_STATE} : {$ORGANIZATIONSTATE}
{$MOD.LBL_ORGANIZATION_CODE} : {$ORGANIZATIONCODE}
{$MOD.LBL_ORGANIZATION_COUNTRY} : {$ORGANIZATIONCOUNTRY}

+ + + + + + + + + + + + + + + +
{$MOD.LBL_ORGANIZATION_PHONE} : {$ORGANIZATIONPHONE}{$MOD.LBL_ORGANIZATION_WEBSITE} : {$ORGANIZATIONWEBSITE}
{$MOD.LBL_ORGANIZATION_FAX} : {$ORGANIZATIONFAX}{$MOD.LBL_ORGANIZATION_LOGO} : {$ORGANIZATIONLOGONAME}

+ +    +
+
+
+ +
 
+
+ + + + {include file='SettingsSubMenu.tpl'} +{literal} + +{/literal} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:25:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:25:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5661 - /vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Message-ID: <20060502122534.0EBAF702E66@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:25:15 2006 New Revision: 5661 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Tue May 2 06:25:15 2006 @@ -1,151 +1,151 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
- - - - - - - - -

-{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} -
-
- -
- - - - - - - - - - - - - - - - - - - - -
- - - {if $ORGANIZATIONLOGONAME neq ''} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  {$ORGANIZATIONNAME} - {$ERRORFLAG} -

*{$MOD.LBL_ORGANIZATION_NAME} : - -
{$MOD.LBL_ORGANIZATION_ADDRESS} :
{$MOD.LBL_ORGANIZATION_CITY} :
{$MOD.LBL_ORGANIZATION_STATE} :
{$MOD.LBL_ORGANIZATION_CODE} :
{$MOD.LBL_ORGANIZATION_COUNTRY} :

- - - - - - - - - - - - - - - -
{$MOD.LBL_ORGANIZATION_PHONE} : {$MOD.LBL_ORGANIZATION_WEBSITE} :
{$MOD.LBL_ORGANIZATION_FAX} : {$MOD.LBL_ORGANIZATION_LOGO} : - - [{$ORGANIZATIONLOGONAME}] -

- -
-
-
- -
 
-
- - - - {include file='SettingsSubMenu.tpl'} -{literal} - -{/literal} + + + + + {include file='SettingsMenu.tpl'} + + +
+ + + + + + + + +

+{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} +
+
+ +
+ + + + + + + + + + + + + + + + + + + + +
+ + + {if $ORGANIZATIONLOGONAME neq ''} + + {else} + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  {$ORGANIZATIONNAME} + {$ERRORFLAG} +

*{$MOD.LBL_ORGANIZATION_NAME} : + +
{$MOD.LBL_ORGANIZATION_ADDRESS} :
{$MOD.LBL_ORGANIZATION_CITY} :
{$MOD.LBL_ORGANIZATION_STATE} :
{$MOD.LBL_ORGANIZATION_CODE} :
{$MOD.LBL_ORGANIZATION_COUNTRY} :

+ + + + + + + + + + + + + + + +
{$MOD.LBL_ORGANIZATION_PHONE} : {$MOD.LBL_ORGANIZATION_WEBSITE} :
{$MOD.LBL_ORGANIZATION_FAX} : {$MOD.LBL_ORGANIZATION_LOGO} : + + [{$ORGANIZATIONLOGONAME}] +

+ +
+
+
+ +
 
+
+ + + + {include file='SettingsSubMenu.tpl'} +{literal} + +{/literal} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:36:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:36:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5662 - /vtigercrm/trunk/modules/Home/UnifiedSearch.php Message-ID: <20060502123604.AE970702E70@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:35:52 2006 New Revision: 5662 Log: * Modified to display the Total Number of records found and module based record counts Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue May 2 05:38:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:38:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23472=3A_?= =?utf-8?q?Search_result_count_is_missing_in_global_search?= In-Reply-To: <076.b8b6a34e31005f060bcb9a5e08e7ad43@vtiger.fosslabs.com> References: <076.b8b6a34e31005f060bcb9a5e08e7ad43@vtiger.fosslabs.com> Message-ID: <085.8a8be10cca3c7eb44fca46f0c2024245@vtiger.fosslabs.com> #472: Search result count is missing in global search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This has been fixed as to display the Total number of records count and the module based count has been displayed. File has been checkedin in svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 05:45:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:45:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23742=3A_?= =?utf-8?q?New_Ticket_screen?= In-Reply-To: <076.94e6b59f3e5bca0bd95e96ed6e6c80e3@vtiger.fosslabs.com> References: <076.94e6b59f3e5bca0bd95e96ed6e6c80e3@vtiger.fosslabs.com> Message-ID: <085.e33c432865e3ae4be706a4fb8850cd9f@vtiger.fosslabs.com> #742: New Ticket screen ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:45:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:45:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5663 - /vtigercrm/trunk/include/Menu.php Message-ID: <20060502124553.54756702E6C@vtiger.fosslabs.com> Author: don Date: Tue May 2 06:45:47 2006 New Revision: 5663 Log: Removed the calling of permitted actions from session Modified: vtigercrm/trunk/include/Menu.php Modified: vtigercrm/trunk/include/Menu.php ============================================================================== --- vtigercrm/trunk/include/Menu.php (original) +++ vtigercrm/trunk/include/Menu.php Tue May 2 06:45:47 2006 @@ -25,7 +25,8 @@ global $moduleList; require_once('include/utils/utils.php'); -$permissionData = $_SESSION['action_permission_set']; +require_once('include/utils/UserInfoUtil.php'); + $module_menu_array = Array('Contacts' => $app_strings['LNK_NEW_CONTACT'], 'Leads'=> $app_strings['LNK_NEW_LEAD'], @@ -74,7 +75,7 @@ if(in_array($module_display, $moduleList)) { - if($permissionData[$tabid][1] ==0) + if(isPermitted($module_display,'EditView') == 'yes') { $tempArray = Array("index.php?module=".$module_display."&action=".$curr_action."&return_module=".$module_display."&return_action=".$ret_action.$add_url, $label); $module_menu[$i] = $tempArray; From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 05:56:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:56:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5664 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060502125621.9D63F702E74@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:56:17 2006 New Revision: 5664 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue May 2 06:56:17 2006 @@ -70,9 +70,9 @@ - - - + + +
 {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}{$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}  
From vtiger-tickets at vtiger.fosslabs.com Tue May 2 06:00:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:00:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23630=3A_?= =?utf-8?q?Issue_in_User_Detail_View?= In-Reply-To: <076.24acb030007b9b2b25e501432266a4a7@vtiger.fosslabs.com> References: <076.24acb030007b9b2b25e501432266a4a7@vtiger.fosslabs.com> Message-ID: <085.182d0fd648ceedd80944c9dc57c6e9af@vtiger.fosslabs.com> #630: Issue in User Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Browser ---------------------------+------------------------------------------------ Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 06:01:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:01:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23667=3A_?= =?utf-8?q?Users_DetailVIew_goes_Up_if_we_Click_on_the_tab?= In-Reply-To: <076.511538ff98ef7c37b460ea8a0d311c2e@vtiger.fosslabs.com> References: <076.511538ff98ef7c37b460ea8a0d311c2e@vtiger.fosslabs.com> Message-ID: <085.3fb326cc60e0d2b9113d3a121b08a525@vtiger.fosslabs.com> #667: Users DetailVIew goes Up if we Click on the tab ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 06:05:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:05:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23389=3A_?= =?utf-8?q?Chat_is_not_good_in_IE_Browser?= In-Reply-To: <076.68bfacb5e13b1f9f17f61db3db336043@vtiger.fosslabs.com> References: <076.68bfacb5e13b1f9f17f61db3db336043@vtiger.fosslabs.com> Message-ID: <085.12fc24d55814f020f767f95a92121242@vtiger.fosslabs.com> #389: Chat is not good in IE Browser ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: assigned Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * status: new => assigned * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 06:08:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:08:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23501=3A_?= =?utf-8?q?IE_Issue?= In-Reply-To: <076.afe1d49e34fa7f7addddc3b5b5e173f7@vtiger.fosslabs.com> References: <076.afe1d49e34fa7f7addddc3b5b5e173f7@vtiger.fosslabs.com> Message-ID: <085.d0b0789714ddaf9a8a2ab8f315b6ac3e@vtiger.fosslabs.com> #501: IE Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 06:21:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:21:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23426=3A_?= =?utf-8?q?adding_users_to_a_group_must_reduce_the_number_of_users_in_the_?= =?utf-8?q?LHS?= In-Reply-To: <076.38a327c75c245e49b3602c5dca07ae55@vtiger.fosslabs.com> References: <076.38a327c75c245e49b3602c5dca07ae55@vtiger.fosslabs.com> Message-ID: <085.df60f1a45a4960bdeec4901c52e9aae5@vtiger.fosslabs.com> #426: adding users to a group must reduce the number of users in the LHS ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: groups ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 06:24:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:24:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23140=3A_?= =?utf-8?q?slider_not_working_IE?= In-Reply-To: <076.2f545feb010bb599fcef09367a99dd42@vtiger.fosslabs.com> References: <076.2f545feb010bb599fcef09367a99dd42@vtiger.fosslabs.com> Message-ID: <085.8425c5467e8f5b918bb53c9959006f5f@vtiger.fosslabs.com> #140: slider not working IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: slider ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 06:26:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:26:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23145=3A_?= =?utf-8?q?User_Detail_View_-_role_name_in_different_font?= In-Reply-To: <076.ae9ea2111e31305dea3c4f5add30eea1@vtiger.fosslabs.com> References: <076.ae9ea2111e31305dea3c4f5add30eea1@vtiger.fosslabs.com> Message-ID: <085.590c45b490f2bd534f7cca3d4221ae3e@vtiger.fosslabs.com> #145: User Detail View - role name in different font ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: font ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 06:29:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:29:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23159=3A_?= =?utf-8?q?edit_user_=3A_no_foto_shown?= In-Reply-To: <076.252636d06b42ca35a5600b493874b7eb@vtiger.fosslabs.com> References: <076.252636d06b42ca35a5600b493874b7eb@vtiger.fosslabs.com> Message-ID: <085.8ab9c2074630c1144124199b073febb8@vtiger.fosslabs.com> #159: edit user : no foto shown ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: no foto in user edit ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 07:02:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 14:02:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5665 - /vtigercrm/trunk/modules/Users/ChangePassword.php Message-ID: <20060502140230.868F2702E83@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 08:02:25 2006 New Revision: 5665 Log: Change Password made functional - Ahmed Modified: vtigercrm/trunk/modules/Users/ChangePassword.php Modified: vtigercrm/trunk/modules/Users/ChangePassword.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 07:03:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 14:03:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5666 - /vtigercrm/trunk/modules/Users/Save.php Message-ID: <20060502140338.62124702E83@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 08:03:34 2006 New Revision: 5666 Log: Change Password made functional - Ahmed Modified: vtigercrm/trunk/modules/Users/Save.php Modified: vtigercrm/trunk/modules/Users/Save.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue May 2 07:04:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:04:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23342=3A_?= =?utf-8?q?Validation_missing_for_change_password?= In-Reply-To: <076.9750b47cca145f59185db18ec7d18b2f@vtiger.fosslabs.com> References: <076.9750b47cca145f59185db18ec7d18b2f@vtiger.fosslabs.com> Message-ID: <085.772c6cb8e9bf7929cc41988db7ccadbf@vtiger.fosslabs.com> #342: Validation missing for change password ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: change password ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 07:05:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:05:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23342=3A_?= =?utf-8?q?Validation_missing_for_change_password?= In-Reply-To: <076.9750b47cca145f59185db18ec7d18b2f@vtiger.fosslabs.com> References: <076.9750b47cca145f59185db18ec7d18b2f@vtiger.fosslabs.com> Message-ID: <085.e05da8ee36c736db0ef8b28c1368f808@vtiger.fosslabs.com> #342: Validation missing for change password ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: change password ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Validation Done for password form. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 07:06:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:06:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2389=3A_C?= =?utf-8?q?annot_change_admin_Password?= In-Reply-To: <076.2fbbb821e635faa80c32396756edac60@vtiger.fosslabs.com> References: <076.2fbbb821e635faa80c32396756edac60@vtiger.fosslabs.com> Message-ID: <085.2202113b87773e3e30981215851185af@vtiger.fosslabs.com> #89: Cannot change admin Password ----------------------------------+----------------------------------------- Reporter: libregeek at gmail.com | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Cannot change password ----------------------------------+----------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 07:07:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:07:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2389=3A_C?= =?utf-8?q?annot_change_admin_Password?= In-Reply-To: <076.2fbbb821e635faa80c32396756edac60@vtiger.fosslabs.com> References: <076.2fbbb821e635faa80c32396756edac60@vtiger.fosslabs.com> Message-ID: <085.882df733899057bc157cdbde5ab3de0d@vtiger.fosslabs.com> #89: Cannot change admin Password ----------------------------------+----------------------------------------- Reporter: libregeek at gmail.com | Owner: ahmed Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Cannot change password ----------------------------------+----------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed - Admin Password can be changed now without redirecting the same to the home page -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 07:13:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:13:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23158=3A_?= =?utf-8?q?Unable_to_change_password_IE?= In-Reply-To: <076.abef1a60c9e3d592d325f3f425753615@vtiger.fosslabs.com> References: <076.abef1a60c9e3d592d325f3f425753615@vtiger.fosslabs.com> Message-ID: <085.11919e10f84f7a54482c4163b60aad01@vtiger.fosslabs.com> #158: Unable to change password IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: edit password ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 07:14:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:14:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23158=3A_?= =?utf-8?q?Unable_to_change_password_IE?= In-Reply-To: <076.abef1a60c9e3d592d325f3f425753615@vtiger.fosslabs.com> References: <076.abef1a60c9e3d592d325f3f425753615@vtiger.fosslabs.com> Message-ID: <085.dbdbd35a9c56af149308067291b7b9b8@vtiger.fosslabs.com> #158: Unable to change password IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: edit password ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed - Change Password Made Functional in IE with proper validation. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 07:51:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:51:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23369=3A_?= =?utf-8?q?settings_menu_is_not_good_in_IE_browser?= In-Reply-To: <076.b6a9d61f71437be813abb7ca8c29694c@vtiger.fosslabs.com> References: <076.b6a9d61f71437be813abb7ca8c29694c@vtiger.fosslabs.com> Message-ID: <085.bbfd74ea3a1f798bba62f919cb3964a3@vtiger.fosslabs.com> #369: settings menu is not good in IE browser ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 07:54:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:54:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23136=3A_?= =?utf-8?q?minimized_box_expands_on_clicking_any_link?= In-Reply-To: <076.8d6cd6ae9121ebb445f0cde58813b20f@vtiger.fosslabs.com> References: <076.8d6cd6ae9121ebb445f0cde58813b20f@vtiger.fosslabs.com> Message-ID: <085.ef05ba86852ba7c46a35ee8a967d534e@vtiger.fosslabs.com> #136: minimized box expands on clicking any link ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: minimization fails ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 07:58:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:58:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23135=3A_?= =?utf-8?q?missing_communication_templates?= In-Reply-To: <076.5997046850f52c2dcc019dbeb3ff2438@vtiger.fosslabs.com> References: <076.5997046850f52c2dcc019dbeb3ff2438@vtiger.fosslabs.com> Message-ID: <085.7d6a685b0251e2071a1349dddf3e2fe6@vtiger.fosslabs.com> #135: missing communication templates ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:00:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 15:00:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23167=3A_?= =?utf-8?q?standarduser_detail_view_screen_proper?= In-Reply-To: <076.1d766ff6b338fa4771ae7fe7e1bd0c51@vtiger.fosslabs.com> References: <076.1d766ff6b338fa4771ae7fe7e1bd0c51@vtiger.fosslabs.com> Message-ID: <085.601bcba21e388bac939234c793569e06@vtiger.fosslabs.com> #167: standarduser detail view screen proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:22:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 15:22:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23392=3A_?= =?utf-8?q?Issue_in_Field_Access_IE_browser?= In-Reply-To: <076.da3a82840e4830a891413c4cbde054cd@vtiger.fosslabs.com> References: <076.da3a82840e4830a891413c4cbde054cd@vtiger.fosslabs.com> Message-ID: <085.484d36204a3031e0d0c14b06d50ddcc2@vtiger.fosslabs.com> #392: Issue in Field Access IE browser ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jeri Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * owner: ela => jeri -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:25:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 15:25:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5667 - /vtigercrm/trunk/modules/Home/UnifiedSearch.php Message-ID: <20060502152512.A6D40702E96@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 09:25:07 2006 New Revision: 5667 Log: * Added customview functionality to get the assigned to values which are same like in ListView of all modules Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:27:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 15:27:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23467=3A_?= =?utf-8?q?Issue_in_global_seach?= In-Reply-To: <076.af78d74012efe9405d4e54b0d4502661@vtiger.fosslabs.com> References: <076.af78d74012efe9405d4e54b0d4502661@vtiger.fosslabs.com> Message-ID: <085.58d7ba962fc7e23cdd0fa2ee6798b865@vtiger.fosslabs.com> #467: Issue in global seach ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and changed files checkedin in svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:31:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 15:31:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23153=3A_?= =?utf-8?q?More_Information=2C_Address_Information_fails_IE?= In-Reply-To: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> References: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> Message-ID: <085.244543cb5f61e58539d7557cfaf2071c@vtiger.fosslabs.com> #153: More Information, Address Information fails IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: More Info ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:41:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 15:41:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23166=3A_?= =?utf-8?q?edit_view_different_from_detail_view_in_Users?= In-Reply-To: <076.305e0e2f49604557e718c0b4c9732e6d@vtiger.fosslabs.com> References: <076.305e0e2f49604557e718c0b4c9732e6d@vtiger.fosslabs.com> Message-ID: <085.008d431e8d5c9e5a8bcc77ffd4e2e8d2@vtiger.fosslabs.com> #166: edit view different from detail view in Users ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: edit view/detail view ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:32:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:32:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23239=3A_?= =?utf-8?q?Improper_expand-collapase?= In-Reply-To: <076.5823353ff6ccc9495006e3cc32c0cd19@vtiger.fosslabs.com> References: <076.5823353ff6ccc9495006e3cc32c0cd19@vtiger.fosslabs.com> Message-ID: <085.549ef4fb5a32aadd008a53f24dd9fc08@vtiger.fosslabs.com> #239: Improper expand-collapase ------------------------+--------------------------------------------------- Reporter: saraj | Owner: Elavalagan Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Expand Collapse ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:36:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:36:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23304=3A_?= =?utf-8?q?Show_contents_on-mousover?= In-Reply-To: <076.12b5e03c26eb7033b97b03b38ef20578@vtiger.fosslabs.com> References: <076.12b5e03c26eb7033b97b03b38ef20578@vtiger.fosslabs.com> Message-ID: <085.4543bae4d1e8aadaa49bca6878f6cc8b@vtiger.fosslabs.com> #304: Show contents on-mousover ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: User Detail view ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:37:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:37:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23316=3A_?= =?utf-8?q?Error_Message_merges_with_the_arrow?= In-Reply-To: <076.2e31abce995b69bf750fa51b6fc23dc7@vtiger.fosslabs.com> References: <076.2e31abce995b69bf750fa51b6fc23dc7@vtiger.fosslabs.com> Message-ID: <085.5aba5d63e09cfb08244a04d07c5d5a7e@vtiger.fosslabs.com> #316: Error Message merges with the arrow ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Duplicate user Error message ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:39:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:39:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23345=3A_?= =?utf-8?q?No_css/smartification_for_Login_History?= In-Reply-To: <076.6e3fb9b3ca30ba32d7be19a23d4a1c22@vtiger.fosslabs.com> References: <076.6e3fb9b3ca30ba32d7be19a23d4a1c22@vtiger.fosslabs.com> Message-ID: <085.b1af98050c52196233c65f778357e2a9@vtiger.fosslabs.com> #345: No css/smartification for Login History ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Login History ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:41:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:41:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23366=3A_?= =?utf-8?q?Non_functional_Change_foto_form?= In-Reply-To: <076.30468475e2d031606a3c41a1e641e8bd@vtiger.fosslabs.com> References: <076.30468475e2d031606a3c41a1e641e8bd@vtiger.fosslabs.com> Message-ID: <085.5bbed3dbc6f00b8bf0953c8859b47a15@vtiger.fosslabs.com> #366: Non functional Change foto form ------------------------+--------------------------------------------------- Reporter: saraj | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: change photo ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:45:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:45:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23614=3A_?= =?utf-8?q?Edit_Pick_list_popup_is_half_displayed?= In-Reply-To: <076.19bd966bb5be11457c9445cff5c6903c@vtiger.fosslabs.com> References: <076.19bd966bb5be11457c9445cff5c6903c@vtiger.fosslabs.com> Message-ID: <085.84dab25a976f318e75c7c9e9a477c281@vtiger.fosslabs.com> #614: Edit Pick list popup is half displayed ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ela Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Pick List Settings ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:06:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:06:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23264=3A_?= =?utf-8?q?Priority_Color_issue?= In-Reply-To: <076.cd84196e248706270bd26f418a850f2f@vtiger.fosslabs.com> References: <076.cd84196e248706270bd26f418a850f2f@vtiger.fosslabs.com> Message-ID: <085.b744f8b84b2984d353c64b5de10e9596@vtiger.fosslabs.com> #264: Priority Color issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Color priority ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:07:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:07:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23374=3A_?= =?utf-8?q?ListView_UI_issue?= In-Reply-To: <076.772f081d80c75e4d58bc5ff8aab6601e@vtiger.fosslabs.com> References: <076.772f081d80c75e4d58bc5ff8aab6601e@vtiger.fosslabs.com> Message-ID: <085.767cf2e3f9b71db44d378104935e7496@vtiger.fosslabs.com> #374: ListView UI issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: philip Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:09:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:09:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23511=3A_?= =?utf-8?q?UI_issue_in_Organisation_Sharing_Privileges?= In-Reply-To: <076.fe0ea81408ef07b9329d7ab6936815df@vtiger.fosslabs.com> References: <076.fe0ea81408ef07b9329d7ab6936815df@vtiger.fosslabs.com> Message-ID: <085.0aa3e5211a4a5ddd8b80a9442ed81ea2@vtiger.fosslabs.com> #511: UI issue in Organisation Sharing Privileges ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: UI ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:15:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:15:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23542=3A_?= =?utf-8?q?Sales_Order_not_added_ot_potentials_related_lists?= In-Reply-To: <076.9beb3974ac0560b949c5f74283de241d@vtiger.fosslabs.com> References: <076.9beb3974ac0560b949c5f74283de241d@vtiger.fosslabs.com> Message-ID: <085.b4ed7ea3333ab0760bf87937c049a6b5@vtiger.fosslabs.com> #542: Sales Order not added ot potentials related lists ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: Related Lists ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:19:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:19:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23589=3A_?= =?utf-8?q?Email_link_in_user_list_view_should_be_mailto_link?= In-Reply-To: <076.e39853c0ab0ebbcd0d8555aa39b63cbe@vtiger.fosslabs.com> References: <076.e39853c0ab0ebbcd0d8555aa39b63cbe@vtiger.fosslabs.com> Message-ID: <085.47313ba234b64cb4c08051e2260937b1@vtiger.fosslabs.com> #589: Email link in user list view should be mailto link ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:19:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:19:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23702=3A_?= =?utf-8?q?New_UI_For_Login_History?= In-Reply-To: <076.86851b5e2b6ae7b46beeca1ab823881c@vtiger.fosslabs.com> References: <076.86851b5e2b6ae7b46beeca1ab823881c@vtiger.fosslabs.com> Message-ID: <085.e4e5fd1a292f5a2c4791c232ccfd7dc0@vtiger.fosslabs.com> #702: New UI For Login History ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:21:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:21:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23347=3A_?= =?utf-8?q?Validation_not_proper_for_imports?= In-Reply-To: <076.139e96c58d8f549425203aec6ec1342b@vtiger.fosslabs.com> References: <076.139e96c58d8f549425203aec6ec1342b@vtiger.fosslabs.com> Message-ID: <085.1c2ed2fe75ea5b150cf0fce95f947dd2@vtiger.fosslabs.com> #347: Validation not proper for imports ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: import ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:26:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:26:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23303=3A_?= =?utf-8?q?Security_Issues_with_HelpDesk?= In-Reply-To: <076.be4389901e26c984cd7ea7bb7d59c5c9@vtiger.fosslabs.com> References: <076.be4389901e26c984cd7ea7bb7d59c5c9@vtiger.fosslabs.com> Message-ID: <085.25aec96bbf8e54a5a455f44693b48ac6@vtiger.fosslabs.com> #303: Security Issues with HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 12:27:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:27:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5668 - in /vtigercrm/trunk/themes/blue/images: BackupServer_btm.gif BackupServer_top.gif CurrConfig_btm.gif CurrConfig_top.gif Inventory_btm.gif Inventory_top.gif MailMerge_btm.gif MailMerge_top.gif MailServer_btm.gif MailServer_top.gif Message-ID: <20060502192715.688B2702EA7@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:26:45 2006 New Revision: 5668 Log: Added the images for settings no image files-Ahmed Added: vtigercrm/trunk/themes/blue/images/BackupServer_btm.gif (with props) vtigercrm/trunk/themes/blue/images/BackupServer_top.gif (with props) vtigercrm/trunk/themes/blue/images/CurrConfig_btm.gif (with props) vtigercrm/trunk/themes/blue/images/CurrConfig_top.gif (with props) vtigercrm/trunk/themes/blue/images/Inventory_btm.gif (with props) vtigercrm/trunk/themes/blue/images/Inventory_top.gif (with props) vtigercrm/trunk/themes/blue/images/MailMerge_btm.gif (with props) vtigercrm/trunk/themes/blue/images/MailMerge_top.gif (with props) vtigercrm/trunk/themes/blue/images/MailServer_btm.gif (with props) vtigercrm/trunk/themes/blue/images/MailServer_top.gif (with props) From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:28:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:28:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23383=3A_?= =?utf-8?q?Improper_Alignment_while_attaching_Multiple_files_-_HelpDesk?= In-Reply-To: <076.05350b18c07640b9f51b5ee10d606d0a@vtiger.fosslabs.com> References: <076.05350b18c07640b9f51b5ee10d606d0a@vtiger.fosslabs.com> Message-ID: <085.a4c7a3bd2f975c70d0355a07edf28755@vtiger.fosslabs.com> #383: Improper Alignment while attaching Multiple files - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:29:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:29:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23321=3A_?= =?utf-8?q?Old_UI_in_Add_New_Attachment_-_HelpDesk?= In-Reply-To: <076.f82ff5a4a8d6f04287845ea0f72538e6@vtiger.fosslabs.com> References: <076.f82ff5a4a8d6f04287845ea0f72538e6@vtiger.fosslabs.com> Message-ID: <085.51fe2e4ec520410cb8830770f2d6f502@vtiger.fosslabs.com> #321: Old UI in Add New Attachment - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:30:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:30:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23415=3A_?= =?utf-8?q?Menu_Pointer_Image_Issue_-_Reports?= In-Reply-To: <076.6ff31ad4eb06ac7e5cb11a02dd3ddecb@vtiger.fosslabs.com> References: <076.6ff31ad4eb06ac7e5cb11a02dd3ddecb@vtiger.fosslabs.com> Message-ID: <085.e276bc671d5984b892c9ceb079994941@vtiger.fosslabs.com> #415: Menu Pointer Image Issue - Reports ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 12:31:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:31:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5669 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060502193139.4370C702EA7@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:31:33 2006 New Revision: 5669 Log: changed the pop window properties of change password button - ahmed Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:37:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:37:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23299=3A_?= =?utf-8?q?calendar_icon_in_email_detail_view_is_not_working?= In-Reply-To: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> References: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> Message-ID: <085.f7521dde4ea654115cb3b6e484b2c276@vtiger.fosslabs.com> #299: calendar icon in email detail view is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:37:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:37:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23299=3A_?= =?utf-8?q?calendar_icon_in_email_detail_view_is_not_working?= In-Reply-To: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> References: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> Message-ID: <085.9e0d34a89ca6c747ff2f7dfa39218e6e@vtiger.fosslabs.com> #299: calendar icon in email detail view is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: reopened Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: fixed => * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:38:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:38:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23299=3A_?= =?utf-8?q?calendar_icon_in_email_detail_view_is_not_working?= In-Reply-To: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> References: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> Message-ID: <085.70faae8354b509a954ec59dc3f074386@vtiger.fosslabs.com> #299: calendar icon in email detail view is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: reopened => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:39:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:39:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23370=3A_?= =?utf-8?q?clock_and_calculator_overlapped_with_emails_edit_view_layer?= In-Reply-To: <076.6129dfb75d56ab5200f4fca417ebe57a@vtiger.fosslabs.com> References: <076.6129dfb75d56ab5200f4fca417ebe57a@vtiger.fosslabs.com> Message-ID: <085.a5da5b9013e563c86bb7a0e4c879d7e7@vtiger.fosslabs.com> #370: clock and calculator overlapped with emails edit view layer --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:41:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:41:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23520=3A_?= =?utf-8?q?New_-Emails_quick_create_is_not_working?= In-Reply-To: <076.e24db133eec90e5dc2b5c84e0d9486dc@vtiger.fosslabs.com> References: <076.e24db133eec90e5dc2b5c84e0d9486dc@vtiger.fosslabs.com> Message-ID: <085.b279bef968b76b814645441667430d6a@vtiger.fosslabs.com> #520: New -Emails quick create is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:45:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:45:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23752=3A_?= =?utf-8?q?Add_postgresql_support_to_trunk?= Message-ID: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> #752: Add postgresql support to trunk ---------------------------------------+------------------------------------ Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: adodb postgresql database | ---------------------------------------+------------------------------------ Developers interested in postgresql support intend to replicate the successful work done to enable postgresql support in source:vtigercrm/branches/4.2, as referenced by tickets #62 and #17, and merged in r5306. The branch should be made with the command: {{{ svn cp http://(name-at)vtiger.fosslabs.com/svn/vtiger/vtigercrm/trunk http://(name- at)vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/5.0_postgresql_integration -m 'refs #(this ticket). Create a branch of vtigercrm/trunk named vtigercrm/branches/5.0_postgresql_integration. Development on this branch should be merged back to vtigercrm/trunk as soon as complete, to be included in vtigercrm/tags/vtigercrm-5.0.0beta series of releases' }}} -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 12:46:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:46:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5670 - /vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl Message-ID: <20060502194618.8FD86702EA6@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:46:06 2006 New Revision: 5670 Log: Added the images in Inventory T&C - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl Tue May 2 13:46:06 2006 @@ -30,11 +30,17 @@ - +
- + {if $INV_TERMS_MODE eq 'view'} - {else} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 12:49:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:49:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5671 - /vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl Message-ID: <20060502194923.A6B7E702EA7@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:49:10 2006 New Revision: 5671 Log: Added the images in Email config - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl Tue May 2 13:49:10 2006 @@ -35,10 +35,16 @@ + +
  + + + + +
 
+
+

- +
- - + + {if $EMAILCONFIG_MODE neq 'edit'} - -
 Mail Server (SMTP) - Settings{$ERROR_MSG}

+ + + + +
 
+
Mail Server (SMTP) - Settings{$ERROR_MSG}

From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:49:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:49:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23439=3A_?= =?utf-8?q?Validation_is_not_working_for_quick_create_form?= In-Reply-To: <076.edf94bb3508212d7dd3244389b2a56d2@vtiger.fosslabs.com> References: <076.edf94bb3508212d7dd3244389b2a56d2@vtiger.fosslabs.com> Message-ID: <085.ac815d7cdfbcfd77278851a46c9233cc@vtiger.fosslabs.com> #439: Validation is not working for quick create form ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 12:51:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:51:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5672 - /vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl Message-ID: <20060502195105.9E1F5702EA6@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:50:53 2006 New Revision: 5672 Log: Added the images in Backup Server config - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl Tue May 2 13:50:53 2006 @@ -32,11 +32,17 @@ - +
- + {if $BKP_SERVER_MODE neq 'edit'} - {else} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 12:52:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:52:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5673 - /vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Message-ID: <20060502195222.C8660702ECA@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:52:08 2006 New Revision: 5673 Log: Added the images in Currency Edit view - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Tue May 2 13:52:08 2006 @@ -38,10 +38,16 @@ - + - + - + - + - + From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:10:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:10:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23242=3A_?= =?utf-8?q?Security_Settings_-_LHS_navigation_missing_for_Roles_section?= In-Reply-To: <076.978f8d6d19ec9e1fa5607e8f75858cd8@vtiger.fosslabs.com> References: <076.978f8d6d19ec9e1fa5607e8f75858cd8@vtiger.fosslabs.com> Message-ID: <085.def3e503dcea7592adf0b1c01cfeb85c@vtiger.fosslabs.com> #242: Security Settings - LHS navigation missing for Roles section ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 13:10:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:10:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5677 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060502201028.9C425702EC1@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:10:23 2006 New Revision: 5677 Log: Added the images in Usereditview - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Tue May 2 14:10:23 2006 @@ -1,255 +1,272 @@ - - - - - - -
  + + + + +
 
+
+

- +
- - + From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:52:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:52:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23449=3A_?= =?utf-8?q?Issue_with_inner_scroll_in_Create_View_Screen?= In-Reply-To: <076.af8a6ec71dac7dc76c6c7216e25cbe13@vtiger.fosslabs.com> References: <076.af8a6ec71dac7dc76c6c7216e25cbe13@vtiger.fosslabs.com> Message-ID: <085.eae37c206a5e87af81b5ccc8b63cce8d@vtiger.fosslabs.com> #449: Issue with inner scroll in Create View Screen ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 12:55:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:55:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23313=3A_?= =?utf-8?q?Hacking_Attempt_Issue_in_Quick_Create?= In-Reply-To: <076.27119f7d66b8afb1666388aa77e8ff04@vtiger.fosslabs.com> References: <076.27119f7d66b8afb1666388aa77e8ff04@vtiger.fosslabs.com> Message-ID: <085.43af0cea4da2072b794a453c919f3842@vtiger.fosslabs.com> #313: Hacking Attempt Issue in Quick Create ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:00:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:00:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23476=3A_?= =?utf-8?q?Issue_in_quick_create?= In-Reply-To: <076.d12ad7f4315ab75de243cc17d0b21d7c@vtiger.fosslabs.com> References: <076.d12ad7f4315ab75de243cc17d0b21d7c@vtiger.fosslabs.com> Message-ID: <085.db29a077a88e3baea7e222dd4a5816e1@vtiger.fosslabs.com> #476: Issue in quick create ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 13:05:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:05:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5674 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060502200503.908B7702EC1@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:04:53 2006 New Revision: 5674 Log: Added new style in settings for IE - Ahmed Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Tue May 2 14:04:53 2006 @@ -590,161 +590,159 @@ /* For Settings */ .lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-color:#BBBBBB; + border-left:1px solid #666666; + border-right:1px solid #666666; + border-top:0px solid #666666; + border-collapse:collapse; + text-align:right; + padding-top:0px; + padding-left:5px; + padding-right:5px; + vertical-align:top; } .lftMnuHdr{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:100%; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + color:white; + background-color:#DDDDDD; + border-bottom:1px solid #BBBBBB; + text-decoration:none; + width:99%; } .lftMnuHdr tr td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:20px; - padding-right:5px; - padding-left:0px; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + color:white; + background-color:#DDDDDD; + border-bottom:1px solid #BBBBBB; + text-align:left; + text-decoration:none; + height:25px; + padding-right:0px; + padding-left:0px; } a.lftMnuHdr{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:20px; - padding-left:5px; - padding-top:3px; - width:100%; - display:block; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + color:white; + background-color:#666666; + border-top:1px solid #BBBBBB; + border-bottom:1px solid #999999; + text-align:left; + text-decoration:none; + height:25px; + padding-left:5px; + width:100%; + display:block; + vertical-align:middle; } a.lftMnuHdr:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:20px; - padding-left:5px; - padding-top:3px; - width:100%; - display:block; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + color:white; + background-color:#666666; + border-top:1px solid #BBBBBB; + border-bottom:1px solid #999999; + text-align:left; + text-decoration:none; + height:25px; + padding-left:5px; + width:100%; + display:block; } a.lftSubMnu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:95%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + display:block; + color:#666666; + height:20px; + width:93%; + text-align:left; + padding-left:15px; + text-decoration:none; + border-bottom:1px solid #BBBBBB; + padding-top:2px; + white-space:nowrap; } a.lftSubMnu:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:95%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + display:block; + color:#666666; + height:20px; + width:93%; + text-align:left; + padding-left:15px; + text-decoration:none; + border-bottom:1px solid #BBBBBB; + padding-top:2px; + white-space:nowrap; + background-color:#CCCCCC; } .padTab{ - padding-top:10px; - padding-left:10px; - padding-left:10px; - padding-bottom:0px; - vertical-align:top; - background-color:#FFFFFF; + padding-top:10px; + padding-left:10px; + padding-left:10px; + padding-bottom:0px; + vertical-align:top; + background-color:#FFFFFF; } .controlTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + text-align:center; + font-weight:bold; + text-decoration:none; + width:100%; + border:0px; +} .controlTab tr td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + text-align:center; + font-weight:bold; + text-decoration:none; + vertical-align:bottom; } #company{ - position:relative; - width:100%; - height:230px; - display:block; - background-color:#FFFFFF; - white-space:nowrap; - overflow:auto; - border:1px solid #CCCCCC; -} - + position:relative; + width:100%; + height:200px; + display:block; + background-color:#FFFFFF; + white-space:nowrap; + overflow:auto; + border:1px solid #CCCCCC; +} + #user{position:relative;left:0px;top:0px;width:100%;display:block;} #studio{position:relative;left:0px;top:0px;width:100%;display:block;} -#comm{position:relative;left:0px;top:0px;width:100%;display:block;} +#communication{position:relative;left:0px;top:0px;width:100%;display:block;} #config{position:relative;left:0px;top:0px;width:100%;display:block;} #userTab{position:relative;left:0px;top:0px;width:100%;display:none;} #studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - #scrollTab{ position:relative; From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 13:06:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:06:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5675 - /vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Message-ID: <20060502200610.4B582702EC1@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:05:58 2006 New Revision: 5675 Log: Added the images in Create word template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Tue May 2 14:05:58 2006 @@ -32,8 +32,14 @@ - + - + - + - + - + - + - + - + - + - + - + - +
 Currency
+
+ + + + +
 
+
Currency

- - + + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 13:09:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:09:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5676 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060502200914.62A3F702EC1@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:09:00 2006 New Revision: 5676 Log: Added the images in Userdetailview - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue May 2 14:09:00 2006 @@ -90,7 +90,7 @@ - + @@ -104,34 +104,34 @@ {/if} - + - + - - + + - + - + - + - + - + - +
 {$UMOD.LBL_TEMPLATE_DETAILS} + + + + +
 
+
{$UMOD.LBL_TEMPLATE_DETAILS}
{$UMOD.LBL_DESCRIPTION} :
*{$UMOD.LBL_USER_NAME} {$USER_NAME}{$USER_NAME}  {$UMOD.LBL_ADMIN}
{$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}{$FIRST_NAME}  *{$UMOD.LBL_LAST_NAME}{$LAST_NAME}{$LAST_NAME} 
*{$UMOD.LBL_USER_ROLE}{$ROLEASSIGNED} {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED}{$ROLEASSIGNED}  {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED} 
*{$UMOD.LBL_EMAIL}{$EMAIL1}{$EMAIL1}  *{$UMOD.LBL_STATUS}{$STATUS}{$STATUS} 
 
{$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$ACTIVITY_VIEW}  {$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}{$LEAD_VIEW} 
*{$UMOD.LBL_COLOR}{$COLORASSIGNED}{$COLORASSIGNED}  {$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}{$CURRENCY_NAME} 
 
@@ -148,46 +148,45 @@
{$UMOD.LBL_TITLE}{$TITLE}{$TITLE}  {$UMOD.LBL_OFFICE_PHONE}{$PHONE_WORK}{$PHONE_WORK} 
{$UMOD.LBL_DEPARTMENT}{$DEPARTMENT}{$DEPARTMENT}  {$UMOD.LBL_MOBILE_PHONE}{$PHONE_MOBILE}{$PHONE_MOBILE} 
{$UMOD.LBL_REPORTS_TO} {$REPORTS_TO_NAME}{$REPORTS_TO_ID}  {$UMOD.LBL_OTHER_PHONE}{$PHONE_OTHER}{$PHONE_OTHER} 
{$UMOD.LBL_OTHER_EMAIL}{$EMAIL2}{$EMAIL2}  {$UMOD.LBL_FAX}{$PHONE_FAX}{$PHONE_FAX} 
{$UMOD.LBL_YAHOO_ID}{$YAHOO_ID}{$YAHOO_ID}  {$UMOD.LBL_HOME_PHONE}{$PHONE_HOME}{$PHONE_HOME} 
{$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}{$DATE_FORMAT}     
{$UMOD.LBL_SIGNATURE}{$SIGNATURE}{$SIGNATURE}  {$UMOD.LBL_NOTES}{$DESCRIPTION} - {$DESCRIPTION} 
 
@@ -204,31 +203,31 @@
{$UMOD.LBL_ADDRESS}{$ADDRESS_STREET}{$ADDRESS_STREET}     
{$UMOD.LBL_CITY}{$ADDRESS_CITY}{$ADDRESS_CITY}     
{$UMOD.LBL_STATE}{$ADDRESS_STATE}{$ADDRESS_STATE}     
{$UMOD.LBL_POSTAL_CODE}{$ADDRESS_POSTALCODE}{$ADDRESS_POSTALCODE}     
{$UMOD.LBL_COUNTRY}{$ADDRESS_COUNTRY}{$ADDRESS_COUNTRY}     
- - {include file='SettingsMenu.tpl'} - -
- - - - -
{$MOD.LBL_USER_MANAGEMENT}
- - - - - - - - - - - - - - - - - - - - -
 
- - - - - - - - - - - - -
- - - - - - - - -
 {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} 
-
-
- - - -
 
- - - - - - - - - - - {if $MODE neq 'edit'} - - - - - - - {/if} - - - - - - - - - - - - - - - - - - {$USER_STATUS_OPTIONS} - - - - - - - - - - - - - - - - -
{$UMOD.LBL_NEW_FORM_TITLE}
*{$UMOD.LBL_USER_NAME} {$UMOD.LBL_ADMIN}
*{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
{$UMOD.LBL_FIRST_NAME} *{$UMOD.LBL_LAST_NAME}
*{$UMOD.LBL_USER_ROLE}{$USER_ROLE}*{$UMOD.LBL_EMAIL}
*{$UMOD.LBL_STATUS} 
 
{$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
*{$UMOD.LBL_COLOR}  {$CAL_COLOR}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
 
-
-
-
- - - -
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$UMOD.LBL_NEW_FORM_TITLE}
{$UMOD.LBL_TITLE}{$UMOD.LBL_OFFICE_PHONE}
{$UMOD.LBL_DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}
{$UMOD.LBL_REPORTS_TO} {$UMOD.LBL_OTHER_PHONE}
{$UMOD.LBL_OTHER_EMAIL}{$UMOD.LBL_FAX}
{$UMOD.LBL_YAHOO_ID}{$UMOD.LBL_HOME_PHONE}
{$UMOD.LBL_USER_IMAGE}{$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}
- {$UMOD.LBL_TAG_CLOUD} -
{$UMOD.LBL_SIGNATURE}{$UMOD.LBL_NOTES} -
 
-
-
- -
- - - -
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$UMOD.LBL_NEW_FORM_TITLE}
{$UMOD.LBL_ADDRESS}  
{$UMOD.LBL_CITY}  
{$UMOD.LBL_STATE}  
{$UMOD.LBL_POSTAL_CODE}  
{$UMOD.LBL_COUNTRY}  
 
-
-
-
 
- - -
-
- -
-
-
- -{$JAVASCRIPT} - - {include file='SettingsSubMenu.tpl'} + + + + + + + + + {include file='SettingsMenu.tpl'} + +
+ + + + +
+ + + + + + + + +
+ + {$MOD.LBL_SETTINGS} + > {$MOD.LBL_USER_MANAGEMENT} +
+
{$USER_NAME}
+ Edit View of {$FIRST_NAME} {$LAST_NAME} +
+
+ + + + + + + + + + + + + + + + + + + + +
 
+ + + + + + + + + + + + +
+ + + + + + + + +
 {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} 
+
+
+ + + +
 
+ + + + + + + + + + + {if $MODE neq 'edit'} + + + + + + + {/if} + + + + + + + + + + + + + + + + + + {$USER_STATUS_OPTIONS} + + + + + + + + + + + + + + + + +
{$UMOD.LBL_NEW_FORM_TITLE}
*{$UMOD.LBL_USER_NAME} {$UMOD.LBL_ADMIN}
*{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
{$UMOD.LBL_FIRST_NAME} *{$UMOD.LBL_LAST_NAME}
*{$UMOD.LBL_USER_ROLE}{$USER_ROLE}*{$UMOD.LBL_EMAIL}
*{$UMOD.LBL_STATUS} 
 
{$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
*{$UMOD.LBL_COLOR}  {$CAL_COLOR}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
 
+
+
+
+ + + +
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$UMOD.LBL_NEW_FORM_TITLE}
{$UMOD.LBL_TITLE}{$UMOD.LBL_OFFICE_PHONE}
{$UMOD.LBL_DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}
{$UMOD.LBL_REPORTS_TO} {$UMOD.LBL_OTHER_PHONE}
{$UMOD.LBL_OTHER_EMAIL}{$UMOD.LBL_FAX}
{$UMOD.LBL_YAHOO_ID}{$UMOD.LBL_HOME_PHONE}
{$UMOD.LBL_USER_IMAGE}{$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}
+ {$UMOD.LBL_TAG_CLOUD} +
{$UMOD.LBL_SIGNATURE}{$UMOD.LBL_NOTES} +
 
+
+
+ +
+ + + +
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$UMOD.LBL_NEW_FORM_TITLE}
{$UMOD.LBL_ADDRESS}  
{$UMOD.LBL_CITY}  
{$UMOD.LBL_STATE}  
{$UMOD.LBL_POSTAL_CODE}  
{$UMOD.LBL_COUNTRY}  
 
+
+
+
 
+ + +
+
+ +
+
+
+ +{$JAVASCRIPT} + + {include file='SettingsSubMenu.tpl'} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 13:12:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:12:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5678 - /vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Message-ID: <20060502201252.298DE702EA7@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:12:45 2006 New Revision: 5678 Log: Added the changes for IE - Ahmed Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Tue May 2 14:12:45 2006 @@ -1,9 +1,9 @@ - +
- {else} @@ -47,7 +47,7 @@ @@ -81,11 +81,11 @@
+
@@ -16,7 +16,7 @@
-
+ @@ -65,7 +64,7 @@ {$MOD.LBL_BACKUP_SERVER_CONFIGURATION}{$MOD.LBL_SYSTEM_CONFIG}{$MOD.LBL_CURRENCY_CONFIG} -{$MOD.LBL_MIGRATION} +{$MOD.LBL_MIGRATION} From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:13:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:13:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23746=3A_?= =?utf-8?q?New_=3CRecord=3E_-_Handling_Tickets_and_FAQ?= In-Reply-To: <076.8a974f855c1ae2b8ba9418701ef5c2f7@vtiger.fosslabs.com> References: <076.8a974f855c1ae2b8ba9418701ef5c2f7@vtiger.fosslabs.com> Message-ID: <085.74c6b427e3891830d1490021108c196f@vtiger.fosslabs.com> #746: New - Handling Tickets and FAQ ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:16:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:16:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23257=3A_?= =?utf-8?q?User_Management_-_Sub_tabs_actions_differ?= In-Reply-To: <076.f28264e22e3c7288a956ba1e76f97b54@vtiger.fosslabs.com> References: <076.f28264e22e3c7288a956ba1e76f97b54@vtiger.fosslabs.com> Message-ID: <085.f7e6731e58ecc203b5f4712e10d0f348@vtiger.fosslabs.com> #257: User Management - Sub tabs actions differ ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:17:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:17:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23354=3A_?= =?utf-8?q?Create_Activities_-_New_Links_are_far_way_from_each_other?= In-Reply-To: <076.d728bc840c3411160e5c1544b0757af2@vtiger.fosslabs.com> References: <076.d728bc840c3411160e5c1544b0757af2@vtiger.fosslabs.com> Message-ID: <085.62d758f511a3fe2f075f7e7079014150@vtiger.fosslabs.com> #354: Create Activities - New Links are far way from each other ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:19:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:19:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23475=3A_?= =?utf-8?q?Settings=3A_Sub-tabs_in_Users=2C_Profiles=2C_and_Roles_are_inco?= =?utf-8?q?nsistent?= In-Reply-To: <076.6bc07ced293941eb262865a8634fd724@vtiger.fosslabs.com> References: <076.6bc07ced293941eb262865a8634fd724@vtiger.fosslabs.com> Message-ID: <085.39526bc06c1598209ec510d7effd5b2a@vtiger.fosslabs.com> #475: Settings: Sub-tabs in Users, Profiles, and Roles are inconsistent ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:20:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:20:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23477=3A_?= =?utf-8?q?Admin_Check_box_-_Redundant?= In-Reply-To: <076.bfd18d9b0d7148c3b406d51ac0ea5015@vtiger.fosslabs.com> References: <076.bfd18d9b0d7148c3b406d51ac0ea5015@vtiger.fosslabs.com> Message-ID: <085.ae7a5788f22bae476c17cacbeaac3be5@vtiger.fosslabs.com> #477: Admin Check box - Redundant ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * version: 5.0.0 => 5.0.1 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 13:20:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:20:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5679 - /vtigercrm/trunk/modules/Users/ChangePassword.php Message-ID: <20060502202057.8EF36702EDF@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:20:51 2006 New Revision: 5679 Log: Added new style css to change password - Ahmed Modified: vtigercrm/trunk/modules/Users/ChangePassword.php Modified: vtigercrm/trunk/modules/Users/ChangePassword.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 13:24:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:24:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5680 - /vtigercrm/trunk/modules/Users/Save.php Message-ID: <20060502202411.76FF0702EDF@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:24:05 2006 New Revision: 5680 Log: New user creation is now functional - Ahmed Modified: vtigercrm/trunk/modules/Users/Save.php Modified: vtigercrm/trunk/modules/Users/Save.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:24:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:24:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23205=3A_?= =?utf-8?q?no_image_mail_server_info?= In-Reply-To: <076.d44d3396d8e036259f267ae772a82b40@vtiger.fosslabs.com> References: <076.d44d3396d8e036259f267ae772a82b40@vtiger.fosslabs.com> Message-ID: <085.d8d1ff0925e62ce9912f4297b38ff206@vtiger.fosslabs.com> #205: no image mail server info ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: mail server info ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:26:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:26:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23202=3A_?= =?utf-8?q?=27no_image=27_while_company_info_edit?= In-Reply-To: <076.49b980f60f323d38dd3fb5eb903756ac@vtiger.fosslabs.com> References: <076.49b980f60f323d38dd3fb5eb903756ac@vtiger.fosslabs.com> Message-ID: <085.656d195ff381d02365f6a8326650f682@vtiger.fosslabs.com> #202: 'no image' while company info edit ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: company info ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:26:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:26:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23213=3A_?= =?utf-8?q?no_image_backup_server_config?= In-Reply-To: <076.3f0dea16607ae71bf674ea181a738a8e@vtiger.fosslabs.com> References: <076.3f0dea16607ae71bf674ea181a738a8e@vtiger.fosslabs.com> Message-ID: <085.a78c248107fe610c8d7456942943ce17@vtiger.fosslabs.com> #213: no image backup server config ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: backup server config ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:27:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:27:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23232=3A_?= =?utf-8?q?misalignment_in_Inventory_Terms_and_Conditions_UI?= In-Reply-To: <076.4fc8ed4216aad11ae8ce31e9e1229069@vtiger.fosslabs.com> References: <076.4fc8ed4216aad11ae8ce31e9e1229069@vtiger.fosslabs.com> Message-ID: <085.3dc52ba38d2c0f92a998ddfe028de363@vtiger.fosslabs.com> #232: misalignment in Inventory Terms and Conditions UI ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: inventory ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:29:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:29:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23134=3A_?= =?utf-8?q?Settings_Left_side_screen_too_big?= In-Reply-To: <076.97dc79f5ef0ccc78a5d2282fc9283bb1@vtiger.fosslabs.com> References: <076.97dc79f5ef0ccc78a5d2282fc9283bb1@vtiger.fosslabs.com> Message-ID: <085.65e901d4a48bcb1cf6bd439787850529@vtiger.fosslabs.com> #134: Settings Left side screen too big ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Left hand side screen Settings ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 13:34:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:34:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23333=3A_?= =?utf-8?q?No_css_for_Change_password_popup?= In-Reply-To: <076.166732b8cfc76c7f522640e2cbaa3eef@vtiger.fosslabs.com> References: <076.166732b8cfc76c7f522640e2cbaa3eef@vtiger.fosslabs.com> Message-ID: <085.25685eaaeafd84c12eac96098a68db78@vtiger.fosslabs.com> #333: No css for Change password popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: User Change Password popup ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 14:04:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 21:04:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23203=3A_?= =?utf-8?q?UI_issue_in_tag?= In-Reply-To: <076.c68798cae45ed03d0e7c2b988d395d60@vtiger.fosslabs.com> References: <076.c68798cae45ed03d0e7c2b988d395d60@vtiger.fosslabs.com> Message-ID: <085.0de54bcba211cf0e3cca9b7777780765@vtiger.fosslabs.com> #203: UI issue in tag ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 14:07:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 21:07:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23407=3A_?= =?utf-8?q?Inconsistency_in_Pagination?= In-Reply-To: <076.18acc4366a70c7be608f072b875694f1@vtiger.fosslabs.com> References: <076.18acc4366a70c7be608f072b875694f1@vtiger.fosslabs.com> Message-ID: <085.ec21c98b0d5a65bd42658fa167498c20@vtiger.fosslabs.com> #407: Inconsistency in Pagination ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 14:12:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 21:12:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23113=3A_?= =?utf-8?q?Issue_in_Create_Leads_Screen?= In-Reply-To: <076.48d81357938176da9aa5cb5437084734@vtiger.fosslabs.com> References: <076.48d81357938176da9aa5cb5437084734@vtiger.fosslabs.com> Message-ID: <085.518ca1375a5a566450859f96d7912e4e@vtiger.fosslabs.com> #113: Issue in Create Leads Screen ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 14:13:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 21:13:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23438=3A_?= =?utf-8?q?Positioning_of_the_addtag_button_is_improper?= In-Reply-To: <076.e3699430f94d979a408b8b7caa0b6fb3@vtiger.fosslabs.com> References: <076.e3699430f94d979a408b8b7caa0b6fb3@vtiger.fosslabs.com> Message-ID: <085.9a3678afe9aec3c00c3aa20dca061d56@vtiger.fosslabs.com> #438: Positioning of the addtag button is improper ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:18:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 22:18:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23753=3A_?= =?utf-8?q?Fix_mime-types_throughout_/trunk?= Message-ID: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> #753: Fix mime-types throughout /trunk -----------------------+---------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: mime | -----------------------+---------------------------------------------------- source:vtigercrm/trunk has many files with no mime-type subversion property. It is important to fix these before release tags are made (including beta tags). -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:32:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 22:32:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23752=3A_?= =?utf-8?q?Add_postgresql_support_to_trunk?= In-Reply-To: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> References: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> Message-ID: <085.041489e134e5b9dfa3edb33007707774@vtiger.fosslabs.com> #752: Add postgresql support to trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: adodb postgresql database ------------------------+--------------------------------------------------- Comment (by jeffk): Per Allan Bush, this work will be attempted on the trunk, without making a feature branch. Developers and testers should still file related issues on this bug. All commits relating to postgresql support on source:vtigercrm/trunk should add the text 'refs #752' in their commit message. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:40:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 22:40:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23753=3A_?= =?utf-8?q?Fix_mime-types_throughout_/trunk?= In-Reply-To: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> References: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> Message-ID: <085.3ae04c092c34c90e8fda71bf1f81c89e@vtiger.fosslabs.com> #753: Fix mime-types throughout /trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mime ------------------------+--------------------------------------------------- Comment (by jeffk): (In [5681]) refs #753. fixing one mime-type property -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 15:40:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 02 May 2006 22:40:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5681 - /vtigercrm/trunk/README.txt Message-ID: <20060502224030.0AC56702EF1@vtiger.fosslabs.com> Author: jeffk Date: Tue May 2 16:40:26 2006 New Revision: 5681 Log: refs #753. fixing one mime-type property Modified: vtigercrm/trunk/README.txt (props changed) From vtiger-tickets at vtiger.fosslabs.com Tue May 2 17:24:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 00:24:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23388=3A_?= =?utf-8?q?In_consistent_headings_in_Setting_pages?= In-Reply-To: <076.cd4fd81a0701b4d2a86d39847cf87427@vtiger.fosslabs.com> References: <076.cd4fd81a0701b4d2a86d39847cf87427@vtiger.fosslabs.com> Message-ID: <085.c54add10d0c827881e3c215fa96c5855@vtiger.fosslabs.com> #388: In consistent headings in Setting pages ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Settings ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 17:24:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 00:24:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23250=3A_?= =?utf-8?q?Arrangement_of_icons_inconsistent?= In-Reply-To: <076.609795e90d591a97352576571bb0aae0@vtiger.fosslabs.com> References: <076.609795e90d591a97352576571bb0aae0@vtiger.fosslabs.com> Message-ID: <085.464b80b265bec3b510cf588c62075be9@vtiger.fosslabs.com> #250: Arrangement of icons inconsistent ------------------------+--------------------------------------------------- Reporter: saraj | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: icons inconsistent ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 20:57:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 03:57:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5682 - /vtigercrm/trunk/Smarty/templates/Settings.tpl Message-ID: <20060503035743.DCBC2702F1E@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 21:57:39 2006 New Revision: 5682 Log: UI Changes done in settings - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue May 2 21:57:39 2006 @@ -1,9 +1,9 @@ -
{$MOD.LBL_CONFIGURATION}
+
{include file='SettingsMenu.tpl'} - + - - + - +
- +
@@ -75,6 +75,7 @@ + @@ -103,16 +104,14 @@ - + - - - - + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 20:58:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 03:58:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5683 - /vtigercrm/trunk/Smarty/templates/UserListView.tpl Message-ID: <20060503035828.54E6A702F20@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 21:58:24 2006 New Revision: 5683 Log: UI Changes done in settings - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Tue May 2 21:58:24 2006 @@ -15,7 +15,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 20:58:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 03:58:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5684 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060503035850.D85FA702F20@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 21:58:47 2006 New Revision: 5684 Log: UI Changes done in settings - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Tue May 2 21:58:47 2006 @@ -24,7 +24,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 22:01:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 05:01:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5685 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060503050159.9C8A5702F34@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 23:01:50 2006 New Revision: 5685 Log: Added the mailto link for Emails in User Detail View - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue May 2 23:01:50 2006 @@ -115,7 +115,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 22:36:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 05:36:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5686 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060503053647.B14BF702F3F@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 23:36:42 2006 New Revision: 5686 Log: Added Other Phone field instead of only other - Ahmed Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 23:35:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 06:35:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5687 - /vtigercrm/trunk/Smarty/libs/Smarty.class.php Message-ID: <20060503063533.2C74D702F4C@vtiger.fosslabs.com> Author: richie Date: Wed May 3 00:35:28 2006 New Revision: 5687 Log: @ added to 1234 and 1217 lines Modified: vtigercrm/trunk/Smarty/libs/Smarty.class.php Modified: vtigercrm/trunk/Smarty/libs/Smarty.class.php ============================================================================== --- vtigercrm/trunk/Smarty/libs/Smarty.class.php (original) +++ vtigercrm/trunk/Smarty/libs/Smarty.class.php Wed May 3 00:35:28 2006 @@ -1212,7 +1212,7 @@ header('HTTP/1.1 304 Not Modified'); } else { - header('Last-Modified: '.$_gmt_mtime); + @header('Last-Modified: '.$_gmt_mtime); echo $_smarty_results; } } else { @@ -1231,7 +1231,7 @@ } else { $this->_cache_info['template'][$resource_name] = true; if ($this->cache_modified_check && $display) { - header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT'); + @header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT'); } } } From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 23:36:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 06:36:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5688 - /vtigercrm/trunk/Smarty_setup.php Message-ID: <20060503063612.40497702F4C@vtiger.fosslabs.com> Author: richie Date: Wed May 3 00:36:08 2006 New Revision: 5688 Log: Extra space removed at the end of file Modified: vtigercrm/trunk/Smarty_setup.php Modified: vtigercrm/trunk/Smarty_setup.php ============================================================================== --- vtigercrm/trunk/Smarty_setup.php (original) +++ vtigercrm/trunk/Smarty_setup.php Wed May 3 00:36:08 2006 @@ -16,4 +16,3 @@ } ?> - From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 23:52:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 06:52:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5689 - /vtigercrm/trunk/pkg/bin/startvTiger.bat Message-ID: <20060503065209.CFE11702F49@vtiger.fosslabs.com> Author: richie Date: Wed May 3 00:52:05 2006 New Revision: 5689 Log: message changed Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Wed May 3 00:52:05 2006 @@ -150,13 +150,23 @@ echo "" echo "" echo "********* Service not started as port # %apache_port% occupied ******* " -echo "********* Kindly free port %apache_port% and restart again or give a different port which is free******* " +echo "" +echo "" +echo "" +echo "" +echo "********* I am sorry. I am not able to start the product as the apache port that you have specified: port # %apache_port% seems to be occupied ******* . You could give me a different port number if you wish by doing the following ...." +echo "" +echo "" echo "" echo "" echo "********* Open the apache/conf/httpd.conf file, search for 'Listen' and change the port number ******* " echo "" echo "" -echo "********* Make the apache port change in startvTiger.bat and stopvTiger.bat too******* " +echo "" +echo "" +echo "********* Change the apache port in startvTiger.bat and stopvTiger.bat too and then access the product from the browser in the following manner http://localhost:apacheport******* " +echo "" +echo "" echo "" echo "" echo "" From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 00:08:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 07:08:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5690 - /vtigercrm/trunk/pkg/bin/startvTiger.bat Message-ID: <20060503070816.C5066702F57@vtiger.fosslabs.com> Author: richie Date: Wed May 3 01:08:12 2006 New Revision: 5690 Log: sleep for 20 seconds added. This is so as at times, when the server is started, it seems that the port is shown as occupied as it does not get enuf time to start Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Wed May 3 01:08:12 2006 @@ -50,6 +50,9 @@ echo "installing vtigercrm5_beta apache service" echo "" echo "" +echo "Starting vtigercrm5_beta apache service after sleeping for 20 seconds" +echo "" +%SLEEP_STR% -n 20 127.0.0.1>nul bin\apache -k install -n vtigercrm5_beta -f conf\httpd.conf echo "" echo "Starting vtigercrm5_beta apache service" From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 00:58:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 07:58:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5691 - /vtigercrm/trunk/modules/Users/Forms.php Message-ID: <20060503075859.8F056702F5A@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 01:58:55 2006 New Revision: 5691 Log: Added validation for UserEditView - Ahmed Modified: vtigercrm/trunk/modules/Users/Forms.php Modified: vtigercrm/trunk/modules/Users/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Users/Forms.php (original) +++ vtigercrm/trunk/modules/Users/Forms.php Wed May 3 01:58:55 2006 @@ -74,11 +74,11 @@ return false; } if (trim(form.email1.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email1.value)) { - alert('"' + form.email1.value + '" $err_invalid_email_address'); + alert('"' + form.email1.value + '" is $err_invalid_email_address'); return false; } if (trim(form.email2.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email2.value)) { - alert('"' + form.email2.value + '" $err_invalid_email_address'); + alert('"' + form.email2.value + '" value in other email field is $err_invalid_email_address'); return false; } if(trim(form.new_password.value) != trim(form.confirm_new_password.value)) @@ -97,4 +97,67 @@ return $the_script; } +function get_validate_record_js1 () { +global $mod_strings; +global $app_strings; + +$lbl_last_name = $mod_strings['LBL_LIST_LAST_NAME']; +$lbl_user_name = $mod_strings['LBL_LIST_USER_NAME']; +$lbl_new_password = $mod_strings['LBL_LIST_PASSWORD']; +$lbl_confirm_new_password = $mod_strings['LBL_LIST_CONFIRM_PASSWORD']; +$lbl_user_email1 = $mod_strings['LBL_LIST_EMAIL']; +$err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS']; +$err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS']; + +$the_script = << + + + +EOQ; + +return $the_script; +} + + + ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 01:00:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 08:00:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5692 - /vtigercrm/trunk/modules/Users/EditView.php Message-ID: <20060503080021.7BCF1702F46@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 02:00:17 2006 New Revision: 5692 Log: Added validation for UserEditView - Ahmed Modified: vtigercrm/trunk/modules/Users/EditView.php Modified: vtigercrm/trunk/modules/Users/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditView.php (original) +++ vtigercrm/trunk/modules/Users/EditView.php Wed May 3 02:00:17 2006 @@ -99,8 +99,11 @@ $smarty->assign("RETURN_ID", $_REQUEST['return_id']); $RETURN_ID = $_REQUEST['return_id']; } - -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); +if($mode == 'edit') + $smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js1()); +else + $smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); + $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); $smarty->assign("ID", $focus->id); $smarty->assign("USER_NAME", $focus->user_name); From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 01:02:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 08:02:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5693 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060503080224.D978C702EA4@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 02:02:20 2006 New Revision: 5693 Log: Added validation for UserEditView - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Wed May 3 02:02:20 2006 @@ -38,7 +38,6 @@ '; - -$list = imap_getmailboxes($mbox, "{".$imapServerAddress."}", "*"); -sort($list); -if (is_array($list)) { - $boxes = ''; + +$list = imap_getmailboxes($mbox, "{".$imapServerAddress."}", "*"); +sort($list); +if (is_array($list)) { + $boxes = ''; -} -$navigationOutput .= ''; -$navigationOutput .= ''; - -imap_close($mbox); -//print_r($listview_entries); + $boxes .= ''; +} +$navigationOutput .= ''; +$navigationOutput .= ''; + +imap_close($mbox); +//print_r($listview_entries); $smarty = new vtigerCRM_Smarty; $smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); -$smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("LISTENTITY", $listview_entries); -$smarty->assign("LISTHEADER", $listview_header); -$smarty->assign("MODULE","Webmails"); -$smarty->assign("SINGLE_MOD",'Webmails'); -$smarty->assign("BUTTONS",$other_text); -$smarty->assign("CATEGORY","My Home Page"); -$smarty->assign("NAVIGATION", $navigationOutput); +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("LISTENTITY", $listview_entries); +$smarty->assign("LISTHEADER", $listview_header); +$smarty->assign("MODULE","Webmails"); +$smarty->assign("SINGLE_MOD",'Webmails'); +$smarty->assign("BUTTONS",$other_text); +$smarty->assign("CATEGORY","My Home Page"); +$smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("FOLDER_SELECT", $boxes); -$smarty->assign("NUM_EMAILS", $numEmails); +$smarty->assign("NUM_EMAILS", $numEmails); $smarty->assign("MAILBOX", $mailbox); $smarty->assign("ACCOUNT", $account_name); $smarty->assign("BOXLIST",$folders); -$smarty->display("Webmails.tpl"); -//$smarty->display("ListView.tpl"); - -?> +$smarty->display("Webmails.tpl"); +//$smarty->display("ListView.tpl"); + +?> Modified: vtigercrm/trunk/modules/Webmails/body.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/body.php (original) +++ vtigercrm/trunk/modules/Webmails/body.php Wed May 3 06:00:54 2006 @@ -21,8 +21,8 @@ if(isset($_REQUEST["mailbox"]) && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} global $mbox; -$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); - +//$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); +$mbox = @imap_open('{'.$imapServerAddress.'/'.$mail_protocol.'}'.$mailbox, $login_username, $secretkey) or die("Connection to server failed with: ".imap_last_error()); $email = new Webmail($mbox,$mailid); $email->loadMail(); From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 05:20:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 12:20:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5711 - /vtigercrm/trunk/modules/Users/add2db.php Message-ID: <20060503122006.D4AC9702FD7@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 06:20:01 2006 New Revision: 5711 Log: Added Javascript validation in Mail Merge - Ahmed Modified: vtigercrm/trunk/modules/Users/add2db.php Modified: vtigercrm/trunk/modules/Users/add2db.php ============================================================================== --- vtigercrm/trunk/modules/Users/add2db.php (original) +++ vtigercrm/trunk/modules/Users/add2db.php Wed May 3 06:20:01 2006 @@ -100,23 +100,25 @@ if($errorCode == 4) { include('themes/'.$theme.'/header.php'); - $errormessage = "Kindly give a valid file for upload!
" ; - echo $errormessage; include "upload.php"; + // $errormessage = "Kindly give a valid file for upload!
" ; + echo ""; } else if($errorCode == 2) { - $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file
"; include('themes/'.$theme.'/header.php'); - echo $errormessage; include "upload.php"; + //$errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file
"; + echo ""; + //echo $errormessage; //echo $errorCode; } else if($errorCode == 3) { include('themes/'.$theme.'/header.php'); - echo "Problems in file upload. Please try again!
"; include "upload.php"; + echo ""; + } } From vtiger-tickets at vtiger.fosslabs.com Wed May 3 05:22:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 12:22:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23557=3A_?= =?utf-8?q?javascript_validation_for_mailmerge_creation?= In-Reply-To: <076.4c9123e555ad11a98d8fe9df89747f63@vtiger.fosslabs.com> References: <076.4c9123e555ad11a98d8fe9df89747f63@vtiger.fosslabs.com> Message-ID: <085.b2b75de1e50c79bb49eeece7045b96e5@vtiger.fosslabs.com> #557: javascript validation for mailmerge creation --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Javascript validation done for mail merge creation -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 05:32:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 12:32:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23738=3A_?= =?utf-8?q?custom_date_field_does_not_work?= In-Reply-To: <076.a77c78c65d038159208fb0ccaed11ec1@vtiger.fosslabs.com> References: <076.a77c78c65d038159208fb0ccaed11ec1@vtiger.fosslabs.com> Message-ID: <085.c675b7c882db14270c7aa5e6c226162f@vtiger.fosslabs.com> #738: custom date field does not work ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: custom, field ------------------------+--------------------------------------------------- Changes (by don): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 05:47:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 12:47:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5712 - in /vtigercrm/trunk/modules/Import: ImportMap.php ImportStep4.php Message-ID: <20060503124715.779C5702FE5@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 06:47:10 2006 New Revision: 5712 Log: * commented the function call retrieve_by_string_fields which is not used now for mapping Modified: vtigercrm/trunk/modules/Import/ImportMap.php vtigercrm/trunk/modules/Import/ImportStep4.php Modified: vtigercrm/trunk/modules/Import/ImportMap.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportMap.php (original) +++ vtigercrm/trunk/modules/Import/ImportMap.php Wed May 3 06:47:10 2006 @@ -76,7 +76,7 @@ { $query_arr = array('assigned_user_id'=>$owner_id,'name'=>$name); - $this->retrieve_by_string_fields($query_arr, false); + //$this->retrieve_by_string_fields($query_arr, false); $result = 1; $this->assigned_user_id = $owner_id; Modified: vtigercrm/trunk/modules/Import/ImportStep4.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportStep4.php (original) +++ vtigercrm/trunk/modules/Import/ImportStep4.php Wed May 3 06:47:10 2006 @@ -153,7 +153,6 @@ } - p("user_field=".$user_field." if=".$focus->importable_fields[$user_field]); // match up the "official" field to the user @@ -164,7 +163,6 @@ // now mark that we've seen this field $field_to_pos[$user_field] = $pos; $col_pos_to_field[$pos] = $user_field; - } } @@ -270,17 +268,18 @@ if($totalnoofrows > $RECORDCOUNT && $START < $totalnoofrows) { - $rows1 = Array(); - for($j=$START;$j<$START+$RECORDCOUNT;$j++) - { - $rows1[] = $datarows[$j]; - } - $res = InsertImportRecords($datarows,$rows1,$focus,$ret_field_count,$col_pos_to_field,$START,$RECORDCOUNT,$_REQUEST['module'],$totalnoofrows,$skipped_record_count); - -if($START != 0) - echo ''.$res.''; - - $count = $_REQUEST['count']; + $rows1 = Array(); + for($j=$START;$j<$START+$RECORDCOUNT;$j++) + { + $rows1[] = $datarows[$j]; + } + + $res = InsertImportRecords($datarows,$rows1,$focus,$ret_field_count,$col_pos_to_field,$START,$RECORDCOUNT,$_REQUEST['module'],$totalnoofrows,$skipped_record_count); + + if($START != 0) + echo ''.$res.''; + + $count = $_REQUEST['count']; } else { @@ -300,11 +299,8 @@ if( $has_header) { - - foreach($col_pos_to_field as $pos=>$field_name) { - if ( isset($firstrow[$pos]) && isset( $field_name)) { $header_to_field[ $firstrow[$pos] ] = $field_name; @@ -323,10 +319,8 @@ $mapping_file = new ImportMap(); - $query_arr = array('assigned_user_id'=>$current_user->id,'name'=>$mapping_file_name); - - - $mapping_file->retrieve_by_string_fields($query_arr, false); + //$query_arr = array('assigned_user_id'=>$current_user->id,'name'=>$mapping_file_name); + //$mapping_file->retrieve_by_string_fields($query_arr, false); $result = $mapping_file->save_map( $current_user->id, $mapping_file_name, From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 05:49:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 12:49:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5713 - in /vtigercrm/trunk/modules/Import: ImportStep1.html ImportStep2.html ImportStep3.html ImportStep4.html error.html Message-ID: <20060503124955.6E970702EF1@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 06:49:49 2006 New Revision: 5713 Log: * Unwnated files has been removed as now we had written in tpl files Removed: vtigercrm/trunk/modules/Import/ImportStep1.html vtigercrm/trunk/modules/Import/ImportStep2.html vtigercrm/trunk/modules/Import/ImportStep3.html vtigercrm/trunk/modules/Import/ImportStep4.html vtigercrm/trunk/modules/Import/error.html From vtiger-tickets at vtiger.fosslabs.com Wed May 3 06:30:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 13:30:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23754=3A_?= =?utf-8?q?Thunderbird_plugin_does_not_find_contacts?= Message-ID: <076.0f14fd08f60f589fea2f8a7eecc2b4c7@vtiger.fosslabs.com> #754: Thunderbird plugin does not find contacts ----------------------------------+----------------------------------------- Reporter: hpw at softechmatrix.nl | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: thunderbirdextn | Version: 4.2.3 Keywords: contact not found | ----------------------------------+----------------------------------------- This is an issue I have at one of my clients: In most cases the Thunderbird plugin can not find the contact in vTiger. It seems dependant on the specific contact in the database as some contact can be found (repeatable without a problem) but most contacts can not be found (again repeatable, they wont be found no matter how many tries). I have no idea how to help you guys to recreate this behaviour. If you need any material from me (specific files, additional info, etc.) just post a reply to this ticket (or drop me an email). I monitor my tickets on a weekly basis ;) -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 07:08:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 14:08:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5714 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060503140834.872C1702FFE@vtiger.fosslabs.com> Author: don Date: Wed May 3 08:08:27 2006 New Revision: 5714 Log: i18n of quick create label done Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Wed May 3 08:08:27 2006 @@ -49,6 +49,7 @@ global $currentModule; +global $app_strings; global $app_list_strings; global $moduleList; global $theme; @@ -64,6 +65,7 @@ $qc_modules = getQuickCreateModules(); $smarty->assign("QCMODULE", $qc_modules); +$smarty->assign("APP", $app_strings); $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 07:11:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 14:11:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5715 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060503141132.D5B6F702FFE@vtiger.fosslabs.com> Author: don Date: Wed May 3 08:11:28 2006 New Revision: 5715 Log: i18n of quick create label done Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed May 3 08:11:28 2006 @@ -56,7 +56,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 07:14:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 14:14:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5716 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060503141403.125D9703009@vtiger.fosslabs.com> Author: don Date: Wed May 3 08:13:58 2006 New Revision: 5716 Log: i18n of quick create label done Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Wed May 3 08:13:58 2006 @@ -1666,6 +1666,21 @@ global $adb; global $mod_strings; + + $new_label=Array('Leads'=>'LNK_NEW_LEAD', + 'Accounts'=>'LNK_NEW_ACCOUNT', + 'Activities'=>'LNK_NEW_TASK', + 'Campaigns'=>'LNK_NEW_CAMPAIGN', + 'Emails'=>'LNK_NEW_EMAIL', + 'Events'=>'LNK_NEW_EVENT', + 'HelpDesk'=>'LNK_NEW_HDESK', + 'Notes'=>'LNK_NEW_NOTE', + 'Potentials'=>'LNK_NEW_OPPORTUNITY', + 'PriceBooks'=>'LNK_NEW_PRICEBOOK', + 'Products'=>'LNK_NEW_PRODUCT', + 'Contacts'=>'LNK_NEW_CONTACT', + 'Vendors'=>'LNK_NEW_VENDOR'); + $qc_query = "select distinct tablabel,tab.name from field inner join tab on tab.tabid = field.tabid where quickcreate=0 order by tab.tablabel"; $result = $adb->query($qc_query); $noofrows = $adb->num_rows($result); @@ -1673,7 +1688,9 @@ for($i = 0; $i < $noofrows; $i++) { $tablabel = $adb->query_result($result,$i,'tablabel'); + $tabname = $adb->query_result($result,$i,'name'); + $tablabel = $new_label[$tabname]; if(isPermitted($tabname,'EditView','') == 'yes') { $return_qcmodule[] = $tablabel; From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 07:16:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 14:16:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5717 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060503141659.4CFC670300B@vtiger.fosslabs.com> Author: don Date: Wed May 3 08:16:55 2006 New Revision: 5717 Log: i18n of quick create label done Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Wed May 3 07:18:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 14:18:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23747=3A_?= =?utf-8?q?Handling_=3CNew=3ERecord=3A_Tasks_and_Events?= In-Reply-To: <076.2ad5054a596cd3d9eadad40186d30945@vtiger.fosslabs.com> References: <076.2ad5054a596cd3d9eadad40186d30945@vtiger.fosslabs.com> Message-ID: <085.0aabb9acda5d4caaa827925a76d97421@vtiger.fosslabs.com> #747: Handling Record: Tasks and Events ------------------------+--------------------------------------------------- Reporter: gopal | Owner: don Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 07:32:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 14:32:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5718 - in /vtigercrm/trunk/modules/System: ./ includes/ includes/lang/ includes/mb/ includes/os/ includes/xml/ templates/aq/ templates/black/ templates/blue/ templates/bulix/ templates/classic/ templates/kde/ templates/metal/ templates/orange/ templates/typo3/ templates/wintendoxp/ Message-ID: <20060503143255.36413703006@vtiger.fosslabs.com> Author: richie Date: Wed May 3 08:30:23 2006 New Revision: 5718 Log: latest version updated Modified: vtigercrm/trunk/modules/System/config.php vtigercrm/trunk/modules/System/includes/XPath.class.php vtigercrm/trunk/modules/System/includes/class.Template.inc.php vtigercrm/trunk/modules/System/includes/common_functions.php vtigercrm/trunk/modules/System/includes/lang/ar_utf8.php vtigercrm/trunk/modules/System/includes/lang/bg.php vtigercrm/trunk/modules/System/includes/lang/big5.php vtigercrm/trunk/modules/System/includes/lang/br.php vtigercrm/trunk/modules/System/includes/lang/ca.php vtigercrm/trunk/modules/System/includes/lang/cn.php vtigercrm/trunk/modules/System/includes/lang/cs.php vtigercrm/trunk/modules/System/includes/lang/ct.php vtigercrm/trunk/modules/System/includes/lang/da.php vtigercrm/trunk/modules/System/includes/lang/de.php vtigercrm/trunk/modules/System/includes/lang/en.php vtigercrm/trunk/modules/System/includes/lang/es.php vtigercrm/trunk/modules/System/includes/lang/et.php vtigercrm/trunk/modules/System/includes/lang/eu.php vtigercrm/trunk/modules/System/includes/lang/fi.php vtigercrm/trunk/modules/System/includes/lang/fr.php vtigercrm/trunk/modules/System/includes/lang/gr.php vtigercrm/trunk/modules/System/includes/lang/he.php vtigercrm/trunk/modules/System/includes/lang/hu.php vtigercrm/trunk/modules/System/includes/lang/id.php vtigercrm/trunk/modules/System/includes/lang/is.php vtigercrm/trunk/modules/System/includes/lang/it.php vtigercrm/trunk/modules/System/includes/lang/ja.php vtigercrm/trunk/modules/System/includes/lang/jp.php vtigercrm/trunk/modules/System/includes/lang/ko.php vtigercrm/trunk/modules/System/includes/lang/lt.php vtigercrm/trunk/modules/System/includes/lang/lv.php vtigercrm/trunk/modules/System/includes/lang/nl.php vtigercrm/trunk/modules/System/includes/lang/no.php vtigercrm/trunk/modules/System/includes/lang/pl.php vtigercrm/trunk/modules/System/includes/lang/pt-br.php vtigercrm/trunk/modules/System/includes/lang/pt.php vtigercrm/trunk/modules/System/includes/lang/ro.php vtigercrm/trunk/modules/System/includes/lang/ru.php vtigercrm/trunk/modules/System/includes/lang/sk.php vtigercrm/trunk/modules/System/includes/lang/sv.php vtigercrm/trunk/modules/System/includes/lang/tr.php vtigercrm/trunk/modules/System/includes/lang/tw.php vtigercrm/trunk/modules/System/includes/mb/class.healthd.inc.php vtigercrm/trunk/modules/System/includes/mb/class.hwsensors.inc.php vtigercrm/trunk/modules/System/includes/mb/class.lmsensors.inc.php vtigercrm/trunk/modules/System/includes/mb/class.mbm5.inc.php vtigercrm/trunk/modules/System/includes/mb/class.mbmon.inc.php vtigercrm/trunk/modules/System/includes/os/class.BSD.common.inc.php vtigercrm/trunk/modules/System/includes/os/class.Darwin.inc.php vtigercrm/trunk/modules/System/includes/os/class.FreeBSD.inc.php vtigercrm/trunk/modules/System/includes/os/class.HP-UX.inc.php vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php vtigercrm/trunk/modules/System/includes/os/class.NetBSD.inc.php vtigercrm/trunk/modules/System/includes/os/class.OpenBSD.inc.php vtigercrm/trunk/modules/System/includes/os/class.SunOS.inc.php vtigercrm/trunk/modules/System/includes/os/class.WINNT.inc.php vtigercrm/trunk/modules/System/includes/system_footer.php vtigercrm/trunk/modules/System/includes/system_header.php vtigercrm/trunk/modules/System/includes/xml/filesystems.php vtigercrm/trunk/modules/System/includes/xml/hardware.php vtigercrm/trunk/modules/System/includes/xml/mbinfo.php vtigercrm/trunk/modules/System/includes/xml/memory.php vtigercrm/trunk/modules/System/includes/xml/network.php vtigercrm/trunk/modules/System/includes/xml/vitals.php vtigercrm/trunk/modules/System/phpsysinfo.dtd vtigercrm/trunk/modules/System/systemconfig.php vtigercrm/trunk/modules/System/templates/aq/aq.css vtigercrm/trunk/modules/System/templates/aq/box.tpl vtigercrm/trunk/modules/System/templates/aq/form.tpl vtigercrm/trunk/modules/System/templates/black/black.css vtigercrm/trunk/modules/System/templates/black/box.tpl vtigercrm/trunk/modules/System/templates/black/form.tpl vtigercrm/trunk/modules/System/templates/blue/blue.css vtigercrm/trunk/modules/System/templates/blue/box.tpl vtigercrm/trunk/modules/System/templates/blue/form.tpl vtigercrm/trunk/modules/System/templates/bulix/box.tpl vtigercrm/trunk/modules/System/templates/bulix/bulix.css vtigercrm/trunk/modules/System/templates/bulix/form.tpl vtigercrm/trunk/modules/System/templates/classic/box.tpl vtigercrm/trunk/modules/System/templates/classic/classic.css vtigercrm/trunk/modules/System/templates/classic/form.tpl vtigercrm/trunk/modules/System/templates/kde/box.tpl vtigercrm/trunk/modules/System/templates/kde/form.tpl vtigercrm/trunk/modules/System/templates/metal/box.tpl vtigercrm/trunk/modules/System/templates/metal/form.tpl vtigercrm/trunk/modules/System/templates/metal/metal.css vtigercrm/trunk/modules/System/templates/orange/box.tpl vtigercrm/trunk/modules/System/templates/orange/form.tpl vtigercrm/trunk/modules/System/templates/orange/orange.css vtigercrm/trunk/modules/System/templates/typo3/box.tpl vtigercrm/trunk/modules/System/templates/typo3/form.tpl vtigercrm/trunk/modules/System/templates/wintendoxp/box.tpl vtigercrm/trunk/modules/System/templates/wintendoxp/form.tpl vtigercrm/trunk/modules/System/templates/wintendoxp/wintendoxp.css Modified: vtigercrm/trunk/modules/System/config.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/XPath.class.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/class.Template.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/common_functions.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ar_utf8.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/bg.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/big5.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/br.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ca.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/cn.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/cs.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ct.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/da.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/de.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/en.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/es.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/et.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/eu.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/fi.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/fr.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/gr.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/he.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/hu.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/id.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/is.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/it.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ja.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/jp.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ko.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/lt.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/lv.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/nl.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/no.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/pl.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/pt-br.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/pt.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ro.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ru.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/sk.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/sv.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/tr.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/tw.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/mb/class.healthd.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/mb/class.hwsensors.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/mb/class.lmsensors.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/mb/class.mbm5.inc.php ============================================================================== --- vtigercrm/trunk/modules/System/includes/mb/class.mbm5.inc.php (original) +++ vtigercrm/trunk/modules/System/includes/mb/class.mbm5.inc.php Wed May 3 08:30:23 2006 @@ -24,8 +24,8 @@ // need more csv logs to make it better. // class mbinfo { - var buf_label; - var buf_value; + var $buf_label; + var $buf_value; function temperature() { $results = array(); Modified: vtigercrm/trunk/modules/System/includes/mb/class.mbmon.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.BSD.common.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.Darwin.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.FreeBSD.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.HP-UX.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.NetBSD.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.OpenBSD.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.SunOS.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.WINNT.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/system_footer.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/system_header.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/filesystems.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/hardware.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/mbinfo.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/memory.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/network.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/vitals.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/phpsysinfo.dtd ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/systemconfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/aq/aq.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/aq/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/aq/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/black/black.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/black/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/black/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/blue/blue.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/blue/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/blue/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/bulix/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/bulix/bulix.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/bulix/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/classic/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/classic/classic.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/classic/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/kde/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/kde/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/metal/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/metal/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/metal/metal.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/orange/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/orange/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/orange/orange.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/typo3/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/typo3/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/wintendoxp/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/wintendoxp/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/wintendoxp/wintendoxp.css ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:17:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:17:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5719 - /vtigercrm/trunk/modules/Settings/SaveMailAccount.php Message-ID: <20060503151745.348EF70300F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 09:17:38 2006 New Revision: 5719 Log: Redirection problem rectified while saving mail server information - Ahmed Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php ============================================================================== --- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original) +++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Wed May 3 09:17:38 2006 @@ -12,7 +12,7 @@ global $current_user; $displayname=$_REQUEST['displayname']; -$user_id = $current_user->id; +$userid = $current_user->id; $email=$_REQUEST['email']; $account_name=$_REQUEST['account_name']; $mailprotocol=$_REQUEST['mailprotocol']; @@ -33,7 +33,7 @@ if(isset($_REQUEST['edit']) && $_REQUEST['edit'] && $_REQUEST['record']!='') { - $sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."', box_refresh='".$box_refresh."', mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', showbody='no' where account_id = '".$id."'"; + $sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."', box_refresh='".$box_refresh."', mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', showbody='no' where user_id = '".$id."'"; } else { @@ -43,5 +43,5 @@ $adb->query($sql); -header("Location:index.php?module=Settings&action=ListMailAccount"); +header("Location:index.php?module=Settings&action=AddMailAccount&record=$userid"); ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:22:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:22:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5720 - /vtigercrm/trunk/modules/Settings/AddMailAccount.php Message-ID: <20060503152219.CD52270301A@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 09:22:13 2006 New Revision: 5720 Log: Redirection problem rectified while saving mail server information - Ahmed Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.php Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddMailAccount.php (original) +++ vtigercrm/trunk/modules/Settings/AddMailAccount.php Wed May 3 09:22:13 2006 @@ -34,7 +34,7 @@ if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { - $sql = "select * from mail_accounts where account_id=".$_REQUEST['record']; + $sql = "select * from mail_accounts where user_id=".$_REQUEST['record']; $result = $adb->query($sql); $rowcount = $adb->num_rows($result); @@ -43,6 +43,7 @@ while($temprow = $adb->fetchByAssoc($result)) { $smarty->assign("DISPLAYNAME", $temprow['display_name']); + $smarty->assign("ID", $temprow['user_id']); $smarty->assign("EMAIL", $temprow['mail_id']); $smarty->assign("ACCOUNTNAME", $temprow['account_name']); $smarty->assign($temprow['mail_protocol'],$temprow['mail_protocol']); From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:34:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:34:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5721 - in /vtigercrm/trunk/modules/System/includes: system_footer.php system_header.php Message-ID: <20060503153407.D09D1703021@vtiger.fosslabs.com> Author: richie Date: Wed May 3 09:34:01 2006 New Revision: 5721 Log: changes made to accomodate the newer version Modified: vtigercrm/trunk/modules/System/includes/system_footer.php vtigercrm/trunk/modules/System/includes/system_header.php Modified: vtigercrm/trunk/modules/System/includes/system_footer.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/system_header.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:34:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:34:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5722 - in /vtigercrm/trunk/modules/System: config.php systemconfig.php Message-ID: <20060503153419.D09E9703021@vtiger.fosslabs.com> Author: richie Date: Wed May 3 09:34:13 2006 New Revision: 5722 Log: cchanges made to accomodate the newer version Modified: vtigercrm/trunk/modules/System/config.php vtigercrm/trunk/modules/System/systemconfig.php Modified: vtigercrm/trunk/modules/System/config.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/systemconfig.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Wed May 3 08:36:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 15:36:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23221=3A_?= =?utf-8?q?system_configuration_hangs?= In-Reply-To: <076.1b3561fa42e0dbfb58c5c24a884f58d0@vtiger.fosslabs.com> References: <076.1b3561fa42e0dbfb58c5c24a884f58d0@vtiger.fosslabs.com> Message-ID: <085.cb2e0ec8743932c8214c71024ec0b0d4@vtiger.fosslabs.com> #221: system configuration hangs ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: system ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: Fixed with changeset 5722 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:40:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:40:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5723 - /vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Message-ID: <20060503154006.4FBCF703027@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 09:40:00 2006 New Revision: 5723 Log: Modified Emails Per Page Label Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Wed May 3 09:40:00 2006 @@ -127,7 +127,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:52:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:52:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5724 - /vtigercrm/trunk/modules/System/includes/common_functions.php Message-ID: <20060503155238.19F77703034@vtiger.fosslabs.com> Author: richie Date: Wed May 3 09:52:32 2006 New Revision: 5724 Log: webpath replaced by getcwd Modified: vtigercrm/trunk/modules/System/includes/common_functions.php Modified: vtigercrm/trunk/modules/System/includes/common_functions.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:56:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:56:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5725 - /vtigercrm/trunk/modules/System/includes/xml/vitals.php Message-ID: <20060503155655.A991A703036@vtiger.fosslabs.com> Author: richie Date: Wed May 3 09:56:51 2006 New Revision: 5725 Log: getcwd replaces webpath Modified: vtigercrm/trunk/modules/System/includes/xml/vitals.php Modified: vtigercrm/trunk/modules/System/includes/xml/vitals.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 10:46:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 17:46:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5726 - /vtigercrm/trunk/vtigerversion.php Message-ID: <20060503174600.6717170666F@vtiger.fosslabs.com> Author: allanbush Date: Wed May 3 11:45:57 2006 New Revision: 5726 Log: Removed executable property as this file isn't an executable. Modified: vtigercrm/trunk/vtigerversion.php (props changed) From vtiger-tickets at vtiger.fosslabs.com Wed May 3 11:49:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 18:49:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23753=3A_?= =?utf-8?q?Fix_mime-types_throughout_/trunk?= In-Reply-To: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> References: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> Message-ID: <085.9778ae4aa1175d8fd3102f00f1aebc1f@vtiger.fosslabs.com> #753: Fix mime-types throughout /trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mime ------------------------+--------------------------------------------------- Changes (by allanbush): * priority: major => critical Comment: Worse then missing mime-types there are several non-binary files with binary mime-types. This disables SVN's ability to elegantly track the changes so we can't see what changes were made when. As such this should be fixed as soon as possible to prevent the lose of anymore changesets. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 12:00:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 19:00:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23753=3A_?= =?utf-8?q?Fix_mime-types_throughout_/trunk?= In-Reply-To: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> References: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> Message-ID: <085.facca684f4cabff2bdea2fb753c5a13f@vtiger.fosslabs.com> #753: Fix mime-types throughout /trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mime ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5727]) Replaced binary mime-types with text/plain. Refs #753. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 12:00:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 19:00:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5727 - in /vtigercrm/trunk: Copyright.txt INSTALLATION.txt LICENSE.txt config.php graph.php log4php.properties phprint.php Message-ID: <20060503190042.0C8C3708DE4@vtiger.fosslabs.com> Author: allanbush Date: Wed May 3 13:00:38 2006 New Revision: 5727 Log: Replaced binary mime-types with text/plain. Refs #753. Modified: vtigercrm/trunk/Copyright.txt (props changed) vtigercrm/trunk/INSTALLATION.txt (props changed) vtigercrm/trunk/LICENSE.txt (props changed) vtigercrm/trunk/config.php (props changed) vtigercrm/trunk/graph.php (props changed) vtigercrm/trunk/log4php.properties (props changed) vtigercrm/trunk/phprint.php (props changed) From vtiger-tickets at vtiger.fosslabs.com Wed May 3 14:30:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 21:30:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23753=3A_?= =?utf-8?q?Fix_mime-types_throughout_/trunk?= In-Reply-To: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> References: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> Message-ID: <085.0bda66c0b3da56de10d578a05cd2c5c7@vtiger.fosslabs.com> #753: Fix mime-types throughout /trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: mime ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [5728]) Set mime-type property for all files. Closes #753. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 14:30:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 21:30:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5728 - in /vtigercrm/trunk: ./ Image/ Image/Canvas/ Image/Canvas/Fonts/ Image/Canvas/GD/ Image/Graph/ Image/Graph/Axis/ Image/Graph/Axis/Marker/ Image/Graph/DataPreprocessor/ Image/Graph/DataSelector/ Image/Graph/Dataset/ Image/Graph/Figure/ Image/Graph/Fill/ Image/Graph/Grid/ Image/Graph/Images/Maps/ Image/Graph/Layout/ Image/Graph/Line/ Image/Graph/Marker/ Image/Graph/Marker/Pointing/ Image/Graph/Plot/ Image/Graph/Plot/Fit/ Image/Graph/Plot/Smoothed/ Image/Graph/Plotarea/ Smarty/ Smarty/cache/ Smarty/configs/ Smarty/libs/ Smarty/libs/internals/ Smarty/libs/plugins/ Smarty/misc/ Smarty/templates/ Smarty/templates/Settings/ Smarty/templates_c/ XTemplate/ adodb/ adodb/contrib/ adodb/datadict/ adodb/drivers/ adodb/lang/ adodb/pear/Auth/Container/ adodb/perf/ adodb/session/ adodb/session/old/ adodb/tests/ adodb/xsl/ cache/ cache/images/ cache/import/ cache/upload/ class_http/ cron/ data/ database/ include/ include/Ajax/ include/ListView/ include/calculator/ include/clock/ include/database/ include/db_backup/ include/dd/ include/dd/dd_files/ include/fckeditor/ include/fckeditor/editor/ include/fckeditor/editor/_source/classes/ include/fckeditor/editor/_source/commandclasses/ include/fckeditor/editor/_source/globals/ include/fckeditor/editor/_source/internals/ include/fckeditor/editor/css/ include/fckeditor/editor/css/behaviors/ include/fckeditor/editor/dialog/ include/fckeditor/editor/dialog/common/ include/fckeditor/editor/dialog/fck_about/ include/fckeditor/editor/dialog/fck_docprops/ include/fckeditor/editor/dialog/fck_image/ include/fckeditor/editor/dialog/fck_link/ include/fckeditor/editor/dialog/fck_select/ include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/ include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/ include/fckeditor/editor/dialog/fck_universalkey/ include/fckeditor/editor/filemanager/browser/default/ include/fckeditor/editor/filemanager/browser/default/connectors/ include/fckeditor/editor/filemanager/browser/default/connectors/asp/ include/fckeditor/editor/filemanager/browser/default/connectors/aspx/ include/fckeditor/editor/filemanager/browser/default/connectors/cfm/ include/fckeditor/editor/filemanager/browser/default/connectors/perl/ include/fckeditor/editor/filemanager/browser/default/connectors/php/ include/fckeditor/editor/filemanager/browser/default/js/ include/fckeditor/editor/js/ include/fckeditor/editor/lang/ include/fckeditor/editor/plugins/placeholder/ include/fckeditor/editor/plugins/placeholder/lang/ include/fckeditor/editor/plugins/tablecommands/ include/fckeditor/editor/skins/default/ include/fckeditor/editor/skins/office2003/ include/fckeditor/editor/skins/silver/ include/feedParser/ include/fpdf/ include/fpdf/font/ include/fpdf/templates/ include/freetag/ include/images/ include/js/ include/language/ include/lastrss/ include/nusoap/ include/php_writeexcel/ include/prototype-1.4.0/ include/prototype-1.4.0/dist/ include/prototype-1.4.0/lib/ include/prototype-1.4.0/src/ include/prototype-1.4.0/test/ include/scriptaculous/ include/utils/ install/ jscalendar/ jscalendar/lang/ log4php/ log4php/appenders/ log4php/config/ log4php/helpers/ log4php/layouts/ log4php/or/ log4php/spi/ log4php/varia/ log4php/xml/ logs/ migration/ modules/Accounts/ modules/Accounts/language/ modules/Activities/ modules/Activities/language/ modules/Administration/ modules/Administration/language/ modules/Calendar/ modules/Calendar/admin/ modules/Calendar/auth/ modules/Calendar/db/ modules/Calendar/language/ modules/Calendar/layout/ modules/Calendar/localization/ modules/Calendar/tmp/ modules/Campaigns/ modules/Campaigns/language/ modules/Contacts/ modules/Contacts/js/ modules/Contacts/language/ modules/CustomView/ modules/CustomView/language/ modules/Dashboard/ modules/Dashboard/language/ modules/Emails/ modules/Emails/language/ modules/Emails/templates/ modules/Faq/ modules/Faq/language/ modules/Help/ modules/Help/language/ modules/HelpDesk/ modules/HelpDesk/language/ modules/Home/ modules/Home/language/ modules/Import/ modules/Import/language/ modules/Invoice/ modules/Invoice/language/ modules/Invoice/pdf_templates/ modules/Invoice/pdf_templates/lastpage/ modules/Leads/ modules/Leads/language/ modules/Migration/ modules/Migration/ModifyDatabase/ modules/Migration/language/ modules/Notes/ modules/Notes/language/ modules/Portal/ modules/Portal/language/ modules/Potentials/ modules/Potentials/language/ modules/PriceBooks/ modules/PriceBooks/language/ modules/Products/ modules/Products/language/ modules/PurchaseOrder/ modules/PurchaseOrder/language/ modules/PurchaseOrder/pdf_templates/ modules/PurchaseOrder/pdf_templates/lastpage/ modules/Quotes/ modules/Quotes/language/ modules/Quotes/pdf_templates/ modules/Quotes/pdf_templates/lastpage/ modules/Reports/ modules/Reports/language/ modules/Rss/ modules/Rss/language/ modules/SalesOrder/ modules/SalesOrder/language/ modules/SalesOrder/pdf_templates/ modules/SalesOrder/pdf_templates/lastpage/ modules/Settings/ modules/Settings/language/ modules/System/ modules/System/includes/ modules/System/includes/lang/ modules/System/includes/mb/ modules/System/includes/os/ modules/System/includes/xml/ modules/System/language/ modules/System/templates/aq/ modules/System/templates/black/ modules/System/templates/blue/ modules/System/templates/bulix/ modules/System/templates/classic/ modules/System/templates/kde/ modules/System/templates/metal/ modules/System/templates/orange/ modules/System/templates/typo3/ modules/System/templates/wintendoxp/ modules/Users/ modules/Users/language/ modules/Utilities/ modules/Vendors/ modules/Vendors/language/ modules/Webmails/ modules/Webmails/images/ modules/Webmails/js/ modules/Webmails/language/ modules/Webmails/templates/ modules/Yahoo/language/ modules/imports/ modules/imports/Excel/ modules/uploads/ modules/uploads/language/ pkg/apache/conf/ pkg/bin/ pkg/license/ pkg/php/ schema/ soap/ storage/ test/contact/ test/logo/ test/product/ test/upload/ test/user/ test/wordtemplatedownload/ themes/Aqua/ themes/Aqua/images/ themes/blue/ themes/blue/images/ themes/nature/ themes/orange/ user_privileges/ Message-ID: <20060503213010.62650709DEF@vtiger.fosslabs.com> Author: allanbush Date: Wed May 3 15:19:46 2006 New Revision: 5728 Log: Set mime-type property for all files. Closes #753. Modified: vtigercrm/trunk/Image/Canvas.php (props changed) vtigercrm/trunk/Image/Canvas/Color.php (props changed) vtigercrm/trunk/Image/Canvas/Fonts/README (props changed) vtigercrm/trunk/Image/Canvas/Fonts/VeraCopyright.txt (props changed) vtigercrm/trunk/Image/Canvas/Fonts/fontmap.txt (props changed) vtigercrm/trunk/Image/Canvas/GD.php (props changed) vtigercrm/trunk/Image/Canvas/GD/JPG.php (props changed) vtigercrm/trunk/Image/Canvas/GD/PNG.php (props changed) vtigercrm/trunk/Image/Canvas/ImageMap.php (props changed) vtigercrm/trunk/Image/Canvas/PDF.php (props changed) vtigercrm/trunk/Image/Canvas/SVG.php (props changed) vtigercrm/trunk/Image/Canvas/Tool.php (props changed) vtigercrm/trunk/Image/Canvas/WithMap.php (props changed) vtigercrm/trunk/Image/Color.php (props changed) vtigercrm/trunk/Image/Graph.php (props changed) vtigercrm/trunk/Image/Graph/Axis.php (props changed) vtigercrm/trunk/Image/Graph/Axis/Category.php (props changed) vtigercrm/trunk/Image/Graph/Axis/Logarithmic.php (props changed) vtigercrm/trunk/Image/Graph/Axis/Marker/Area.php (props changed) vtigercrm/trunk/Image/Graph/Axis/Marker/Line.php (props changed) vtigercrm/trunk/Image/Graph/Axis/Radar.php (props changed) vtigercrm/trunk/Image/Graph/Common.php (props changed) vtigercrm/trunk/Image/Graph/Config.php (props changed) vtigercrm/trunk/Image/Graph/Constants.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Array.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Currency.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Date.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Formatted.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Function.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/NumberText.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/RomanNumerals.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Sequential.php (props changed) vtigercrm/trunk/Image/Graph/DataSelector.php (props changed) vtigercrm/trunk/Image/Graph/DataSelector/EveryNthPoint.php (props changed) vtigercrm/trunk/Image/Graph/DataSelector/NoZeros.php (props changed) vtigercrm/trunk/Image/Graph/DataSelector/Values.php (props changed) vtigercrm/trunk/Image/Graph/Dataset.php (props changed) vtigercrm/trunk/Image/Graph/Dataset/Function.php (props changed) vtigercrm/trunk/Image/Graph/Dataset/Random.php (props changed) vtigercrm/trunk/Image/Graph/Dataset/Sequential.php (props changed) vtigercrm/trunk/Image/Graph/Dataset/Trivial.php (props changed) vtigercrm/trunk/Image/Graph/Dataset/VectorFunction.php (props changed) vtigercrm/trunk/Image/Graph/Element.php (props changed) vtigercrm/trunk/Image/Graph/Figure/Circle.php (props changed) vtigercrm/trunk/Image/Graph/Figure/Ellipse.php (props changed) vtigercrm/trunk/Image/Graph/Figure/Polygon.php (props changed) vtigercrm/trunk/Image/Graph/Figure/Rectangle.php (props changed) vtigercrm/trunk/Image/Graph/Fill.php (props changed) vtigercrm/trunk/Image/Graph/Fill/Array.php (props changed) vtigercrm/trunk/Image/Graph/Fill/Gradient.php (props changed) vtigercrm/trunk/Image/Graph/Fill/Image.php (props changed) vtigercrm/trunk/Image/Graph/Font.php (props changed) vtigercrm/trunk/Image/Graph/Grid.php (props changed) vtigercrm/trunk/Image/Graph/Grid/Bars.php (props changed) vtigercrm/trunk/Image/Graph/Grid/Lines.php (props changed) vtigercrm/trunk/Image/Graph/Grid/Polar.php (props changed) vtigercrm/trunk/Image/Graph/Images/Maps/README (props changed) vtigercrm/trunk/Image/Graph/Layout.php (props changed) vtigercrm/trunk/Image/Graph/Layout/Horizontal.php (props changed) vtigercrm/trunk/Image/Graph/Layout/Matrix.php (props changed) vtigercrm/trunk/Image/Graph/Layout/Vertical.php (props changed) vtigercrm/trunk/Image/Graph/Legend.php (props changed) vtigercrm/trunk/Image/Graph/Line/Array.php (props changed) vtigercrm/trunk/Image/Graph/Line/Dashed.php (props changed) vtigercrm/trunk/Image/Graph/Line/Dotted.php (props changed) vtigercrm/trunk/Image/Graph/Line/Formatted.php (props changed) vtigercrm/trunk/Image/Graph/Line/Solid.php (props changed) vtigercrm/trunk/Image/Graph/Logo.php (props changed) vtigercrm/trunk/Image/Graph/Marker.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Array.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Asterisk.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Average.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Box.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Bubble.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Circle.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Cross.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Diamond.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Icon.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Pinpoint.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Plus.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Pointing.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Pointing/Angular.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Pointing/Radial.php (props changed) vtigercrm/trunk/Image/Graph/Marker/ReversePinpoint.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Star.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Triangle.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Value.php (props changed) vtigercrm/trunk/Image/Graph/Plot.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Area.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Band.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Bar.php (props changed) vtigercrm/trunk/Image/Graph/Plot/BoxWhisker.php (props changed) vtigercrm/trunk/Image/Graph/Plot/CandleStick.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Dot.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Fit/Line.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Impulse.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Line.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Odo.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Pie.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Radar.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Smoothed/Area.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Smoothed/Bezier.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Smoothed/Line.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Smoothed/Radar.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Step.php (props changed) vtigercrm/trunk/Image/Graph/Plotarea.php (props changed) vtigercrm/trunk/Image/Graph/Plotarea/Element.php (props changed) vtigercrm/trunk/Image/Graph/Plotarea/Map.php (props changed) vtigercrm/trunk/Image/Graph/Plotarea/Radar.php (props changed) vtigercrm/trunk/Image/Graph/Simple.php (props changed) vtigercrm/trunk/Image/Graph/Title.php (props changed) vtigercrm/trunk/Image/Graph/Tool.php (props changed) vtigercrm/trunk/LICENSE_AGREEMENT.txt (props changed) vtigercrm/trunk/PEAR.php (props changed) vtigercrm/trunk/Popup.php (props changed) vtigercrm/trunk/Release_Notes.html (props changed) vtigercrm/trunk/SendReminder.php (props changed) vtigercrm/trunk/Smarty/BUGS (props changed) vtigercrm/trunk/Smarty/COPYING.lib (props changed) vtigercrm/trunk/Smarty/ChangeLog (props changed) vtigercrm/trunk/Smarty/FAQ (props changed) vtigercrm/trunk/Smarty/INSTALL (props changed) vtigercrm/trunk/Smarty/NEWS (props changed) vtigercrm/trunk/Smarty/QUICK_START (props changed) vtigercrm/trunk/Smarty/README (props changed) vtigercrm/trunk/Smarty/RELEASE_NOTES (props changed) vtigercrm/trunk/Smarty/cache/index.html (props changed) vtigercrm/trunk/Smarty/configs/index.html (props changed) vtigercrm/trunk/Smarty/libs/Config_File.class.php (props changed) vtigercrm/trunk/Smarty/libs/Smarty.class.php (props changed) vtigercrm/trunk/Smarty/libs/Smarty_Compiler.class.php (props changed) vtigercrm/trunk/Smarty/libs/debug.tpl (props changed) vtigercrm/trunk/Smarty/libs/internals/core.assemble_plugin_filepath.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.assign_smarty_interface.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.create_dir_structure.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.display_debug_console.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.get_include_path.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.get_microtime.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.get_php_resource.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.is_secure.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.is_trusted.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.load_plugins.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.load_resource_plugin.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.process_cached_inserts.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.process_compiled_include.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.read_cache_file.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.rm_auto.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.rmdir.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.run_insert_handler.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.smarty_include_php.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.write_cache_file.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.write_compiled_include.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.write_compiled_resource.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.write_file.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/block.textformat.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/compiler.assign.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.assign_debug_info.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.config_load.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.counter.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.cycle.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.debug.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.eval.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.fetch.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_checkboxes.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_image.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_options.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_radios.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_select_date.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_select_time.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_table.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.mailto.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.math.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.popup.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.popup_init.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.capitalize.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.cat.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.count_characters.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.count_paragraphs.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.count_sentences.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.count_words.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.date_format.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.debug_print_var.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.default.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.escape.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.indent.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.lower.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.nl2br.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.regex_replace.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.replace.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.spacify.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.string_format.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.strip.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.strip_tags.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.truncate.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.upper.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.wordwrap.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/outputfilter.trimwhitespace.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/shared.escape_special_chars.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/shared.make_timestamp.php (props changed) vtigercrm/trunk/Smarty/misc/smarty_icon.README (props changed) vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (props changed) vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (props changed) vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (props changed) vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (props changed) vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (props changed) vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (props changed) vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl (props changed) vtigercrm/trunk/Smarty/templates/CreateView.tpl (props changed) vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (props changed) vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl (props changed) vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl (props changed) vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl (props changed) vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl (props changed) vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl (props changed) vtigercrm/trunk/Smarty/templates/CustomView.tpl (props changed) vtigercrm/trunk/Smarty/templates/DetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (props changed) vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl (props changed) vtigercrm/trunk/Smarty/templates/EditProfile.tpl (props changed) vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl (props changed) vtigercrm/trunk/Smarty/templates/EmailContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (props changed) vtigercrm/trunk/Smarty/templates/Emails.tpl (props changed) vtigercrm/trunk/Smarty/templates/FieldAccess.tpl (props changed) vtigercrm/trunk/Smarty/templates/FieldAccessindex.tpl (props changed) vtigercrm/trunk/Smarty/templates/FieldOrderindex.tpl (props changed) vtigercrm/trunk/Smarty/templates/GlobalListView.tpl (props changed) vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl (props changed) vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/Header.tpl (props changed) vtigercrm/trunk/Smarty/templates/HomePage.tpl (props changed) vtigercrm/trunk/Smarty/templates/ImportMap.tpl (props changed) vtigercrm/trunk/Smarty/templates/ImportStep1.tpl (props changed) vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (props changed) vtigercrm/trunk/Smarty/templates/Importerror.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListGroup.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListLeadCustomFieldMapping.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListView.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (props changed) vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/Organizationindex.tpl (props changed) vtigercrm/trunk/Smarty/templates/PickListindex.tpl (props changed) vtigercrm/trunk/Smarty/templates/Popup.tpl (props changed) vtigercrm/trunk/Smarty/templates/Portal.tpl (props changed) vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (props changed) vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl (props changed) vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (props changed) vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportColumns.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportFilters.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportRun.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/Reports.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportsType.tpl (props changed) vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/RoleEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/Rss.tpl (props changed) vtigercrm/trunk/Smarty/templates/RssFeeds.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (props changed) vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl (props changed) vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/UserEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/UserListView.tpl (props changed) vtigercrm/trunk/Smarty/templates/UserProfile.tpl (props changed) vtigercrm/trunk/Smarty/templates/Webmails.tpl (props changed) vtigercrm/trunk/Smarty/templates/salesEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates_c/vtigercrm.txt (props changed) vtigercrm/trunk/Smarty_setup.php (props changed) vtigercrm/trunk/XTemplate/LICENSE (props changed) vtigercrm/trunk/XTemplate/README (props changed) vtigercrm/trunk/XTemplate/debug.php (props changed) vtigercrm/trunk/XTemplate/xtpl.php (props changed) vtigercrm/trunk/adodb/adodb-csvlib.inc.php (props changed) vtigercrm/trunk/adodb/adodb-datadict.inc.php (props changed) vtigercrm/trunk/adodb/adodb-error.inc.php (props changed) vtigercrm/trunk/adodb/adodb-errorhandler.inc.php (props changed) vtigercrm/trunk/adodb/adodb-errorpear.inc.php (props changed) vtigercrm/trunk/adodb/adodb-exceptions.inc.php (props changed) vtigercrm/trunk/adodb/adodb-iterator.inc.php (props changed) vtigercrm/trunk/adodb/adodb-lib.inc.php (props changed) vtigercrm/trunk/adodb/adodb-pager.inc.php (props changed) vtigercrm/trunk/adodb/adodb-pear.inc.php (props changed) vtigercrm/trunk/adodb/adodb-perf.inc.php (props changed) vtigercrm/trunk/adodb/adodb-perf.inc.php.#.LENS-03-09-05 (props changed) vtigercrm/trunk/adodb/adodb-php4.inc.php (props changed) vtigercrm/trunk/adodb/adodb-time.inc.php (props changed) vtigercrm/trunk/adodb/adodb-xmlschema.inc.php (props changed) vtigercrm/trunk/adodb/adodb.inc.php (props changed) vtigercrm/trunk/adodb/contrib/toxmlrpc.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-access.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-sapdb.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-access.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-ar.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-bg.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-bgutf8.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-ca.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-cn.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-cz.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-da.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-de.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-en.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-es.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-esperanto.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-fr.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-hu.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-it.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-nl.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-pl.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-pt-br.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-ro.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-ru1251.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-sv.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-uk1251.inc.php (props changed) vtigercrm/trunk/adodb/pear/Auth/Container/ADOdb.php (props changed) vtigercrm/trunk/adodb/perf/perf-db2.inc.php (props changed) vtigercrm/trunk/adodb/perf/perf-informix.inc.php (props changed) vtigercrm/trunk/adodb/perf/perf-mssql.inc.php (props changed) vtigercrm/trunk/adodb/perf/perf-mysql.inc.php (props changed) vtigercrm/trunk/adodb/perf/perf-oci8.inc.php (props changed) vtigercrm/trunk/adodb/perf/perf-postgres.inc.php (props changed) vtigercrm/trunk/adodb/pivottable.inc.php (props changed) vtigercrm/trunk/adodb/rsfilter.inc.php (props changed) vtigercrm/trunk/adodb/server.php (props changed) vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php (props changed) vtigercrm/trunk/adodb/session/adodb-compress-gzip.php (props changed) vtigercrm/trunk/adodb/session/adodb-cryptsession.php (props changed) vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php (props changed) vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php (props changed) vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php (props changed) vtigercrm/trunk/adodb/session/adodb-encrypt-sha1.php (props changed) vtigercrm/trunk/adodb/session/adodb-session-clob.php (props changed) vtigercrm/trunk/adodb/session/adodb-session.php (props changed) vtigercrm/trunk/adodb/session/crypt.inc.php (props changed) vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php (props changed) vtigercrm/trunk/adodb/session/old/adodb-session-clob.php (props changed) vtigercrm/trunk/adodb/session/old/adodb-session.php (props changed) vtigercrm/trunk/adodb/session/old/crypt.inc.php (props changed) vtigercrm/trunk/adodb/tests/benchmark.php (props changed) vtigercrm/trunk/adodb/tests/client.php (props changed) vtigercrm/trunk/adodb/tests/pdo.php (props changed) vtigercrm/trunk/adodb/tests/test-datadict.php (props changed) vtigercrm/trunk/adodb/tests/test-perf.php (props changed) vtigercrm/trunk/adodb/tests/test-pgblob.php (props changed) vtigercrm/trunk/adodb/tests/test-php5.php (props changed) vtigercrm/trunk/adodb/tests/test-xmlschema.php (props changed) vtigercrm/trunk/adodb/tests/test.php (props changed) vtigercrm/trunk/adodb/tests/test2.php (props changed) vtigercrm/trunk/adodb/tests/test3.php (props changed) vtigercrm/trunk/adodb/tests/test4.php (props changed) vtigercrm/trunk/adodb/tests/test5.php (props changed) vtigercrm/trunk/adodb/tests/test_rs_array.php (props changed) vtigercrm/trunk/adodb/tests/testcache.php (props changed) vtigercrm/trunk/adodb/tests/testdatabases.inc.php (props changed) vtigercrm/trunk/adodb/tests/testgenid.php (props changed) vtigercrm/trunk/adodb/tests/testmssql.php (props changed) vtigercrm/trunk/adodb/tests/testoci8.php (props changed) vtigercrm/trunk/adodb/tests/testoci8cursor.php (props changed) vtigercrm/trunk/adodb/tests/testpaging.php (props changed) vtigercrm/trunk/adodb/tests/testpear.php (props changed) vtigercrm/trunk/adodb/tests/testsessions.php (props changed) vtigercrm/trunk/adodb/tests/time.php (props changed) vtigercrm/trunk/adodb/tests/tmssql.php (props changed) vtigercrm/trunk/adodb/toexport.inc.php (props changed) vtigercrm/trunk/adodb/tohtml.inc.php (props changed) vtigercrm/trunk/adodb/xsl/convert-0.1-0.2.xsl (props changed) vtigercrm/trunk/adodb/xsl/convert-0.2-0.1.xsl (props changed) vtigercrm/trunk/adodb/xsl/remove-0.2.xsl (props changed) vtigercrm/trunk/cache/images/index.html (props changed) vtigercrm/trunk/cache/import/index.html (props changed) vtigercrm/trunk/cache/index.html (props changed) vtigercrm/trunk/cache/upload/index.html (props changed) vtigercrm/trunk/class_http/class_http.php (props changed) vtigercrm/trunk/class_http/image_cache.php (props changed) vtigercrm/trunk/config.db.php (props changed) vtigercrm/trunk/config.inc.php (props changed) vtigercrm/trunk/config.template.php (props changed) vtigercrm/trunk/connection.php (props changed) vtigercrm/trunk/copyright.html (props changed) vtigercrm/trunk/cron/class.phpmailer.php (props changed) vtigercrm/trunk/cron/class.smtp.php (props changed) vtigercrm/trunk/cron/executecron.sh (props changed) vtigercrm/trunk/cron/intimateTaskStatus.bat (props changed) vtigercrm/trunk/cron/intimateTaskStatus.php (props changed) vtigercrm/trunk/cron/jobstartwindows.bat (props changed) vtigercrm/trunk/cron/output.txt (props changed) vtigercrm/trunk/cron/send_mail.php (props changed) vtigercrm/trunk/cron/sendreminder.sh (props changed) vtigercrm/trunk/data/CRMEntity.php (props changed) vtigercrm/trunk/data/SugarBean.php (props changed) vtigercrm/trunk/data/Tracker.php (props changed) vtigercrm/trunk/database/DatabaseConnection.php (props changed) vtigercrm/trunk/getCompanyProfile.php (props changed) vtigercrm/trunk/include/Ajax/CommonAjax.php (props changed) vtigercrm/trunk/include/ComboStrings.php (props changed) vtigercrm/trunk/include/ComboUtil.php (props changed) vtigercrm/trunk/include/CustomFieldUtil.php (props changed) vtigercrm/trunk/include/FormValidationUtil.php (props changed) vtigercrm/trunk/include/ListView/ListView.php (props changed) vtigercrm/trunk/include/Menu.php (props changed) vtigercrm/trunk/include/PopulateComboValues.php (props changed) vtigercrm/trunk/include/PopulateCustomFieldTables.php (props changed) vtigercrm/trunk/include/RelatedListView.php (props changed) vtigercrm/trunk/include/SearchBlock.html (props changed) vtigercrm/trunk/include/SearchBlock.php (props changed) vtigercrm/trunk/include/calculator/Calc.php (props changed) vtigercrm/trunk/include/calculator/calc.js (props changed) vtigercrm/trunk/include/clock/Clock.php (props changed) vtigercrm/trunk/include/database/PearDatabase.php (props changed) vtigercrm/trunk/include/db_backup/backup.php (props changed) vtigercrm/trunk/include/db_backup/ftp.php (props changed) vtigercrm/trunk/include/dd/Sajax.php (props changed) vtigercrm/trunk/include/dd/dd.php (props changed) vtigercrm/trunk/include/dd/dd_files/coordinates.js (props changed) vtigercrm/trunk/include/dd/dd_files/drag.js (props changed) vtigercrm/trunk/include/dd/dd_files/dragdrop.js (props changed) vtigercrm/trunk/include/dd/dd_files/lists.css (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckcontextmenugroup.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckcontextmenuitem.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckcontextmenuseparator.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckevents.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckpanel_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckpanel_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckplugin.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckspecialcombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckstyledef.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckstyledef_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckstyledef_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckstylesloader.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbar.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarbutton.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarcombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckxml_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckxml_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fck_othercommands.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fcknamedcommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fckstylecommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fcktablecommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/globals/fck_constants.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/globals/fckeditorapi.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_1.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_1_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_1_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_2.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_2_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_2_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_last.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_onload.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckbrowserinfo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcodeformatter.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcommands.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckconfig.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcontextmenu.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcontextmenu_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcontextmenu_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcoreextensions.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckdebug.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckdialog.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckdialog_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckdialog_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcklanguagemanager.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcknamespace.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckplugins.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckregexlib.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckscriptloader.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckselection.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckselection_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckselection_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktablehandler.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktablehandler_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktablehandler_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktoolbaritems.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktoolbarset.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktools.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktools_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktools_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckundo_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckundo_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckurlparams.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckxhtml.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckxhtml_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckxhtml_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckxhtmlentities.js (props changed) vtigercrm/trunk/include/fckeditor/editor/css/behaviors/anchors.htc (props changed) vtigercrm/trunk/include/fckeditor/editor/css/behaviors/disablehandles.htc (props changed) vtigercrm/trunk/include/fckeditor/editor/css/behaviors/hiddenfield.htc (props changed) vtigercrm/trunk/include/fckeditor/editor/css/behaviors/moz-bindings.xml (props changed) vtigercrm/trunk/include/fckeditor/editor/css/behaviors/showtableborders.htc (props changed) vtigercrm/trunk/include/fckeditor/editor/css/fck_editorarea.css (props changed) vtigercrm/trunk/include/fckeditor/editor/css/fck_internal.css (props changed) vtigercrm/trunk/include/fckeditor/editor/css/fck_showtableborders_gecko.css (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/common/fck_dialog_common.css (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/common/fck_dialog_common.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/common/fcknumericfield.htc (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/common/moz-bindings.xml (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_about.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_about/lgpl.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_anchor.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_button.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_checkbox.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_colorselector.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_docprops.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_find.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_flash.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_form.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_hiddenfield.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_image.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_image/fck_image.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_image/fck_image_preview.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_link.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_link/fck_link.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_listprop.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_paste.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_radiobutton.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_replace.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_select.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_select/fck_select.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_smiley.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_source.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_specialchar.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_table.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_tablecell.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_template.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_textarea.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_textfield.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey/data.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey/diacritic.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey/dialogue.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey/fck_universalkey.css (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey/multihexa.js (props changed) vtigercrm/trunk/include/fckeditor/editor/fckblank.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckdebug.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckdialog.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckdocument.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckeditor.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckeditor.original.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckeditorarea.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/browser.css (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/browser.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/basexml.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/class_upload.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/commands.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/config.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/connector.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/io.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/util.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/aspx/connector.aspx (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/cfm/config.cfm (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/cfm/connector.cfm (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/basexml.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/commands.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/connector.cgi (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/io.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/upload_fck.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/util.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/basexml.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/commands.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/config.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/io.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/util.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/test.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmactualfolder.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmfolders.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmresourceslist.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmresourcetype.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmupload.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/js/common.js (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/js/fckxml.js (props changed) vtigercrm/trunk/include/fckeditor/editor/js/fck_startup.js (props changed) vtigercrm/trunk/include/fckeditor/editor/js/fckeditorcode_gecko_1.js (props changed) vtigercrm/trunk/include/fckeditor/editor/js/fckeditorcode_gecko_2.js (props changed) vtigercrm/trunk/include/fckeditor/editor/js/fckeditorcode_ie_1.js (props changed) vtigercrm/trunk/include/fckeditor/editor/js/fckeditorcode_ie_2.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/_getfontformat.html (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/_translationstatus.txt (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ar.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/bg.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/bs.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ca.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/cs.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/da.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/de.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/el.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/en-au.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/en-uk.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/en.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/eo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/es.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/et.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/eu.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/fa.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/fcklanguagemanager.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/fi.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/fo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/fr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/gl.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/gr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/he.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/hi.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/hr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/hu.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/it.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ja.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/lt.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/lv.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/mn.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ms.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/nl.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/no.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/pl.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/pt-br.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/pt.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ro.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ru.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/sk.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/sl.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/sr-latn.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/sr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/sv.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/th.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/tr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/uk.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/vi.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/zh-cn.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/zh.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/fck_placeholder.html (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/fckplugin.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/lang/de.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/lang/en.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/lang/fr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/lang/it.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/lang/pl.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/tablecommands/fckplugin.js (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/default/fck_contextmenu.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/default/fck_dialog.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/default/fck_editor.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/office2003/fck_contextmenu.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/office2003/fck_dialog.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/office2003/fck_editor.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/silver/fck_contextmenu.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/silver/fck_dialog.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/silver/fck_editor.css (props changed) vtigercrm/trunk/include/fckeditor/fckconfig.js (props changed) vtigercrm/trunk/include/fckeditor/fckeditor.js (props changed) vtigercrm/trunk/include/fckeditor/fckeditor.php (props changed) vtigercrm/trunk/include/fckeditor/fckstyles.xml (props changed) vtigercrm/trunk/include/fckeditor/fcktemplates.xml (props changed) vtigercrm/trunk/include/fckeditor/license.txt (props changed) vtigercrm/trunk/include/feedParser/feedParser.php (props changed) vtigercrm/trunk/include/feedParser/xmlParser.php (props changed) vtigercrm/trunk/include/file.php (props changed) vtigercrm/trunk/include/formbase.php (props changed) vtigercrm/trunk/include/fpdf/font/courier.php (props changed) vtigercrm/trunk/include/fpdf/font/helvetica.php (props changed) vtigercrm/trunk/include/fpdf/font/helveticab.php (props changed) vtigercrm/trunk/include/fpdf/font/helveticabi.php (props changed) vtigercrm/trunk/include/fpdf/font/helveticai.php (props changed) vtigercrm/trunk/include/fpdf/font/symbol.php (props changed) vtigercrm/trunk/include/fpdf/font/times.php (props changed) vtigercrm/trunk/include/fpdf/font/timesb.php (props changed) vtigercrm/trunk/include/fpdf/font/timesbi.php (props changed) vtigercrm/trunk/include/fpdf/font/timesi.php (props changed) vtigercrm/trunk/include/fpdf/font/zapfdingbats.php (props changed) vtigercrm/trunk/include/fpdf/fpdf.css (props changed) vtigercrm/trunk/include/fpdf/fpdf.php (props changed) vtigercrm/trunk/include/fpdf/pdf.php (props changed) vtigercrm/trunk/include/fpdf/templates/body.php (props changed) vtigercrm/trunk/include/freetag/freetag.class.php (props changed) vtigercrm/trunk/include/freetag/license.txt (props changed) vtigercrm/trunk/include/images/vtigercrm_icon.ico (props changed) vtigercrm/trunk/include/js/ColorPicker2.js (props changed) vtigercrm/trunk/include/js/Inventory.js (props changed) vtigercrm/trunk/include/js/ListView.js (props changed) vtigercrm/trunk/include/js/Mail.js (props changed) vtigercrm/trunk/include/js/Merge.js (props changed) vtigercrm/trunk/include/js/ajax.js (props changed) vtigercrm/trunk/include/js/clock.js (props changed) vtigercrm/trunk/include/js/conveyor.js (props changed) vtigercrm/trunk/include/js/customview.js (props changed) vtigercrm/trunk/include/js/dtlviewajax.js (props changed) vtigercrm/trunk/include/js/effectspack.js (props changed) vtigercrm/trunk/include/js/general.js (props changed) vtigercrm/trunk/include/js/menu.js (props changed) vtigercrm/trunk/include/js/popup.js (props changed) vtigercrm/trunk/include/js/prototype.js (props changed) vtigercrm/trunk/include/js/prototype_fade.js (props changed) vtigercrm/trunk/include/js/scale_demo.js (props changed) vtigercrm/trunk/include/js/scroller.js (props changed) vtigercrm/trunk/include/js/search.js (props changed) vtigercrm/trunk/include/js/searchajax.js (props changed) vtigercrm/trunk/include/js/slider.js (props changed) vtigercrm/trunk/include/js/submenu.js (props changed) vtigercrm/trunk/include/js/thumbnail.js (props changed) vtigercrm/trunk/include/js/xfade2.js (props changed) vtigercrm/trunk/include/language/en_us.lang.php (props changed) vtigercrm/trunk/include/lastrss/lastRSS.php (props changed) vtigercrm/trunk/include/logging.php (props changed) vtigercrm/trunk/include/nusoap/changelog (props changed) vtigercrm/trunk/include/nusoap/class.nusoap_base.php (props changed) vtigercrm/trunk/include/nusoap/class.soap_fault.php (props changed) vtigercrm/trunk/include/nusoap/class.soap_parser.php (props changed) vtigercrm/trunk/include/nusoap/class.soap_server.php (props changed) vtigercrm/trunk/include/nusoap/class.soap_transport_http.php (props changed) vtigercrm/trunk/include/nusoap/class.soap_val.php (props changed) vtigercrm/trunk/include/nusoap/class.soapclient.php (props changed) vtigercrm/trunk/include/nusoap/class.wsdl.php (props changed) vtigercrm/trunk/include/nusoap/class.wsdlcache.php (props changed) vtigercrm/trunk/include/nusoap/class.xmlschema.php (props changed) vtigercrm/trunk/include/nusoap/nusoap.php (props changed) vtigercrm/trunk/include/nusoap/nusoapmime.php (props changed) vtigercrm/trunk/include/php_writeexcel/LICENSE (props changed) vtigercrm/trunk/include/php_writeexcel/class.excel.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_biffwriter.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_format.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_formula.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_olewriter.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_workbook.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_workbookbig.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_worksheet.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/functions.writeexcel_utility.inc.php (props changed) vtigercrm/trunk/include/prototype-1.4.0/CHANGELOG (props changed) vtigercrm/trunk/include/prototype-1.4.0/LICENSE (props changed) vtigercrm/trunk/include/prototype-1.4.0/README (props changed) vtigercrm/trunk/include/prototype-1.4.0/Rakefile (props changed) vtigercrm/trunk/include/prototype-1.4.0/dist/prototype.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/lib/protodoc.rb (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/HEADER (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/ajax.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/array.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/base.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/dom.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/enumerable.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/event.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/form.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/hash.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/position.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/prototype.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/range.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/string.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/test/console.html (props changed) vtigercrm/trunk/include/prototype-1.4.0/test/test.css (props changed) vtigercrm/trunk/include/scriptaculous/builder.js (props changed) vtigercrm/trunk/include/scriptaculous/controls.js (props changed) vtigercrm/trunk/include/scriptaculous/dom-drag.js (props changed) vtigercrm/trunk/include/scriptaculous/dragdrop.js (props changed) vtigercrm/trunk/include/scriptaculous/effects.js (props changed) vtigercrm/trunk/include/scriptaculous/prototype.js (props changed) vtigercrm/trunk/include/scriptaculous/scriptaculous.js (props changed) vtigercrm/trunk/include/scriptaculous/slider.js (props changed) vtigercrm/trunk/include/scriptaculous/unittest.js (props changed) vtigercrm/trunk/include/style.css (props changed) vtigercrm/trunk/include/upload_file.php (props changed) vtigercrm/trunk/include/utils/CommonUtils.php (props changed) vtigercrm/trunk/include/utils/DeleteUtils.php (props changed) vtigercrm/trunk/include/utils/DetailViewUtils.php (props changed) vtigercrm/trunk/include/utils/EditViewUtils.php (props changed) vtigercrm/trunk/include/utils/GetGroupUsers.php (props changed) vtigercrm/trunk/include/utils/GetParentGroups.php (props changed) vtigercrm/trunk/include/utils/GetUserGroups.php (props changed) vtigercrm/trunk/include/utils/GraphUtils.php (props changed) vtigercrm/trunk/include/utils/InventoryUtils.php (props changed) vtigercrm/trunk/include/utils/ListViewUtils.php (props changed) vtigercrm/trunk/include/utils/SearchUtils.php (props changed) vtigercrm/trunk/include/utils/UserInfoUtil.php (props changed) vtigercrm/trunk/include/utils/export.php (props changed) vtigercrm/trunk/include/utils/utils.php (props changed) vtigercrm/trunk/index.php (props changed) vtigercrm/trunk/install.php (props changed) vtigercrm/trunk/install/0welcome.php (props changed) vtigercrm/trunk/install/1checkSystem.php (props changed) vtigercrm/trunk/install/2setConfig.php (props changed) vtigercrm/trunk/install/3confirmConfig.php (props changed) vtigercrm/trunk/install/4createConfigFile.php (props changed) vtigercrm/trunk/install/5createTables.inc.php (props changed) vtigercrm/trunk/install/5createTables.php (props changed) vtigercrm/trunk/install/install.css (props changed) vtigercrm/trunk/install/populateSeedData.php (props changed) vtigercrm/trunk/jscalendar/calendar-setup.js (props changed) vtigercrm/trunk/jscalendar/calendar-win2k-cold-1.css (props changed) vtigercrm/trunk/jscalendar/calendar.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-af.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-br.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-ca.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-cs-win.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-da.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-de.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-du.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-el.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-en.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-es.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-fi.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-fr.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-hr-utf8.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-hr.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-hu.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-it.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-jp.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-ko-utf8.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-ko.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-lt-utf8.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-lt.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-nl.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-no.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-pl-utf8.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-pl.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-pt.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-ro.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-ru.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-si.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-sk.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-sp.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-sv.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-tr.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-zh.js (props changed) vtigercrm/trunk/log4php/Logger.php (props changed) vtigercrm/trunk/log4php/LoggerAppender.php (props changed) vtigercrm/trunk/log4php/LoggerAppenderSkeleton.php (props changed) vtigercrm/trunk/log4php/LoggerBasicConfigurator.php (props changed) vtigercrm/trunk/log4php/LoggerCategory.php (props changed) vtigercrm/trunk/log4php/LoggerDefaultCategoryFactory.php (props changed) vtigercrm/trunk/log4php/LoggerHierarchy.php (props changed) vtigercrm/trunk/log4php/LoggerLayout.php (props changed) vtigercrm/trunk/log4php/LoggerLevel.php (props changed) vtigercrm/trunk/log4php/LoggerLog.php (props changed) vtigercrm/trunk/log4php/LoggerMDC.php (props changed) vtigercrm/trunk/log4php/LoggerManager.php (props changed) vtigercrm/trunk/log4php/LoggerNDC.php (props changed) vtigercrm/trunk/log4php/LoggerPropertyConfigurator.php (props changed) vtigercrm/trunk/log4php/LoggerRoot.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderEcho.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderMail.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderMailEvent.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderNull.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderPhp.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderRollingFile.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderSocket.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderSyslog.php (props changed) vtigercrm/trunk/log4php/config/LoggerPropertyGetter.php (props changed) vtigercrm/trunk/log4php/config/LoggerPropertySetter.php (props changed) vtigercrm/trunk/log4php/helpers/LoggerFormattingInfo.php (props changed) vtigercrm/trunk/log4php/helpers/LoggerOptionConverter.php (props changed) vtigercrm/trunk/log4php/helpers/LoggerPatternConverter.php (props changed) vtigercrm/trunk/log4php/helpers/LoggerPatternParser.php (props changed) vtigercrm/trunk/log4php/helpers/LoggerTransform.php (props changed) vtigercrm/trunk/log4php/layouts/LoggerLayoutHtml.php (props changed) vtigercrm/trunk/log4php/layouts/LoggerLayoutSimple.php (props changed) vtigercrm/trunk/log4php/layouts/LoggerLayoutTTCC.php (props changed) vtigercrm/trunk/log4php/layouts/LoggerPatternLayout.php (props changed) vtigercrm/trunk/log4php/layouts/LoggerXmlLayout.php (props changed) vtigercrm/trunk/log4php/or/LoggerDefaultRenderer.php (props changed) vtigercrm/trunk/log4php/or/LoggerObjectRenderer.php (props changed) vtigercrm/trunk/log4php/or/LoggerRendererMap.php (props changed) vtigercrm/trunk/log4php/spi/LoggerConfigurator.php (props changed) vtigercrm/trunk/log4php/spi/LoggerFactory.php (props changed) vtigercrm/trunk/log4php/spi/LoggerFilter.php (props changed) vtigercrm/trunk/log4php/spi/LoggerLocationInfo.php (props changed) vtigercrm/trunk/log4php/spi/LoggerLoggingEvent.php (props changed) vtigercrm/trunk/log4php/varia/LoggerDenyAllFilter.php (props changed) vtigercrm/trunk/log4php/varia/LoggerLevelMatchFilter.php (props changed) vtigercrm/trunk/log4php/varia/LoggerLevelRangeFilter.php (props changed) vtigercrm/trunk/log4php/varia/LoggerStringMatchFilter.php (props changed) vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php (props changed) vtigercrm/trunk/log4php_1.properties (props changed) vtigercrm/trunk/logs/todel.txt.txt (props changed) vtigercrm/trunk/migration/migrate_functions.php (props changed) vtigercrm/trunk/modules/Accounts/Account.js (props changed) vtigercrm/trunk/modules/Accounts/Account.php (props changed) vtigercrm/trunk/modules/Accounts/AccountsAjax.php (props changed) vtigercrm/trunk/modules/Accounts/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Accounts/CustomAction.php (props changed) vtigercrm/trunk/modules/Accounts/CustomView.php (props changed) vtigercrm/trunk/modules/Accounts/Delete.php (props changed) vtigercrm/trunk/modules/Accounts/DetailView.php (props changed) vtigercrm/trunk/modules/Accounts/EditView.php (props changed) vtigercrm/trunk/modules/Accounts/Forms.php (props changed) vtigercrm/trunk/modules/Accounts/HeadLines.php (props changed) vtigercrm/trunk/modules/Accounts/Import.php (props changed) vtigercrm/trunk/modules/Accounts/ListView.php (props changed) vtigercrm/trunk/modules/Accounts/ListViewTop.php (props changed) vtigercrm/trunk/modules/Accounts/Merge.php (props changed) vtigercrm/trunk/modules/Accounts/Popup.php (props changed) vtigercrm/trunk/modules/Accounts/PopupSearchForm.html (props changed) vtigercrm/trunk/modules/Accounts/Popup_picker.html (props changed) vtigercrm/trunk/modules/Accounts/Popup_picker.php (props changed) vtigercrm/trunk/modules/Accounts/Save.php (props changed) vtigercrm/trunk/modules/Accounts/Tickerdetail.php (props changed) vtigercrm/trunk/modules/Accounts/index.php (props changed) vtigercrm/trunk/modules/Accounts/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Activities/ActivitiesAjax.php (props changed) vtigercrm/trunk/modules/Activities/Activity.js (props changed) vtigercrm/trunk/modules/Activities/Activity.php (props changed) vtigercrm/trunk/modules/Activities/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Activities/CustomView.php (props changed) vtigercrm/trunk/modules/Activities/Delete.php (props changed) vtigercrm/trunk/modules/Activities/DetailView.php (props changed) vtigercrm/trunk/modules/Activities/EditView.php (props changed) vtigercrm/trunk/modules/Activities/Event.php (props changed) vtigercrm/trunk/modules/Activities/Forms.php (props changed) vtigercrm/trunk/modules/Activities/GroupAllocationView.html (props changed) vtigercrm/trunk/modules/Activities/GroupAllocationView.php (props changed) vtigercrm/trunk/modules/Activities/ListView.php (props changed) vtigercrm/trunk/modules/Activities/OpenListView.php (props changed) vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php (props changed) vtigercrm/trunk/modules/Activities/Save.php (props changed) vtigercrm/trunk/modules/Activities/SearchForm.html (props changed) vtigercrm/trunk/modules/Activities/SendReminder.bat (props changed) vtigercrm/trunk/modules/Activities/index.php (props changed) vtigercrm/trunk/modules/Activities/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Activities/updateRelations.php (props changed) vtigercrm/trunk/modules/Administration/Forms.php (props changed) vtigercrm/trunk/modules/Administration/index.php (props changed) vtigercrm/trunk/modules/Administration/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Calendar/Authenticate.php (props changed) vtigercrm/trunk/modules/Calendar/CalendarCommon.php (props changed) vtigercrm/trunk/modules/Calendar/Date.pinc (props changed) vtigercrm/trunk/modules/Calendar/Delete.php (props changed) vtigercrm/trunk/modules/Calendar/Forms.php (props changed) vtigercrm/trunk/modules/Calendar/Save.php (props changed) vtigercrm/trunk/modules/Calendar/UserCalendar.php (props changed) vtigercrm/trunk/modules/Calendar/acl.pinc (props changed) vtigercrm/trunk/modules/Calendar/addEventUI.php (props changed) vtigercrm/trunk/modules/Calendar/admin/admin.pinc (props changed) vtigercrm/trunk/modules/Calendar/admin/create_config.php (props changed) vtigercrm/trunk/modules/Calendar/admin/demodata.p3 (props changed) vtigercrm/trunk/modules/Calendar/admin/en.p3 (props changed) vtigercrm/trunk/modules/Calendar/admin/mconfig.pinc (props changed) vtigercrm/trunk/modules/Calendar/admin/scheme.php (props changed) vtigercrm/trunk/modules/Calendar/admin/sv.p3 (props changed) vtigercrm/trunk/modules/Calendar/admin/update.php (props changed) vtigercrm/trunk/modules/Calendar/appointment.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_cmdline.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_db.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_http.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_ldap.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_pam.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_typo3.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_x509.pinc (props changed) vtigercrm/trunk/modules/Calendar/base.pinc (props changed) vtigercrm/trunk/modules/Calendar/calendar.php (props changed) vtigercrm/trunk/modules/Calendar/calendar_dayview.php (props changed) vtigercrm/trunk/modules/Calendar/calendar_monthview.php (props changed) vtigercrm/trunk/modules/Calendar/calendar_share.php (props changed) vtigercrm/trunk/modules/Calendar/calendar_weekview.php (props changed) vtigercrm/trunk/modules/Calendar/company.pinc (props changed) vtigercrm/trunk/modules/Calendar/config.php (props changed) vtigercrm/trunk/modules/Calendar/config_default.pinc (props changed) vtigercrm/trunk/modules/Calendar/database.pinc (props changed) vtigercrm/trunk/modules/Calendar/db.p3 (props changed) vtigercrm/trunk/modules/Calendar/db/db.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_interbase.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_mssql.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_mysql.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_oci.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_ora.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_pg.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/table.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/table_custom_example.pinc (props changed) vtigercrm/trunk/modules/Calendar/department.pinc (props changed) vtigercrm/trunk/modules/Calendar/disable_sharing.php (props changed) vtigercrm/trunk/modules/Calendar/gettext.php (props changed) vtigercrm/trunk/modules/Calendar/handler.pinc (props changed) vtigercrm/trunk/modules/Calendar/history.pinc (props changed) vtigercrm/trunk/modules/Calendar/i18n.php (props changed) vtigercrm/trunk/modules/Calendar/index.php (props changed) vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Calendar/layout/adq_layout.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/classic_base.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/classic_layout.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/layout_base.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/new_layout.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/test_layout.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/theme_base.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/theme_blue.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/theme_red.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/theme_white.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/cs.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/de.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/el.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/en-us.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/en.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/es-mx.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/es-ni.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/es-ve.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/es.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/fr.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_au.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_be.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_ch.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_cl.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_co.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_cs.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_de.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_de_at.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_en_uk.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_es.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_es_ve.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_fr.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_hk.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_hu.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_it.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_ja.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_ko.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_mx.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_ni.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_nl.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_nz.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_pl.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_pt.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_ru.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_sv.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_us.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_vi.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/it.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/ko.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_cs.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_de.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_es.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_nl.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_pl.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_sv.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_template.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_vi.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/nl.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/pl.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/pt-br.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/pt.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/ru.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/sv.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/tw.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/vi.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/zh.p3 (props changed) vtigercrm/trunk/modules/Calendar/location.pinc (props changed) vtigercrm/trunk/modules/Calendar/login.pinc (props changed) vtigercrm/trunk/modules/Calendar/logout.php (props changed) vtigercrm/trunk/modules/Calendar/mail.pinc (props changed) vtigercrm/trunk/modules/Calendar/minical.php (props changed) vtigercrm/trunk/modules/Calendar/minitimer.php (props changed) vtigercrm/trunk/modules/Calendar/module_base.pinc (props changed) vtigercrm/trunk/modules/Calendar/modules.pinc (props changed) vtigercrm/trunk/modules/Calendar/mytutos.php (props changed) vtigercrm/trunk/modules/Calendar/new_calendar.php (props changed) vtigercrm/trunk/modules/Calendar/pdf.pinc (props changed) vtigercrm/trunk/modules/Calendar/permission.p3 (props changed) vtigercrm/trunk/modules/Calendar/preference.pinc (props changed) vtigercrm/trunk/modules/Calendar/product.pinc (props changed) vtigercrm/trunk/modules/Calendar/script.js (props changed) vtigercrm/trunk/modules/Calendar/task.pinc (props changed) vtigercrm/trunk/modules/Calendar/team.pinc (props changed) vtigercrm/trunk/modules/Calendar/timetrack.pinc (props changed) vtigercrm/trunk/modules/Calendar/tmp/vtigercrm.calendar (props changed) vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php (props changed) vtigercrm/trunk/modules/Calendar/user.pinc (props changed) vtigercrm/trunk/modules/Calendar/webelements.p3 (props changed) vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Campaigns/Campaign.js (props changed) vtigercrm/trunk/modules/Campaigns/Campaign.php (props changed) vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php (props changed) vtigercrm/trunk/modules/Campaigns/CustomView.php (props changed) vtigercrm/trunk/modules/Campaigns/Delete.php (props changed) vtigercrm/trunk/modules/Campaigns/DetailView.php (props changed) vtigercrm/trunk/modules/Campaigns/EditView.php (props changed) vtigercrm/trunk/modules/Campaigns/ListView.php (props changed) vtigercrm/trunk/modules/Campaigns/Save.php (props changed) vtigercrm/trunk/modules/Campaigns/index.php (props changed) vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Contacts/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Contacts/Contact.js (props changed) vtigercrm/trunk/modules/Contacts/Contact.php (props changed) vtigercrm/trunk/modules/Contacts/ContactsAjax.php (props changed) vtigercrm/trunk/modules/Contacts/CustomAction.php (props changed) vtigercrm/trunk/modules/Contacts/CustomView.php (props changed) vtigercrm/trunk/modules/Contacts/Delete.php (props changed) vtigercrm/trunk/modules/Contacts/DetailView.php (props changed) vtigercrm/trunk/modules/Contacts/EditView.php (props changed) vtigercrm/trunk/modules/Contacts/Forms.php (props changed) vtigercrm/trunk/modules/Contacts/Import.php (props changed) vtigercrm/trunk/modules/Contacts/ListView.php (props changed) vtigercrm/trunk/modules/Contacts/Merge.php (props changed) vtigercrm/trunk/modules/Contacts/Popup.php (props changed) vtigercrm/trunk/modules/Contacts/PopupSearchForm.html (props changed) vtigercrm/trunk/modules/Contacts/Popup_picker.html (props changed) vtigercrm/trunk/modules/Contacts/Save.php (props changed) vtigercrm/trunk/modules/Contacts/chat.css (props changed) vtigercrm/trunk/modules/Contacts/chat.php (props changed) vtigercrm/trunk/modules/Contacts/contactSeedData.php (props changed) vtigercrm/trunk/modules/Contacts/index.php (props changed) vtigercrm/trunk/modules/Contacts/js/ajax.js (props changed) vtigercrm/trunk/modules/Contacts/js/chat.js (props changed) vtigercrm/trunk/modules/Contacts/js/css-window_p.js (props changed) vtigercrm/trunk/modules/Contacts/js/dom-drag_p.js (props changed) vtigercrm/trunk/modules/Contacts/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Contacts/vtchat.php (props changed) vtigercrm/trunk/modules/CustomView/CustomAction.html (props changed) vtigercrm/trunk/modules/CustomView/CustomAction.php (props changed) vtigercrm/trunk/modules/CustomView/CustomView.js (props changed) vtigercrm/trunk/modules/CustomView/CustomView.php (props changed) vtigercrm/trunk/modules/CustomView/Delete.php (props changed) vtigercrm/trunk/modules/CustomView/EditView.php (props changed) vtigercrm/trunk/modules/CustomView/Forms.php (props changed) vtigercrm/trunk/modules/CustomView/ListViewTop.php (props changed) vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (props changed) vtigercrm/trunk/modules/CustomView/Save.php (props changed) vtigercrm/trunk/modules/CustomView/SaveAction.php (props changed) vtigercrm/trunk/modules/CustomView/SendMailAction.php (props changed) vtigercrm/trunk/modules/CustomView/index.php (props changed) vtigercrm/trunk/modules/CustomView/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php (props changed) vtigercrm/trunk/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php (props changed) vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php (props changed) vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php (props changed) vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php (props changed) vtigercrm/trunk/modules/Dashboard/Entity_charts.php (props changed) vtigercrm/trunk/modules/Dashboard/Forms.php (props changed) vtigercrm/trunk/modules/Dashboard/ReportsCharts.php (props changed) vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php (props changed) vtigercrm/trunk/modules/Dashboard/display_charts.php (props changed) vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php (props changed) vtigercrm/trunk/modules/Dashboard/index.php (props changed) vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Dashboard/line_graph.php (props changed) vtigercrm/trunk/modules/Dashboard/pie_graph.php (props changed) vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php (props changed) vtigercrm/trunk/modules/Emails/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Emails/Choose.php (props changed) vtigercrm/trunk/modules/Emails/ChooseEmail.php (props changed) vtigercrm/trunk/modules/Emails/CustomView.php (props changed) vtigercrm/trunk/modules/Emails/Delete.php (props changed) vtigercrm/trunk/modules/Emails/DetailView.php (props changed) vtigercrm/trunk/modules/Emails/EditView.php (props changed) vtigercrm/trunk/modules/Emails/Email.js (props changed) vtigercrm/trunk/modules/Emails/Email.php (props changed) vtigercrm/trunk/modules/Emails/EmailsAjax.php (props changed) vtigercrm/trunk/modules/Emails/Forms.php (props changed) vtigercrm/trunk/modules/Emails/ListView.php (props changed) vtigercrm/trunk/modules/Emails/PHPMailer_LICENSE.txt (props changed) vtigercrm/trunk/modules/Emails/Save.php (props changed) vtigercrm/trunk/modules/Emails/SearchForm.html (props changed) vtigercrm/trunk/modules/Emails/SelectEmails.php (props changed) vtigercrm/trunk/modules/Emails/class.phpmailer.php (props changed) vtigercrm/trunk/modules/Emails/class.smtp.php (props changed) vtigercrm/trunk/modules/Emails/gotodownload.php (props changed) vtigercrm/trunk/modules/Emails/index.php (props changed) vtigercrm/trunk/modules/Emails/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Emails/mail.php (props changed) vtigercrm/trunk/modules/Emails/mailbox.php (props changed) vtigercrm/trunk/modules/Emails/mailsend.php (props changed) vtigercrm/trunk/modules/Emails/sendmail.php (props changed) vtigercrm/trunk/modules/Emails/templates/testemailtemplateusage.php (props changed) vtigercrm/trunk/modules/Emails/templates/todel.txt (props changed) vtigercrm/trunk/modules/Emails/updateRelations.php (props changed) vtigercrm/trunk/modules/Faq/CustomView.php (props changed) vtigercrm/trunk/modules/Faq/Delete.php (props changed) vtigercrm/trunk/modules/Faq/DetailView.php (props changed) vtigercrm/trunk/modules/Faq/EditView.php (props changed) vtigercrm/trunk/modules/Faq/Faq.js (props changed) vtigercrm/trunk/modules/Faq/Faq.php (props changed) vtigercrm/trunk/modules/Faq/FaqAjax.php (props changed) vtigercrm/trunk/modules/Faq/Forms.php (props changed) vtigercrm/trunk/modules/Faq/ListView.php (props changed) vtigercrm/trunk/modules/Faq/Save.php (props changed) vtigercrm/trunk/modules/Faq/SearchForm.html (props changed) vtigercrm/trunk/modules/Faq/index.php (props changed) vtigercrm/trunk/modules/Faq/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Help/Forms.php (props changed) vtigercrm/trunk/modules/Help/index.php (props changed) vtigercrm/trunk/modules/Help/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php (props changed) vtigercrm/trunk/modules/HelpDesk/Convert.html (props changed) vtigercrm/trunk/modules/HelpDesk/Convert.php (props changed) vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php (props changed) vtigercrm/trunk/modules/HelpDesk/ConvertToEntities.php (props changed) vtigercrm/trunk/modules/HelpDesk/CumulStatistics.html (props changed) vtigercrm/trunk/modules/HelpDesk/CumulStatistics.php (props changed) vtigercrm/trunk/modules/HelpDesk/CustomView.php (props changed) vtigercrm/trunk/modules/HelpDesk/Delete.php (props changed) vtigercrm/trunk/modules/HelpDesk/DetailView.php (props changed) vtigercrm/trunk/modules/HelpDesk/EditView.php (props changed) vtigercrm/trunk/modules/HelpDesk/Forms.php (props changed) vtigercrm/trunk/modules/HelpDesk/HelpDesk.js (props changed) vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (props changed) vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php (props changed) vtigercrm/trunk/modules/HelpDesk/ListTickets.php (props changed) vtigercrm/trunk/modules/HelpDesk/ListView.php (props changed) vtigercrm/trunk/modules/HelpDesk/Merge.php (props changed) vtigercrm/trunk/modules/HelpDesk/Save.php (props changed) vtigercrm/trunk/modules/HelpDesk/SearchForm.html (props changed) vtigercrm/trunk/modules/HelpDesk/TicketHistory.html (props changed) vtigercrm/trunk/modules/HelpDesk/TicketHistory.php (props changed) vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php (props changed) vtigercrm/trunk/modules/HelpDesk/index.php (props changed) vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Home/Forms.php (props changed) vtigercrm/trunk/modules/Home/LastViewed.php (props changed) vtigercrm/trunk/modules/Home/UnifiedSearch.php (props changed) vtigercrm/trunk/modules/Home/home_rss.php (props changed) vtigercrm/trunk/modules/Home/index.php (props changed) vtigercrm/trunk/modules/Home/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Import/Forms.php (props changed) vtigercrm/trunk/modules/Import/ImportAccount.php (props changed) vtigercrm/trunk/modules/Import/ImportAjax.php (props changed) vtigercrm/trunk/modules/Import/ImportButton.php (props changed) vtigercrm/trunk/modules/Import/ImportContact.php (props changed) vtigercrm/trunk/modules/Import/ImportLead.php (props changed) vtigercrm/trunk/modules/Import/ImportMap.php (props changed) vtigercrm/trunk/modules/Import/ImportOpportunity.php (props changed) vtigercrm/trunk/modules/Import/ImportProduct.php (props changed) vtigercrm/trunk/modules/Import/ImportSave.php (props changed) vtigercrm/trunk/modules/Import/ImportStep1.php (props changed) vtigercrm/trunk/modules/Import/ImportStep2.php (props changed) vtigercrm/trunk/modules/Import/ImportStep3.php (props changed) vtigercrm/trunk/modules/Import/ImportStep4.php (props changed) vtigercrm/trunk/modules/Import/ImportSteplast.php (props changed) vtigercrm/trunk/modules/Import/ImportStepundo.php (props changed) vtigercrm/trunk/modules/Import/UsersLastImport.php (props changed) vtigercrm/trunk/modules/Import/error.php (props changed) vtigercrm/trunk/modules/Import/index.php (props changed) vtigercrm/trunk/modules/Import/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Import/parse_utils.php (props changed) vtigercrm/trunk/modules/Invoice/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Invoice/CreatePDF.php (props changed) vtigercrm/trunk/modules/Invoice/CustomView.php (props changed) vtigercrm/trunk/modules/Invoice/Delete.php (props changed) vtigercrm/trunk/modules/Invoice/DetailView.php (props changed) vtigercrm/trunk/modules/Invoice/EditView.php (props changed) vtigercrm/trunk/modules/Invoice/Forms.php (props changed) vtigercrm/trunk/modules/Invoice/Invoice.js (props changed) vtigercrm/trunk/modules/Invoice/Invoice.php (props changed) vtigercrm/trunk/modules/Invoice/InvoiceAjax.php (props changed) vtigercrm/trunk/modules/Invoice/ListTopInvoice.php (props changed) vtigercrm/trunk/modules/Invoice/ListView.php (props changed) vtigercrm/trunk/modules/Invoice/Popup.php (props changed) vtigercrm/trunk/modules/Invoice/Save.php (props changed) vtigercrm/trunk/modules/Invoice/index.php (props changed) vtigercrm/trunk/modules/Invoice/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Invoice/pdf_templates/footer.php (props changed) vtigercrm/trunk/modules/Invoice/pdf_templates/header.php (props changed) vtigercrm/trunk/modules/Invoice/pdf_templates/lastpage/body.php (props changed) vtigercrm/trunk/modules/Invoice/pdf_templates/lastpage/footer.php (props changed) vtigercrm/trunk/modules/Leads/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Leads/ConvertLead.html (props changed) vtigercrm/trunk/modules/Leads/ConvertLead.php (props changed) vtigercrm/trunk/modules/Leads/CustomAction.php (props changed) vtigercrm/trunk/modules/Leads/CustomView.php (props changed) vtigercrm/trunk/modules/Leads/Delete.php (props changed) vtigercrm/trunk/modules/Leads/DetailView.php (props changed) vtigercrm/trunk/modules/Leads/EditView.php (props changed) vtigercrm/trunk/modules/Leads/Forms.php (props changed) vtigercrm/trunk/modules/Leads/Import.php (props changed) vtigercrm/trunk/modules/Leads/Lead.js (props changed) vtigercrm/trunk/modules/Leads/Lead.php (props changed) vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (props changed) vtigercrm/trunk/modules/Leads/LeadsAjax.php (props changed) vtigercrm/trunk/modules/Leads/ListView.php (props changed) vtigercrm/trunk/modules/Leads/ListViewTop.php (props changed) vtigercrm/trunk/modules/Leads/Merge.php (props changed) vtigercrm/trunk/modules/Leads/Popup.php (props changed) vtigercrm/trunk/modules/Leads/PopupSearchForm.html (props changed) vtigercrm/trunk/modules/Leads/Popup_picker.html (props changed) vtigercrm/trunk/modules/Leads/Save.php (props changed) vtigercrm/trunk/modules/Leads/index.php (props changed) vtigercrm/trunk/modules/Leads/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Leads/result.php (props changed) vtigercrm/trunk/modules/Migration/Migration.php (props changed) vtigercrm/trunk/modules/Migration/MigrationCheck.php (props changed) vtigercrm/trunk/modules/Migration/MigrationStep1.php (props changed) vtigercrm/trunk/modules/Migration/MigrationStep2.php (props changed) vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (props changed) vtigercrm/trunk/modules/Migration/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Migration/updateCurrency.php (props changed) vtigercrm/trunk/modules/Notes/CustomView.php (props changed) vtigercrm/trunk/modules/Notes/Delete.php (props changed) vtigercrm/trunk/modules/Notes/DetailView.php (props changed) vtigercrm/trunk/modules/Notes/EditView.php (props changed) vtigercrm/trunk/modules/Notes/Forms.php (props changed) vtigercrm/trunk/modules/Notes/ListView.php (props changed) vtigercrm/trunk/modules/Notes/Note.js (props changed) vtigercrm/trunk/modules/Notes/Note.php (props changed) vtigercrm/trunk/modules/Notes/NotesAjax.php (props changed) vtigercrm/trunk/modules/Notes/Save.php (props changed) vtigercrm/trunk/modules/Notes/index.php (props changed) vtigercrm/trunk/modules/Notes/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Portal/Delete.php (props changed) vtigercrm/trunk/modules/Portal/ListView.php (props changed) vtigercrm/trunk/modules/Portal/Popup.php (props changed) vtigercrm/trunk/modules/Portal/Portal.js (props changed) vtigercrm/trunk/modules/Portal/Portalstyle.css (props changed) vtigercrm/trunk/modules/Portal/index.php (props changed) vtigercrm/trunk/modules/Portal/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Potentials/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Potentials/Charts.php (props changed) vtigercrm/trunk/modules/Potentials/CustomView.php (props changed) vtigercrm/trunk/modules/Potentials/Delete.php (props changed) vtigercrm/trunk/modules/Potentials/DetailView.php (props changed) vtigercrm/trunk/modules/Potentials/EditView.php (props changed) vtigercrm/trunk/modules/Potentials/Forms.php (props changed) vtigercrm/trunk/modules/Potentials/Import.php (props changed) vtigercrm/trunk/modules/Potentials/ListView.php (props changed) vtigercrm/trunk/modules/Potentials/ListViewTop.php (props changed) vtigercrm/trunk/modules/Potentials/Opportunity.js (props changed) vtigercrm/trunk/modules/Potentials/Opportunity.php (props changed) vtigercrm/trunk/modules/Potentials/Popup.php (props changed) vtigercrm/trunk/modules/Potentials/PopupSearchForm.html (props changed) vtigercrm/trunk/modules/Potentials/Popup_picker.html (props changed) vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (props changed) vtigercrm/trunk/modules/Potentials/Save.php (props changed) vtigercrm/trunk/modules/Potentials/index.php (props changed) vtigercrm/trunk/modules/Potentials/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Potentials/updateRelations.php (props changed) vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php (props changed) vtigercrm/trunk/modules/PriceBooks/CustomView.php (props changed) vtigercrm/trunk/modules/PriceBooks/Delete.php (props changed) vtigercrm/trunk/modules/PriceBooks/DetailView.php (props changed) vtigercrm/trunk/modules/PriceBooks/EditView.php (props changed) vtigercrm/trunk/modules/PriceBooks/ListView.php (props changed) vtigercrm/trunk/modules/PriceBooks/Popup.php (props changed) vtigercrm/trunk/modules/PriceBooks/PriceBook.js (props changed) vtigercrm/trunk/modules/PriceBooks/PriceBook.php (props changed) vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php (props changed) vtigercrm/trunk/modules/PriceBooks/Save.php (props changed) vtigercrm/trunk/modules/PriceBooks/index.php (props changed) vtigercrm/trunk/modules/PriceBooks/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html (props changed) vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (props changed) vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html (props changed) vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (props changed) vtigercrm/trunk/modules/Products/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Products/CustomView.php (props changed) vtigercrm/trunk/modules/Products/Delete.php (props changed) vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php (props changed) vtigercrm/trunk/modules/Products/DetailView.php (props changed) vtigercrm/trunk/modules/Products/EditListPrice.html (props changed) vtigercrm/trunk/modules/Products/EditListPrice.php (props changed) vtigercrm/trunk/modules/Products/EditView.php (props changed) vtigercrm/trunk/modules/Products/Forms.php (props changed) vtigercrm/trunk/modules/Products/Import.php (props changed) vtigercrm/trunk/modules/Products/ListView.php (props changed) vtigercrm/trunk/modules/Products/Popup.php (props changed) vtigercrm/trunk/modules/Products/Product.js (props changed) vtigercrm/trunk/modules/Products/Product.php (props changed) vtigercrm/trunk/modules/Products/ProductsAjax.php (props changed) vtigercrm/trunk/modules/Products/Productsslide.js (props changed) vtigercrm/trunk/modules/Products/Save.php (props changed) vtigercrm/trunk/modules/Products/UpdateListPrice.php (props changed) vtigercrm/trunk/modules/Products/addPbProductRelToDB.php (props changed) vtigercrm/trunk/modules/Products/index.php (props changed) vtigercrm/trunk/modules/Products/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Products/multifile.js (props changed) vtigercrm/trunk/modules/Products/updateRelations.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/CustomView.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/Delete.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/EditView.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/Forms.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/ListView.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/Popup.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js (props changed) vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/Save.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/index.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/footer.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/lastpage/body.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/lastpage/footer.php (props changed) vtigercrm/trunk/modules/Quotes/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Quotes/CreatePDF.php (props changed) vtigercrm/trunk/modules/Quotes/CustomView.php (props changed) vtigercrm/trunk/modules/Quotes/Delete.php (props changed) vtigercrm/trunk/modules/Quotes/DetailView.php (props changed) vtigercrm/trunk/modules/Quotes/EditView.php (props changed) vtigercrm/trunk/modules/Quotes/Forms.php (props changed) vtigercrm/trunk/modules/Quotes/ListTopQuotes.php (props changed) vtigercrm/trunk/modules/Quotes/ListView.php (props changed) vtigercrm/trunk/modules/Quotes/Popup.php (props changed) vtigercrm/trunk/modules/Quotes/Quote.js (props changed) vtigercrm/trunk/modules/Quotes/Quote.php (props changed) vtigercrm/trunk/modules/Quotes/QuotesAjax.php (props changed) vtigercrm/trunk/modules/Quotes/Save.php (props changed) vtigercrm/trunk/modules/Quotes/index.php (props changed) vtigercrm/trunk/modules/Quotes/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Quotes/pdf_templates/footer.php (props changed) vtigercrm/trunk/modules/Quotes/pdf_templates/header.php (props changed) vtigercrm/trunk/modules/Quotes/pdf_templates/lastpage/body.php (props changed) vtigercrm/trunk/modules/Quotes/pdf_templates/lastpage/footer.php (props changed) vtigercrm/trunk/modules/Reports/AdvancedFilter.html (props changed) vtigercrm/trunk/modules/Reports/AdvancedFilter.php (props changed) vtigercrm/trunk/modules/Reports/ChangeFolder.php (props changed) vtigercrm/trunk/modules/Reports/CreatePDF.php (props changed) vtigercrm/trunk/modules/Reports/CreateXL.php (props changed) vtigercrm/trunk/modules/Reports/Delete.php (props changed) vtigercrm/trunk/modules/Reports/DeleteReportFolder.php (props changed) vtigercrm/trunk/modules/Reports/Forms.php (props changed) vtigercrm/trunk/modules/Reports/ListView.html (props changed) vtigercrm/trunk/modules/Reports/ListView.php (props changed) vtigercrm/trunk/modules/Reports/NewReport0.html (props changed) vtigercrm/trunk/modules/Reports/NewReport0.php (props changed) vtigercrm/trunk/modules/Reports/NewReport1.php (props changed) vtigercrm/trunk/modules/Reports/NewReportFolder.html (props changed) vtigercrm/trunk/modules/Reports/NewReportFolder.php (props changed) vtigercrm/trunk/modules/Reports/PopulateReports.php (props changed) vtigercrm/trunk/modules/Reports/Report.js (props changed) vtigercrm/trunk/modules/Reports/ReportColumns.html (props changed) vtigercrm/trunk/modules/Reports/ReportColumns.php (props changed) vtigercrm/trunk/modules/Reports/ReportColumnsTotal.html (props changed) vtigercrm/trunk/modules/Reports/ReportColumnsTotal.php (props changed) vtigercrm/trunk/modules/Reports/ReportFilters.php (props changed) vtigercrm/trunk/modules/Reports/ReportGrouping.html (props changed) vtigercrm/trunk/modules/Reports/ReportGrouping.php (props changed) vtigercrm/trunk/modules/Reports/ReportRun.php (props changed) vtigercrm/trunk/modules/Reports/ReportType.html (props changed) vtigercrm/trunk/modules/Reports/ReportType.php (props changed) vtigercrm/trunk/modules/Reports/Reports.php (props changed) vtigercrm/trunk/modules/Reports/ReportsAjax.php (props changed) vtigercrm/trunk/modules/Reports/Save.php (props changed) vtigercrm/trunk/modules/Reports/SaveAndRun.php (props changed) vtigercrm/trunk/modules/Reports/SaveReport.html (props changed) vtigercrm/trunk/modules/Reports/SaveReport.php (props changed) vtigercrm/trunk/modules/Reports/SaveReport0.php (props changed) vtigercrm/trunk/modules/Reports/SaveReportFolder.php (props changed) vtigercrm/trunk/modules/Reports/StandardFilter.html (props changed) vtigercrm/trunk/modules/Reports/StandardFilter.php (props changed) vtigercrm/trunk/modules/Reports/index.php (props changed) vtigercrm/trunk/modules/Reports/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Rss/Delete.php (props changed) vtigercrm/trunk/modules/Rss/Forms.php (props changed) vtigercrm/trunk/modules/Rss/ListView.html (props changed) vtigercrm/trunk/modules/Rss/ListView.php (props changed) vtigercrm/trunk/modules/Rss/Popup.html (props changed) vtigercrm/trunk/modules/Rss/Popup.php (props changed) vtigercrm/trunk/modules/Rss/Rss.js (props changed) vtigercrm/trunk/modules/Rss/Rss.php (props changed) vtigercrm/trunk/modules/Rss/RssAjax.php (props changed) vtigercrm/trunk/modules/Rss/Save.php (props changed) vtigercrm/trunk/modules/Rss/Star.php (props changed) vtigercrm/trunk/modules/Rss/index.php (props changed) vtigercrm/trunk/modules/Rss/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php (props changed) vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (props changed) vtigercrm/trunk/modules/SalesOrder/CustomView.php (props changed) vtigercrm/trunk/modules/SalesOrder/Delete.php (props changed) vtigercrm/trunk/modules/SalesOrder/DetailView.php (props changed) vtigercrm/trunk/modules/SalesOrder/EditView.php (props changed) vtigercrm/trunk/modules/SalesOrder/Forms.php (props changed) vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php (props changed) vtigercrm/trunk/modules/SalesOrder/ListView.php (props changed) vtigercrm/trunk/modules/SalesOrder/Popup.php (props changed) vtigercrm/trunk/modules/SalesOrder/SalesOrder.js (props changed) vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (props changed) vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php (props changed) vtigercrm/trunk/modules/SalesOrder/Save.php (props changed) vtigercrm/trunk/modules/SalesOrder/index.php (props changed) vtigercrm/trunk/modules/SalesOrder/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/SalesOrder/pdf_templates/footer.php (props changed) vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php (props changed) vtigercrm/trunk/modules/SalesOrder/pdf_templates/lastpage/body.php (props changed) vtigercrm/trunk/modules/SalesOrder/pdf_templates/lastpage/footer.php (props changed) vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (props changed) vtigercrm/trunk/modules/Settings/AddMailAccount.html (props changed) vtigercrm/trunk/modules/Settings/AddMailAccount.php (props changed) vtigercrm/trunk/modules/Settings/BackupServerConfig.php (props changed) vtigercrm/trunk/modules/Settings/ComboFieldList.html (props changed) vtigercrm/trunk/modules/Settings/ComboFieldList.php (props changed) vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php (props changed) vtigercrm/trunk/modules/Settings/CreateCustomField.php (props changed) vtigercrm/trunk/modules/Settings/CurrencyDelete.php (props changed) vtigercrm/trunk/modules/Settings/CurrencyEditView.php (props changed) vtigercrm/trunk/modules/Settings/CurrencyInfo.html (props changed) vtigercrm/trunk/modules/Settings/CurrencyInfo.php (props changed) vtigercrm/trunk/modules/Settings/CurrencyListView.php (props changed) vtigercrm/trunk/modules/Settings/CustomFieldList.php (props changed) vtigercrm/trunk/modules/Settings/DeleteCustomField.php (props changed) vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php (props changed) vtigercrm/trunk/modules/Settings/DeleteMailAccount.php (props changed) vtigercrm/trunk/modules/Settings/EditComboField.php (props changed) vtigercrm/trunk/modules/Settings/EditCompanyDetails.php (props changed) vtigercrm/trunk/modules/Settings/EditField.html (props changed) vtigercrm/trunk/modules/Settings/EditFieldBlock.php (props changed) vtigercrm/trunk/modules/Settings/EmailConfig.php (props changed) vtigercrm/trunk/modules/Settings/FileStorage.php (props changed) vtigercrm/trunk/modules/Settings/Forms.php (props changed) vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (props changed) vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php (props changed) vtigercrm/trunk/modules/Settings/ListMailAccount.php (props changed) vtigercrm/trunk/modules/Settings/ListModuleOwners.php (props changed) vtigercrm/trunk/modules/Settings/OrganizationConfig.php (props changed) vtigercrm/trunk/modules/Settings/PickList.php (props changed) vtigercrm/trunk/modules/Settings/Save.php (props changed) vtigercrm/trunk/modules/Settings/SaveCompany.php (props changed) vtigercrm/trunk/modules/Settings/SaveConvertLead.php (props changed) vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php (props changed) vtigercrm/trunk/modules/Settings/SaveMailAccount.php (props changed) vtigercrm/trunk/modules/Settings/SettingsAjax.php (props changed) vtigercrm/trunk/modules/Settings/SettingsSubMenu.php (props changed) vtigercrm/trunk/modules/Settings/UpdateComboValues.php (props changed) vtigercrm/trunk/modules/Settings/add2db.php (props changed) vtigercrm/trunk/modules/Settings/customfield.html (props changed) vtigercrm/trunk/modules/Settings/downloadfile.php (props changed) vtigercrm/trunk/modules/Settings/fieldtypes.html (props changed) vtigercrm/trunk/modules/Settings/fieldtypes.php (props changed) vtigercrm/trunk/modules/Settings/index.php (props changed) vtigercrm/trunk/modules/Settings/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/System/config.php (props changed) vtigercrm/trunk/modules/System/includes/XPath.class.php (props changed) vtigercrm/trunk/modules/System/includes/class.Template.inc.php (props changed) vtigercrm/trunk/modules/System/includes/common_functions.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ar_utf8.php (props changed) vtigercrm/trunk/modules/System/includes/lang/bg.php (props changed) vtigercrm/trunk/modules/System/includes/lang/big5.php (props changed) vtigercrm/trunk/modules/System/includes/lang/br.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ca.php (props changed) vtigercrm/trunk/modules/System/includes/lang/cn.php (props changed) vtigercrm/trunk/modules/System/includes/lang/cs.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ct.php (props changed) vtigercrm/trunk/modules/System/includes/lang/da.php (props changed) vtigercrm/trunk/modules/System/includes/lang/de.php (props changed) vtigercrm/trunk/modules/System/includes/lang/en.php (props changed) vtigercrm/trunk/modules/System/includes/lang/es.php (props changed) vtigercrm/trunk/modules/System/includes/lang/et.php (props changed) vtigercrm/trunk/modules/System/includes/lang/eu.php (props changed) vtigercrm/trunk/modules/System/includes/lang/fi.php (props changed) vtigercrm/trunk/modules/System/includes/lang/fr.php (props changed) vtigercrm/trunk/modules/System/includes/lang/gr.php (props changed) vtigercrm/trunk/modules/System/includes/lang/he.php (props changed) vtigercrm/trunk/modules/System/includes/lang/hu.php (props changed) vtigercrm/trunk/modules/System/includes/lang/id.php (props changed) vtigercrm/trunk/modules/System/includes/lang/index.html (props changed) vtigercrm/trunk/modules/System/includes/lang/is.php (props changed) vtigercrm/trunk/modules/System/includes/lang/it.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ja.php (props changed) vtigercrm/trunk/modules/System/includes/lang/jp.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ko.php (props changed) vtigercrm/trunk/modules/System/includes/lang/lt.php (props changed) vtigercrm/trunk/modules/System/includes/lang/lv.php (props changed) vtigercrm/trunk/modules/System/includes/lang/nl.php (props changed) vtigercrm/trunk/modules/System/includes/lang/no.php (props changed) vtigercrm/trunk/modules/System/includes/lang/pl.php (props changed) vtigercrm/trunk/modules/System/includes/lang/pt-br.php (props changed) vtigercrm/trunk/modules/System/includes/lang/pt.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ro.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ru.php (props changed) vtigercrm/trunk/modules/System/includes/lang/sk.php (props changed) vtigercrm/trunk/modules/System/includes/lang/sv.php (props changed) vtigercrm/trunk/modules/System/includes/lang/tr.php (props changed) vtigercrm/trunk/modules/System/includes/lang/tw.php (props changed) vtigercrm/trunk/modules/System/includes/mb/class.healthd.inc.php (props changed) vtigercrm/trunk/modules/System/includes/mb/class.hwsensors.inc.php (props changed) vtigercrm/trunk/modules/System/includes/mb/class.lmsensors.inc.php (props changed) vtigercrm/trunk/modules/System/includes/mb/class.mbm5.inc.php (props changed) vtigercrm/trunk/modules/System/includes/mb/class.mbmon.inc.php (props changed) vtigercrm/trunk/modules/System/includes/mb/index.html (props changed) vtigercrm/trunk/modules/System/includes/os/class.BSD.common.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.Darwin.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.FreeBSD.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.HP-UX.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.NetBSD.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.OpenBSD.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.SunOS.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.WINNT.inc.bak.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.WINNT.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/index.html (props changed) vtigercrm/trunk/modules/System/includes/system_footer.php (props changed) vtigercrm/trunk/modules/System/includes/system_header.php (props changed) vtigercrm/trunk/modules/System/includes/xml/filesystems.php (props changed) vtigercrm/trunk/modules/System/includes/xml/hardware.php (props changed) vtigercrm/trunk/modules/System/includes/xml/index.html (props changed) vtigercrm/trunk/modules/System/includes/xml/mbinfo.php (props changed) vtigercrm/trunk/modules/System/includes/xml/memory.php (props changed) vtigercrm/trunk/modules/System/includes/xml/network.php (props changed) vtigercrm/trunk/modules/System/includes/xml/vitals.php (props changed) vtigercrm/trunk/modules/System/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/System/phpsysinfo.dtd (props changed) vtigercrm/trunk/modules/System/phpsysinfo_service.exe (props changed) vtigercrm/trunk/modules/System/systemconfig.php (props changed) vtigercrm/trunk/modules/System/templates/aq/aq.css (props changed) vtigercrm/trunk/modules/System/templates/aq/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/aq/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/black/black.css (props changed) vtigercrm/trunk/modules/System/templates/black/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/black/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/blue/blue.css (props changed) vtigercrm/trunk/modules/System/templates/blue/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/blue/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/bulix/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/bulix/bulix.css (props changed) vtigercrm/trunk/modules/System/templates/bulix/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/classic/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/classic/classic.css (props changed) vtigercrm/trunk/modules/System/templates/classic/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/kde/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/kde/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/kde/kde.css (props changed) vtigercrm/trunk/modules/System/templates/metal/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/metal/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/metal/metal.css (props changed) vtigercrm/trunk/modules/System/templates/orange/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/orange/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/orange/orange.css (props changed) vtigercrm/trunk/modules/System/templates/typo3/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/typo3/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/typo3/typo3.css (props changed) vtigercrm/trunk/modules/System/templates/wintendoxp/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/wintendoxp/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/wintendoxp/wintendoxp.css (props changed) vtigercrm/trunk/modules/Users/Announcements.php (props changed) vtigercrm/trunk/modules/Users/Authenticate.php (props changed) vtigercrm/trunk/modules/Users/ChangePassword.php (props changed) vtigercrm/trunk/modules/Users/CreateProfile.php (props changed) vtigercrm/trunk/modules/Users/CreateProfile1.php (props changed) vtigercrm/trunk/modules/Users/CreateSharingRule.php (props changed) vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (props changed) vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php (props changed) vtigercrm/trunk/modules/Users/Delete.php (props changed) vtigercrm/trunk/modules/Users/DeleteGroup.php (props changed) vtigercrm/trunk/modules/Users/DeleteProfile.php (props changed) vtigercrm/trunk/modules/Users/DeleteRole.php (props changed) vtigercrm/trunk/modules/Users/DeleteSharingRule.php (props changed) vtigercrm/trunk/modules/Users/DeleteUser.php (props changed) vtigercrm/trunk/modules/Users/DetailView.php (props changed) vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php (props changed) vtigercrm/trunk/modules/Users/EditHomeOrder.php (props changed) vtigercrm/trunk/modules/Users/EditInventoryNotification.php (props changed) vtigercrm/trunk/modules/Users/EditNotification.php (props changed) vtigercrm/trunk/modules/Users/EditView.php (props changed) vtigercrm/trunk/modules/Users/Error.php (props changed) vtigercrm/trunk/modules/Users/Forms.php (props changed) vtigercrm/trunk/modules/Users/GroupDetailView.php (props changed) vtigercrm/trunk/modules/Users/ListProfiles.php (props changed) vtigercrm/trunk/modules/Users/ListView.php (props changed) vtigercrm/trunk/modules/Users/Listhistory.php (props changed) vtigercrm/trunk/modules/Users/Login.php (props changed) vtigercrm/trunk/modules/Users/LoginHistory.php (props changed) vtigercrm/trunk/modules/Users/Logout.php (props changed) vtigercrm/trunk/modules/Users/OrgSharingDetailView.php (props changed) vtigercrm/trunk/modules/Users/OrgSharingEditView.php (props changed) vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php (props changed) vtigercrm/trunk/modules/Users/Popup.php (props changed) vtigercrm/trunk/modules/Users/Popup_picker.html (props changed) vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php (props changed) vtigercrm/trunk/modules/Users/RecalculateSharingRules.php (props changed) vtigercrm/trunk/modules/Users/RoleDeleteStep1.php (props changed) vtigercrm/trunk/modules/Users/RoleDetailView.php (props changed) vtigercrm/trunk/modules/Users/Save.php (props changed) vtigercrm/trunk/modules/Users/SaveGroup.php (props changed) vtigercrm/trunk/modules/Users/SaveInventoryNotification.php (props changed) vtigercrm/trunk/modules/Users/SaveNotification.php (props changed) vtigercrm/trunk/modules/Users/SaveOrgSharing.php (props changed) vtigercrm/trunk/modules/Users/SaveProfile.php (props changed) vtigercrm/trunk/modules/Users/SaveRole.php (props changed) vtigercrm/trunk/modules/Users/SaveSharingRule.php (props changed) vtigercrm/trunk/modules/Users/SearchForm.html (props changed) vtigercrm/trunk/modules/Users/Security.php (props changed) vtigercrm/trunk/modules/Users/ShowHistory.html (props changed) vtigercrm/trunk/modules/Users/ShowHistory.php (props changed) vtigercrm/trunk/modules/Users/TabCustomise.html (props changed) vtigercrm/trunk/modules/Users/TabCustomise.php (props changed) vtigercrm/trunk/modules/Users/TemplateMerge.php (props changed) vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php (props changed) vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (props changed) vtigercrm/trunk/modules/Users/UpdateTab.html (props changed) vtigercrm/trunk/modules/Users/UpdateTab.php (props changed) vtigercrm/trunk/modules/Users/User.php (props changed) vtigercrm/trunk/modules/Users/UserDeleteStep1.php (props changed) vtigercrm/trunk/modules/Users/UsersAjax.php (props changed) vtigercrm/trunk/modules/Users/about_us.php (props changed) vtigercrm/trunk/modules/Users/add2db.php (props changed) vtigercrm/trunk/modules/Users/binaryfilelist.php (props changed) vtigercrm/trunk/modules/Users/createemailtemplate.php (props changed) vtigercrm/trunk/modules/Users/createnewgroup.php (props changed) vtigercrm/trunk/modules/Users/createrole.php (props changed) vtigercrm/trunk/modules/Users/deleteemailtemplate.php (props changed) vtigercrm/trunk/modules/Users/deletewordtemplate.php (props changed) vtigercrm/trunk/modules/Users/detailviewemailtemplate.php (props changed) vtigercrm/trunk/modules/Users/downloadfile.php (props changed) vtigercrm/trunk/modules/Users/editemailtemplate.php (props changed) vtigercrm/trunk/modules/Users/fade.css (props changed) vtigercrm/trunk/modules/Users/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Users/listemailtemplates.php (props changed) vtigercrm/trunk/modules/Users/listgroups.php (props changed) vtigercrm/trunk/modules/Users/listinventorynotifications.php (props changed) vtigercrm/trunk/modules/Users/listnotificationschedulers.php (props changed) vtigercrm/trunk/modules/Users/listroles.html (props changed) vtigercrm/trunk/modules/Users/listroles.php (props changed) vtigercrm/trunk/modules/Users/listwordtemplates.php (props changed) vtigercrm/trunk/modules/Users/lookupemailtemplates.php (props changed) vtigercrm/trunk/modules/Users/massChangeStatus.php (props changed) vtigercrm/trunk/modules/Users/massdelete.php (props changed) vtigercrm/trunk/modules/Users/notify_detail.php (props changed) vtigercrm/trunk/modules/Users/populatetemplate.php (props changed) vtigercrm/trunk/modules/Users/profilePrivileges.php (props changed) vtigercrm/trunk/modules/Users/saveemailtemplate.php (props changed) vtigercrm/trunk/modules/Users/savetermsandconditions.php (props changed) vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (props changed) vtigercrm/trunk/modules/Users/updateNotificationSchedulers.php (props changed) vtigercrm/trunk/modules/Users/upload.php (props changed) vtigercrm/trunk/modules/Utilities/Merge.php (props changed) vtigercrm/trunk/modules/Vendors/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Vendors/CustomView.php (props changed) vtigercrm/trunk/modules/Vendors/Delete.php (props changed) vtigercrm/trunk/modules/Vendors/DetailView.php (props changed) vtigercrm/trunk/modules/Vendors/EditView.php (props changed) vtigercrm/trunk/modules/Vendors/ListView.php (props changed) vtigercrm/trunk/modules/Vendors/Popup.php (props changed) vtigercrm/trunk/modules/Vendors/Save.php (props changed) vtigercrm/trunk/modules/Vendors/Vendor.js (props changed) vtigercrm/trunk/modules/Vendors/Vendor.php (props changed) vtigercrm/trunk/modules/Vendors/VendorsAjax.php (props changed) vtigercrm/trunk/modules/Vendors/index.php (props changed) vtigercrm/trunk/modules/Vendors/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Vendors/updateRelations.php (props changed) vtigercrm/trunk/modules/Webmails/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Webmails/CustomView.php (props changed) vtigercrm/trunk/modules/Webmails/DetailView.php (props changed) vtigercrm/trunk/modules/Webmails/EditView.php (props changed) vtigercrm/trunk/modules/Webmails/EditView.php.orig (props changed) vtigercrm/trunk/modules/Webmails/Forms.php (props changed) vtigercrm/trunk/modules/Webmails/ListView.php (props changed) vtigercrm/trunk/modules/Webmails/ListView.php.orig (props changed) vtigercrm/trunk/modules/Webmails/MailParse.php (props changed) vtigercrm/trunk/modules/Webmails/PopupRelationChooser.php (props changed) vtigercrm/trunk/modules/Webmails/Save.php (props changed) vtigercrm/trunk/modules/Webmails/TODO (props changed) vtigercrm/trunk/modules/Webmails/Webmail.php (props changed) vtigercrm/trunk/modules/Webmails/WebmailsAjax.php (props changed) vtigercrm/trunk/modules/Webmails/body.php (props changed) vtigercrm/trunk/modules/Webmails/class.phpmailer.php (props changed) vtigercrm/trunk/modules/Webmails/class.smtp.php (props changed) vtigercrm/trunk/modules/Webmails/dlAttachments.php (props changed) vtigercrm/trunk/modules/Webmails/images/index.php (props changed) vtigercrm/trunk/modules/Webmails/index.php (props changed) vtigercrm/trunk/modules/Webmails/js/script.js (props changed) vtigercrm/trunk/modules/Webmails/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Webmails/sendmail.php (props changed) vtigercrm/trunk/modules/Webmails/showOverviewUI.php (props changed) vtigercrm/trunk/modules/Webmails/templates/Address Change (props changed) vtigercrm/trunk/modules/Webmails/templates/Announcement for Release (props changed) vtigercrm/trunk/modules/Webmails/templates/Follow Up (props changed) vtigercrm/trunk/modules/Webmails/templates/Good received acknowledgement (props changed) vtigercrm/trunk/modules/Webmails/templates/Pending Invoices (props changed) vtigercrm/trunk/modules/Webmails/templates/Test Announcement (props changed) vtigercrm/trunk/modules/Webmails/templates/testemailtemplateusage.php (props changed) vtigercrm/trunk/modules/Webmails/templates/todel.txt (props changed) vtigercrm/trunk/modules/Webmails/testview.php (props changed) vtigercrm/trunk/modules/Yahoo/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/imports/Excel/OLE.inc (props changed) vtigercrm/trunk/modules/imports/Excel/reader.php (props changed) vtigercrm/trunk/modules/imports/Headers.php (props changed) vtigercrm/trunk/modules/imports/import.php (props changed) vtigercrm/trunk/modules/uploads/add2db.php (props changed) vtigercrm/trunk/modules/uploads/deleteattachments.php (props changed) vtigercrm/trunk/modules/uploads/downloadfile.php (props changed) vtigercrm/trunk/modules/uploads/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/uploads/upload.php (props changed) vtigercrm/trunk/parent_tabdata.php (props changed) vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (props changed) vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (props changed) vtigercrm/trunk/pkg/bin/datamigration.bat (props changed) vtigercrm/trunk/pkg/bin/datamigration.sh (props changed) vtigercrm/trunk/pkg/bin/find_replace.bat (props changed) vtigercrm/trunk/pkg/bin/startvTiger.bat (props changed) vtigercrm/trunk/pkg/bin/startvTiger.sh (props changed) vtigercrm/trunk/pkg/bin/stopvTiger.bat (props changed) vtigercrm/trunk/pkg/bin/stopvTiger.sh (props changed) vtigercrm/trunk/pkg/bin/uninstallvtiger.sh (props changed) vtigercrm/trunk/pkg/license/License_linux.txt (props changed) vtigercrm/trunk/pkg/license/License_windows.txt (props changed) vtigercrm/trunk/pkg/php/php.ini (props changed) vtigercrm/trunk/quickcreate.php (props changed) vtigercrm/trunk/schema/DatabaseSchema.xml (props changed) vtigercrm/trunk/soap/contactserialize.php (props changed) vtigercrm/trunk/soap/customerportal.php (props changed) vtigercrm/trunk/soap/vtigerolservice.php (props changed) vtigercrm/trunk/soap/webforms.php (props changed) vtigercrm/trunk/storage/vtiger.txt (props changed) vtigercrm/trunk/tabdata.php (props changed) vtigercrm/trunk/test/contact/a.txt (props changed) vtigercrm/trunk/test/logo/logo.txt (props changed) vtigercrm/trunk/test/logo/sale.jpeg (props changed) vtigercrm/trunk/test/product/vtigercrm.txt (props changed) vtigercrm/trunk/test/upload/vtigercrm.txt (props changed) vtigercrm/trunk/test/user/a.txt (props changed) vtigercrm/trunk/test/wordtemplatedownload/todel.txt (props changed) vtigercrm/trunk/themes/Aqua/footer.php (props changed) vtigercrm/trunk/themes/Aqua/header.html (props changed) vtigercrm/trunk/themes/Aqua/header.php (props changed) vtigercrm/trunk/themes/Aqua/images/black.png (props changed) vtigercrm/trunk/themes/Aqua/layout_utils.php (props changed) vtigercrm/trunk/themes/Aqua/loginheader.html (props changed) vtigercrm/trunk/themes/Aqua/loginheader.php (props changed) vtigercrm/trunk/themes/Aqua/style.css (props changed) vtigercrm/trunk/themes/blue/footer.php (props changed) vtigercrm/trunk/themes/blue/header.php (props changed) vtigercrm/trunk/themes/blue/images/Thumbs.db (props changed) vtigercrm/trunk/themes/blue/images/bl_bar.jpg (props changed) vtigercrm/trunk/themes/blue/images/cal16x16Call.jpg (props changed) vtigercrm/trunk/themes/blue/images/cal16x16Linked.jpg (props changed) vtigercrm/trunk/themes/blue/images/cal16x16Meeting.jpg (props changed) vtigercrm/trunk/themes/blue/images/cal16x16ToDo.jpg (props changed) vtigercrm/trunk/themes/blue/images/vtiger-crm.jpg (props changed) vtigercrm/trunk/themes/blue/images/vtiger.jpg (props changed) vtigercrm/trunk/themes/blue/layout_utils.php (props changed) vtigercrm/trunk/themes/blue/loginheader.html (props changed) vtigercrm/trunk/themes/blue/loginheader.php (props changed) vtigercrm/trunk/themes/blue/style.css (props changed) vtigercrm/trunk/themes/nature/footer.php (props changed) vtigercrm/trunk/themes/nature/header.html (props changed) vtigercrm/trunk/themes/nature/header.php (props changed) vtigercrm/trunk/themes/nature/layout_utils.php (props changed) vtigercrm/trunk/themes/nature/loginheader.html (props changed) vtigercrm/trunk/themes/nature/loginheader.php (props changed) vtigercrm/trunk/themes/nature/style.css (props changed) vtigercrm/trunk/themes/orange/footer.php (props changed) vtigercrm/trunk/themes/orange/header.html (props changed) vtigercrm/trunk/themes/orange/header.php (props changed) vtigercrm/trunk/themes/orange/layout_utils.php (props changed) vtigercrm/trunk/themes/orange/loginheader.html (props changed) vtigercrm/trunk/themes/orange/loginheader.php (props changed) vtigercrm/trunk/themes/orange/style.css (props changed) vtigercrm/trunk/user_privileges/index.html (props changed) vtigercrm/trunk/vtigercrm5_alpha_Security.html (props changed) vtigercrm/trunk/vtigerservice.php (props changed) vtigercrm/trunk/vtigerversion.php (props changed) From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 21:05:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:05:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5729 - /vtigercrm/trunk/log4php/appenders/ Message-ID: <20060504040522.A3075709F1E@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:05:05 2006 New Revision: 5729 Log: log4php version has been updated Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php vtigercrm/trunk/log4php/appenders/LoggerAppenderEcho.php vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php vtigercrm/trunk/log4php/appenders/LoggerAppenderMail.php vtigercrm/trunk/log4php/appenders/LoggerAppenderMailEvent.php vtigercrm/trunk/log4php/appenders/LoggerAppenderNull.php vtigercrm/trunk/log4php/appenders/LoggerAppenderPhp.php vtigercrm/trunk/log4php/appenders/LoggerAppenderRollingFile.php vtigercrm/trunk/log4php/appenders/LoggerAppenderSocket.php vtigercrm/trunk/log4php/appenders/LoggerAppenderSyslog.php Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php ============================================================================== --- vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php (original) +++ vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php Wed May 3 22:05:05 2006 @@ -1,139 +1,139 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage appenders - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - - -define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT', 'php://stdout'); -define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDERR', 'php://stderr'); - -/** - * ConsoleAppender appends log events to STDOUT or STDERR using a layout specified by the user. - * - *

Optional parameter is {@link $target}. The default target is Stdout.

- *

Note: Use this Appender with command-line php scripts. - * On web scripts this appender has no effects.

- *

This appender requires a layout.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage appenders - */ -class LoggerAppenderConsole extends LoggerAppenderSkeleton { - - /** - * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords STDOUT and STDERR (case insensitive). - * Default is STDOUT - * @var string - */ - var $target = 'php://stdout'; - - /** - * @var boolean - * @access private - */ - var $requiresLayout = true; - - /** - * @var mixed the resource used to open stdout/stderr - * @access private - */ - var $fp = false; - - /** - * Constructor. - * - * @param string $name appender name - */ - function LoggerAppenderConsole($name) - { - $this->LoggerAppenderSkeleton($name); - } - - /** - * Set console target. - * @param mixed $value a constant or a string - */ - function setTarget($value) - { - $v = trim($value); - if ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDOUT') { - $this->target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT; - } elseif ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDERR') { - $target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT; - } else { - LoggerLog::debug( - "LoggerAppenderConsole::targetWarn() ". - "Invalid target. Using '".LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT."' by default." - ); - } - } - - function getTarget() - { - return $this->target; - } - - function activateOptions() - { - LoggerLog::debug("LoggerAppenderConsole::activateOptions()"); - - $this->fp = @fopen($this->getTarget(), 'w'); - - if ($this->fp and $this->layout !== null) - @fwrite($this->fp, $this->layout->getHeader()); - - $this->closed = (bool)($this->fp === false); - } - - /** - * @see LoggerAppender::close() - */ - function close() - { - LoggerLog::debug("LoggerAppenderConsole::close()"); - - if ($this->fp and $this->layout !== null) { - @fwrite($this->fp, $this->layout->getFooter()); - } - @fclose($this->fp); - $this->closed = true; - } - - function append($event) - { - if ($this->fp and $this->layout !== null) { - - LoggerLog::debug("LoggerAppenderConsole::append()"); - - @fwrite($this->fp, $this->layout->format($event)); - } - } -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage appenders + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + + +define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT', 'php://stdout'); +define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDERR', 'php://stderr'); + +/** + * ConsoleAppender appends log events to STDOUT or STDERR using a layout specified by the user. + * + *

Optional parameter is {@link $target}. The default target is Stdout.

+ *

Note: Use this Appender with command-line php scripts. + * On web scripts this appender has no effects.

+ *

This appender requires a layout.

+ * + * @author VxR + * @version $Revision: 1.11 $ + * @package log4php + * @subpackage appenders + */ +class LoggerAppenderConsole extends LoggerAppenderSkeleton { + + /** + * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords STDOUT and STDERR (case insensitive). + * Default is STDOUT + * @var string + */ + var $target = 'php://stdout'; + + /** + * @var boolean + * @access private + */ + var $requiresLayout = true; + + /** + * @var mixed the resource used to open stdout/stderr + * @access private + */ + var $fp = false; + + /** + * Constructor. + * + * @param string $name appender name + */ + function LoggerAppenderConsole($name) + { + $this->LoggerAppenderSkeleton($name); + } + + /** + * Set console target. + * @param mixed $value a constant or a string + */ + function setTarget($value) + { + $v = trim($value); + if ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDOUT') { + $this->target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT; + } elseif ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDERR') { + $target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT; + } else { + LoggerLog::debug( + "LoggerAppenderConsole::targetWarn() ". + "Invalid target. Using '".LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT."' by default." + ); + } + } + + function getTarget() + { + return $this->target; + } + + function activateOptions() + { + LoggerLog::debug("LoggerAppenderConsole::activateOptions()"); + + $this->fp = @fopen($this->getTarget(), 'w'); + + if ($this->fp and $this->layout !== null) + @fwrite($this->fp, $this->layout->getHeader()); + + $this->closed = (bool)($this->fp === false); + } + + /** + * @see LoggerAppender::close() + */ + function close() + { + LoggerLog::debug("LoggerAppenderConsole::close()"); + + if ($this->fp and $this->layout !== null) { + @fwrite($this->fp, $this->layout->getFooter()); + } + @fclose($this->fp); + $this->closed = true; + } + + function append($event) + { + if ($this->fp and $this->layout !== null) { + + LoggerLog::debug("LoggerAppenderConsole::append()"); + + @fwrite($this->fp, $this->layout->format($event)); + } + } +} + ?> Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php ============================================================================== --- vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php (original) +++ vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php Wed May 3 22:05:05 2006 @@ -1,97 +1,97 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage appenders - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/appenders/LoggerAppenderFile.php'); - -/** - * LoggerAppenderDailyFile appends log events to a file ne. - * - * A formatted version of the date pattern is used as to create the file name - * using the {@link PHP_MANUAL#sprintf} function. - *

Parameters are {@link $datePattern}, {@link $file}. Note that file - * parameter should include a '%s' identifier and should always be set - * before {@link $file} param.

- * - * @author Abel Gonzalez - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage appenders - */ -class LoggerAppenderDailyFile extends LoggerAppenderFile { - - /** - * Format date. - * It follows the {@link PHP_MANUAL#date()} formatting rules and should always be set before {@link $file} param. - * @var string - */ - var $datePattern = "Ymd"; - - /** - * Constructor - * - * @param string $name appender name - */ - function LoggerAppenderDailyFile($name) - { - $this->LoggerAppenderFile($name); - } - - /** - * Sets date format for the file name. - * @param string $format a regular date() string format - */ - function setDatePattern ( $format ) - { - $this->datePattern = $format; - } - - /** - * @return string returns date format for the filename - */ - function getDatePattern ( ) - { - return $this->datePattern; - } - - /** - * The File property takes a string value which should be the name of the file to append to. - * Sets and opens the file where the log output will go. - * - * @see LoggerAppenderFile::setFile() - */ - function setFile() - { - $numargs = func_num_args(); - $args = func_get_args(); - - if ($numargs == 1 and is_string($args[0])) { - parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) ); - } elseif ($numargs == 2 and is_string($args[0]) and is_bool($args[1])) { - parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] ); - } - } - -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage appenders + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +require_once(LOG4PHP_DIR . '/appenders/LoggerAppenderFile.php'); + +/** + * LoggerAppenderDailyFile appends log events to a file ne. + * + * A formatted version of the date pattern is used as to create the file name + * using the {@link PHP_MANUAL#sprintf} function. + *

Parameters are {@link $datePattern}, {@link $file}. Note that file + * parameter should include a '%s' identifier and should always be set + * before {@link $file} param.

+ * + * @author Abel Gonzalez + * @version $Revision: 1.7 $ + * @package log4php + * @subpackage appenders + */ +class LoggerAppenderDailyFile extends LoggerAppenderFile { + + /** + * Format date. + * It follows the {@link PHP_MANUAL#date()} formatting rules and should always be set before {@link $file} param. + * @var string + */ + var $datePattern = "Ymd"; + + /** + * Constructor + * + * @param string $name appender name + */ + function LoggerAppenderDailyFile($name) + { + $this->LoggerAppenderFile($name); + } + + /** + * Sets date format for the file name. + * @param string $format a regular date() string format + */ + function setDatePattern ( $format ) + { + $this->datePattern = $format; + } + + /** + * @return string returns date format for the filename + */ + function getDatePattern ( ) + { + return $this->datePattern; + } + + /** + * The File property takes a string value which should be the name of the file to append to. + * Sets and opens the file where the log output will go. + * + * @see LoggerAppenderFile::setFile() + */ + function setFile() + { + $numargs = func_num_args(); + $args = func_get_args(); + + if ($numargs == 1 and is_string($args[0])) { + parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) ); + } elseif ($numargs == 2 and is_string($args[0]) and is_bool($args[1])) { + parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] ); + } + } + +} + ?> Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php ============================================================================== --- vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php (original) +++ vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php Wed May 3 22:05:05 2006 @@ -1,209 +1,209 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage appenders - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); -require_once('DB.php'); - -/** - * Appends log events to a db table using PEAR::DB class. - * - *

This appender uses a table in a database to log events.

- *

Parameters are {@link $dsn}, {@link $createTable}, {@link table} and {@link $sql}.

- *

See examples in test directory.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage appenders - * @since 0.3 - */ -class LoggerAppenderDb extends LoggerAppenderSkeleton { - - /** - * Create the log table if it does not exists (optional). - * @var boolean - */ - var $createTable = true; - - /** - * PEAR::Db Data source name. Read PEAR::Db for dsn syntax (mandatory). - * @var string - */ - var $dsn; - - /** - * A {@link LoggerPatternLayout} string used to format a valid insert query (mandatory). - * @var string - */ - var $sql; - - /** - * Table name to write events. Used only if {@link $createTable} is true. - * @var string - */ - var $table; - - /** - * @var object PEAR::Db instance - * @access private - */ - var $db = null; - - /** - * @var boolean used to check if all conditions to append are true - * @access private - */ - var $canAppend = true; - - /** - * @access private - */ - var $requiresLayout = false; - - /** - * Constructor. - * - * @param string $name appender name - */ - function LoggerAppenderDb($name) - { - $this->LoggerAppenderSkeleton($name); - } - - /** - * Setup db connection. - * Based on defined options, this method connects to db defined in {@link $dsn} - * and creates a {@link $table} table if {@link $createTable} is true. - * @return boolean true if all ok. - */ - function activateOptions() - { - $this->db = DB::connect($this->dsn); - - if (DB::isError($this->db)) { - LoggerLog::debug("LoggerAppenderDb::activateOptions() DB Connect Error [".$this->db->getMessage()."]"); - $this->db = null; - $this->closed = true; - $this->canAppend = false; - - } else { - - $this->layout = LoggerLayout::factory('LoggerPatternLayout'); - $this->layout->setConversionPattern($this->getSql()); - - // test if log table exists - $tableInfo = $this->db->tableInfo($this->table, $mode = null); - if (DB::isError($tableInfo) and $this->getCreateTable()) { - $query = "CREATE TABLE {$this->table} (timestamp varchar(32),logger varchar(32),level varchar(32),message varchar(64),thread varchar(32),file varchar(64),line varchar(4) );"; - - LoggerLog::debug("LoggerAppenderDb::activateOptions() creating table '{$this->table}'... using sql='$query'"); - - $result = $this->db->query($query); - if (DB::isError($result)) { - LoggerLog::debug("LoggerAppenderDb::activateOptions() error while creating '{$this->table}'. Error is ".$result->getMessage()); - $this->canAppend = false; - return; - } - } - $this->canAppend = true; - } - - } - - function append($event) - { - if ($this->canAppend) { - - $query = $this->layout->format($event); - - LoggerLog::debug("LoggerAppenderDb::append() query='$query'"); - - $this->db->query($query); - } - } - - function close() - { - if ($this->db !== null) - $this->db->disconnect(); - $this->closed = true; - } - - /** - * @return boolean - */ - function getCreateTable() - { - return $this->createTable; - } - - /** - * @return string the defined dsn - */ - function getDsn() - { - return $this->dsn; - } - - /** - * @return string the sql pattern string - */ - function getSql() - { - return $this->sql; - } - - /** - * @return string the table name to create - */ - function getTable() - { - return $this->table; - } - - function setCreateTable($flag) - { - $this->createTable = LoggerOptionConverter::toBoolean($flag, true); - } - - function setDsn($newDsn) - { - $this->dsn = $newDsn; - } - - function setSql($sql) - { - $this->sql = $sql; - } - - function setTable($table) - { - $this->table = $table; - } - -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage appenders + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php'); +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); +require_once('DB.php'); + +/** + * Appends log events to a db table using PEAR::DB class. + * + *

This appender uses a table in a database to log events.

+ *

Parameters are {@link $dsn}, {@link $createTable}, {@link table} and {@link $sql}.

+ *

See examples in test directory.

+ * + * @author VxR + * @version $Revision: 1.7 $ + * @package log4php + * @subpackage appenders + * @since 0.3 + */ +class LoggerAppenderDb extends LoggerAppenderSkeleton { + + /** + * Create the log table if it does not exists (optional). + * @var boolean + */ + var $createTable = true; + + /** + * PEAR::Db Data source name. Read PEAR::Db for dsn syntax (mandatory) From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 21:07:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:07:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5730 - /vtigercrm/trunk/log4php/ Message-ID: <20060504040732.334DC709F1E@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:07:13 2006 New Revision: 5730 Log: log4php latest version has been updated Modified: vtigercrm/trunk/log4php/Logger.php vtigercrm/trunk/log4php/LoggerAppender.php vtigercrm/trunk/log4php/LoggerAppenderSkeleton.php vtigercrm/trunk/log4php/LoggerBasicConfigurator.php vtigercrm/trunk/log4php/LoggerCategory.php vtigercrm/trunk/log4php/LoggerDefaultCategoryFactory.php vtigercrm/trunk/log4php/LoggerHierarchy.php vtigercrm/trunk/log4php/LoggerLayout.php vtigercrm/trunk/log4php/LoggerLevel.php vtigercrm/trunk/log4php/LoggerLog.php vtigercrm/trunk/log4php/LoggerMDC.php vtigercrm/trunk/log4php/LoggerManager.php vtigercrm/trunk/log4php/LoggerNDC.php vtigercrm/trunk/log4php/LoggerPropertyConfigurator.php vtigercrm/trunk/log4php/LoggerRoot.php Modified: vtigercrm/trunk/log4php/Logger.php ============================================================================== --- vtigercrm/trunk/log4php/Logger.php (original) +++ vtigercrm/trunk/log4php/Logger.php Wed May 3 22:07:13 2006 @@ -1,67 +1,67 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/LoggerCategory.php'); -require_once(LOG4PHP_DIR . '/LoggerManager.php'); - -/** - * Main class for logging operations - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - */ -class Logger extends LoggerCategory { - - /** - * Constructor - * @param string $name logger name - */ - function Logger($name) - { - $this->LoggerCategory($name); - } - - /** - * Get a Logger by name (Delegate to {@link LoggerManager}) - * @param string $name logger name - * @param LoggerFactory $factory a {@link LoggerFactory} instance or null - * @return Logger - * @static - */ - function &getLogger($name, $factory = null) - { - return LoggerManager::getLogger($name, $factory); - } - - /** - * get the Root Logger (Delegate to {@link LoggerManager}) - * @return LoggerRoot - * @static - */ - function &getRootLogger() - { - return LoggerManager::getRootLogger(); - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/LoggerCategory.php'); +require_once(LOG4PHP_DIR . '/LoggerManager.php'); + +/** + * Main class for logging operations + * + * @author VxR + * @version $Revision: 1.9 $ + * @package log4php + */ +class Logger extends LoggerCategory { + + /** + * Constructor + * @param string $name logger name + */ + function Logger($name) + { + $this->LoggerCategory($name); + } + + /** + * Get a Logger by name (Delegate to {@link LoggerManager}) + * @param string $name logger name + * @param LoggerFactory $factory a {@link LoggerFactory} instance or null + * @return Logger + * @static + */ + function &getLogger($name, $factory = null) + { + return LoggerManager::getLogger($name, $factory); + } + + /** + * get the Root Logger (Delegate to {@link LoggerManager}) + * @return LoggerRoot + * @static + */ + function &getRootLogger() + { + return LoggerManager::getRootLogger(); + } +} ?> Modified: vtigercrm/trunk/log4php/LoggerAppender.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerAppender.php (original) +++ vtigercrm/trunk/log4php/LoggerAppender.php Wed May 3 22:07:13 2006 @@ -1,218 +1,218 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - * Abstract class that defines output logs strategies. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @abstract - */ -class LoggerAppender { - - /** - * Factory - * - * @param string $name appender name - * @param string $class create an instance of this appender class - * @return LoggerAppender - */ - function factory($name, $class) - { - $class = basename($class); - if (!empty($class)) { - if (!class_exists($class)) - @include_once(LOG4PHP_DIR . "/appenders/{$class}.php"); - if (class_exists($class)) - return new $class($name); - } - return null; - } - - /** - * Singleton - * - * @param string $name appender name - * @param string $class create or get a reference instance of this class - * @return LoggerAppender - */ - function &singleton($name, $class = '') - { - static $instances; - - if (!empty($name)) { - if (!isset($instances[$name])) { - if (!empty($class)) { - $appender = LoggerAppender::factory($name, $class); - if ($appender !== null) { - $instances[$name] = $appender; - return $instances[$name]; - } - } - return null; - } - return $instances[$name]; - } - return null; - } - - /* --------------------------------------------------------------------------*/ - /* --------------------------------------------------------------------------*/ - /* --------------------------------------------------------------------------*/ - - /** - * Add a filter to the end of the filter list. - * - * @param LoggerFilter $newFilter add a new LoggerFilter - * @abstract - */ - function addFilter($newFilter) - { - // override - } - - /** - * Clear the list of filters by removing all the filters in it. - * @abstract - */ - function clearFilters() - { - // override - } - - /** - * Return the first filter in the filter chain for this Appender. - * The return value may be null if no is filter is set. - * @return Filter - */ - function &getFilter() - { - // override - } - - /** - * Release any resources allocated. - * Subclasses of {@link LoggerAppender} should implement - * this method to perform proper closing procedures. - * @abstract - */ - function close() - { - //override me - } - - /** - * This method performs threshold checks and invokes filters before - * delegating actual logging to the subclasses specific append() method. - * @param LoggerLoggingEvent $event - * @abstract - */ - function doAppend($event) - { - //override me - } - - /** - * Get the name of this appender. - * @return string - */ - function getName() - { - //override me - } - - /** - * Do not use this method. - * - * @param object $errorHandler - */ - function setErrorHandler($errorHandler) - { - // override me - } - - /** - * Do not use this method. - * @return object Returns the ErrorHandler for this appender. - */ - function &getErrorHandler() - { - return $this->errorHandler; - } - - /** - * Set the Layout for this appender. - * - * @param LoggerLayout $layout - */ - function setLayout($layout) - { - // override me - } - - /** - * Returns this appender layout. - * @return LoggerLayout - */ - function &getLayout() - { - // override me - } - - /** - * Set the name of this appender. - * - * The name is used by other components to identify this appender. - * - * @param string $name - */ - function setName($name) - { - // override me - } - - /** - * Configurators call this method to determine if the appender - * requires a layout. - * - *

If this method returns true, meaning that layout is required, - * then the configurator will configure a layout using the configuration - * information at its disposal. If this method returns false, - * meaning that a layout is not required, then layout configuration will be - * skipped even if there is available layout configuration - * information at the disposal of the configurator.

- * - *

In the rather exceptional case, where the appender - * implementation admits a layout but can also work without it, then - * the appender should return true.

- * - * @return boolean - */ - function requiresLayout() - { - // override me - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + * Abstract class that defines output logs strategies. + * + * @author VxR + * @version $Revision: 1.14 $ + * @package log4php + * @abstract + */ +class LoggerAppender { + + /** + * Factory + * + * @param string $name appender name + * @param string $class create an instance of this appender class + * @return LoggerAppender + */ + function factory($name, $class) + { + $class = basename($class); + if (!empty($class)) { + if (!class_exists($class)) + @include_once(LOG4PHP_DIR . "/appenders/{$class}.php"); + if (class_exists($class)) + return new $class($name); + } + return null; + } + + /** + * Singleton + * + * @param string $name appender name + * @param string $class create or get a reference instance of this class + * @return LoggerAppender + */ + function &singleton($name, $class = '') + { + static $instances; + + if (!empty($name)) { + if (!isset($instances[$name])) { + if (!empty($class)) { + $appender = LoggerAppender::factory($name, $class); + if ($appender !== null) { + $instances[$name] = $appender; + return $instances[$name]; + } + } + return null; + } + return $instances[$name]; + } + return null; + } + + /* --------------------------------------------------------------------------*/ + /* --------------------------------------------------------------------------*/ + /* --------------------------------------------------------------------------*/ + + /** + * Add a filter to the end of the filter list. + * + * @param LoggerFilter $newFilter add a new LoggerFilter + * @abstract + */ + function addFilter($newFilter) + { + // override + } + + /** + * Clear the list of filters by removing all the filters in it. + * @abstract + */ + function clearFilters() + { + // override + } + + /** + * Return the first filter in the filter chain for this Appender. + * The return value may be null if no is filter is set. + * @return Filter + */ + function &getFilter() + { + // override + } + + /** + * Release any resources allocated. + * Subclasses of {@link LoggerAppender} should implement + * this method to perform proper closing procedures. + * @abstract + */ + function close() + { + //override me + } + + /** + * This method performs threshold checks and invokes filters before + * delegating actual logging to the subclasses specific append() method. + * @param LoggerLoggingEvent $event + * @abstract + */ + function doAppend($event) + { + //override me + } + + /** + * Get the name of this appender. + * @return string + */ + function getName() + { + //override me + } + + /** + * Do not use this method. + * + * @param object $errorHandler + */ + function setErrorHandler($errorHandler) + { + // override me + } + + /** + * Do not use this method. + * @return object Returns the ErrorHandler for this appender. + */ + function &getErrorHandler() + { + return $this->errorHandler; + } + + /** + * Set the Layout for this appender. + * + * @param LoggerLayout $layout + */ + function setLayout($layout) + { + // override me + } + + /** + * Returns this appender layout. + * @return LoggerLayout + */ + function &getLayout() + { + // override me + } + + /** + * Set the name of this appender. + * + * The name is used by other components to identify this appender. + * + * @param string $name + */ + function setName($name) + { + // override me + } + + /** + * Configurators call this method to determine if the appender + * requires a layout. + * + *

If this method returns true, meaning that layout is required, + * then the configurator will configure a layout using the configuration + * information at its disposal. If this method returns false, + * meaning that a layout is not required, then layout configuration will be + * skipped even if there is available layout configuration + * information at the disposal of the configurator.

+ * + *

In the rather exceptional case, where the appender + * implementation admits a layout but can also work without it, then + * the appender should return true.

+ * + * @return boolean + */ + function requiresLayout() + { + // override me + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerAppenderSkeleton.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerAppenderSkeleton.php (original) +++ vtigercrm/trunk/log4php/LoggerAppenderSkeleton.php Wed May 3 22:07:13 2006 @@ -1,355 +1,355 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerAppender.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); - -/** - * Abstract superclass of the other appenders in the package. - * - * This class provides the code for common functionality, such as - * support for threshold filtering and support for general filters. - * - * @author VxR - * @author Sergio Strampelli - * @version $Revision: 1.1 $ - * @package log4php - * @abstract - */ -class LoggerAppenderSkeleton extends LoggerAppender { - - /** - * @var boolean closed appender flag - */ - var $closed; - - /** - * @var object unused - */ - var $errorHandler; - - /** - * The first filter in the filter chain - * @var LoggerFilter - */ - var $headFilter = null; - - /** - * LoggerLayout for this appender. It can be null if appender has its own layout - * @var LoggerLayout - */ - var $layout = null; - - /** - * @var string Appender name - */ - var $name; - - /** - * The last filter in the filter chain - * @var LoggerFilter - */ - var $tailFilter = null; - - /** - * @var LoggerLevel There is no level threshold filtering by default. - */ - var $threshold = null; - - /** - * @var boolean needs a layout formatting ? - */ - var $requiresLayout = false; - -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ - - /** - * Constructor - * - * @param string $name appender name - */ - function LoggerAppenderSkeleton($name) - { - $this->name = $name; - $this->clearFilters(); - } - - /** - * @param LoggerFilter $newFilter add a new LoggerFilter - * @see LoggerAppender::addFilter() - */ - function addFilter($newFilter) - { - if($this->headFilter === null) { - $this->headFilter = $newFilter; - $this->tailFilter =& $this->headFilter; - } else { - $this->tailFilter->next = $newFilter; - $this->tailFilter =& $this->tailFilter->next; - } - } - - /** - * Derived appenders should override this method if option structure - * requires it. - */ - function activateOptions() - { - - } - - /** - * Subclasses of {@link LoggerAppenderSkeleton} should implement - * this method to perform actual logging. - * - * @param LoggerLoggingEvent $event - * @see doAppend() - * @abstract - */ - function append($event) - { - // override me - } - - /** - * @see LoggerAppender::clearFilters() - */ - function clearFilters() - { - unset($this->headFilter); - unset($this->tailFilter); - $this->headFilter = null; - $this->tailFilter = null; - } - - /** - * @see LoggerAppender::close() - */ - function close() - { - //override me - } - - /** - * Finalize this appender by calling the derived class' close() method. - */ - function finalize() - { - // An appender might be closed then garbage collected. There is no - // point in closing twice. - if ($this->closed) return; - - LoggerLog::debug("LoggerAppenderSkeleton::finalize():name=[{$this->name}]."); - - $this->close(); - } - - /** - * Do not use this method. - * @see LoggerAppender::getErrorHandler() - * @return object - */ - function &getErrorHandler() - { - return $this->errorHandler; - } - - /** - * @see LoggerAppender::getFilter() - * @return Filter - */ - function &getFilter() - { - return $this->headFilter; - } - - /** - * Return the first filter in the filter chain for this Appender. - * The return value may be null if no is filter is set. - * @return Filter - */ - function &getFirstFilter() - { - return $this->headFilter; - } - - /** - * @see LoggerAppender::getLayout() - * @return LoggerLayout - */ - function &getLayout() - { - return $this->layout; - } - - /** - * @see LoggerAppender::getName() - * @return string - */ - function getName() - { - return $this->name; - } - - /** - * Returns this appenders threshold level. - * See the {@link setThreshold()} method for the meaning of this option. - * @return LoggerLevel - */ - function &getThreshold() - { - return $this->threshold; - } - - /** - * Check whether the message level is below the appender's threshold. - * - * - * If there is no threshold set, then the return value is always true. - * @param LoggerLevel $priority - * @return boolean true if priority is greater or equal than threshold - */ - function isAsSevereAsThreshold($priority) - { - if ($this->threshold === null) - return true; - - return $priority->isGreaterOrEqual($this->getThreshold()); - } - - /** - * @see LoggerAppender::doAppend() - * @param LoggerLoggingEvent $event - */ - function doAppend($event) - { - LoggerLog::debug("LoggerAppenderSkeleton::doAppend()"); - - if ($this->closed) { - LoggerLog::debug("LoggerAppenderSkeleton::doAppend() Attempted to append to closed appender named [{$this->name}]."); - return; - } - if(!$this->isAsSevereAsThreshold($event->getLevel())) { - LoggerLog::debug("LoggerAppenderSkeleton::doAppend() event level is less severe than threshold."); - return; - } - - $f = $this->getFirstFilter(); - - while($f !== null) { - switch ($f->decide($event)) { - case LOG4PHP_LOGGER_FILTER_DENY: return; - case LOG4PHP_LOGGER_FILTER_ACCEPT: return $this->append($event); - case LOG4PHP_LOGGER_FILTER_NEUTRAL: $f = $f->next; - } - } - $this->append($event); - } - - - /** - * @see LoggerAppender::requiresLayout() - * @return boolean - */ - function requiresLayout() - { - return $this->requiresLayout; - } - - /** - * @see LoggerAppender::setErrorHandler() - * @param object - */ - function setErrorHandler($errorHandler) - { - if($errorHandler == null) { - // We do not throw exception here since the cause is probably a - // bad config file. - LoggerLog::warn("You have tried to set a null error-handler."); - } else { - $this->errorHandler = $errorHandler; - } - } - - /** - * @see LoggerAppender::setLayout() - * @param LoggerLayout $layout - */ - function setLayout($layout) - { - if ($this->requiresLayout()) - $this->layout = $layout; - } - - /** - * @see LoggerAppender::setName() - * @param string $name - */ - function setName($name) - { - $this->name = $name; - } - - /** - * Set the threshold level of this appender. - * - * @param mixed $threshold can be a {@link LoggerLevel} object or a string. - * @see LoggerOptionConverter::toLevel() - */ - function setThreshold($threshold) - { - if (is_string($threshold)) { - $this->threshold = LoggerOptionConverter::toLevel($threshold, null); - }elseif (is_a($threshold, 'loggerlevel')) { - $this->threshold = $threshold; - } - } - - /** - * Perform actions before object serialization. - * - * Call {@link finalize()} to properly close the appender. - */ - function __sleep() - { - $this->finalize(); - return array_keys(get_object_vars($this)); - } - - /** - * Perform actions after object deserialization. - * - * Call {@link activateOptions()} to properly setup the appender. - */ - function __wakeup() - { - $this->activateOptions(); - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerAppender.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); + +/** + * Abstract superclass of the other appenders in the package. + * + * This class provides the code for common functionality, such as + * support for threshold filtering and support for general filters. + * + * @author VxR + * @author Sergio Strampelli + * @version $Revision: 1.15 $ + * @package log4php + * @abstract + */ +class LoggerAppenderSkeleton extends LoggerAppender { + + /** + * @var boolean closed appender flag + */ + var $closed; + + /** + * @var object unused + */ + var $errorHandler; + + /** + * The first filter in the filter chain + * @var LoggerFilter + */ + var $headFilter = null; + + /** + * LoggerLayout for this appender. It can be null if appender has its own layout + * @var LoggerLayout + */ + var $layout = null; + + /** + * @var string Appender name + */ + var $name; + + /** + * The last filter in the filter chain + * @var LoggerFilter + */ + var $tailFilter = null; + + /** + * @var LoggerLevel There is no level threshold filtering by default. + */ + var $threshold = null; + + /** + * @var boolean needs a layout formatting ? + */ + var $requiresLayout = false; + +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ + + /** + * Constructor + * + * @param string $name appender name + */ + function LoggerAppenderSkeleton($name) + { + $this->name = $name; + $this->clearFilters(); + } + + /** + * @param LoggerFilter $newFilter add a new LoggerFilter + * @see LoggerAppender::addFilter() + */ + function addFilter($newFilter) + { + if($this->headFilter === null) { + $this->headFilter = $newFilter; + $this->tailFilter =& $this->headFilter; + } else { + $this->tailFilter->next = $newFilter; + $this->tailFilter =& $this->tailFilter->next; + } + } + + /** + * Derived appenders should override this method if option structure + * requires it. + */ + function activateOptions() + { + + } + + /** + * Subclasses of {@link LoggerAppenderSkeleton} should implement + * this method to perform actual logging. + * + * @param LoggerLoggingEvent $event + * @see doAppend() + * @abstract + */ + function append($event) + { + // override me + } + + /** + * @see LoggerAppender::clearFilters() + */ + function clearFilters() + { + unset($this->headFilter); + unset($this->tailFilter); + $this->headFilter = null; + $this->tailFilter = null; + } + + /** + * @see LoggerAppender::close() + */ + function close() + { + //override me + } + + /** + * Finalize this appender by calling the derived class' close() method. + */ + function finalize() + { + // An appender might be closed then garbage collected. There is no + // point in closing twice. + if ($this->closed) return; + + LoggerLog::debug("LoggerAppenderSkeleton::finalize():name=[{$this->name}]."); + + $this->close(); + } + + /** + * Do not use this method. + * @see LoggerAppender::getErrorHandler() + * @return object + */ + function &getErrorHandler() + { + return $this->errorHandler; + } + + /** + * @see LoggerAppender::getFilter() + * @return Filter + */ + function &getFilter() + { + return $this->headFilter; + } + + /** + * Return the first filter in the filter chain for this Appender. + * The return value may be null if no is filter is set. + * @return Filter + */ + function &getFirstFilter() + { + return $this->headFilter; + } + + /** + * @see LoggerAppender::getLayout() + * @return LoggerLayout + */ + function &getLayout() + { + return $this->layout; + } + + /** + * @see LoggerAppender::getName() + * @return string + */ + function getName() + { + return $this->name; + } + + /** + * Returns this appenders threshold level. + * See the {@link setThreshold()} method for the meaning of this option. + * @return LoggerLevel + */ + function &getThreshold() + { + return $this->threshold; + } + + /** + * Check whether the message level is below the appender's threshold. + * + * + * If there is no threshold set, then the return value is always true. + * @param LoggerLevel $priority + * @return boolean true if priority is greater or equal than threshold + */ + function isAsSevereAsThreshold($priority) + { + if ($this->threshold === null) + return true; + + return $priority->isGreaterOrEqual($this->getThreshold()); + } + + /** + * @see LoggerAppender::doAppend() + * @param LoggerLoggingEvent $event + */ + function doAppend($event) + { + LoggerLog::debug("LoggerAppenderSkeleton::doAppend()"); + + if ($this->closed) { + LoggerLog::debug("LoggerAppenderSkeleton::doAppend() Attempted to append to closed appender named [{$this->name}]."); + return; + } + if(!$this->isAsSevereAsThreshold($event->getLevel())) { + LoggerLog::debug("LoggerAppenderSkeleton::doAppend() event level is less severe than threshold."); + return; + } + + $f = $this->getFirstFilter(); + + while($f !== null) { + switch ($f->decide($event)) { + case LOG4PHP_LOGGER_FILTER_DENY: return; + case LOG4PHP_LOGGER_FILTER_ACCEPT: return $this->append($event); + case LOG4PHP_LOGGER_FILTER_NEUTRAL: $f = $f->next; + } + } + $this->append($event); + } + + + /** + * @see LoggerAppender::requiresLayout() + * @return boolean + */ + function requiresLayout() + { + return $this->requiresLayout; + } + + /** + * @see LoggerAppender::setErrorHandler() + * @param object + */ + function setErrorHandler($errorHandler) + { + if($errorHandler == null) { + // We do not throw exception here since the cause is probably a + // bad config file. + LoggerLog::warn("You have tried to set a null error-handler."); + } else { + $this->errorHandler = $errorHandler; + } + } + + /** + * @see LoggerAppender::setLayout() + * @param LoggerLayout $layout + */ + function setLayout($layout) + { + if ($this->requiresLayout()) + $this->layout = $layout; + } + + /** + * @see LoggerAppender::setName() + * @param string $name + */ + function setName($name) + { + $this->name = $name; + } + + /** + * Set the threshold level of this appender. + * + * @param mixed $threshold can be a {@link LoggerLevel} object or a string. + * @see LoggerOptionConverter::toLevel() + */ + function setThreshold($threshold) + { + if (is_string($threshold)) { + $this->threshold = LoggerOptionConverter::toLevel($threshold, null); + }elseif (is_a($threshold, 'loggerlevel')) { + $this->threshold = $threshold; + } + } + + /** + * Perform actions before object serialization. + * + * Call {@link finalize()} to properly close the appender. + */ + function __sleep() + { + $this->finalize(); + return array_keys(get_object_vars($this)); + } + + /** + * Perform actions after object deserialization. + * + * Call {@link activateOptions()} to properly setup the appender. + */ + function __wakeup() + { + $this->activateOptions(); + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerBasicConfigurator.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerBasicConfigurator.php (original) +++ vtigercrm/trunk/log4php/LoggerBasicConfigurator.php Wed May 3 22:07:13 2006 @@ -1,80 +1,80 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); -require_once(LOG4PHP_DIR . '/LoggerLayout.php'); -require_once(LOG4PHP_DIR . '/LoggerAppender.php'); -require_once(LOG4PHP_DIR . '/LoggerManager.php'); - -/** - * Use this class to quickly configure the package. - * - *

For file based configuration see {@link LoggerPropertyConfigurator}. - *

For XML based configuration see {@link LoggerDOMConfigurator}. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @since 0.5 - */ -class LoggerBasicConfigurator extends LoggerConfigurator { - - function LoggerBasicConfigurator() - { - return; - } - - /** - * Add a {@link LoggerAppenderConsole} that uses - * the {@link LoggerLayoutTTCC} to the root category. - * - * @param string $url not used here - * @static - */ - function configure($url = null) - { - $root =& LoggerManager::getRootLogger(); - - $appender =& LoggerAppender::singleton('A1', 'LoggerAppenderConsole'); - $layout = LoggerLayout::factory('LoggerLayoutTTCC'); - $appender->setLayout($layout); - - $root->addAppender($appender); - } - - /** - * Reset the default hierarchy to its defaut. - * It is equivalent to - * - * LoggerManager::resetConfiguration(); - * - * - * @see LoggerHierarchy::resetConfiguration() - * @static - */ - function resetConfiguration() - { - LoggerManager::resetConfiguration(); - } -} -?> +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); +require_once(LOG4PHP_DIR . '/LoggerLayout.php'); +require_once(LOG4PHP_DIR . '/LoggerAppender.php'); +require_once(LOG4PHP_DIR . '/LoggerManager.php'); + +/** + * Use this class to quickly configure the package. + * + *

For file based configuration see {@link LoggerPropertyConfigurator}. + *

For XML based configuration see {@link LoggerDOMConfigurator}. + * + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @since 0.5 + */ +class LoggerBasicConfigurator extends LoggerConfigurator { + + function LoggerBasicConfigurator() + { + return; + } + + /** + * Add a {@link LoggerAppenderConsole} that uses + * the {@link LoggerLayoutTTCC} to the root category. + * + * @param string $url not used here + * @static + */ + function configure($url = null) + { + $root =& LoggerManager::getRootLogger(); + + $appender =& LoggerAppender::singleton('A1', 'LoggerAppenderConsole'); + $layout = LoggerLayout::factory('LoggerLayoutTTCC'); + $appender->setLayout($layout); + + $root->addAppender($appender)); + } + + /** + * Reset the default hierarchy to its defaut. + * It is equivalent to + * + * LoggerManager::resetConfiguration(); + * + * + * @see LoggerHierarchy::resetConfiguration() + * @static + */ + function resetConfiguration() + { + LoggerManager::resetConfiguration(); + } +} +?> Modified: vtigercrm/trunk/log4php/LoggerCategory.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerCategory.php (original) +++ vtigercrm/trunk/log4php/LoggerCategory.php Wed May 3 22:07:13 2006 @@ -1,572 +1,572 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLevel.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php'); - -/** - * This class has been deprecated and replaced by the Logger subclass. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @see Logger - */ -class LoggerCategory { - - /** - * Additivity is set to true by default, that is children inherit the - * appenders of their ancestors by default. - * @var boolean - */ - var $additive = true; - - /** - * @var string fully qualified class name - */ - var $fqcn = 'LoggerCategory'; - - /** - * @var LoggerLevel The assigned level of this category. - */ - var $level = null; - - /** - * @var string name of this category. - */ - var $name = ''; - - /** - * @var Logger The parent of this category. - */ - var $parent = null; - - /** - * @var LoggerHierarchy the object repository - */ - var $repository = null; - - /** - * @var array collection of appenders - * @see LoggerAppender - */ - var $aai = array(); - -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ - - /** - * Constructor. - * - * @param string $name Category name - */ - function LoggerCategory($name) - { - $this->name = $name; - } - - /** - * Add a new Appender to the list of appenders of this Category instance. - * - * @param LoggerAppender $newAppender - */ - function addAppender(&$newAppender) - { - $appenderName = $newAppender->getName(); - $this->aai[$appenderName] =& $newAppender; - } - - /** - * If assertion parameter is false, then logs msg as an error statement. - * - * @param bool $assertion - * @param string $msg message to log - */ - function assertLog($assertion = true, $msg = '') - { - if ($assertion == false) { - $this->error($msg); - } - } - - /** - * Call the appenders in the hierarchy starting at this. - * - * @param LoggerLoggingEvent $event - */ - function callAppenders($event) - { - if (sizeof($this->aai) > 0) { - foreach (array_keys($this->aai) as $appenderName) { - $this->aai[$appenderName]->doAppend($event); - } - } - if ($this->parent != null and $this->getAdditivity()) { - $this->parent->callAppenders($event); - } - } - - /** - * Log a message object with the DEBUG level including the caller. - * - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function debug($message, $caller = null) - { - $debugLevel = LoggerLevel::getLevelDebug(); - if ($this->repository->isDisabled($debugLevel)) { - return; - } - if ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $debugLevel, $message); - } - } - - /** - * Log a message object with the ERROR level including the caller. - * - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function error($message, $caller = null) - { - $errorLevel = LoggerLevel::getLevelError(); - if ($this->repository->isDisabled($errorLevel)) { - return; - } - if ($errorLevel->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $errorLevel, $message); - } - } - - /** - * Deprecated. Please use LoggerManager::exists() instead. - * - * @param string $name - * @see LoggerManager::exists() - * @deprecated - */ - function exists($name) - { - return LoggerManager::exists($name); - } - - /** - * Log a message object with the FATAL level including the caller. - * - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function fatal($message, $caller = null) - { - $fatalLevel = LoggerLevel::getLevelFatal(); - if ($this->repository->isDisabled($fatalLevel)) { - return; - } - if ($fatalLevel->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $fatalLevel, $message); - } - } - - /** - * This method creates a new logging event and logs the event without further checks. - * - * It should not be called directly. Use {@link info()}, {@link debug()}, {@link warn()}, - * {@link error()} and {@link fatal()} wrappers. - * - * @param string $fqcn Fully Qualified Class Name of the Logger - * @param mixed $caller caller object or caller string id - * @param LoggerLevel $level log level - * @param mixed $message message - * @see LoggerLoggingEvent - */ - function forcedLog($fqcn, $caller, $level, $message) - { - // $fqcn = is_object($caller) ? get_class($caller) : (string)$caller; - $this->callAppenders(new LoggerLoggingEvent($fqcn, $this, $level, $message)); - } - - /** - * Get the additivity flag for this Category instance. - * @return boolean - */ - function getAdditivity() - { - return $this->additive; - } - - /** - * Get the appenders contained in this category as an array. - * @return array collection of appenders - */ - function &getAllAppenders() - { - $appenders = array(); - $appenderNames = array_keys($this->aai); - $enumAppenders = sizeof($appenderNames); - for ($i = 0; $i < $enumAppenders; $i++) { - $appenderName = $appenderNames[$i]; - $appenders[] =& $this->aai[$appenderName]; - } - return $appenders; - } - - /** - * Look for the appender named as name. - * @return LoggerAppender - */ - function &getAppender($name) - { - return $this->aai[$name]; - } - - /** - * Please use the {@link getEffectiveLevel()} method instead. - * @deprecated - */ - function getChainedPriority() - { - return $this->getEffectiveLevel(); - } - - /** - * Please use {@link LoggerManager::getCurrentLoggers()} instead. - * @deprecated - */ - function getCurrentCategories() - { - return LoggerManager::getCurrentLoggers(); - } - - /** - * Please use {@link LoggerManager::getLoggerRepository()} instead. - * @deprecated - */ - function &getDefaultHierarchy() - { - return LoggerManager::getLoggerRepository(); - } - - /** - * @deprecated Use {@link getLoggerRepository()} - * @return LoggerHierarchy - */ - function &getHierarchy() - { - return $this->getLoggerRepository(); - } - - /** - * Starting from this category, search the category hierarchy for a non-null level and return it. - * @see LoggerLevel - * @return LoggerLevel or null - */ - function getEffectiveLevel() - { - for($c = $this; $c != null; $c = $c->parent) { - if($c->level !== null) - return $c->level; - } - return null; - } - - /** - * Retrieve a category with named as the name parameter. - * @return Logger - */ - function &getInstance($name) - { - return LoggerManager::getLogger($name); - } - - /** - * Returns the assigned Level, if any, for this Category. - * @return LoggerLevel or null - */ - function getLevel() - { - return $this->level; - } - - /** - * Return the the repository where this Category is attached. - * @return LoggerHierarchy - */ - function &getLoggerRepository() - { - return $this->repository; - } - - /** - * Return the category name. - * @return string - */ - function getName() - { - return $this->name; - } - - /** - * Returns the parent of this category. - * @return Logger - */ - function &getParent() - { - return $this->parent; - } - - /** - * Please use getLevel() instead. - * @deprecated - */ - function getPriority() - { - return $this->getLevel(); - } - - /** - * Return the inherited ResourceBundle for this category. - */ - function getResourceBundle() - { - return; - } - - /** - * Returns the string resource coresponding to key in this category's inherited resource bundle. - */ - function getResourceBundleString($key) - { - return; - } - - /** - * Return the root of the default category hierrachy. - * @return LoggerRoot - */ - function &getRoot() - { - return LoggerManager::getRootLogger(); - } - - /** - * Log a message object with the INFO Level. - * - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function info($message, $caller = null) - { - $infoLevel = LoggerLevel::getLevelInfo(); - if ($this->repository->isDisabled($infoLevel)) { - return; - } - if ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $infoLevel, $message); - } - } - - /** - * Is the appender passed as parameter attached to this category? - * - * @param LoggerAppender $appender - */ - function isAttached($appender) - { - return in_array($appender->getName(), array_keys($this->aai)); - } - - /** - * Check whether this category is enabled for the DEBUG Level. - * @return boolean - */ - function isDebugEnabled() - { - $debugLevel = LoggerLevel::getLevelDebug(); - if ($this->repository->isDisabled($debugLevel)) { - return false; - } - return ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel())); - } - - /** - * Check whether this category is enabled for a given Level passed as parameter. - * - * @param LoggerLevel level - * @return boolean - */ - function isEnabledFor($level) - { - if ($this->repository->isDisabled($level)) { - return false; - } - return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel())); - } - - /** - * Check whether this category is enabled for the info Level. - * @return boolean - * @see LoggerLevel - */ - function isInfoEnabled() - { - $infoLevel = LoggerLevel::getLevelInfo(); - if ($this->repository->isDisabled($infoLevel)) { - return false; - } - return ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel())); - } - - /** - * Log a localized and parameterized message. - */ - function l7dlog($priority, $key, $params, $t) - { - return; - } - - /** - * This generic form is intended to be used by wrappers. - * - * @param LoggerLevel $priority a valid level - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function log($priority, $message, $caller = null) - { - if ($this->repository->isDisabled($priority)) { - return; - } - if ($priority->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $priority, $message); - } - } - - /** - * Remove all previously added appenders from this Category instance. - */ - function removeAllAppenders() - { - $appenderNames = array_keys($this->aai); - $enumAppenders = sizeof($appenderNames); - for ($i = 0; $i < $enumAppenders; $i++) { - $this->removeAppender($appenderNames[$i]); - } - } - - /** - * Remove the appender passed as parameter form the list of appenders. - * - * @param mixed $appender can be an appender name or a {@link LoggerAppender} object - */ - function removeAppender($appender) - { - if (is_a($appender, 'loggerappender')) { - $appender->close(); - unset($this->aai[$appender->getName()]); - } elseif (is_string($appender) and isset($this->aai[$appender])) { - $this->aai[$appender]->close(); - unset($this->aai[$appender]); - } - } - - /** - * Set the additivity flag for this Category instance. - * - * @param boolean $additive - */ - function setAdditivity($additive) - { - $this->additive = (bool)$additive; - } - - /** - * @deprecated Please use {@link setLevel()} instead. - * @see setLevel() - */ - function setPriority($priority) - { - $this->setLevel($priority); - } - - /** - * Only the Hiearchy class can set the hiearchy of a - * category. - * - * @param LoggerHierarchy &$repository - */ - function setHierarchy(&$repository) - { - $this->repository =& $repository; - } - - /** - * Set the level of this Category. - * - * @param LoggerLevel $level a level string or a level costant - */ - function setLevel($level) - { - $this->level = $level; - } - - /** - * Set the resource bundle to be used with localized logging methods - */ - function setResourceBundle($bundle) - { - return; - } - - /** - * @deprecated use {@link LoggerManager::shutdown()} instead. - * @see LoggerManager::shutdown() - */ - function shutdown() - { - LoggerManager::shutdown(); - } - - /** - * Log a message with the WARN level. - * - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function warn($message, $caller = null) - { - $warnLevel = LoggerLevel::getLevelWarn(); - if ($this->repository->isDisabled($warnLevel)) { - return; - } - if ($warnLevel->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $warnLevel, $message); - } - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLevel.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php'); + +/** + * This class has been deprecated and replaced by the Logger subclass. + * + * @author VxR + * @version $Revision: 1.17 $ + * @package log4php + * @see Logger + */ +class LoggerCategory { + + /** + * Additivity is set to true by default, that is children inherit the + * appenders of their ancestors by default. + * @var boolean + */ + var $additive = true; + + /** + * @var string fully qualified class name + */ + var $fqcn = 'LoggerCategory'; + + /** + * @var LoggerLevel The assigned level of this category. + */ + var $level = null; + + /** + * @var string name of this category. + */ + var $name = ''; + + /** + * @var Logger The parent of this category. + */ + var $parent = null; + + /** + * @var LoggerHierarchy the object repository + */ + var $repository = null; + + /** + * @var array collection of appenders + * @see LoggerAppender + */ + var $aai = array(); + +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ + + /** + * Constructor. + * + * @param string $name Category name + */ + function LoggerCategory($name) + { + $this->name = $name; + } + + /** + * Add a new Appender to the list of appenders of this Category instance. + * + * @param LoggerAppender $newAppender + */ + function addAppender(&$newAppender) + { + $appenderName = $newAppender->getName(); + $this->aai[$appenderName] =& $newAppender; + } + + /** + * If assertion parameter is false, then logs msg as an error statement. + * + * @param bool $assertion + * @param string $msg message to log + */ + function assertLog($assertion = true, $msg = '') + { + if ($assertion == false) { + $this->error($msg); + } + } + + /** + * Call the appenders in the hierarchy starting at this. + * + * @param LoggerLoggingEvent $event + */ + function callAppenders($event) + { + if (sizeof($this->aai) > 0) { + foreach (array_keys($this->aai) as $appenderName) { + $this->aai[$appenderName]->doAppend($event); + } + } + if ($this->parent != null and $this->getAdditivity()) { + $this->parent->callAppenders($event); + } + } + + /** + * Log a message object with the DEBUG level including the caller. + * + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function debug($message, $caller = null) + { + $debugLevel = LoggerLevel::getLevelDebug(); + if ($this->repository->isDisabled($debugLevel)) { + return; + } + if ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $debugLevel, $message); + } + } + + /** + * Log a message object with the ERROR level including the caller. + * + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function error($message, $caller = null) + { + $errorLevel = LoggerLevel::getLevelError(); + if ($this->repository->isDisabled($errorLevel)) { + return; + } + if ($errorLevel->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $errorLevel, $message); + } + } + + /** + * Deprecated. Please use LoggerManager::exists() instead. + * + * @param string $name + * @see LoggerManager::exists() + * @deprecated + */ + function exists($name) + { + return LoggerManager::exists($name); + } + + /** + * Log a message object with the FATAL level including the caller. + * + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function fatal($message, $caller = null) + { + $fatalLevel = LoggerLevel::getLevelFatal(); + if ($this->repository->isDisabled($fatalLevel)) { + return; + } + if ($fatalLevel->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $fatalLevel, $message); + } + } + + /** + * This method creates a new logging event and logs the event without further checks. + * + * It should not be called directly. Use {@link info()}, {@link debug()}, {@link warn()}, + * {@link error()} and {@link fatal()} wrappers. + * + * @param string $fqcn Fully Qualified Class Name of the Logger + * @param mixed $caller caller object or caller string id + * @param LoggerLevel $level log level + * @param mixed $message message + * @see LoggerLoggingEvent + */ + function forcedLog($fqcn, $caller, $level, $message) + { + // $fqcn = is_object($caller) ? get_class($caller) : (string)$caller; + $this->callAppenders(new LoggerLoggingEvent($fqcn, $this, $level, $message)); + } + + /** + * Get the additivity flag for this Category instance. + * @return boolean + */ + function getAdditivity() + { + return $this->additive; + } + + /** + * Get the appenders contained in this category as an array. + * @return array collection of appenders + */ + function &getAllAppenders() + { + $appenders = array(); + $appenderNames = array_keys($this->aai); + $enumAppenders = sizeof($appenderNames); + for ($i = 0; $i < $enumAppenders; $i++) { + $appenderName = $appenderNames[$i]; + $appenders[] =& $this->aai[$appenderName]; + } + return $appenders; + } + + /** + * Look for the appender named as name. + * @return LoggerAppender + */ + function &getAppender($name) + { + return $this->aai[$name]; + } + + /** + * Please use the {@link getEffectiveLevel()} method instead. + * @deprecated + */ + function getChainedPriority() + { + return $this->getEffectiveLevel(); + } + + /** + * Please use {@link LoggerManager::getCurrentLoggers()} instead. + * @deprecated + */ + function getCurrentCategories() + { + return LoggerManager::getCurrentLoggers(); + } + + /** + * Please use {@link LoggerManager::getLoggerRepository()} instead. + * @deprecated + */ + function &getDefaultHierarchy() + { + return LoggerManager::getLoggerRepository(); + } + + /** + * @deprecated Use {@link getLoggerRepository()} + * @return LoggerHierarchy + */ + function &getHierarchy() + { + return $this->getLoggerRepository(); + } + + /** + * Starting from this category, search the category hierarchy for a non-null level and return it. + * @see LoggerLevel + * @return LoggerLevel or null + */ + function getEffectiveLevel() + { + for($c = $this; $c != null; $c = $c->parent) { + if($c->level !== null) + return $c->level; + } + return null; + } + + /** + * Retrieve a category with named as the name parameter. + * @return Logger + */ + function &getInstance($name) + { + return LoggerManager::getLogger($name); + } + + /** + * Returns the assigned Level, if any, for this Category. + * @return LoggerLevel or null + */ + function getLevel() + { + return $this->level; + } + + /** + * Return the the repository where this Category is attached. + * @return LoggerHierarchy + */ + function &getLoggerRepository() + { + return $this->repository; + } + + /** + * Return the category name. + * @return string + */ + function getName() + { + return $this->name; + } + + /** + * Returns the parent of this category. + * @return Logger + */ + function &getParent() + { + return $this->parent; + } + + /** + * Please use getLevel() instead. + * @deprecated + */ + function getPriority() + { + return $this->getLevel(); + } + + /** + * Return the inherited ResourceBundle for this category. + */ + function getResourceBundle() + { + return; + } + + /** + * Returns the string resource coresponding to key in this category's inherited resource bundle. + */ + function getResourceBundleString($key) + { + return; + } + + /** + * Return the root of the default category hierrachy. + * @return LoggerRoot + */ + function &getRoot() + { + return LoggerManager::getRootLogger(); + } + + /** + * Log a message object with the INFO Level. + * + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function info($message, $caller = null) + { + $infoLevel = LoggerLevel::getLevelInfo(); + if ($this->repository->isDisabled($infoLevel)) { + return; + } + if ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $infoLevel, $message); + } + } + + /** + * Is the appender passed as parameter attached to this category? + * + * @param LoggerAppender $appender + */ + function isAttached($appender) + { + return in_array($appender->getName(), array_keys($this->aai)); + } + + /** + * Check whether this category is enabled for the DEBUG Level. + * @return boolean + */ + function isDebugEnabled() + { + $debugLevel = LoggerLevel::getLevelDebug(); + if ($this->repository->isDisabled($debugLevel)) { + return false; + } + return ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel())); + } + + /** + * Check whether this category is enabled for a given Level passed as parameter. + * + * @param LoggerLevel level + * @return boolean + */ + function isEnabledFor($level) + { + if ($this->repository->isDisabled($level)) { + return false; + } + return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel())); + } + + /** + * Check whether this category is enabled for the info Level. + * @return boolean + * @see LoggerLevel + */ + function isInfoEnabled() + { + $infoLevel = LoggerLevel::getLevelInfo(); + if ($this->repository->isDisabled($infoLevel)) { + return false; + } + return ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel())); + } + + /** + * Log a localized and parameterized message. + */ + function l7dlog($priority, $key, $params, $t) + { + return; + } + + /** + * This generic form is intended to be used by wrappers. + * + * @param LoggerLevel $priority a valid level + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function log($priority, $message, $caller = null) + { + if ($this->repository->isDisabled($priority)) { + return; + } + if ($priority->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $priority, $message); + } + } + + /** + * Remove all previously added appenders from this Category instance. + */ + function removeAllAppenders() + { + $appenderNames = array_keys($this->aai); + $enumAppenders = sizeof($appenderNames); + for ($i = 0; $i < $enumAppenders; $i++) { + $this->removeAppender($appenderNames[$i]); + } + } + + /** + * Remove the appender passed as parameter form the list of appenders. + * + * @param mixed $appender can be an appender name or a {@link LoggerAppender} object + */ + function removeAppender($appender) + { + if (is_a($appender, 'loggerappender')) { + $appender->close(); + unset($this->aai[$appender->getName()]); + } elseif (is_string($appender) and isset($this->aai[$appender])) { + $this->aai[$appender]->close(); + unset($this->aai[$appender]); + } + } + + /** + * Set the additivity flag for this Category instance. + * + * @param boolean $additive + */ + function setAdditivity($additive) + { + $this->additive = (bool)$additive; + } + + /** + * @deprecated Please use {@link setLevel()} instead. + * @see setLevel() + */ + function setPriority($priority) + { + $this->setLevel($priority); + } + + /** + * Only the Hiearchy class can set the hiearchy of a + * category. + * + * @param LoggerHierarchy &$repository + */ + function setHierarchy(&$repository) + { + $this->repository =& $repository; + } + + /** + * Set the level of this Category. + * + * @param LoggerLevel $level a level string or a level costant + */ + function setLevel($level) + { + $this->level = $level; + } + + /** + * Set the resource bundle to be used with localized logging methods + */ + function setResourceBundle($bundle) + { + return; + } + + /** + * @deprecated use {@link LoggerManager::shutdown()} instead. + * @see LoggerManager::shutdown() + */ + function shutdown() + { + LoggerManager::shutdown(); + } + + /** + * Log a message with the WARN level. + * + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function warn($message, $caller = null) + { + $warnLevel = LoggerLevel::getLevelWarn(); + if ($this->repository->isDisabled($warnLevel)) { + return; + } + if ($warnLevel->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $warnLevel, $message); + } + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerDefaultCategoryFactory.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerDefaultCategoryFactory.php (original) +++ vtigercrm/trunk/log4php/LoggerDefaultCategoryFactory.php Wed May 3 22:07:13 2006 @@ -1,52 +1,52 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/spi/LoggerFactory.php'); -require_once(LOG4PHP_DIR . '/Logger.php'); - -/** - * Creates instances of {@link Logger} with a given name. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @since 0.5 - */ -class LoggerDefaultCategoryFactory extends LoggerFactory { - - function LoggerDefaultCategoryFactory() - { - return; - } - - /** - * @param string $name - * @return Logger - */ - function makeNewLoggerInstance($name) - { - return new Logger($name); - } -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/spi/LoggerFactory.php'); +require_once(LOG4PHP_DIR . '/Logger.php'); + +/** + * Creates instances of {@link Logger} with a given name. + * + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @since 0.5 + */ +class LoggerDefaultCategoryFactory extends LoggerFactory { + + function LoggerDefaultCategoryFactory() + { + return; + } + + /** + * @param string $name + * @return Logger + */ + function makeNewLoggerInstance($name) + { + return new Logger($name); + } +} + ?> Modified: vtigercrm/trunk/log4php/LoggerHierarchy.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerHierarchy.php (original) +++ vtigercrm/trunk/log4php/LoggerHierarchy.php Wed May 3 22:07:13 2006 @@ -1,388 +1,388 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); -require_once(LOG4PHP_DIR . '/LoggerLevel.php'); -require_once(LOG4PHP_DIR . '/LoggerRoot.php'); -require_once(LOG4PHP_DIR . '/or/LoggerRendererMap.php'); -require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php'); - -/** - * This class is specialized in retrieving loggers by name and also maintaining - * the logger hierarchy. - * - *

The casual user does not have to deal with this class directly.

- * - *

The structure of the logger hierarchy is maintained by the - * getLogger method. The hierarchy is such that children link - * to their parent but parents do not have any pointers to their - * children. Moreover, loggers can be instantiated in any order, in - * particular descendant before ancestor.

- * - *

In case a descendant is created before a particular ancestor, - * then it creates a provision node for the ancestor and adds itself - * to the provision node. Other descendants of the same ancestor add - * themselves to the previously created provision node.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - */ -class LoggerHierarchy { - - /** - * @var object currently unused - */ - var $defaultFactory; - - /** - * @var boolean activate internal logging - * @see LoggerLog - */ - var $debug = false; - - /** - * @var array hierarchy tree. saves here all loggers - */ - var $ht = array(); - - /** - * @var LoggerRoot - */ - var $root = null; - - /** - * @var LoggerRendererMap - */ - var $rendererMap; - - /** - * @var LoggerLevel main level threshold - */ - var $threshold; - - /** - * @var boolean currently unused - */ - var $emittedNoAppenderWarning = false; - - /** - * @var boolean currently unused - */ - var $emittedNoResourceBundleWarning = false; - - -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ - - function &singleton() - { - static $instance; - - if (!isset($instance)) - $instance = new LoggerHierarchy(new LoggerRoot()); - return $instance; - } - - /** - * Create a new logger hierarchy. - * @param object $root the root logger - */ - function LoggerHierarchy($root) - { - $this->root =& $root; - // Enable all level levels by default. - $this->setThreshold(LoggerLevel::getLevelAll()); - $this->root->setHierarchy($this); - $this->rendererMap = new LoggerRendererMap(); - $this->defaultFactory = new LoggerDefaultCategoryFactory(); - } - - /** - * Add a HierarchyEventListener event to the repository. - * Not Yet Impl. - */ - function addHierarchyEventListener($listener) - { - return; - } - - /** - * Add an object renderer for a specific class. - * Not Yet Impl. - */ - function addRenderer($classToRender, $or) - { - $this->rendererMap->put($classToRender, $or); - } - - /** - * This call will clear all logger definitions from the internal hashtable. - */ - function clear() - { - $this->ht = array(); - } - - function emitNoAppenderWarning($cat) - { - return; - } - - /** - * Check if the named logger exists in the hierarchy. - * @param string $name - * @return boolean - */ - function exists($name) - { - return in_array($name, array_keys($this->ht)); - } - - function fireAddAppenderEvent($logger, $appender) - { - return; - } - - /** - * @deprecated Please use {@link getCurrentLoggers()} instead. - */ - function &getCurrentCategories() - { - return $this->getCurrentLoggers(); - } - - /** - * Returns all the currently defined categories in this hierarchy as an array. - * @return array - */ - function &getCurrentLoggers() - { - $loggers = array(); - $loggerNames = array_keys($this->ht); - $enumLoggers = sizeof($loggerNames); - for ($i = 0; $i < $enumLoggers; $i++) { - $loggerName = $loggerNames[$i]; - $loggers[] =& $this->ht[$loggerName]; - } - return $loggers; - } - - /** - * Return a new logger instance named as the first parameter using the default factory. - * - * @param string $name logger name - * @param LoggerFactory $factory a {@link LoggerFactory} instance or null - * @return Logger - */ - function &getLogger($name, $factory = null) - { - if ($factory === null) { - return $this->getLoggerByFactory($name, $this->defaultFactory); - } else { - return $this->getLoggerByFactory($name, $factory); - } - } - - /** - * Return a new logger instance named as the first parameter using the default factory. - * - * @param string $name logger name - * @return Logger - * @todo merge with {@link getLogger()} - */ - function &getLoggerByFactory($name, $factory) - { - if (!isset($this->ht[$name])) { - LoggerLog::debug("LoggerHierarchy::getLoggerByFactory():name=[$name]:factory=[".get_class($factory)."] creating a new logger..."); - $this->ht[$name] = $factory->makeNewLoggerInstance($name); - $this->ht[$name]->setHierarchy($this); - $nodes = explode('.', $name); - $firstNode = array_shift($nodes); - if ( $firstNode != $name and isset($this->ht[$firstNode])) { - LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$firstNode]"); - $this->ht[$name]->parent =& $this->ht[$firstNode]; - } else { - LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [root]"); - $this->ht[$name]->parent =& $this->root; - } - if (sizeof($nodes) > 0) { - // find parent node - foreach ($nodes as $node) { - $parentNode = "$firstNode.$node"; - if (isset($this->ht[$parentNode]) and $parentNode != $name) { - LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$parentNode]"); - $this->ht[$name]->parent =& $this->ht[$parentNode]; - } - $firstNode .= ".$node"; - } - } - // update children - /* - $children = array(); - foreach (array_keys($this->ht) as $nodeName) { - if ($nodeName != $name and substr($nodeName, 0, strlen($name)) == $name) { - $children[] = $nodeName; - } - } - */ - } - return $this->ht[$name]; - } - - /** - * @return LoggerRendererMap Get the renderer map for this hierarchy. - */ - function &getRendererMap() - { - return $this->rendererMap; - } - - /** - * @return LoggerRoot Get the root of this hierarchy. - */ - function &getRootLogger() - { - if (!isset($this->root) or $this->root == null) - $this->root = new LoggerRoot(); - return $this->root; - } - - /** - * @return LoggerLevel Returns the threshold Level. - */ - function getThreshold() - { - return $this->threshold; - } - - /** - * This method will return true if this repository is disabled - * for level object passed as parameter and false otherwise. - * @return boolean - */ - function isDisabled($level) - { - return ($this->threshold->level > $level->level); - } - - /** - * @deprecated Deprecated with no replacement. - */ - function overrideAsNeeded($override) - { - return; - } - - /** - * Reset all values contained in this hierarchy instance to their - * default. - * - * This removes all appenders from all categories, sets - * the level of all non-root categories to null, - * sets their additivity flag to true and sets the level - * of the root logger to {@link LOGGER_LEVEL_DEBUG}. Moreover, - * message disabling is set its default "off" value. - * - *

Existing categories are not removed. They are just reset. - * - *

This method should be used sparingly and with care as it will - * block all logging until it is completed.

- */ - function resetConfiguration() - { - $root =& $this->getRootLogger(); - - $root->setLevel(LoggerLevel::getLevelDebug()); - $this->setThreshold(LoggerLevel::getLevelAll()); - $this->shutDown(); - $loggers =& $this->getCurrentLoggers(); - $enumLoggers = sizeof($loggers); - for ($i = 0; $i < $enumLoggers; $i++) { - $loggers[$i]->setLevel(null); - $loggers[$i]->setAdditivity(true); - $loggers[$i]->setResourceBundle(null); - } - $this->rendererMap->clear(); - } - - /** - * @deprecated Deprecated with no replacement. - */ - function setDisableOverride($override) - { - return; - } - - /** - * Used by subclasses to add a renderer to the hierarchy passed as parameter. - * @param string $renderedClass a LoggerRenderer class name - * @param LoggerRenderer $renderer - * - */ - function setRenderer($renderedClass, $renderer) - { - $this->rendererMap->put($renderedClass, $renderer); - } - - /** - * set a new threshold level - * - * @param LoggerLevel $l - */ - function setThreshold($l) - { - if ($l !== null) - $this->threshold = $l; - } - - /** - * Shutting down a hierarchy will safely close and remove - * all appenders in all categories including the root logger. - * - *

Some appenders such as {@link LoggerSocketAppender} - * need to be closed before the - * application exists. Otherwise, pending logging events might be - * lost. - * - *

The shutdown method is careful to close nested - * appenders before closing regular appenders. This is allows - * configurations where a regular appender is attached to a logger - * and again to a nested appender. - */ - function shutdown() - { - $this->root->removeAllAppenders(); - $cats =& $this->getCurrentLoggers(); - $enumCats = sizeof($cats); - if ($enumCats > 0) { - for ($i = 0; $i < $enumCats; $i++) { - $cats[$i]->removeAllAppenders(); - } - } - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); +require_once(LOG4PHP_DIR . '/LoggerLevel.php'); +require_once(LOG4PHP_DIR . '/LoggerRoot.php'); +require_once(LOG4PHP_DIR . '/or/LoggerRendererMap.php'); +require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php'); + +/** + * This class is specialized in retrieving loggers by name and also maintaining + * the logger hierarchy. + * + *

The casual user does not have to deal with this class directly.

+ * + *

The structure of the logger hierarchy is maintained by the + * getLogger method. The hierarchy is such that children link + * to their parent but parents do not have any pointers to their + * children. Moreover, loggers can be instantiated in any order, in + * particular descendant before ancestor.

+ * + *

In case a descendant is created before a particular ancestor, + * then it creates a provision node for the ancestor and adds itself + * to the provision node. Other descendants of the same ancestor add + * themselves to the previously created provision node.

+ * + * @author VxR + * @version $Revision: 1.20 $ + * @package log4php + */ +class LoggerHierarchy { + + /** + * @var object currently unused + */ + var $defaultFactory; + + /** + * @var boolean activate internal logging + * @see LoggerLog + */ + var $debug = false; + + /** + * @var array hierarchy tree. saves here all loggers + */ + var $ht = array(); + + /** + * @var LoggerRoot + */ + var $root = null; + + /** + * @var LoggerRendererMap + */ + var $rendererMap; + + /** + * @var LoggerLevel main level threshold + */ + var $threshold; + + /** + * @var boolean currently unused + */ + var $emittedNoAppenderWarning = false; + + /** + * @var boolean currently unused + */ + var $emittedNoResourceBundleWarning = false; + + +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ + + function &singleton() + { + static $instance; + + if (!isset($instance)) + $instance = new LoggerHierarchy(new LoggerRoot()); + return $instance; + } + + /** + * Create a new logger hierarchy. + * @param object $root the root logger + */ + function LoggerHierarchy($root) + { + $this->root =& $root; + // Enable all level levels by default. + $this->setThreshold(LoggerLevel::getLevelAll()); + $this->root->setHierarchy($this); + $this->rendererMap = new LoggerRendererMap(); + $this->defaultFactory = new LoggerDefaultCategoryFactory(); + } + + /** + * Add a HierarchyEventListener event to the repository. + * Not Yet Impl. + */ + function addHierarchyEventListener($listener) + { + return; + } + + /** + * Add an object renderer for a specific class. + * Not Yet Impl. + */ + function addRenderer($classToRender, $or) + { + $this->rendererMap->put($classToRender, $or); + } + + /** + * This call will clear all logger definitions from the internal hashtable. + */ + function clear() + { + $this->ht = array(); + } + + function emitNoAppenderWarning($cat) + { + return; + } + + /** + * Check if the named logger exists in the hierarchy. + * @param string $name + * @return boolean + */ + function exists($name) + { + return in_array($name, array_keys($this->ht)); + } + + function fireAddAppenderEvent($logger, $appender) + { + return; + } + + /** + * @deprecated Please use {@link getCurrentLoggers()} instead. + */ + function &getCurrentCategories() + { + return $this->getCurrentLoggers(); + } + + /** + * Returns all the currently defined categories in this hierarchy as an array. + * @return array + */ + function &getCurrentLoggers() + { + $loggers = array(); + $loggerNames = array_keys($this->ht); + $enumLoggers = sizeof($loggerNames); + for ($i = 0; $i < $enumLoggers; $i++) { + $loggerName = $loggerNames[$i]; + $loggers[] =& $this->ht[$loggerName]; + } + return $loggers; + } + + /** + * Return a new logger instance named as the first parameter using the default factory. + * + * @param string $name logger name + * @param LoggerFactory $factory a {@link LoggerFactory} instance or null + * @return Logger + */ + function &getLogger($name, $factory = null) + { + if ($factory === null) { + return $this->getLoggerByFactory($name, $this->defaultFactory); + } else { + return $this->getLoggerByFactory($name, $factory); + } + } + + /** + * Return a new logger instance named as the first parameter using the default factory. + * + * @param string $name logger name + * @return Logger + * @todo merge with {@link getLogger()} + */ + function &getLoggerByFactory($name, $factory) + { + if (!isset($this->ht[$name])) { + LoggerLog::debug("LoggerHierarchy::getLoggerByFactory():name=[$name]:factory=[".get_class($factory)."] creating a new logger..."); + $this->ht[$name] = $factory->makeNewLoggerInstance($name); + $this->ht[$name]->setHierarchy($this); + $nodes = explode('.', $name); + $firstNode = array_shift($nodes); + if ( $firstNode != $name and isset($this->ht[$firstNode])) { + LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$firstNode]"); + $this->ht[$name]->parent =& $this->ht[$firstNode]; + } else { + LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [root]"); + $this->ht[$name]->parent =& $this->root; + } + if (sizeof($nodes) > 0) { + // find parent node + foreach ($nodes as $node) { + $parentNode = "$firstNode.$node"; + if (isset($this->ht[$parentNode]) and $parentNode != $name) { + LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$parentNode]"); + $this->ht[$name]->parent =& $this->ht[$parentNode]; + } + $firstNode .= ".$node"; + } + } + // update children + /* + $children = array(); + foreach (array_keys($this->ht) as $nodeName) { + if ($nodeName != $name and substr($nodeName, 0, strlen($name)) == $name) { + $children[] = $nodeName; + } + } + */ + } + return $this->ht[$name]; + } + + /** + * @return LoggerRendererMap Get the renderer map for this hierarchy. + */ + function &getRendererMap() + { + return $this->rendererMap; + } + + /** + * @return LoggerRoot Get the root of this hierarchy. + */ + function &getRootLogger() + { + if (!isset($this->root) or $this->root == null) + $this->root = new LoggerRoot(); + return $this->root; + } + + /** + * @return LoggerLevel Returns the threshold Level. + */ + function getThreshold() + { + return $this->threshold; + } + + /** + * This method will return true if this repository is disabled + * for level object passed as parameter and false otherwise. + * @return boolean + */ + function isDisabled($level) + { + return ($this->threshold->level > $level->level); + } + + /** + * @deprecated Deprecated with no replacement. + */ + function overrideAsNeeded($override) + { + return; + } + + /** + * Reset all values contained in this hierarchy instance to their + * default. + * + * This removes all appenders from all categories, sets + * the level of all non-root categories to null, + * sets their additivity flag to true and sets the level + * of the root logger to {@link LOGGER_LEVEL_DEBUG}. Moreover, + * message disabling is set its default "off" value. + * + *

Existing categories are not removed. They are just reset. + * + *

This method should be used sparingly and with care as it will + * block all logging until it is completed.

+ */ + function resetConfiguration() + { + $root =& $this->getRootLogger(); + + $root->setLevel(LoggerLevel::getLevelDebug()); + $this->setThreshold(LoggerLevel::getLevelAll()); + $this->shutDown(); + $loggers =& $this->getCurrentLoggers(); + $enumLoggers = sizeof($loggers); + for ($i = 0; $i < $enumLoggers; $i++) { + $loggers[$i]->setLevel(null); + $loggers[$i]->setAdditivity(true); + $loggers[$i]->setResourceBundle(null); + } + $this->rendererMap->clear(); + } + + /** + * @deprecated Deprecated with no replacement. + */ + function setDisableOverride($override) + { + return; + } + + /** + * Used by subclasses to add a renderer to the hierarchy passed as parameter. + * @param string $renderedClass a LoggerRenderer class name + * @param LoggerRenderer $renderer + * + */ + function setRenderer($renderedClass, $renderer) + { + $this->rendererMap->put($renderedClass, $renderer); + } + + /** + * set a new threshold level + * + * @param LoggerLevel $l + */ + function setThreshold($l) + { + if ($l !== null) + $this->threshold = $l; + } + + /** + * Shutting down a hierarchy will safely close and remove + * all appenders in all categories including the root logger. + * + *

Some appenders such as {@link LoggerSocketAppender} + * need to be closed before the + * application exists. Otherwise, pending logging events might be + * lost. + * + *

The shutdown method is careful to close nested + * appenders before closing regular appenders. This is allows + * configurations where a regular appender is attached to a logger + * and again to a nested appender. + */ + function shutdown() + { + $this->root->removeAllAppenders(); + $cats =& $this->getCurrentLoggers(); + $enumCats = sizeof($cats); + if ($enumCats > 0) { + for ($i = 0; $i < $enumCats; $i++) { + $cats[$i]->removeAllAppenders(); + } + } + } +} ?> Modified: vtigercrm/trunk/log4php/LoggerLayout.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerLayout.php (original) +++ vtigercrm/trunk/log4php/LoggerLayout.php Wed May 3 22:07:13 2006 @@ -1,98 +1,98 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - * Extend this abstract class to create your own log layout format. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @abstract - */ -class LoggerLayout { - - /** - * Creates LoggerLayout instances with the given class name. - * - * @param string $class - * @return LoggerLayout - */ - function factory($class) - { - if (!empty($class)) { - $class = basename($class); - if (!class_exists($class)) - @include_once(LOG4PHP_DIR . "/layouts/{$class}.php"); - if (class_exists($class)) - return new $class(); - } - return null; - } - - /** - * Override this method - */ - function activateOptions() - { - // override; - } - - /** - * Override this method to create your own layout format. - * - * @param LoggerLoggingEvent - * @return string - */ - function format($event) - { - return $event->getRenderedMessage(); - } - - /** - * Returns the content type output by this layout. - * @return string - */ - function getContentType() - { - return "text/plain"; - } - - /** - * Returns the footer for the layout format. - * @return string - */ - function getFooter() - { - return null; - } - - /** - * Returns the header for the layout format. - * @return string - */ - function getHeader() - { - return null; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + * Extend this abstract class to create your own log layout format. + * + * @author VxR + * @version $Revision: 1.10 $ + * @package log4php + * @abstract + */ +class LoggerLayout { + + /** + * Creates LoggerLayout instances with the given class name. + * + * @param string $class + * @return LoggerLayout + */ + function factory($class) + { + if (!empty($class)) { + $class = basename($class); + if (!class_exists($class)) + @include_once(LOG4PHP_DIR . "/layouts/{$class}.php"); + if (class_exists($class)) + return new $class(); + } + return null; + } + + /** + * Override this method + */ + function activateOptions() + { + // override; + } + + /** + * Override this method to create your own layout format. + * + * @param LoggerLoggingEvent + * @return string + */ + function format($event) + { + return $event->getRenderedMessage(); + } + + /** + * Returns the content type output by this layout. + * @return string + */ + function getContentType() + { + return "text/plain"; + } + + /** + * Returns the footer for the layout format. + * @return string + */ + function getFooter() + { + return null; + } + + /** + * Returns the header for the layout format. + * @return string + */ + function getHeader() + { + return null; + } +} ?> Modified: vtigercrm/trunk/log4php/LoggerLevel.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerLevel.php (original) +++ vtigercrm/trunk/log4php/LoggerLevel.php Wed May 3 22:07:13 2006 @@ -1,264 +1,264 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -define('LOG4PHP_LEVEL_OFF_INT', 2147483647); -define('LOG4PHP_LEVEL_FATAL_INT', 50000); -define('LOG4PHP_LEVEL_ERROR_INT', 40000); -define('LOG4PHP_LEVEL_WARN_INT', 30000); -define('LOG4PHP_LEVEL_INFO_INT', 20000); -define('LOG4PHP_LEVEL_DEBUG_INT', 10000); -define('LOG4PHP_LEVEL_ALL_INT', -2147483648); - -/** - * Defines the minimum set of levels recognized by the system, that is - * OFF, FATAL, ERROR, - * WARN, INFODEBUG and - * ALL. - * - *

The LoggerLevel class may be subclassed to define a larger - * level set.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @since 0.5 - */ -class LoggerLevel { - - /** - * @var integer - */ - var $level; - - /** - * @var string - */ - var $levelStr; - - /** - * @var integer - */ - var $syslogEquivalent; - - /** - * Constructor - * - * @param integer $level - * @param string $levelStr - * @param integer $syslogEquivalent - */ - function LoggerLevel($level, $levelStr, $syslogEquivalent) - { - $this->level = $level; - $this->levelStr = $levelStr; - $this->syslogEquivalent = $syslogEquivalent; - } - - /** - * Two priorities are equal if their level fields are equal. - * - * @param object $o - * @return boolean - */ - function equals($o) - { - if (is_a($o, 'loggerlevel')) { - return ($this->level == $o->level); - } else { - return false; - } - } - - /** - * Returns an Off Level - * @static - * @return LoggerLevel - */ - function &getLevelOff() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_OFF_INT, 'OFF', 0); - return $level; - } - - /** - * Returns a Fatal Level - * @static - * @return LoggerLevel - */ - function &getLevelFatal() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0); - return $level; - } - - /** - * Returns an Error Level - * @static - * @return LoggerLevel - */ - function &getLevelError() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3); - return $level; - } - - /** - * Returns a Warn Level - * @static - * @return LoggerLevel - */ - function &getLevelWarn() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_WARN_INT, 'WARN', 4); - return $level; - } - - /** - * Returns an Info Level - * @static - * @return LoggerLevel - */ - function &getLevelInfo() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_INFO_INT, 'INFO', 6); - return $level; - } - - /** - * Returns a Debug Level - * @static - * @return LoggerLevel - */ - function &getLevelDebug() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7); - return $level; - } - - /** - * Returns an All Level - * @static - * @return LoggerLevel - */ - function &getLevelAll() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ALL_INT, 'ALL', 7); - return $level; - } - - /** - * Return the syslog equivalent of this priority as an integer. - * @final - * @return integer - */ - function getSyslogEquivalent() - { - return $this->syslogEquivalent; - } - - /** - * Returns true if this level has a higher or equal - * level than the level passed as argument, false - * otherwise. - * - *

You should think twice before overriding the default - * implementation of isGreaterOrEqual method. - * - * @param LoggerLevel $r - * @return boolean - */ - function isGreaterOrEqual($r) - { - return $this->level >= $r->level; - } - - /** - * Returns the string representation of this priority. - * @return string - * @final - */ - function toString() - { - return $this->levelStr; - } - - /** - * Returns the integer representation of this level. - * @return integer - */ - function toInt() - { - return $this->level; - } - - /** - * Convert the string passed as argument to a level. If the - * conversion fails, then this method returns a DEBUG Level. - * - * @param mixed $arg - * @param LoggerLevel $default - * @static - */ - function &toLevel($arg, $defaultLevel = null) - { - if ($defaultLevel === null) { - return LoggerLevel::toLevel($arg, LoggerLevel::getLevelDebug()); - } else { - if (is_int($arg)) { - switch($arg) { - case LOG4PHP_LEVEL_ALL_INT: return LoggerLevel::getLevelAll(); - case LOG4PHP_LEVEL_DEBUG_INT: return LoggerLevel::getLevelDebug(); - case LOG4PHP_LEVEL_INFO_INT: return LoggerLevel::getLevelInfo(); - case LOG4PHP_LEVEL_WARN_INT: return LoggerLevel::getLevelWarn(); - case LOG4PHP_LEVEL_ERROR_INT: return LoggerLevel::getLevelError(); - case LOG4PHP_LEVEL_FATAL_INT: return LoggerLevel::getLevelFatal(); - case LOG4PHP_LEVEL_OFF_INT: return LoggerLevel::getLevelOff(); - default: return $defaultLevel; - } - } else { - switch(strtoupper($arg)) { - case 'ALL': return LoggerLevel::getLevelAll(); - case 'DEBUG': return LoggerLevel::getLevelDebug(); - case 'INFO': return LoggerLevel::getLevelInfo(); - case 'WARN': return LoggerLevel::getLevelWarn(); - case 'ERROR': return LoggerLevel::getLevelError(); - case 'FATAL': return LoggerLevel::getLevelFatal(); - case 'OFF': return LoggerLevel::getLevelOff(); - default: return $defaultLevel; - } - } - } - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +define('LOG4PHP_LEVEL_OFF_INT', 2147483647); +define('LOG4PHP_LEVEL_FATAL_INT', 50000); +define('LOG4PHP_LEVEL_ERROR_INT', 40000); +define('LOG4PHP_LEVEL_WARN_INT', 30000); +define('LOG4PHP_LEVEL_INFO_INT', 20000); +define('LOG4PHP_LEVEL_DEBUG_INT', 10000); +define('LOG4PHP_LEVEL_ALL_INT', -2147483648); + +/** + * Defines the minimum set of levels recognized by the system, that is + * OFF, FATAL, ERROR, + * WARN, INFODEBUG and + * ALL. + * + *

The LoggerLevel class may be subclassed to define a larger + * level set.

+ * + * @author VxR + * @version $Revision: 1.11 $ + * @package log4php + * @since 0.5 + */ +class LoggerLevel { + + /** + * @var integer + */ + var $level; + + /** + * @var string + */ + var $levelStr; + + /** + * @var integer + */ + var $syslogEquivalent; + + /** + * Constructor + * + * @param integer $level + * @param string $levelStr + * @param integer $syslogEquivalent + */ + function LoggerLevel($level, $levelStr, $syslogEquivalent) + { + $this->level = $level; + $this->levelStr = $levelStr; + $this->syslogEquivalent = $syslogEquivalent; + } + + /** + * Two priorities are equal if their level fields are equal. + * + * @param object $o + * @return boolean + */ + function equals($o) + { + if (is_a($o, 'loggerlevel')) { + return ($this->level == $o->level); + } else { + return false; + } + } + + /** + * Returns an Off Level + * @static + * @return LoggerLevel + */ + function &getLevelOff() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_OFF_INT, 'OFF', 0); + return $level; + } + + /** + * Returns a Fatal Level + * @static + * @return LoggerLevel + */ + function &getLevelFatal() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0); + return $level; + } + + /** + * Returns an Error Level + * @static + * @return LoggerLevel + */ + function &getLevelError() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3); + return $level; + } + + /** + * Returns a Warn Level + * @static + * @return LoggerLevel + */ + function &getLevelWarn() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_WARN_INT, 'WARN', 4); + return $level; + } + + /** + * Returns an Info Level + * @static + * @return LoggerLevel + */ + function &getLevelInfo() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_INFO_INT, 'INFO', 6); + return $level; + } + + /** + * Returns a Debug Level + * @static + * @return LoggerLevel + */ + function &getLevelDebug() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7); + return $level; + } + + /** + * Returns an All Level + * @static + * @return LoggerLevel + */ + function &getLevelAll() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ALL_INT, 'ALL', 7); + return $level; + } + + /** + * Return the syslog equivalent of this priority as an integer. + * @final + * @return integer + */ + function getSyslogEquivalent() + { + return $this->syslogEquivalent; + } + + /** + * Returns true if this level has a higher or equal + * level than the level passed as argument, false + * otherwise. + * + *

You should think twice before overriding the default + * implementation of isGreaterOrEqual method. + * + * @param LoggerLevel $r + * @return boolean + */ + function isGreaterOrEqual($r) + { + return $this->level >= $r->level; + } + + /** + * Returns the string representation of this priority. + * @return string + * @final + */ + function toString() + { + return $this->levelStr; + } + + /** + * Returns the integer representation of this level. + * @return integer + */ + function toInt() + { + return $this->level; + } + + /** + * Convert the string passed as argument to a level. If the + * conversion fails, then this method returns a DEBUG Level. + * + * @param mixed $arg + * @param LoggerLevel $default + * @static + */ + function &toLevel($arg, $defaultLevel = null) + { + if ($defaultLevel === null) { + return LoggerLevel::toLevel($arg, LoggerLevel::getLevelDebug()); + } else { + if (is_int($arg)) { + switch($arg) { + case LOG4PHP_LEVEL_ALL_INT: return LoggerLevel::getLevelAll(); + case LOG4PHP_LEVEL_DEBUG_INT: return LoggerLevel::getLevelDebug(); + case LOG4PHP_LEVEL_INFO_INT: return LoggerLevel::getLevelInfo(); + case LOG4PHP_LEVEL_WARN_INT: return LoggerLevel::getLevelWarn(); + case LOG4PHP_LEVEL_ERROR_INT: return LoggerLevel::getLevelError(); + case LOG4PHP_LEVEL_FATAL_INT: return LoggerLevel::getLevelFatal(); + case LOG4PHP_LEVEL_OFF_INT: return LoggerLevel::getLevelOff(); + default: return $defaultLevel; + } + } else { + switch(strtoupper($arg)) { + case 'ALL': return LoggerLevel::getLevelAll(); + case 'DEBUG': return LoggerLevel::getLevelDebug(); + case 'INFO': return LoggerLevel::getLevelInfo(); + case 'WARN': return LoggerLevel::getLevelWarn(); + case 'ERROR': return LoggerLevel::getLevelError(); + case 'FATAL': return LoggerLevel::getLevelFatal(); + case 'OFF': return LoggerLevel::getLevelOff(); + default: return $defaultLevel; + } + } + } + } +} ?> Modified: vtigercrm/trunk/log4php/LoggerLog.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerLog.php (original) +++ vtigercrm/trunk/log4php/LoggerLog.php Wed May 3 22:07:13 2006 @@ -1,99 +1,99 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - * Helper class for internal logging - * - *

It uses php {@link PHP_MANUAL#trigger_error trigger_error()} function - * to output messages.

- *

You need to recode methods to output messages in a different way.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - */ -class LoggerLog { - - /** - * Log if debug is enabled. - * - * Log using php {@link PHP_MANUAL#trigger_error trigger_error()} function - * with E_USER_NOTICE level by default. - * - * @param string $message log message - * @param integer $errLevel level to log - * @static - */ - function log($message, $errLevel = E_USER_NOTICE) - { - if (LoggerLog::internalDebugging()) - trigger_error($message, $errLevel); - } - - function internalDebugging($value = null) - { - static $debug = false; - - if (is_bool($value)) - $debug = $value; - return $debug; - } - - /** - * Report a debug message. - * - * @param string $message log message - * @static - * @since 0.3 - */ - function debug($message) - { - LoggerLog::log($message, E_USER_NOTICE); - } - - /** - * Report an error message. - * - * @param string $message log message - * @static - * @since 0.3 - */ - function error($message) - { - trigger_error($message, E_USER_ERROR); - } - - /** - * Report a warning message. - * - * @param string $message log message - * @static - * @since 0.3 - */ - function warn($message) - { - trigger_error($message, E_USER_WARNING); - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + * Helper class for internal logging + * + *

It uses php {@link PHP_MANUAL#trigger_error trigger_error()} function + * to output messages.

+ *

You need to recode methods to output messages in a different way.

+ * + * @author VxR + * @version $Revision: 1.9 $ + * @package log4php + */ +class LoggerLog { + + /** + * Log if debug is enabled. + * + * Log using php {@link PHP_MANUAL#trigger_error trigger_error()} function + * with E_USER_NOTICE level by default. + * + * @param string $message log message + * @param integer $errLevel level to log + * @static + */ + function log($message, $errLevel = E_USER_NOTICE) + { + if (LoggerLog::internalDebugging()) + trigger_error($message, $errLevel); + } + + function internalDebugging($value = null) + { + static $debug = false; + + if (is_bool($value)) + $debug = $value; + return $debug; + } + + /** + * Report a debug message. + * + * @param string $message log message + * @static + * @since 0.3 + */ + function debug($message) + { + LoggerLog::log($message, E_USER_NOTICE); + } + + /** + * Report an error message. + * + * @param string $message log message + * @static + * @since 0.3 + */ + function error($message) + { + trigger_error($message, E_USER_ERROR); + } + + /** + * Report a warning message. + * + * @param string $message log message + * @static + * @since 0.3 + */ + function warn($message) + { + trigger_error($message, E_USER_WARNING); + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerMDC.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerMDC.php (original) +++ vtigercrm/trunk/log4php/LoggerMDC.php Wed May 3 22:07:13 2006 @@ -1,129 +1,129 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - - -define('LOGGER_MDC_HT_SIZE', 7); - -/** - * This is the global repository of user mappings - */ -$GLOBALS['log4php.LoggerMDC.ht'] = array(); - -/** - * The LoggerMDC class is similar to the {@link LoggerNDC} class except that it is - * based on a map instead of a stack. It provides mapped diagnostic contexts. - * - * A Mapped Diagnostic Context, or - * MDC in short, is an instrument for distinguishing interleaved log - * output from different sources. Log output is typically interleaved - * when a server handles multiple clients near-simultaneously. - * - *

The MDC is managed on a per thread basis. - * - * @author VxR - * @version $Revision: 1.1 $ - * @since 0.3 - * @package log4php - */ -class LoggerMDC { - - /** - * Put a context value as identified with the key parameter into the current thread's - * context map. - * - *

If the current thread does not have a context map it is - * created as a side effect.

- * - *

Note that you cannot put more than {@link LOGGER_MDC_HT_SIZE} keys.

- * - * @param string $key the key - * @param string $value the value - * @static - */ - function put($key, $value) - { - if ( sizeof($GLOBALS['log4php.LoggerMDC.ht']) < LOGGER_MDC_HT_SIZE ) - $GLOBALS['log4php.LoggerMDC.ht'][$key] = $value; - } - - /** - * Get the context identified by the key parameter. - * - *

You can use special key identifiers to map values in - * PHP $_SERVER and $_ENV vars. Just put a 'server.' or 'env.' - * followed by the var name you want to refer.

- * - *

This method has no side effects.

- * - * @param string $key - * @return string - * @static - */ - function get($key) - { - LoggerLog::debug("LoggerMDC::get() key='$key'"); - - if (!empty($key)) { - if (strpos($key, 'server.') === 0) { - $varName = substr($key, 7); - - LoggerLog::debug("LoggerMDC::get() a _SERVER[$varName] is requested."); - - return $_SERVER[$varName]; - } elseif (strpos($key, 'env.') === 0) { - - $varName = substr($key, 4); - - LoggerLog::debug("LoggerMDC::get() a _ENV[$varName] is requested."); - - return $_ENV[$varName]; - } elseif (isset($GLOBALS['log4php.LoggerMDC.ht'][$key])) { - - LoggerLog::debug("LoggerMDC::get() a user key is requested."); - - return $GLOBALS['log4php.LoggerMDC.ht'][$key]; - } - } - return ''; - } - - /** - * Remove the the context identified by the key parameter. - * - * It only affects user mappings. - * - * @param string $key - * @return string - * @static - */ - function remove($key) - { - unset($GLOBALS['log4php.LoggerMDC.ht'][$key]); - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + + +define('LOGGER_MDC_HT_SIZE', 7); + +/** + * This is the global repository of user mappings + */ +$GLOBALS['log4php.LoggerMDC.ht'] = array(); + +/** + * The LoggerMDC class is similar to the {@link LoggerNDC} class except that it is + * based on a map instead of a stack. It provides mapped diagnostic contexts. + * + * A Mapped Diagnostic Context, or + * MDC in short, is an instrument for distinguishing interleaved log + * output from different sources. Log output is typically interleaved + * when a server handles multiple clients near-simultaneously. + * + *

The MDC is managed on a per thread basis. + * + * @author VxR + * @version $Revision: 1.4 $ + * @since 0.3 + * @package log4php + */ +class LoggerMDC { + + /** + * Put a context value as identified with the key parameter into the current thread's + * context map. + * + *

If the current thread does not have a context map it is + * created as a side effect.

+ * + *

Note that you cannot put more than {@link LOGGER_MDC_HT_SIZE} keys.

+ * + * @param string $key the key + * @param string $value the value + * @static + */ + function put($key, $value) + { + if ( sizeof($GLOBALS['log4php.LoggerMDC.ht']) < LOGGER_MDC_HT_SIZE ) + $GLOBALS['log4php.LoggerMDC.ht'][$key] = $value; + } + + /** + * Get the context identified by the key parameter. + * + *

You can use special key identifiers to map values in + * PHP $_SERVER and $_ENV vars. Just put a 'server.' or 'env.' + * followed by the var name you want to refer.

+ * + *

This method has no side effects.

+ * + * @param string $key + * @return string + * @static + */ + function get($key) + { + LoggerLog::debug("LoggerMDC::get() key='$key'"); + + if (!empty($key)) { + if (strpos($key, 'server.') === 0) { + $varName = substr($key, 7); + + LoggerLog::debug("LoggerMDC::get() a _SERVER[$varName] is requested."); + + return $_SERVER[$varName]; + } elseif (strpos($key, 'env.') === 0) { + + $varName = substr($key, 4); + + LoggerLog::debug("LoggerMDC::get() a _ENV[$varName] is requested."); + + return $_ENV[$varName]; + } elseif (isset($GLOBALS['log4php.LoggerMDC.ht'][$key])) { + + LoggerLog::debug("LoggerMDC::get() a user key is requested."); + + return $GLOBALS['log4php.LoggerMDC.ht'][$key]; + } + } + return ''; + } + + /** + * Remove the the context identified by the key parameter. + * + * It only affects user mappings. + * + * @param string $key + * @return string + * @static + */ + function remove($key) + { + unset($GLOBALS['log4php.LoggerMDC.ht'][$key]); + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerManager.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerManager.php (original) +++ vtigercrm/trunk/log4php/LoggerManager.php Wed May 3 22:07:13 2006 @@ -1,262 +1,262 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * LOG4PHP_DIR points to the log4php root directory. - * - * If not defined it will be set automatically when the first package classfile - * is included - * - * @var string - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/LoggerHierarchy.php'); - -/** - * Use the LoggerManager to get Logger instances. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @see Logger - * @todo create a configurator selector - */ -class LoggerManager { - - /** - * check if a given logger exists. - * - * @param string $name logger name - * @static - * @return boolean - */ - function exists($name) - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->exists($name); - } - - /** - * Returns an array this whole Logger instances. - * - * @static - * @see Logger - * @return array - */ - function getCurrentLoggers() - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->getCurrentLoggers(); - } - - /** - * Returns the root logger. - * - * @static - * @return object - * @see LoggerRoot - */ - function &getRootLogger() - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->getRootLogger(); - } - - /** - * Returns the specified Logger. - * - * @param string $name logger name - * @param LoggerFactory $factory a {@link LoggerFactory} instance or null - * @static - * @return Logger - */ - function &getLogger($name, $factory = null) - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->getLogger($name, $factory); - } - - /** - * Returns the LoggerHierarchy. - * - * @static - * @return LoggerHierarchy - */ - function &getLoggerRepository() - { - return LoggerHierarchy::singleton(); - } - - - /** - * Destroy loggers object tree. - * - * @static - * @return boolean - */ - function resetConfiguration() - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->resetConfiguration(); - } - - /** - * Does nothing. - * @static - */ - function setRepositorySelector($selector, $guard) - { - return; - } - - /** - * Safely close all appenders. - * @static - */ - function shutdown() - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->shutdown(); - } -} - -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- - -if (!defined('LOG4PHP_DEFAULT_INIT_OVERRIDE')) { - if (isset($_ENV['log4php.defaultInitOverride'])) { - /** - * @ignore - */ - define('LOG4PHP_DEFAULT_INIT_OVERRIDE', - LoggerOptionConverter::toBoolean($_ENV['log4php.defaultInitOverride'], false) - ); - } elseif (isset($GLOBALS['log4php.defaultInitOverride'])) { - /** - * @ignore - */ - define('LOG4PHP_DEFAULT_INIT_OVERRIDE', - LoggerOptionConverter::toBoolean($GLOBALS['log4php.defaultInitOverride'], false) - ); - } else { - /** - * Controls init execution - * - * With this constant users can skip the default init procedure that is - * called when this file is included. - * - *

If it is not user defined, log4php tries to autoconfigure using (in order):

- * - * - the $_ENV['log4php.defaultInitOverride'] variable. - * - the $GLOBALS['log4php.defaultInitOverride'] global variable. - * - defaults to false - * - * @var boolean - */ - define('LOG4PHP_DEFAULT_INIT_OVERRIDE', false); - } -} - -if (!defined('LOG4PHP_CONFIGURATION')) { - if (isset($_ENV['log4php.configuration'])) { - /** - * @ignore - */ - define('LOG4PHP_CONFIGURATION', trim($_ENV['log4php.configuration'])); - } else { - /** - * Configuration file. - * - *

This constant tells configurator classes where the configuration - * file is located.

- *

If not set by user, log4php tries to set it automatically using - * (in order):

- * - * - the $_ENV['log4php.configuration'] enviroment variable. - * - defaults to 'log4php.properties'. - * - * @var string - */ - define('LOG4PHP_CONFIGURATION', 'log4php.properties'); - } -} - -if (!defined('LOG4PHP_CONFIGURATOR_CLASS')) { - if ( strtolower(substr( LOG4PHP_CONFIGURATION, -4 )) == '.xml') { - /** - * @ignore - */ - define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR . '/xml/LoggerDOMConfigurator'); - } else { - /** - * Holds the configurator class name. - * - *

This constant is set with the fullname (path included but non the - * .php extension) of the configurator class that init procedure will use.

- *

If not set by user, log4php tries to set it automatically.

- *

If {@link LOG4PHP_CONFIGURATION} has '.xml' extension set the - * constants to '{@link LOG4PHP_DIR}/xml/{@link LoggerDOMConfigurator}'.

- *

Otherwise set the constants to - * '{@link LOG4PHP_DIR}/{@link LoggerPropertyConfigurator}'.

- * - *

Security Note: classfile pointed by this constant will be brutally - * included with a: - * @include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php");

- * - * @var string - */ - define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR . '/LoggerPropertyConfigurator'); - } -} - -if (!LOG4PHP_DEFAULT_INIT_OVERRIDE) { - if (!LoggerManagerDefaultInit()) - LoggerLog::warn("LOG4PHP main() Default Init failed."); -} - -/** - * Default init procedure. - * - *

This procedure tries to configure the {@link LoggerHierarchy} using the - * configurator class defined via {@link LOG4PHP_CONFIGURATOR_CLASS} that tries - * to load the configurator file defined in {@link LOG4PHP_CONFIGURATION}. - * If something goes wrong a warn is raised.

- *

Users can skip this procedure using {@link LOG4PHP_DEFAULT_INIT_OVERRIDE} - * constant.

- * - * @return boolean - */ -function LoggerManagerDefaultInit() -{ - $configuratorClass = basename(LOG4PHP_CONFIGURATOR_CLASS); - if (!class_exists($configuratorClass)) { - @include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php"); - } - if (class_exists($configuratorClass)) { - - return call_user_func(array($configuratorClass, 'configure'), LOG4PHP_CONFIGURATION); - - } else { - LoggerLog::warn("LoggerManagerDefaultInit() Configurator '{$configuratorClass}' doesnt exists"); - return false; - } -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * LOG4PHP_DIR points to the log4php root directory. + * + * If not defined it will be set automatically when the first package classfile + * is included + * + * @var string + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/LoggerHierarchy.php'); + +/** + * Use the LoggerManager to get Logger instances. + * + * @author VxR + * @version $Revision: 1.18 $ + * @package log4php + * @see Logger + * @todo create a configurator selector + */ +class LoggerManager { + + /** + * check if a given logger exists. + * + * @param string $name logger name + * @static + * @return boolean + */ + function exists($name) + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->exists($name); + } + + /** + * Returns an array this whole Logger instances. + * + * @static + * @see Logger + * @return array + */ + function getCurrentLoggers() + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->getCurrentLoggers(); + } + + /** + * Returns the root logger. + * + * @static + * @return object + * @see LoggerRoot + */ + function &getRootLogger() + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->getRootLogger(); + } + + /** + * Returns the specified Logger. + * + * @param string $name logger name + * @param LoggerFactory $factory a {@link LoggerFactory} instance or null + * @static + * @return Logger + */ + function &getLogger($name, $factory = null) + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->getLogger($name, $factory); + } + + /** + * Returns the LoggerHierarchy. + * + * @static + * @return LoggerHierarchy + */ + function &getLoggerRepository() + { + return LoggerHierarchy::singleton(); + } + + + /** + * Destroy loggers object tree. + * + * @static + * @return boolean + */ + function resetConfiguration() + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->resetConfiguration(); + } + + /** + * Does nothing. + * @static + */ + function setRepositorySelector($selector, $guard) + { + return; + } + + /** + * Safely close all appenders. + * @static + */ + function shutdown() + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->shutdown(); + } +} + +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- + +if (!defined('LOG4PHP_DEFAULT_INIT_OVERRIDE')) { + if (isset($_ENV['log4php.defaultInitOverride'])) { + /** + * @ignore + */ + define('LOG4PHP_DEFAULT_INIT_OVERRIDE', + LoggerOptionConverter::toBoolean($_ENV['log4php.defaultInitOverride'], false) + ); + } elseif (isset($GLOBALS['log4php.defaultInitOverride'])) { + /** + * @ignore + */ + define('LOG4PHP_DEFAULT_INIT_OVERRIDE', + LoggerOptionConverter::toBoolean($GLOBALS['log4php.defaultInitOverride'], false) + ); + } else { + /** + * Controls init execution + * + * With this constant users can skip the default init procedure that is + * called when this file is included. + * + *

If it is not user defined, log4php tries to autoconfigure using (in order):

+ * + * - the $_ENV['log4php.defaultInitOverride'] variable. + * - the $GLOBALS['log4php.defaultInitOverride'] global variable. + * - defaults to false + * + * @var boolean + */ + define('LOG4PHP_DEFAULT_INIT_OVERRIDE', false); + } +} + +if (!defined('LOG4PHP_CONFIGURATION')) { + if (isset($_ENV['log4php.configuration'])) { + /** + * @ignore + */ + define('LOG4PHP_CONFIGURATION', trim($_ENV['log4php.configuration'])); + } else { + /** + * Configuration file. + * + *

This constant tells configurator classes where the configuration + * file is located.

+ *

If not set by user, log4php tries to set it automatically using + * (in order):

+ * + * - the $_ENV['log4php.configuration'] enviroment variable. + * - defaults to 'log4php.properties'. + * + * @var string + */ + define('LOG4PHP_CONFIGURATION', 'log4php.properties'); + } +} + +if (!defined('LOG4PHP_CONFIGURATOR_CLASS')) { + if ( strtolower(substr( LOG4PHP_CONFIGURATION, -4 )) == '.xml') { + /** + * @ignore + */ + define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR . '/xml/LoggerDOMConfigurator'); + } else { + /** + * Holds the configurator class name. + * + *

This constant is set with the fullname (path included but non the + * .php extension) of the configurator class that init procedure will use.

+ *

If not set by user, log4php tries to set it automatically.

+ *

If {@link LOG4PHP_CONFIGURATION} has '.xml' extension set the + * constants to '{@link LOG4PHP_DIR}/xml/{@link LoggerDOMConfigurator}'.

+ *

Otherwise set the constants to + * '{@link LOG4PHP_DIR}/{@link LoggerPropertyConfigurator}'.

+ * + *

Security Note: classfile pointed by this constant will be brutally + * included with a: + * @include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php");

+ * + * @var string + */ + define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR . '/LoggerPropertyConfigurator'); + } +} + +if (!LOG4PHP_DEFAULT_INIT_OVERRIDE) { + if (!LoggerManagerDefaultInit()) + LoggerLog::warn("LOG4PHP main() Default Init failed."); +} + +/** + * Default init procedure. + * + *

This procedure tries to configure the {@link LoggerHierarchy} using the + * configurator class defined via {@link LOG4PHP_CONFIGURATOR_CLASS} that tries + * to load the configurator file defined in {@link LOG4PHP_CONFIGURATION}. + * If something goes wrong a warn is raised.

+ *

Users can skip this procedure using {@link LOG4PHP_DEFAULT_INIT_OVERRIDE} + * constant.

+ * + * @return boolean + */ +function LoggerManagerDefaultInit() +{ + $configuratorClass = basename(LOG4PHP_CONFIGURATOR_CLASS); + if (!class_exists($configuratorClass)) { + @include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php"); + } + if (class_exists($configuratorClass)) { + + return call_user_func(array($configuratorClass, 'configure'), LOG4PHP_CONFIGURATION); + + } else { + LoggerLog::warn("LoggerManagerDefaultInit() Configurator '{$configuratorClass}' doesnt exists"); + return false; + } +} + ?> Modified: vtigercrm/trunk/log4php/LoggerNDC.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerNDC.php (original) +++ vtigercrm/trunk/log4php/LoggerNDC.php Wed May 3 22:07:13 2006 @@ -1,240 +1,240 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -define('LOGGER_NDC_HT_SIZE', 7); - -/** - * This is the global repository of NDC stack - */ -$GLOBALS['log4php.LoggerNDC.ht'] = array(); - -/** - * This is the max depth of NDC stack - */ -$GLOBALS['log4php.LoggerNDC.maxDepth'] = LOGGER_NDC_HT_SIZE; - - -/** - * The NDC class implements nested diagnostic contexts as - * defined by Neil Harrison in the article "Patterns for Logging - * Diagnostic Messages" part of the book "Pattern Languages of - * Program Design 3" edited by Martin et al. - * - *

A Nested Diagnostic Context, or NDC in short, is an instrument - * to distinguish interleaved log output from different sources. Log - * output is typically interleaved when a server handles multiple - * clients near-simultaneously. - * - *

Interleaved log output can still be meaningful if each log entry - * from different contexts had a distinctive stamp. This is where NDCs - * come into play. - * - *

Note that NDCs are managed on a per thread - * basis. NDC operations such as {@link push()}, {@link pop()}, - * {@link clear()}, {@link getDepth()} and {@link setMaxDepth()} - * affect the NDC of the current thread only. NDCs of other - * threads remain unaffected. - * - *

For example, a servlet can build a per client request NDC - * consisting the clients host name and other information contained in - * the the request. Cookies are another source of distinctive - * information. To build an NDC one uses the {@link push()} - * operation.

- * - * Simply put, - * - * - Contexts can be nested. - * - When entering a context, call - * LoggerNDC::push() - * As a side effect, if there is no nested diagnostic context for the - * current thread, this method will create it. - * - When leaving a context, call - * LoggerNDC::pop() - * - When exiting a thread make sure to call {@link remove()} - * - *

There is no penalty for forgetting to match each - * push operation with a corresponding pop, - * except the obvious mismatch between the real application context - * and the context set in the NDC.

- * - *

If configured to do so, {@link LoggerPatternLayout} and {@link LoggerLayoutTTCC} - * instances automatically retrieve the nested diagnostic - * context for the current thread without any user intervention. - * Hence, even if a servlet is serving multiple clients - * simultaneously, the logs emanating from the same code (belonging to - * the same category) can still be distinguished because each client - * request will have a different NDC tag.

- * - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @since 0.3 - */ -class LoggerNDC { - - /** - * Clear any nested diagnostic information if any. This method is - * useful in cases where the same thread can be potentially used - * over and over in different unrelated contexts. - * - *

This method is equivalent to calling the {@link setMaxDepth()} - * method with a zero maxDepth argument. - * - * @static - */ - function clear() - { - LoggerLog::debug("LoggerNDC::clear()"); - - $GLOBALS['log4php.LoggerNDC.ht'] = array(); - } - - /** - * Never use this method directly, use the {@link LoggerLoggingEvent::getNDC()} method instead. - * @static - * @return array - */ - function get() - { - LoggerLog::debug("LoggerNDC::get()"); - - return $GLOBALS['log4php.LoggerNDC.ht']; - } - - /** - * Get the current nesting depth of this diagnostic context. - * - * @see setMaxDepth() - * @return integer - * @static - */ - function getDepth() - { - LoggerLog::debug("LoggerNDC::getDepth()"); - - return sizeof($GLOBALS['log4php.LoggerNDC.ht']); - } - - /** - * Clients should call this method before leaving a diagnostic - * context. - * - *

The returned value is the value that was pushed last. If no - * context is available, then the empty string "" is returned.

- * - * @return string The innermost diagnostic context. - * @static - */ - function pop() - { - LoggerLog::debug("LoggerNDC::pop()"); - - if (sizeof($GLOBALS['log4php.LoggerNDC.ht']) > 0) { - return array_pop($GLOBALS['log4php.LoggerNDC.ht']); - } else { - return ''; - } - } - - /** - * Looks at the last diagnostic context at the top of this NDC - * without removing it. - * - *

The returned value is the value that was pushed last. If no - * context is available, then the empty string "" is returned.

- * @return string The innermost diagnostic context. - * @static - */ - function peek() - { - LoggerLog::debug("LoggerNDC::peek()"); - - if (sizeof($GLOBALS['log4php.LoggerNDC.ht']) > 0) { - return end($GLOBALS['log4php.LoggerNDC.ht']); - } else { - return ''; - } - } - - /** - * Push new diagnostic context information for the current thread. - * - *

The contents of the message parameter is - * determined solely by the client. - * - * @param string $message The new diagnostic context information. - * @static - */ - function push($message) - { - LoggerLog::debug("LoggerNDC::push()"); - - array_push($GLOBALS['log4php.LoggerNDC.ht'], (string)$message); - } - - /** - * Remove the diagnostic context for this thread. - * @static - */ - function remove() - { - LoggerLog::debug("LoggerNDC::remove()"); - - LoggerNDC::clear(); - } - - /** - * Set maximum depth of this diagnostic context. If the current - * depth is smaller or equal to maxDepth, then no - * action is taken. - * - *

This method is a convenient alternative to multiple - * {@link pop()} calls. Moreover, it is often the case that at - * the end of complex call sequences, the depth of the NDC is - * unpredictable. The {@link setMaxDepth()} method circumvents - * this problem. - * - * @param integer $maxDepth - * @see getDepth() - * @static - */ - function setMaxDepth($maxDepth) - { - LoggerLog::debug("LoggerNDC::setMaxDepth() maxDepth='$maxDepth'"); - - $maxDepth = (int)$maxDepth; - if ($maxDepth <= LOGGER_NDC_HT_SIZE) { - if (LoggerNDC::getDepth() > $maxDepth) { - $GLOBALS['log4php.LoggerNDC.ht'] = array_slice($GLOBALS['log4php.LoggerNDC.ht'], $maxDepth); - } - $GLOBALS['log4php.LoggerNDC.maxDepth'] = $maxDepth; - } - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +define('LOGGER_NDC_HT_SIZE', 7); + +/** + * This is the global repository of NDC stack + */ +$GLOBALS['log4php.LoggerNDC.ht'] = array(); + +/** + * This is the max depth of NDC stack + */ +$GLOBALS['log4php.LoggerNDC.maxDepth'] = LOGGER_NDC_HT_SIZE; + + +/** + * The NDC class implements nested diagnostic contexts as + * defined by Neil Harrison in the article "Patterns for Logging + * Diagnostic Messages" part of the book "Pattern Languages of + * Program Design 3" edited by Martin et al. + * + *

A Nested Diagnostic Context, or NDC in short, is an instrument + * to distinguish interleaved log output from different sources. Log + * output is typically interleaved when a server handles multiple + * clients near-simultaneously. + * + *

Interleaved log output can still be meaningful if each log entry + * from different contexts had a distinctive stamp. This is where NDCs + * come into play. + * + *

Note that NDCs are managed on a per thread + * basis. NDC operations such as {@link push()}, {@link pop()}, + * {@link clear()}, {@link getDepth()} and {@link setMaxDepth()} + * affect the NDC of the current thread only. NDCs of other + * threads remain unaffected. + * + *

For example, a servlet can build a per client request NDC + * consisting the clients host name and other information contained in + * the the request. Cookies are another source of distinctive + * information. To build an NDC one uses the {@link push()} + * operation.

+ * + * Simply put, + * + * - Contexts can be nested. + * - When entering a context, call + * LoggerNDC::push() + * As a side effect, if there is no nested diagnostic context for the + * current thread, this method will create it. + * - When leaving a context, call + * LoggerNDC::pop() + * - When exiting a thread make sure to call {@link remove()} + * + *

There is no penalty for forgetting to match each + * push operation with a corresponding pop, + * except the obvious mismatch between the real application context + * and the context set in the NDC.

+ * + *

If configured to do so, {@link LoggerPatternLayout} and {@link LoggerLayoutTTCC} + * instances automatically retrieve the nested diagnostic + * context for the current thread without any user intervention. + * Hence, even if a servlet is serving multiple clients + * simultaneously, the logs emanating from the same code (belonging to + * the same category) can still be distinguished because each client + * request will have a different NDC tag.

+ * + * + * @author VxR + * @version $Revision: 1.5 $ + * @package log4php + * @since 0.3 + */ +class LoggerNDC { + + /** + * Clear any nested diagnostic information if any. This method is + * useful in cases where the same thread can be potentially used + * over and over in different unrelated contexts. + * + *

This method is equivalent to calling the {@link setMaxDepth()} + * method with a zero maxDepth argument. + * + * @static + */ + function clear() + { + LoggerLog::debug("LoggerNDC::clear()"); + + $GLOBALS['log4php.LoggerNDC.ht'] = array(); + } + + /** + * Never use this method directly, use the {@link LoggerLoggingEvent::getNDC()} method instead. + * @static + * @return array + */ + function get() + { + LoggerLog::debug("LoggerNDC::get()"); + + return $GLOBALS['log4php.LoggerNDC.ht']; + } + + /** + * Get the current nesting depth of this diagnostic context. + * + * @see setMaxDepth() + * @return integer + * @static + */ + function getDepth() + { + LoggerLog::debug("LoggerNDC::getDepth()"); + + return sizeof($GLOBALS['log4php.LoggerNDC.ht']); + } + + /** + * Clients should call this method before leaving a diagnostic + * context. + * + *

The returned value is the value that was pushed last. If no + * context is available, then the empty string "" is returned.

+ * + * @return string The innermost diagnostic context. + * @static + */ + function pop() + { + LoggerLog::debug("LoggerNDC::pop()"); + + if (sizeof($GLOBALS['log4php.LoggerNDC.ht']) > 0) { + return array_pop($GLOBALS['log4php.LoggerNDC.ht']); + } else { + return ''; + } + } + + /** + * Looks at the last diagnostic context at the top of this NDC + * without removing it. + * + *

The returned value is the value that was pushed last. If no + * context is available, then the empty string "" is returned.

+ * @return string The innermost diagnostic context. + * @static + */ + function peek() + { + LoggerLog::debug("LoggerNDC::peek()"); + + if (sizeof($GLOBALS['log4php.LoggerNDC.ht']) > 0) { + return end($GLOBALS['log4php.LoggerNDC.ht']); + } else { + return ''; + } + } + + /** + * Push new diagnostic context information for the current thread. + * + *

The contents of the message parameter is + * determined solely by the client. + * + * @param string $message The new diagnostic context information. + * @static + */ + function push($message) + { + LoggerLog::debug("LoggerNDC::push()"); + + array_push($GLOBALS['log4php.LoggerNDC.ht'], (string)$message); + } + + /** + * Remove the diagnostic context for this thread. + * @static + */ + function remove() + { + LoggerLog::debug("LoggerNDC::remove()"); + + LoggerNDC::clear(); + } + + /** + * Set maximum depth of this diagnostic context. If the current + * depth is smaller or equal to maxDepth, then no + * action is taken. + * + *

This method is a convenient alternative to multiple + * {@link pop()} calls. Moreover, it is often the case that at + * the end of complex call sequences, the depth of the NDC is + * unpredictable. The {@link setMaxDepth()} method circumvents + * this problem. + * + * @param integer $maxDepth + * @see getDepth() + * @static + */ + function setMaxDepth($maxDepth) + { + LoggerLog::debug("LoggerNDC::setMaxDepth() maxDepth='$maxDepth'"); + + $maxDepth = (int)$maxDepth; + if ($maxDepth <= LOGGER_NDC_HT_SIZE) { + if (LoggerNDC::getDepth() > $maxDepth) { + $GLOBALS['log4php.LoggerNDC.ht'] = array_slice($GLOBALS['log4php.LoggerNDC.ht'], $maxDepth); + } + $GLOBALS['log4php.LoggerNDC.maxDepth'] = $maxDepth; + } + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerPropertyConfigurator.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerPropertyConfigurator.php (original) +++ vtigercrm/trunk/log4php/LoggerPropertyConfigurator.php Wed May 3 22:07:13 2006 @@ -1,654 +1,650 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/config/LoggerPropertySetter.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); -require_once(LOG4PHP_DIR . '/or/LoggerRendererMap.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); -require_once(LOG4PHP_DIR . '/LoggerAppender.php'); -require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php'); -require_once(LOG4PHP_DIR . '/LoggerLayout.php'); -require_once(LOG4PHP_DIR . '/LoggerLevel.php'); -require_once(LOG4PHP_DIR . '/LoggerManager.php'); - -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX', "log4php.category."); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX', "log4php.logger."); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX', "log4php.factory"); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX', "log4php.additivity."); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX', "log4php.rootCategory"); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX', "log4php.rootLogger"); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_APPENDER_PREFIX', "log4php.appender."); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX', "log4php.renderer."); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX', "log4php.threshold"); - -/** - * Key for specifying the {@link LoggerFactory}. - */ -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY', "log4php.loggerFactory"); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY', "log4php.debug"); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME', "root"); - - - -/** - * Allows the configuration of log4php from an external file. - * - * See {@link doConfigure()} for the expected format. - * - *

It is sometimes useful to see how log4php is reading configuration - * files. You can enable log4php internal logging by defining the - * log4php.debug variable.

- * - *

The LoggerPropertyConfigurator does not handle the - * advanced configuration features supported by the {@link LoggerDOMConfigurator} - * such as support for {@link LoggerFilter}, - custom {@link LoggerErrorHandlers}, nested appenders such as the - {@link Logger AsyncAppender}, - * etc. - * - *

All option values admit variable substitution. The - * syntax of variable substitution is similar to that of Unix - * shells. The string between an opening "${" and - * closing "}" is interpreted as a key. The value of - * the substituted variable can be defined as a system property or in - * the configuration file itself. The value of the key is first - * searched in the defined constants, in the enviroments variables - * and if not found there, it is - * then searched in the configuration file being parsed. The - * corresponding value replaces the ${variableName} sequence.

- *

For example, if $_ENV['home'] env var is set to - * /home/xyz, then every occurrence of the sequence - * ${home} will be interpreted as - * /home/xyz. See {@link LoggerOptionConverter::getSystemProperty()} - * for details.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @since 0.5 - */ -class LoggerPropertyConfigurator extends LoggerConfigurator { - - /** - * @var LoggerFactory - */ - var $loggerFactory = null; - - /** - * Constructor - */ - function LoggerPropertyConfigurator() - { - $this->loggerFactory = new LoggerDefaultCategoryFactory(); - } - - /** - * Configure the default repository using the resource pointed by url. - * Url is any valid resurce as defined in {@link PHP_MANUAL#file} function. - * Note that the resource will be search with use_include_path parameter - * set to "1". - * - * @param string $url - * @return boolean configuration result - * @static - */ - function configure($url = '') - { - $configurator = new LoggerPropertyConfigurator(); - $repository =& LoggerManager::getLoggerRepository(); - return $configurator->doConfigure($url, $repository); - } - - /** - * Read configuration from a file. - * - *

The function {@link PHP_MANUAL#parse_ini_file} is used to read the - * file.

- * - * The existing configuration is not cleared nor reset. - * If you require a different behavior, then call - * {@link LoggerManager::resetConfiguration()} - * method before calling {@link doConfigure()}. - * - *

The configuration file consists of statements in the format - * key=value. The syntax of different configuration - * elements are discussed below. - * - *

Repository-wide threshold

- * - *

The repository-wide threshold filters logging requests by level - * regardless of logger. The syntax is: - * - *

-     * log4php.threshold=[level]
-     * 
- * - *

The level value can consist of the string values OFF, FATAL, - * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A - * custom level value can be specified in the form - * level#classname. By default the repository-wide threshold is set - * to the lowest possible value, namely the level ALL. - *

- * - * - *

Appender configuration

- * - *

Appender configuration syntax is:

- *
-     * ; For appender named appenderName, set its class.
-     * ; Note: The appender name can contain dots.
-     * log4php.appender.appenderName=name_of_appender_class
-     * 
-     * ; Set appender specific options.
-     * 
-     * log4php.appender.appenderName.option1=value1
-     * log4php.appender.appenderName.optionN=valueN
-     * 
- * - * For each named appender you can configure its {@link LoggerLayout}. The - * syntax for configuring an appender's layout is: - *
-     * log4php.appender.appenderName.layout=name_of_layout_class
-     * log4php.appender.appenderName.layout.option1=value1
-     *  ....
-     * log4php.appender.appenderName.layout.optionN=valueN
-     * 
- * - *

Configuring loggers

- * - *

The syntax for configuring the root logger is: - *

-     * log4php.rootLogger=[level], appenderName, appenderName, ...
-     * 
- * - *

This syntax means that an optional level can be - * supplied followed by appender names separated by commas. - * - *

The level value can consist of the string values OFF, FATAL, - * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A - * custom level value can be specified in the form

- * - *
level#classname
- * - *

If a level value is specified, then the root level is set - * to the corresponding level. If no level value is specified, - * then the root level remains untouched. - * - *

The root logger can be assigned multiple appenders. - * - *

Each appenderName (separated by commas) will be added to - * the root logger. The named appender is defined using the - * appender syntax defined above. - * - *

For non-root categories the syntax is almost the same: - *

-     * log4php.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ...
-     * 
- * - *

The meaning of the optional level value is discussed above - * in relation to the root logger. In addition however, the value - * INHERITED can be specified meaning that the named logger should - * inherit its level from the logger hierarchy.

- * - *

If no level value is supplied, then the level of the - * named logger remains untouched.

- * - *

By default categories inherit their level from the - * hierarchy. However, if you set the level of a logger and later - * decide that that logger should inherit its level, then you should - * specify INHERITED as the value for the level value. NULL is a - * synonym for INHERITED.

- * - *

Similar to the root logger syntax, each appenderName - * (separated by commas) will be attached to the named logger.

- * - *

See the appender additivity rule in the user manual for - * the meaning of the additivity flag. - * - *

ObjectRenderers

- * - *

You can customize the way message objects of a given type are - * converted to String before being logged. This is done by - * specifying a {@link LoggerObjectRenderer} - * for the object type would like to customize.

- * - *

The syntax is: - * - *

-     * log4php.renderer.name_of_rendered_class=name_of_rendering.class
-     * 
- * - * As in, - *
-     * log4php.renderer.myFruit=myFruitRenderer
-     * 
- * - *

Logger Factories

- * - * The usage of custom logger factories is discouraged and no longer - * documented. - * - *

Example

- * - *

An example configuration is given below. Other configuration - * file examples are given in the tests folder. - * - *

-     * ; Set options for appender named "A1".
-     * ; Appender "A1" will be a SyslogAppender
-     * log4php.appender.A1=SyslogAppender
-     * 
-     * ; The syslog daemon resides on www.abc.net
-     * log4php.appender.A1.SyslogHost=www.abc.net
-     * 
-     * ; A1's layout is a LoggerPatternLayout, using the conversion pattern
-     * ; %r %-5p %c{2} %M.%L %x - %m%n. Thus, the log output will
-     * ; include the relative time since the start of the application in
-     * ; milliseconds, followed by the level of the log request,
-     * ; followed by the two rightmost components of the logger name,
-     * ; followed by the callers method name, followed by the line number,
-     * ; the nested disgnostic context and finally the message itself.
-     * ; Refer to the documentation of LoggerPatternLayout} for further information
-     * ; on the syntax of the ConversionPattern key.
-     * log4php.appender.A1.layout=LoggerPatternLayout
-     * log4php.appender.A1.layout.ConversionPattern="%-4r %-5p %c{2} %M.%L %x - %m%n"
-     * 
-     * ; Set options for appender named "A2"
-     * ; A2 should be a LoggerAppenderRollingFile, with maximum file size of 10 MB
-     * ; using at most one backup file. A2's layout is TTCC, using the
-     * ; ISO8061 date format with context printing enabled.
-     * log4php.appender.A2=LoggerAppenderRollingFile
-     * log4php.appender.A2.MaxFileSize=10MB
-     * log4php.appender.A2.MaxBackupIndex=1
-     * log4php.appender.A2.layout=LoggerLayoutTTCC
-     * log4php.appender.A2.layout.ContextPrinting="true"
-     * log4php.appender.A2.layout.DateFormat="%c"
-     * 
-     * ; Root logger set to DEBUG using the A2 appender defined above.
-     * log4php.rootLogger=DEBUG, A2
-     * 
-     * ; Logger definitions:
-     * ; The SECURITY logger inherits is level from root. However, it's output
-     * ; will go to A1 appender defined above. It's additivity is non-cumulative.
-     * log4php.logger.SECURITY=INHERIT, A1
-     * log4php.additivity.SECURITY=false
-     * 
-     * ; Only warnings or above will be logged for the logger "SECURITY.access".
-     * ; Output will go to A1.
-     * log4php.logger.SECURITY.access=WARN
-     * 
-     * 
-     * ; The logger "class.of.the.day" inherits its level from the
-     * ; logger hierarchy.  Output will go to the appender's of the root
-     * ; logger, A2 in this case.
-     * log4php.logger.class.of.the.day=INHERIT
-     * 
- * - *

Refer to the setOption method in each Appender and - * Layout for class specific options.

- * - *

Use the ";" character at the - * beginning of a line for comments.

- * - * @param string $url The name of the configuration file where the - * configuration information is stored. - * @param LoggerHierarchy &$repository the repository to apply the configuration - */ - function doConfigure($url, &$repository) - { - $properties = @parse_ini_file($url); - if ($properties === false) { - LoggerLog::warn("LoggerPropertyConfigurator::doConfigure() cannot load '$url' configuration."); - return false; - } - return $this->doConfigureProperties($properties, $repository); - } - - - /** - * Read configuration options from properties. - * - * @see doConfigure(). - * @param array $properties - * @param LoggerHierarchy &$hierarchy - */ - function doConfigureProperties($properties, &$hierarchy) - { - if(array_key_exists(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY, $properties)) - $value = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY]; - - if (!empty($value)) { - LoggerLog::internalDebugging(LoggerOptionConverter::toBoolean($value, LoggerLog::internalDebugging())); - } - - $thresholdStr = null; - if(array_key_exists(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX, $properties)) - $thresholdStr = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX]; - $hierarchy->setThreshold(LoggerOptionConverter::toLevel($thresholdStr, LoggerLevel::getLevelAll())); - - $this->configureRootCategory($properties, $hierarchy); - $this->configureLoggerFactory($properties); - $this->parseCatsAndRenderers($properties, $hierarchy); - - LoggerLog::debug("LoggerPropertyConfigurator::doConfigureProperties() Finished configuring."); - - return true; - } - - // -------------------------------------------------------------------------- - // Internal stuff - // -------------------------------------------------------------------------- - - /** - * Check the provided Properties object for a - * {@link LoggerFactory} entry specified by - * {@link LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY}. - * - * If such an entry exists, an attempt is made to create an instance using - * the default constructor. - * This instance is used for subsequent Category creations - * within this configurator. - * - * @see parseCatsAndRenderers() - * @param array $props array of properties - */ - function configureLoggerFactory($props) - { - if(array_key_exists(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY, $props)) - $factoryFqcn = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY]; - if(!empty($factoryFqcn)) { - $factoryClassName = basename($factoryFqcn); - LoggerLog::debug( - "LoggerPropertyConfigurator::configureLoggerFactory() Trying to load factory [" . - $factoryClassName . - "]." - ); - - if (!class_exists($factoryClassName)) - @include_once("{$factoryFqcn}.php"); - if (class_exists($factoryClassName)) { - $loggerFactory = new $factoryClassName(); - } else { - LoggerLog::debug( - "LoggerPropertyConfigurator::configureLoggerFactory() Unable to load factory [" . - $factoryClassName . - "]. Using default." - ); - $loggerFactory = $this->loggerFactory; - } - - LoggerLog::debug( - "LoggerPropertyConfigurator::configureLoggerFactory() ". - "Setting properties for category factory [" . get_class($loggerFactory) . "]." - ); - - LoggerPropertySetter::setPropertiesByObject($loggerFactory, $props, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX . "."); - } - } - - /** - * @param array $props array of properties - * @param LoggerHierarchy &$hierarchy - */ - function configureRootCategory($props, &$hierarchy) - { - $effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX; - $value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX]; - - if(empty($value)) { - $value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX]; - $effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX; - } - - if (empty($value)) { - LoggerLog::debug( - "LoggerPropertyConfigurator::configureRootCategory() ". - "Could not find root logger information. Is this OK?" - ); - } else { - $root =& $hierarchy->getRootLogger(); - // synchronized(root) { - $this->parseCategory( - $props, - $root, - $effectivePrefix, - LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME, - $value - ); - // } - } - } - - /** - * Parse non-root elements, such non-root categories and renderers. - * - * @param array $props array of properties - * @param LoggerHierarchy &$hierarchy - */ - function parseCatsAndRenderers($props, &$hierarchy) - { - while(list($key,$value) = each($props)) { - if( strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0 or - strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) { - if(strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0) { - $loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX)); - } elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) { - $loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX)); - } - $logger =& $hierarchy->getLogger($loggerName, $this->loggerFactory); - // synchronized(logger) { - $this->parseCategory($props, $logger, $key, $loggerName, $value); - $this->parseAdditivityForLogger($props, $logger, $loggerName); - // } - } elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX) === 0) { - $renderedClass = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX)); - $renderingClass = $value; - if (method_exists($hierarchy, 'addrenderer')) { - LoggerRendererMap::addRenderer($hierarchy, $renderedClass, $renderingClass); - } - } - } - } - - /** - * Parse the additivity option for a non-root category. - * - * @param array $props array of properties - * @param Logger &$cat - * @param string $loggerName - */ - function parseAdditivityForLogger($props, &$cat, $loggerName) - { - $value = LoggerOptionConverter::findAndSubst( - LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName, - $props - ); - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAdditivityForLogger() ". - "Handling " . LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName . "=[{$value}]" - ); - // touch additivity only if necessary - if(!empty($value)) { - $additivity = LoggerOptionConverter::toBoolean($value, true); - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAdditivityForLogger() ". - "Setting additivity for [{$loggerName}] to [{$additivity}]" - ); - $cat->setAdditivity($additivity); - } - } - - /** - * This method must work for the root category as well. - * - * @param array $props array of properties - * @param Logger &$logger - * @param string $optionKey - * @param string $loggerName - * @param string $value - * @return Logger - */ - function &parseCategory($props, &$logger, $optionKey, $loggerName, $value) - { - LoggerLog::debug( - "LoggerPropertyConfigurator::parseCategory() ". - "Parsing for [{$loggerName}] with value=[{$value}]." - ); - - // We must skip over ',' but not white space - $st = explode(',', $value); - - // If value is not in the form ", appender.." or "", then we should set - // the level of the loggeregory. - - if(!(@$value{0} == ',' || empty($value))) { - // just to be on the safe side... - if(sizeof($st) == 0) - return; - - $levelStr = current($st); - LoggerLog::debug( - "LoggerPropertyConfigurator::parseCategory() ". - "Level token is [$levelStr]." - ); - - // If the level value is inherited, set category level value to - // null. We also check that the user has not specified inherited for the - // root category. - if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) { - if ($loggerName == LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME) { - LoggerLog::warn( - "LoggerPropertyConfigurator::parseCategory() ". - "The root logger cannot be set to null." - ); - } else { - $logger->setLevel(null); - } - } else { - $logger->setLevel(LoggerOptionConverter::toLevel($levelStr, LoggerLevel::getLevelDebug())); - } - } - - // Begin by removing all existing appenders. - $logger->removeAllAppenders(); - while($appenderName = next($st)) { - $appenderName = trim($appenderName); - if(empty($appenderName)) - continue; - LoggerLog::debug( - "LoggerPropertyConfigurator::parseCategory() ". - "Parsing appender named [{$appenderName}]." - ); - $appender =& $this->parseAppender($props, $appenderName); - if($appender !== null) { - $logger->addAppender($appender); - } - } - } - - /** - * @param array $props array of properties - * @param string $appenderName - * @return LoggerAppender - */ - function &parseAppender($props, $appenderName) - { - $appender =& LoggerAppender::singleton($appenderName); - if($appender !== null) { - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAppender() ". - "Appender [{$appenderName}] was already parsed." - ); - return $appender; - } - // Appender was not previously initialized. - $prefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_APPENDER_PREFIX . $appenderName; - $layoutPrefix = $prefix . ".layout"; - $appenderClass = @$props[$prefix]; - if (!empty($appenderClass)) { - $appender =& LoggerAppender::singleton($appenderName, $appenderClass); - if($appender === null) { - LoggerLog::warn( - "LoggerPropertyConfigurator::parseAppender() ". - "Could not instantiate appender named [$appenderName]." - ); - return null; - } - } else { - LoggerLog::warn( - "LoggerPropertyConfigurator::parseAppender() ". - "Could not instantiate appender named [$appenderName] with null className." - ); - return null; - } - - $appender->setName($appenderName); - if( $appender->requiresLayout() ) { - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAppender() ". - "Parsing layout section for [$appenderName]." - ); - $layoutClass = @$props[$layoutPrefix]; - $layoutClass = LoggerOptionConverter::substVars($layoutClass, $props); - if (empty($layoutClass)) { - LoggerLog::warn( - "LoggerPropertyConfigurator::parseAppender() ". - "layout class is empty in '$layoutPrefix'. Using Simple layout" - ); - $layout = LoggerLayout::factory('LoggerLayoutSimple'); - } else { - $layout = LoggerLayout::factory($layoutClass); - - if($layout === null) { - LoggerLog::warn( - "LoggerPropertyConfigurator::parseAppender() ". - "cannot create layout '$layoutClass'. Using Simple layout" - ); - $layout = LoggerLayout::factory('LoggerLayoutSimple'); - } - } - - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAppender() ". - "Parsing layout options for [$appenderName]." - ); - LoggerPropertySetter::setPropertiesByObject($layout, $props, $layoutPrefix . "."); - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAppender() ". - "End Parsing layout options for [$appenderName]." - ); - $appender->setLayout($layout); - - } - LoggerPropertySetter::setPropertiesByObject($appender, $props, $prefix . "."); - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAppender() ". - "Parsed [{$appenderName}] options." - ); - return $appender; - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/config/LoggerPropertySetter.php'); +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); +require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); +require_once(LOG4PHP_DIR . '/or/LoggerRendererMap.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); +require_once(LOG4PHP_DIR . '/LoggerAppender.php'); +require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php'); +require_once(LOG4PHP_DIR . '/LoggerLayout.php'); +require_once(LOG4PHP_DIR . '/LoggerLevel.php'); +require_once(LOG4PHP_DIR . '/LoggerManager.php'); + +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX', "log4php.category."); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX', "log4php.logger."); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX', "log4php.factory"); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX', "log4php.additivity."); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX', "log4php.rootCategory"); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX', "log4php.rootLogger"); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_APPENDER_PREFIX', "log4php.appender."); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX', "log4php.renderer."); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX', "log4php.threshold"); + +/** + * Key for specifying the {@link LoggerFactory}. + */ +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY', "log4php.loggerFactory"); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY', "log4php.debug"); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME', "root"); + + + +/** + * Allows the configuration of log4php from an external file. + * + * See {@link doConfigure()} for the expected format. + * + *

It is sometimes useful to see how log4php is reading configuration + * files. You can enable log4php internal logging by defining the + * log4php.debug variable.

+ * + *

The LoggerPropertyConfigurator does not handle the + * advanced configuration features supported by the {@link LoggerDOMConfigurator} + * such as support for {@link LoggerFilter}, + custom {@link LoggerErrorHandlers}, nested appenders such as the + {@link Logger AsyncAppender}, + * etc. + * + *

All option values admit variable substitution. The + * syntax of variable substitution is similar to that of Unix + * shells. The string between an opening "${" and + * closing "}" is interpreted as a key. The value of + * the substituted variable can be defined as a system property or in + * the configuration file itself. The value of the key is first + * searched in the defined constants, in the enviroments variables + * and if not found there, it is + * then searched in the configuration file being parsed. The + * corresponding value replaces the ${variableName} sequence.

+ *

For example, if $_ENV['home'] env var is set to + * /home/xyz, then every occurrence of the sequence + * ${home} will be interpreted as + * /home/xyz. See {@link LoggerOptionConverter::getSystemProperty()} + * for details.

+ * + * @author VxR + * @version $Revision: 1.6 $ + * @package log4php + * @since 0.5 + */ +class LoggerPropertyConfigurator extends LoggerConfigurator { + + /** + * @var LoggerFactory + */ + var $loggerFactory = null; + + /** + * Constructor + */ + function LoggerPropertyConfigurator() + { + $this->loggerFactory = new LoggerDefaultCategoryFactory(); + } + + /** + * Configure the default repository using the resource pointed by url. + * Url is any valid resurce as defined in {@link PHP_MANUAL#file} function. + * Note that the resource will be search with use_include_path parameter + * set to "1". + * + * @param string $url + * @return boolean configuration result + * @static + */ + function configure($url = '') + { + $configurator = new LoggerPropertyConfigurator(); + $repository =& LoggerManager::getLoggerRepository(); + return $configurator->doConfigure($url, $repository); + } + + /** + * Read configuration from a file. + * + *

The function {@link PHP_MANUAL#parse_ini_file} is used to read the + * file.

+ * + * The existing configuration is not cleared nor reset. + * If you require a different behavior, then call + * {@link LoggerManager::resetConfiguration()} + * method before calling {@link doConfigure()}. + * + *

The configuration file consists of statements in the format + * key=value. The syntax of different configuration + * elements are discussed below. + * + *

Repository-wide threshold

+ * + *

The repository-wide threshold filters logging requests by level + * regardless of logger. The syntax is: + * + *

+     * log4php.threshold=[level]
+     * 
+ * + *

The level value can consist of the string values OFF, FATAL, + * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A + * custom level value can be specified in the form + * level#classname. By default the repository-wide threshold is set + * to the lowest possible value, namely the level ALL. + *

+ * + * + *

Appender configuration

+ * + *

Appender configuration syntax is:

+ *
+     * ; For appender named appenderName, set its class.
+     * ; Note: The appender name can contain dots.
+     * log4php.appender.appenderName=name_of_appender_class
+     * 
+     * ; Set appender specific options.
+     * 
+     * log4php.appender.appenderName.option1=value1
+     * log4php.appender.appenderName.optionN=valueN
+     * 
+ * + * For each named appender you can configure its {@link LoggerLayout}. The + * syntax for configuring an appender's layout is: + *
+     * log4php.appender.appenderName.layout=name_of_layout_class
+     * log4php.appender.appenderName.layout.option1=value1
+     *  ....
+     * log4php.appender.appenderName.layout.optionN=valueN
+     * 
+ * + *

Configuring loggers

+ * + *

The syntax for configuring the root logger is: + *

+     * log4php.rootLogger=[level], appenderName, appenderName, ...
+     * 
+ * + *

This syntax means that an optional level can be + * supplied followed by appender names separated by commas. + * + *

The level value can consist of the string values OFF, FATAL, + * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A + * custom level value can be specified in the form

+ * + *
level#classname
+ * + *

If a level value is specified, then the root level is set + * to the corresponding level. If no level value is specified, + * then the root level remains untouched. + * + *

The root logger can be assigned multiple appenders. + * + *

Each appenderName (separated by commas) will be added to + * the root logger. The named appender is defined using the + * appender syntax defined above. + * + *

For non-root categories the syntax is almost the same: + *

+     * log4php.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ...
+     * 
+ * + *

The meaning of the optional level value is discussed above + * in relation to the root logger. In addition however, the value + * INHERITED can be specified meaning that the named logger should + * inherit its level from the logger hierarchy.

+ * + *

If no level value is supplied, then the level of the + * named logger remains untouched.

+ * + *

By default categories inherit their level from the + * hierarchy. However, if you set the level of a logger and later + * decide that that logger should inherit its level, then you should + * specify INHERITED as the value for the level value. NULL is a + * synonym for INHERITED.

+ * + *

Similar to the root logger syntax, each appenderName + * (separated by commas) will be attached to the named logger.

+ * + *

See the appender additivity rule in the user manual for + * the meaning of the additivity flag. + * + *

ObjectRenderers

+ * + *

You can customize the way message objects of a given type are + * converted to String before being logged. This is done by + * specifying a {@link LoggerObjectRenderer} + * for the object type would like to customize.

+ * + *

The syntax is: + * + *

+     * log4php.renderer.name_of_rendered_class=name_of_rendering.class
+     * 
+ * + * As in, + *
+     * log4php.renderer.myFruit=myFruitRenderer
+     * 
+ * + *

Logger Factories

+ * + * The usage of custom logger factories is discouraged and no longer + * documented. + * + *

Example

+ * + *

An example configuration is given below. Other configuration + * file examples are given in the tests folder. + * + *

+     * ; Set options for appender named "A1".
+     * ; Appender "A1" will be a SyslogAppender
+     * log4php.appender.A1=SyslogAppender
+     * 
+     * ; The syslog daemon resides on www.abc.net
+     * log4php.appender.A1.SyslogHost=www.abc.net
+     * 
+     * ; A1's layout is a LoggerPatternLayout, using the conversion pattern
+     * ; %r %-5p %c{2} %M.%L %x - %m%n. Thus, the log output will
+     * ; include the relative time since the start of the application in
+     * ; milliseconds, followed by the level of the log request,
+     * ; followed by the two rightmost components of the logger name,
+     * ; followed by the callers method name, followed by the line number,
+     * ; the nested disgnostic context and finally the message itself.
+     * ; Refer to the documentation of LoggerPatternLayout} for further information
+     * ; on the syntax of the ConversionPattern key.
+     * log4php.appender.A1.layout=LoggerPatternLayout
+     * log4php.appender.A1.layout.ConversionPattern="%-4r %-5p %c{2} %M.%L %x - %m%n"
+     * 
+     * ; Set options for appender named "A2"
+     * ; A2 should be a LoggerAppenderRollingFile, with maximum file size of 10 MB
+     * ; using at most one backup file. A2's layout is TTCC, using the
+     * ; ISO8061 date format with context printing enabled.
+     * log4php.appender.A2=LoggerAppenderRollingFile
+     * log4php.appender.A2.MaxFileSize=10MB
+     * log4php.appender.A2.MaxBackupIndex=1
+     * log4php.appender.A2.layout=LoggerLayoutTTCC
+     * log4php.appender.A2.layout.ContextPrinting="true"
+     * log4php.appender.A2.layout.DateFormat="%c"
+     * 
+     * ; Root logger set to DEBUG using the A2 appender defined above.
+     * log4php.rootLogger=DEBUG, A2
+     * 
+     * ; Logger definitions:
+     * ; The SECURITY logger inherits is level from root. However, it's output
+     * ; will go to A1 appender defined above. It's additivity is non-cumulative.
+     * log4php.logger.SECURITY=INHERIT, A1
+     * log4php.additivity.SECURITY=false
+     * 
+     * ; Only warnings or above will be logged for the logger "SECURITY.access".
+     * ; Output will go to A1.
+     * log4php.logger.SECURITY.access=WARN
+     * 
+     * 
+     * ; The logger "class.of.the.day" inherits its level from the
+     * ; logger hierarchy.  Output will go to the appender's of the root
+     * ; logger, A2 in this case.
+     * log4php.logger.class.of.the.day=INHERIT
+     * 
+ * + *

Refer to the setOption method in each Appender and + * Layout for class specific options.

+ * + *

Use the ";" character at the + * beginning of a line for comments.

+ * + * @param string $url The name of the configuration file where the + * configuration information is stored. + * @param LoggerHierarchy &$repository the repository to apply the configuration + */ + function doConfigure($url, &$repository) + { + $properties = @parse_ini_file($url); + if ($properties === false) { + LoggerLog::warn("LoggerPropertyConfigurator::doConfigure() cannot load '$url' configuration."); + return false; + } + return $this->doConfigureProperties($properties, $repository); + } + + + /** + * Read configuration options from properties. + * + * @see doConfigure(). + * @param array $properties + * @param LoggerHierarchy &$hierarchy + */ + function doConfigureProperties($properties, &$hierarchy) + { + $value = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY]; + + if (!empty($value)) { + LoggerLog::internalDebugging(LoggerOptionConverter::toBoolean($value, LoggerLog::internalDebugging())); + } + + $thresholdStr = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX]; + $hierarchy->setThreshold(LoggerOptionConverter::toLevel($thresholdStr, LoggerLevel::getLevelAll())); + + $this->configureRootCategory($properties, $hierarchy); + $this->configureLoggerFactory($properties); + $this->parseCatsAndRenderers($properties, $hierarchy); + + LoggerLog::debug("LoggerPropertyConfigurator::doConfigureProperties() Finished configuring."); + + return true; + } + + // -------------------------------------------------------------------------- + // Internal stuff + // -------------------------------------------------------------------------- + + /** + * Check the provided Properties object for a + * {@link LoggerFactory} entry specified by + * {@link LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY}. + * + * If such an entry exists, an attempt is made to create an instance using + * the default constructor. + * This instance is used for subsequent Category creations + * within this configurator. + * + * @see parseCatsAndRenderers() + * @param array $props array of properties + */ + function configureLoggerFactory($props) + { + $factoryFqcn = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY]; + if(!empty($factoryFqcn)) { + $factoryClassName = basename($factoryFqcn); + LoggerLog::debug( + "LoggerPropertyConfigurator::configureLoggerFactory() Trying to load factory [" . + $factoryClassName . + "]." + ); + + if (!class_exists($factoryClassName)) + @include_once("{$factoryFqcn}.php"); + if (class_exists($factoryClassName)) { + $loggerFactory = new $factoryClassName(); + } else { + LoggerLog::debug( + "LoggerPropertyConfigurator::configureLoggerFactory() Unable to load factory [" . + $factoryClassName . + "]. Using default." + ); + $loggerFactory = $this->loggerFactory; + } + + LoggerLog::debug( + "LoggerPropertyConfigurator::configureLoggerFactory() ". + "Setting properties for category factory [" . get_class($loggerFactory) . "]." + ); + + LoggerPropertySetter::setPropertiesByObject($loggerFactory, $props, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX . "."); + } + } + + /** + * @param array $props array of properties + * @param LoggerHierarchy &$hierarchy + */ + function configureRootCategory($props, &$hierarchy) + { + $effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX; + $value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX]; + + if(empty($value)) { + $value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX]; + $effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX; + } + + if (empty($value)) { + LoggerLog::debug( + "LoggerPropertyConfigurator::configureRootCategory() ". + "Could not find root logger information. Is this OK?" + ); + } else { + $root =& $hierarchy->getRootLogger(); + // synchronized(root) { + $this->parseCategory( + $props, + $root, + $effectivePrefix, + LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME, + $value + ); + // } + } + } + + /** + * Parse non-root elements, such non-root categories and renderers. + * + * @param array $props array of properties + * @param LoggerHierarchy &$hierarchy + */ + function parseCatsAndRenderers($props, &$hierarchy) + { + while(list($key,$value) = each($props)) { + if( strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0 or + strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) { + if(strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0) { + $loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX)); + } elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) { + $loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX)); + } + $logger =& $hierarchy->getLogger($loggerName, $this->loggerFactory); + // synchronized(logger) { + $this->parseCategory($props, $logger, $key, $loggerName, $value); + $this->parseAdditivityForLogger($props, $logger, $loggerName); + // } + } elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX) === 0) { + $renderedClass = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX)); + $renderingClass = $value; + if (method_exists($hierarchy, 'addrenderer')) { + LoggerRendererMap::addRenderer($hierarchy, $renderedClass, $renderingClass); + } + } + } + } + + /** + * Parse the additivity option for a non-root category. + * + * @param array $props array of properties + * @param Logger &$cat + * @param string $loggerName + */ + function parseAdditivityForLogger($props, &$cat, $loggerName) + { + $value = LoggerOptionConverter::findAndSubst( + LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName, + $props + ); + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAdditivityForLogger() ". + "Handling " . LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName . "=[{$value}]" + ); + // touch additivity only if necessary + if(!empty($value)) { + $additivity = LoggerOptionConverter::toBoolean($value, true); + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAdditivityForLogger() ". + "Setting additivity for [{$loggerName}] to [{$additivity}]" + ); + $cat->setAdditivity($additivity); + } + } + + /** + * This method must work for the root category as well. + * + * @param array $props array of properties + * @param Logger &$logger + * @param string $optionKey + * @param string $loggerName + * @param string $value + * @return Logger + */ + function &parseCategory($props, &$logger, $optionKey, $loggerName, $value) + { + LoggerLog::debug( + "LoggerPropertyConfigurator::parseCategory() ". + "Parsing for [{$loggerName}] with value=[{$value}]." + ); + + // We must skip over ',' but not white space + $st = explode(',', $value); + + // If value is not in the form ", appender.." or "", then we should set + // the level of the loggeregory. + + if(!(@$value{0} == ',' || empty($value))) { + // just to be on the safe side... + if(sizeof($st) == 0) + return; + + $levelStr = current($st); + LoggerLog::debug( + "LoggerPropertyConfigurator::parseCategory() ". + "Level token is [$levelStr]." + ); + + // If the level value is inherited, set category level value to + // null. We also check that the user has not specified inherited for the + // root category. + if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) { + if ($loggerName == LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME) { + LoggerLog::warn( + "LoggerPropertyConfigurator::parseCategory() ". + "The root logger cannot be set to null." + ); + } else { + $logger->setLevel(null); + } + } else { + $logger->setLevel(LoggerOptionConverter::toLevel($levelStr, LoggerLevel::getLevelDebug())); + } + } + + // Begin by removing all existing appenders. + $logger->removeAllAppenders(); + while($appenderName = next($st)) { + $appenderName = trim($appenderName); + if(empty($appenderName)) + continue; + LoggerLog::debug( + "LoggerPropertyConfigurator::parseCategory() ". + "Parsing appender named [{$appenderName}]." + ); + $appender =& $this->parseAppender($props, $appenderName); + if($appender !== null) { + $logger->addAppender($appender); + } + } + } + + /** + * @param array $props array of properties + * @param string $appenderName + * @return LoggerAppender + */ + function &parseAppender($props, $appenderName) + { + $appender =& LoggerAppender::singleton($appenderName); + if($appender !== null) { + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAppender() ". + "Appender [{$appenderName}] was already parsed." + ); + return $appender; + } + // Appender was not previously initialized. + $prefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_APPENDER_PREFIX . $appenderName; + $layoutPrefix = $prefix . ".layout"; + $appenderClass = @$props[$prefix]; + if (!empty($appenderClass)) { + $appender =& LoggerAppender::singleton($appenderName, $appenderClass); + if($appender === null) { + LoggerLog::warn( + "LoggerPropertyConfigurator::parseAppender() ". + "Could not instantiate appender named [$appenderName]." + ); + return null; + } + } else { + LoggerLog::warn( + "LoggerPropertyConfigurator::parseAppender() ". + "Could not instantiate appender named [$appenderName] with null className." + ); + return null; + } + + $appender->setName($appenderName); + if( $appender->requiresLayout() ) { + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAppender() ". + "Parsing layout section for [$appenderName]." + ); + $layoutClass = @$props[$layoutPrefix]; + $layoutClass = LoggerOptionConverter::substVars($layoutClass, $props); + if (empty($layoutClass)) { + LoggerLog::warn( + "LoggerPropertyConfigurator::parseAppender() ". + "layout class is empty in '$layoutPrefix'. Using Simple layout" + ); + $layout = LoggerLayout::factory('LoggerLayoutSimple'); + } else { + $layout = LoggerLayout::factory($layoutClass); + + if($layout === null) { + LoggerLog::warn( + "LoggerPropertyConfigurator::parseAppender() ". + "cannot create layout '$layoutClass'. Using Simple layout" + ); + $layout = LoggerLayout::factory('LoggerLayoutSimple'); + } + } + + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAppender() ". + "Parsing layout options for [$appenderName]." + ); + LoggerPropertySetter::setPropertiesByObject($layout, $props, $layoutPrefix . "."); + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAppender() ". + "End Parsing layout options for [$appenderName]." + ); + $appender->setLayout($layout); + + } + LoggerPropertySetter::setPropertiesByObject($appender, $props, $prefix . "."); + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAppender() ". + "Parsed [{$appenderName}] options." + ); + return $appender; + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerRoot.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerRoot.php (original) +++ vtigercrm/trunk/log4php/LoggerRoot.php Wed May 3 22:07:13 2006 @@ -1,101 +1,101 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/Logger.php'); -require_once(LOG4PHP_DIR . '/LoggerLevel.php'); - -/** - * The root logger. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @see Logger - */ -class LoggerRoot extends Logger { - - /** - * @var string name of logger - */ - var $name = 'root'; - - /** - * @var object must be null for LoggerRoot - */ - var $parent = null; - - - /** - * Constructor - * - * @param integer $level initial log level - */ - function LoggerRoot($level = null) - { - $this->Logger($this->name); - if ($level == null) - $level = LoggerLevel::getLevelAll(); - $this->setLevel($level); - } - - /** - * @return integer the level - */ - function getChainedLevel() - { - return $this->level; - } - - /** - * Setting a null value to the level of the root category may have catastrophic results. - * @param LoggerLevel $level - */ - function setLevel($level) - { - $this->level = $level; - } - - /** - * Please use setLevel() instead. - * @param LoggerLevel $level - * @deprecated - */ - function setPriority($level) - { - $this->setLevel($level); - } - - /** - * Always returns false. - * Because LoggerRoot has no parents, it returns false. - * @param Logger $parent - * @return boolean - */ - function setParent($parent) - { - return false; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/Logger.php'); +require_once(LOG4PHP_DIR . '/LoggerLevel.php'); + +/** + * The root logger. + * + * @author VxR + * @version $Revision: 1.9 $ + * @package log4php + * @see Logger + */ +class LoggerRoot extends Logger { + + /** + * @var string name of logger + */ + var $name = 'root'; + + /** + * @var object must be null for LoggerRoot + */ + var $parent = null; + + + /** + * Constructor + * + * @param integer $level initial log level + */ + function LoggerRoot($level = null) + { + $this->Logger($this->name); + if ($level == null) + $level = LoggerLevel::getLevelAll(); + $this->setLevel($level); + } + + /** + * @return integer the level + */ + function getChainedLevel() + { + return $this->level; + } + + /** + * Setting a null value to the level of the root category may have catastrophic results. + * @param LoggerLevel $level + */ + function setLevel($level) + { + $this->level = $level; + } + + /** + * Please use setLevel() instead. + * @param LoggerLevel $level + * @deprecated + */ + function setPriority($level) + { + $this->setLevel($level); + } + + /** + * Always returns false. + * Because LoggerRoot has no parents, it returns false. + * @param Logger $parent + * @return boolean + */ + function setParent($parent) + { + return false; + } +} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 21:09:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:09:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5731 - in /vtigercrm/trunk/log4php/config: LoggerPropertyGetter.php LoggerPropertySetter.php Message-ID: <20060504040945.6EFB9709F1E@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:09:40 2006 New Revision: 5731 Log: log4php latest version has been updated Modified: vtigercrm/trunk/log4php/config/LoggerPropertyGetter.php vtigercrm/trunk/log4php/config/LoggerPropertySetter.php Modified: vtigercrm/trunk/log4php/config/LoggerPropertyGetter.php ============================================================================== --- vtigercrm/trunk/log4php/config/LoggerPropertyGetter.php (original) +++ vtigercrm/trunk/log4php/config/LoggerPropertyGetter.php Wed May 3 22:09:40 2006 @@ -1,37 +1,37 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage config - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage config - * @since 0.5 - * @todo Ehm... try to guess... - */ -class LoggerPropertyGetter { - -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage config + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @subpackage config + * @since 0.5 + * @todo Ehm... try to guess... + */ +class LoggerPropertyGetter { + +} + ?> Modified: vtigercrm/trunk/log4php/config/LoggerPropertySetter.php ============================================================================== --- vtigercrm/trunk/log4php/config/LoggerPropertySetter.php (original) +++ vtigercrm/trunk/log4php/config/LoggerPropertySetter.php Wed May 3 22:09:40 2006 @@ -1,161 +1,161 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage config - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/LoggerLog.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); - -/** - * General purpose Object property setter. Clients repeatedly invokes - * {@link setProperty()} in order to invoke setters - * on the Object specified in the constructor. - * - * Usage: - * - * $ps = new LoggerPropertySetter($anObject); - * $ps->set("name", "Joe"); - * $ps->set("age", 32); - * $ps->set("isMale", true); - * - * will cause the invocations - * - * $anObject->setName("Joe"); - * $anObject->setAge(32); - * $anObject->setMale(true) - * - * if such methods exist. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage config - * @since 0.5 - */ -class LoggerPropertySetter { - - /** - * @var object the target object - * @access private - */ - var $obj; - - /** - * Create a new LoggerPropertySetter for the specified Object. - * This is done in prepartion for invoking {@link setProperty()} - * one or more times. - * @param object &$obj the object for which to set properties - */ - function LoggerPropertySetter(&$obj) - { - $this->obj =& $obj; - } - - /** - * Set the properties of an object passed as a parameter in one - * go. The properties are parsed relative to a - * prefix. - * - * @param object &$obj The object to configure. - * @param array $properties An array containing keys and values. - * @param string $prefix Only keys having the specified prefix will be set. - * @static - */ - function setPropertiesByObject(&$obj, $properties, $prefix) - { - $pSetter = new LoggerPropertySetter($obj); - return $pSetter->setProperties($properties, $prefix); - } - - - /** - * Set the properites for the object that match the - * prefix passed as parameter. - * - * @param array $properties An array containing keys and values. - * @param string $prefix Only keys having the specified prefix will be set. - */ - function setProperties($properties, $prefix) - { - LoggerLog::debug("LoggerOptionConverter::setProperties():prefix=[{$prefix}]"); - - $len = strlen($prefix); - while (list($key,) = each($properties)) { - if (strpos($key, $prefix) === 0) { - if (strpos($key, '.', ($len + 1)) > 0) - continue; - $value = LoggerOptionConverter::findAndSubst($key, $properties); - $key = substr($key, $len); - if ($key == 'layout' and is_a($this->obj, 'loggerappender')) { - continue; - } - $this->setProperty($key, $value); - } - } - $this->activate(); - } - - /** - * Set a property on this PropertySetter's Object. If successful, this - * method will invoke a setter method on the underlying Object. The - * setter is the one for the specified property name and the value is - * determined partly from the setter argument type and partly from the - * value specified in the call to this method. - * - *

If the setter expects a String no conversion is necessary. - * If it expects an int, then an attempt is made to convert 'value' - * to an int using new Integer(value). If the setter expects a boolean, - * the conversion is by new Boolean(value). - * - * @param string $name name of the property - * @param string $value String value of the property - */ - function setProperty($name, $value) - { - LoggerLog::debug("LoggerOptionConverter::setProperty():name=[{$name}]:value=[{$value}]"); - - if ($value === null) return; - - $method = "set" . ucfirst($name); - - if (!method_exists($this->obj, $method)) { - LoggerLog::warn( - "LoggerOptionConverter::setProperty() No such setter method for [{$name}] property in " . - get_class($this->obj) . "." - ); - } else { - return call_user_func(array(&$this->obj, $method), $value); - } - } - - function activate() - { - LoggerLog::debug("LoggerOptionConverter::activate()"); - - if (method_exists($this->obj, 'activateoptions')) { - return call_user_func(array(&$this->obj, 'activateoptions')); - } else { - LoggerLog::debug("LoggerOptionConverter::activate() Nothing to activate."); - } - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage config + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +require_once(LOG4PHP_DIR . '/LoggerLog.php'); +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); + +/** + * General purpose Object property setter. Clients repeatedly invokes + * {@link setProperty()} in order to invoke setters + * on the Object specified in the constructor. + * + * Usage: + * + * $ps = new LoggerPropertySetter($anObject); + * $ps->set("name", "Joe"); + * $ps->set("age", 32); + * $ps->set("isMale", true); + * + * will cause the invocations + * + * $anObject->setName("Joe"); + * $anObject->setAge(32); + * $anObject->setMale(true) + * + * if such methods exist. + * + * @author VxR + * @version $Revision: 1.4 $ + * @package log4php + * @subpackage config + * @since 0.5 + */ +class LoggerPropertySetter { + + /** + * @var object the target object + * @access private + */ + var $obj; + + /** + * Create a new LoggerPropertySetter for the specified Object. + * This is done in prepartion for invoking {@link setProperty()} + * one or more times. + * @param object &$obj the object for which to set properties + */ + function LoggerPropertySetter(&$obj) + { + $this->obj =& $obj; + } + + /** + * Set the properties of an object passed as a parameter in one + * go. The properties are parsed relative to a + * prefix. + * + * @param object &$obj The object to configure. + * @param array $properties An array containing keys and values. + * @param string $prefix Only keys having the specified prefix will be set. + * @static + */ + function setPropertiesByObject(&$obj, $properties, $prefix) + { + $pSetter = new LoggerPropertySetter($obj); + return $pSetter->setProperties($properties, $prefix); + } + + + /** + * Set the properites for the object that match the + * prefix passed as parameter. + * + * @param array $properties An array containing keys and values. + * @param string $prefix Only keys having the specified prefix will be set. + */ + function setProperties($properties, $prefix) + { + LoggerLog::debug("LoggerOptionConverter::setProperties():prefix=[{$prefix}]"); + + $len = strlen($prefix); + while (list($key,) = each($properties)) { + if (strpos($key, $prefix) === 0) { + if (strpos($key, '.', ($len + 1)) > 0) + continue; + $value = LoggerOptionConverter::findAndSubst($key, $properties); + $key = substr($key, $len); + if ($key == 'layout' and is_a($this->obj, 'loggerappender')) { + continue; + } + $this->setProperty($key, $value); + } + } + $this->activate(); + } + + /** + * Set a property on this PropertySetter's Object. If successful, this + * method will invoke a setter method on the underlying Object. The + * setter is the one for the specified property name and the value is + * determined partly from the setter argument type and partly from the + * value specified in the call to this method. + * + *

If the setter expects a String no conversion is necessary. + * If it expects an int, then an attempt is made to convert 'value' + * to an int using new Integer(value). If the setter expects a boolean, + * the conversion is by new Boolean(value). + * + * @param string $name name of the property + * @param string $value String value of the property + */ + function setProperty($name, $value) + { + LoggerLog::debug("LoggerOptionConverter::setProperty():name=[{$name}]:value=[{$value}]"); + + if ($value === null) return; + + $method = "set" . ucfirst($name); + + if (!method_exists($this->obj, $method)) { + LoggerLog::warn( + "LoggerOptionConverter::setProperty() No such setter method for [{$name}] property in " . + get_class($this->obj) . "." + ); + } else { + return call_user_func(array(&$this->obj, $method), $value); + } + } + + function activate() + { + LoggerLog::debug("LoggerOptionConverter::activate()"); + + if (method_exists($this->obj, 'activateoptions')) { + return call_user_func(array(&$this->obj, 'activateoptions')); + } else { + LoggerLog::debug("LoggerOptionConverter::activate() Nothing to activate."); + } + } +} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 21:11:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:11:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5732 - in /vtigercrm/trunk/log4php/helpers: LoggerFormattingInfo.php LoggerOptionConverter.php LoggerPatternConverter.php LoggerPatternParser.php LoggerTransform.php Message-ID: <20060504041130.E8499709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:11:21 2006 New Revision: 5732 Log: log4php latest version has been updated Modified: vtigercrm/trunk/log4php/helpers/LoggerFormattingInfo.php vtigercrm/trunk/log4php/helpers/LoggerOptionConverter.php vtigercrm/trunk/log4php/helpers/LoggerPatternConverter.php vtigercrm/trunk/log4php/helpers/LoggerPatternParser.php vtigercrm/trunk/log4php/helpers/LoggerTransform.php Modified: vtigercrm/trunk/log4php/helpers/LoggerFormattingInfo.php ============================================================================== --- vtigercrm/trunk/log4php/helpers/LoggerFormattingInfo.php (original) +++ vtigercrm/trunk/log4php/helpers/LoggerFormattingInfo.php Wed May 3 22:11:21 2006 @@ -1,61 +1,61 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage helpers - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -/** - * This class encapsulates the information obtained when parsing - * formatting modifiers in conversion modifiers. - * - * @author VxR - * @package log4php - * @subpackage spi - * @since 0.3 - */ -class LoggerFormattingInfo { - - var $min = -1; - var $max = 0x7FFFFFFF; - var $leftAlign = false; - - /** - * Constructor - */ - function LoggerFormattingInfo() {} - - function reset() - { - $this->min = -1; - $this->max = 0x7FFFFFFF; - $this->leftAlign = false; - } - - function dump() - { - LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}"); - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage helpers + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +/** + * This class encapsulates the information obtained when parsing + * formatting modifiers in conversion modifiers. + * + * @author VxR + * @package log4php + * @subpackage spi + * @since 0.3 + */ +class LoggerFormattingInfo { + + var $min = -1; + var $max = 0x7FFFFFFF; + var $leftAlign = false; + + /** + * Constructor + */ + function LoggerFormattingInfo() {} + + function reset() + { + $this->min = -1; + $this->max = 0x7FFFFFFF; + $this->leftAlign = false; + } + + function dump() + { + LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}"); + } +} ?> Modified: vtigercrm/trunk/log4php/helpers/LoggerOptionConverter.php ============================================================================== --- vtigercrm/trunk/log4php/helpers/LoggerOptionConverter.php (original) +++ vtigercrm/trunk/log4php/helpers/LoggerOptionConverter.php Wed May 3 22:11:21 2006 @@ -1,350 +1,350 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage helpers - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/LoggerLevel.php'); - -define('LOG4PHP_OPTION_CONVERTER_DELIM_START', '${'); -define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP', '}'); -define('LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN', 2); -define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN', 1); - -/** - * A convenience class to convert property values to specific types. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage helpers - * @static - * @since 0.5 - */ -class LoggerOptionConverter { - - /** - * OptionConverter is a static class. - */ - function OptionConverter() - { - return; - } - - /** - * @param array $l - * @param array $r - * @return array - * - * @static - */ - function concatanateArrays($l, $r) - { - return array_merge($l, $r); - } - - /** - * Read a predefined var. - * - * It returns a value referenced by $key using this search criteria: - * - if $key is a constant then return it. Else - * - if $key is set in $_ENV then return it. Else - * - return $def. - * - * @param string $key The key to search for. - * @param string $def The default value to return. - * @return string the string value of the system property, or the default - * value if there is no property with that key. - * - * @static - */ - function getSystemProperty($key, $def) - { - LoggerLog::debug("LoggerOptionConverter::getSystemProperty():key=[{$key}]:def=[{$def}]."); - - if (defined($key)) { - return (string)constant($key); - } elseif (isset($_ENV[$key])) { - return (string)$_ENV[$key]; - } else { - return $def; - } - } - - /** - * If $value is true, then true is - * returned. If $value is false, then - * true is returned. Otherwise, $default is - * returned. - * - *

Case of value is unimportant.

- * - * @param string $value - * @param boolean $default - * @return boolean - * - * @static - */ - function toBoolean($value, $default) - { - if($value === null) - return $default; - if ($value == 1) - return true; - $trimmedVal = strtolower(trim($value)); - if ("true" == $trimmedVal or "yes" == $trimmedVal) - return true; - if ("false" == $trimmedVal) - return false; - return $default; - } - - /** - * @param string $value - * @param integer $default - * @return integer - * @static - */ - function toInt($value, $default) - { - $value = trim($value); - if (is_numeric($value)) { - return (int)$value; - } else { - return $default; - } - } - - /** - * Converts a standard or custom priority level to a Level - * object. - * - *

If $value is of form "level#full_file_classname", - * where full_file_classname means the class filename with path - * but without php extension, then the specified class' toLevel() method - * is called to process the specified level string; if no '#' - * character is present, then the default {@link LoggerLevel} - * class is used to process the level value.

- * - *

As a special case, if the $value parameter is - * equal to the string "NULL", then the value null will - * be returned.

- * - *

If any error occurs while converting the value to a level, - * the $defaultValue parameter, which may be - * null, is returned.

- * - *

Case of $value is insignificant for the level level, but is - * significant for the class name part, if present.

- * - * @param string $value - * @param LoggerLevel $defaultValue - * @return LoggerLevel a {@link LoggerLevel} or null - * @static - */ - function toLevel($value, $defaultValue) - { - if($value === null) - return $defaultValue; - - $hashIndex = strpos($value, '#'); - if ($hashIndex === false) { - if("NULL" == strtoupper($value)) { - return null; - } else { - // no class name specified : use standard Level class - return LoggerLevel::toLevel($value, $defaultValue); - } - } - - $result = $defaultValue; - - $clazz = substr($value, ($hashIndex + 1)); - $levelName = substr($value, 0, $hashIndex); - - // This is degenerate case but you never know. - if("NULL" == strtoupper($levelName)) { - return null; - } - - LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}]:pri=[{$levelName}]"); - - if (!class_exists($clazz)) - @include_once("{$clazz}.php"); - - $clazz = basename($clazz); - - if (class_exists($clazz)) { - $result = @call_user_func(array($clazz, 'toLevel'), $value, $defaultValue); - if (!is_a($result, 'loggerlevel')) { - LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}] cannot call toLevel(). Returning default."); - $result = $defaultValue; - } - } else { - LoggerLog::warn("LoggerOptionConverter::toLevel() class '{$clazz}' doesnt exists."); - } - return $result; - } - - /** - * @param string $value - * @param float $default - * @return float - * - * @static - */ - function toFileSize($value, $default) - { - if ($value === null) - return $default; - - $s = strtoupper(trim($value)); - $multiplier = (float)1; - if(($index = strpos($s, 'KB')) !== false) { - $multiplier = 1024; - $s = substr($s, 0, $index); - } elseif(($index = strpos($s, 'MB')) !== false) { - $multiplier = 1024 * 1024; - $s = substr($s, 0, $index); - } elseif(($index = strpos($s, 'GB')) !== false) { - $multiplier = 1024 * 1024 * 1024; - $s = substr($s, 0, $index); - } - if(is_numeric($s)) { - return (float)$s * $multiplier; - } else { - LoggerLog::warn("LoggerOptionConverter::toFileSize() [{$s}] is not in proper form."); - } - return $default; - } - - /** - * Find the value corresponding to $key in - * $props. Then perform variable substitution on the - * found value. - * - * @param string $key - * @param array $props - * @return string - * - * @static - */ - function findAndSubst($key, $props) - { - $value = @$props[$key]; - if(empty($value)) { - return null; - } - return LoggerOptionConverter::substVars($value, $props); - } - - /** - * Perform variable substitution in string $val from the - * values of keys found with the {@link getSystemProperty()} method. - * - *

The variable substitution delimeters are ${ and }. - * - *

For example, if the "MY_CONSTANT" contains "value", then - * the call - * - * $s = LoggerOptionConverter::substituteVars("Value of key is ${MY_CONSTANT}."); - * - * will set the variable $s to "Value of key is value.".

- * - *

If no value could be found for the specified key, then the - * $props parameter is searched, if the value could not - * be found there, then substitution defaults to the empty string.

- * - *

For example, if {@link getSystemProperty()} cannot find any value for the key - * "inexistentKey", then the call - * - * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]"); - * - * will set $s to "Value of inexistentKey is []".

- * - *

A warn is thrown if $val contains a start delimeter "${" - * which is not balanced by a stop delimeter "}" and an empty string is returned.

- * - * @log4j-author Avy Sharell - * - * @param string $val The string on which variable substitution is performed. - * @param array $props - * @return string - * - * @static - */ - function substVars($val, $props = null) - { - LoggerLog::debug("LoggerOptionConverter::substVars():val=[{$val}]"); - - $sbuf = ''; - $i = 0; - while(true) { - $j = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_START, $i); - if ($j === false) { - LoggerLog::debug("LoggerOptionConverter::substVars() no more variables"); - // no more variables - if ($i == 0) { // this is a simple string - LoggerLog::debug("LoggerOptionConverter::substVars() simple string"); - return $val; - } else { // add the tail string which contails no variables and return the result. - $sbuf .= substr($val, $i); - LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]. Returning sbuf"); - return $sbuf; - } - } else { - - $sbuf .= substr($val, $i, $j-$i); - LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]:i={$i}:j={$j}."); - $k = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_STOP, $j); - if ($k === false) { - LoggerLog::warn( - "LoggerOptionConverter::substVars() " . - "'{$val}' has no closing brace. Opening brace at position {$j}." - ); - return ''; - } else { - $j += LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN; - $key = substr($val, $j, $k - $j); - // first try in System properties - $replacement = LoggerOptionConverter::getSystemProperty($key, null); - // then try props parameter - if($replacement == null and $props !== null) { - $replacement = @$props[$key]; - } - - if(!empty($replacement)) { - // Do variable substitution on the replacement string - // such that we can solve "Hello ${x2}" as "Hello p1" - // the where the properties are - // x1=p1 - // x2=${x1} - $recursiveReplacement = LoggerOptionConverter::substVars($replacement, $props); - $sbuf .= $recursiveReplacement; - } - $i = $k + LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN; - } - } - } - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage helpers + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +require_once(LOG4PHP_DIR . '/LoggerLevel.php'); + +define('LOG4PHP_OPTION_CONVERTER_DELIM_START', '${'); +define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP', '}'); +define('LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN', 2); +define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN', 1); + +/** + * A convenience class to convert property values to specific types. + * + * @author VxR + * @version $Revision: 1.6 $ + * @package log4php + * @subpackage helpers + * @static + * @since 0.5 + */ +class LoggerOptionConverter { + + /** + * OptionConverter is a static class. + */ + function OptionConverter() + { + return; + } + + /** + * @param array $l + * @param array $r + * @return array + * + * @static + */ + function concatanateArrays($l, $r) + { + return array_merge($l, $r); + } + + /** + * Read a predefined var. + * + * It returns a value referenced by $key using this search criteria: + * - if $key is a constant then return it. Else + * - if $key is set in $_ENV then return it. Else + * - return $def. + * + * @param string $key The key to search for. + * @param string $def The default value to return. + * @return string the string value of the system property, or the default + * value if there is no property with that key. + * + * @static + */ + function getSystemProperty($key, $def) + { + LoggerLog::debug("LoggerOptionConverter::getSystemProperty():key=[{$key}]:def=[{$def}]."); + + if (defined($key)) { + return (string)constant($key); + } elseif (isset($_ENV[$key])) { + return (string)$_ENV[$key]; + } else { + return $def; + } + } + + /** + * If $value is true, then true is + * returned. If $value is false, then + * true is returned. Otherwise, $default is + * returned. + * + *

Case of value is unimportant.

+ * + * @param string $value + * @param boolean $default + * @return boolean + * + * @static + */ + function toBoolean($value, $default) + { + if($value === null) + return $default; + if ($value == 1) + return true; + $trimmedVal = strtolower(trim($value)); + if ("true" == $trimmedVal or "yes" == $trimmedVal) + return true; + if ("false" == $trimmedVal) + return false; + return $default; + } + + /** + * @param string $value + * @param integer $default + * @return integer + * @static + */ + function toInt($value, $default) + { + $value = trim($value); + if (is_numeric($value)) { + return (int)$value; + } else { + return $default; + } + } + + /** + * Converts a standard or custom priority level to a Level + * object. + * + *

If $value is of form "level#full_file_classname", + * where full_file_classname means the class filename with path + * but without php extension, then the specified class' toLevel() method + * is called to process the specified level string; if no '#' + * character is present, then the default {@link LoggerLevel} + * class is used to process the level value.

+ * + *

As a special case, if the $value parameter is + * equal to the string "NULL", then the value null will + * be returned.

+ * + *

If any error occurs while converting the value to a level, + * the $defaultValue parameter, which may be + * null, is returned.

+ * + *

Case of $value is insignificant for the level level, but is + * significant for the class name part, if present.

+ * + * @param string $value + * @param LoggerLevel $defaultValue + * @return LoggerLevel a {@link LoggerLevel} or null + * @static + */ + function toLevel($value, $defaultValue) + { + if($value === null) + return $defaultValue; + + $hashIndex = strpos($value, '#'); + if ($hashIndex === false) { + if("NULL" == strtoupper($value)) { + return null; + } else { + // no class name specified : use standard Level class + return LoggerLevel::toLevel($value, $defaultValue); + } + } + + $result = $defaultValue; + + $clazz = substr($value, ($hashIndex + 1)); + $levelName = substr($value, 0, $hashIndex); + + // This is degenerate case but you never know. + if("NULL" == strtoupper($levelName)) { + return null; + } + + LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}]:pri=[{$levelName}]"); + + if (!class_exists($clazz)) + @include_once("{$clazz}.php"); + + $clazz = basename($clazz); + + if (class_exists($clazz)) { + $result = @call_user_func(array($clazz, 'toLevel'), $value, $defaultValue); + if (!is_a($result, 'loggerlevel')) { + LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}] cannot call toLevel(). Returning default."); + $result = $defaultValue; + } + } else { + LoggerLog::warn("LoggerOptionConverter::toLevel() class '{$clazz}' doesnt exists."); + } + return $result; + } + + /** + * @param string $value + * @param float $default + * @return float + * + * @static + */ + function toFileSize($value, $default) + { + if ($value === null) + return $default; + + $s = strtoupper(trim($value)); + $multiplier = (float)1; + if(($index = strpos($s, 'KB')) !== false) { + $multiplier = 1024; + $s = substr($s, 0, $index); + } elseif(($index = strpos($s, 'MB')) !== false) { + $multiplier = 1024 * 1024; + $s = substr($s, 0, $index); + } elseif(($index = strpos($s, 'GB')) !== false) { + $multiplier = 1024 * 1024 * 1024; + $s = substr($s, 0, $index); + } + if(is_numeric($s)) { + return (float)$s * $multiplier; + } else { + LoggerLog::warn("LoggerOptionConverter::toFileSize() [{$s}] is not in proper form."); + } + return $default; + } + + /** + * Find the value corresponding to $key in + * $props. Then perform variable substitution on the + * found value. + * + * @param string $key + * @param array $props + * @return string + * + * @static + */ + function findAndSubst($key, $props) + { + $value = @$props[$key]; + if(empty($value)) { + return null; + } + return LoggerOptionConverter::substVars($value, $props); + } + + /** + * Perform variable substitution in string $val from the + * values of keys found with the {@link getSystemProperty()} method. + * + *

The variable substitution delimeters are ${ and }. + * + *

For example, if the "MY_CONSTANT" contains "value", then + * the call + * + * $s = LoggerOptionConverter::substituteVars("Value of key is ${MY_CONSTANT}."); + * + * will set the variable $s to "Value of key is value.".

+ * + *

If no value could be found for the specified key, then the + * $props parameter is searched, if the value could not + * be found there, then substitution defaults to the empty string.

+ * + *

For example, if {@link getSystemProperty()} cannot find any value for the key + * "inexistentKey", then the call + * + * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]"); + * + * will set $s to "Value of inexistentKey is []".

+ * + *

A warn is thrown if $val contains a start delimeter "${" + * which is not balanced by a stop delimeter "}" and an empty string is returned.

+ * + * @log4j-author Avy Sharell + * + * @param string $val The string on which variable substitution is performed. + * @param array $props + * @return string + * + * @static + */ + function substVars($val, $props = null) + { + LoggerLog::debug("LoggerOptionConverter::substVars():val=[{$val}]"); + + $sbuf = ''; + $i = 0; + while(true) { + $j = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_START, $i); + if ($j === false) { + LoggerLog::debug("LoggerOptionConverter::substVars() no more variables"); + // no more variables + if ($i == 0) { // this is a simple string + LoggerLog::debug("LoggerOptionConverter::substVars() simple string"); + return $val; + } else { // add the tail string which contails no variables and return the result. + $sbuf .= substr($val, $i); + LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]. Returning sbuf"); + return $sbuf; + } + } else { + + $sbuf .= substr($val, $i, $j-$i); + LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]:i={$i}:j={$j}."); + $k = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_STOP, $j); + if ($k === false) { + LoggerLog::warn( + "LoggerOptionConverter::substVars() " . + "'{$val}' has no closing brace. Opening brace at position {$j}." + ); + return ''; + } else { + $j += LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN; + $key = substr($val, $j, $k - $j); + // first try in System properties + $replacement = LoggerOptionConverter::getSystemProperty($key, null); + // then try props parameter + if($replacement == null and $props !== null) { + $replacement = @$props[$key]; + } + + if(!empty($replacement)) { + // Do variable substitution on the replacement string + // such that we can solve "Hello ${x2}" as "Hello p1" + // the where the properties are + // x1=p1 + // x2=${x1} + $recursiveReplacement = LoggerOptionConverter::substVars($replacement, $props); + $sbuf .= $recursiveReplacement; + } + $i = $k + LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN; + } + } + } + } + +} ?> Modified: vtigercrm/trunk/log4php/helpers/LoggerPatternConverter.php ============================================================================== --- vtigercrm/trunk/log4php/helpers/LoggerPatternConverter.php (original) +++ vtigercrm/trunk/log4php/helpers/LoggerPatternConverter.php Wed May 3 22:11:21 2006 @@ -1,504 +1,504 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage helpers - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -/** - * Array for fast space padding - * Used by {@link LoggerPatternConverter::spacePad()}. - */ -$GLOBALS['log4php.LoggerPatternConverter.spaces'] = array(" ", " ", " ", " ", //1,2,4,8 spaces - " ", // 16 spaces - " " ); // 32 spaces - -/** - * LoggerPatternConverter is an abstract class that provides the formatting - * functionality that derived classes need. - * - *

Conversion specifiers in a conversion patterns are parsed to - * individual PatternConverters. Each of which is responsible for - * converting a logging event in a converter specific manner.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage helpers - * @abstract - * @since 0.3 - */ -class LoggerPatternConverter { - - /** - * @var LoggerPatternConverter next converter in converter chain - */ - var $next = null; - - var $min = -1; - var $max = 0x7FFFFFFF; - var $leftAlign = false; - - /** - * Constructor - * - * @param LoggerFormattingInfo $fi - */ - function LoggerPatternConverter($fi = null) - { - if ($fi !== null) { - $this->min = $fi->min; - $this->max = $fi->max; - $this->leftAlign = $fi->leftAlign; - } - } - - /** - * Derived pattern converters must override this method in order to - * convert conversion specifiers in the correct way. - * - * @param LoggerLoggingEvent $event - */ - function convert($event) {} - - /** - * A template method for formatting in a converter specific way. - * - * @param string &$sbuf string buffer - * @param LoggerLoggingEvent $e - */ - function format(&$sbuf, $e) - { - LoggerLog::debug("LoggerPatternConverter::format() sbuf='$sbuf'"); - - $s = $this->convert($e); - - LoggerLog::debug("LoggerPatternConverter::format() converted event is '$s'"); - - - if($s == null or empty($s)) { - if(0 < $this->min) - $this->spacePad($sbuf, $this->min); - return; - } - - $len = strlen($s); - - if($len > $this->max) { - $sbuf .= substr($s , 0, ($len - $this->max)); - } elseif($len < $this->min) { - if($this->leftAlign) { - $sbuf .= $s; - $this->spacePad($sbuf, ($this->min - $len)); - } else { - $this->spacePad($sbuf, ($this->min - $len)); - $sbuf .= $s; - } - } else { - $sbuf .= $s; - } - } - - - /** - * Fast space padding method. - * - * @param string &$sbuf string buffer - * @param integer $length pad length - * - * @todo reimplement using PHP string functions - */ - function spacePad(&$sbuf, $length) - { - LoggerLog::debug("LoggerPatternConverter::spacePad() sbuf='$sbuf' len='$length'"); - - while($length >= 32) { - $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5]; - $length -= 32; - } - - for($i = 4; $i >= 0; $i--) { - if(($length & (1<<$i)) != 0) { - $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i]; - } - } - - // $sbuf = str_pad($sbuf, $length); - } -} - -// --------------------------------------------------------------------- -// PatternConverters -// --------------------------------------------------------------------- - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerBasicPatternConverter extends LoggerPatternConverter { - - /** - * @var integer - */ - var $type; - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $type - */ - function LoggerBasicPatternConverter($formattingInfo, $type) - { - LoggerLog::debug("LoggerBasicPatternConverter::LoggerBasicPatternConverter() type='$type'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->type = $type; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - switch($this->type) { - case LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER: - $timeStamp = $event->getTimeStamp(); - $startTime = LoggerLoggingEvent::getStartTime(); - return (string)(int)($timeStamp * 1000 - $startTime * 1000); - - case LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER: - return $event->getThreadName(); - - case LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER: - $level = $event->getLevel(); - return $level->toString(); - - case LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER: - return $event->getNDC(); - - case LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER: - return $event->getRenderedMessage(); - - default: - return ''; - } - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerLiteralPatternConverter extends LoggerPatternConverter { - - /** - * @var string - */ - var $literal; - - /** - * Constructor - * - * @param string $value - */ - function LoggerLiteralPatternConverter($value) - { - LoggerLog::debug("LoggerLiteralPatternConverter::LoggerLiteralPatternConverter() value='$value'"); - - $this->literal = $value; - } - - /** - * @param string &$sbuf - * @param LoggerLoggingEvent $event - */ - function format(&$sbuf, $event) - { - $sbuf .= $this->literal; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - return $this->literal; - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerDatePatternConverter extends LoggerPatternConverter { - - /** - * @var string - */ - var $df; - - /** - * Constructor - * - * @param string $formattingInfo - * @param string $df - */ - function LoggerDatePatternConverter($formattingInfo, $df) - { - LoggerLog::debug("LoggerDatePatternConverter::LoggerDatePatternConverter() dateFormat='$df'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->df = $df; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - $timeStamp = $event->getTimeStamp(); - $usecs = round(($timeStamp - (int)$timeStamp) * 1000); - $this->df = str_replace("\u", "u", ereg_replace("[^\\]u", sprintf(',%03d', $usecs), $this->df)); - - return date($this->df, $event->getTimeStamp()); - - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerMDCPatternConverter extends LoggerPatternConverter { - - /** - * @var string - */ - var $key; - - /** - * Constructor - * - * @param string $formattingInfo - * @param string $key - */ - function LoggerMDCPatternConverter($formattingInfo, $key) - { - LoggerLog::debug("LoggerMDCPatternConverter::LoggerMDCPatternConverter() key='$key'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->key = $key; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - return $event->getMDC($this->key); - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerLocationPatternConverter extends LoggerPatternConverter { - - /** - * @var integer - */ - var $type; - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $type - */ - function LoggerLocationPatternConverter($formattingInfo, $type) - { - LoggerLog::debug("LoggerLocationPatternConverter::LoggerLocationPatternConverter() type='$type'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->type = $type; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - $locationInfo = $event->getLocationInformation(); - switch($this->type) { - case LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER: - return $locationInfo->fullInfo; - case LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER: - return $locationInfo->getMethodName(); - case LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER: - return $locationInfo->getLineNumber(); - case LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER: - return $locationInfo->getFileName(); - default: - return ''; - } - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - * @abstract - */ -class LoggerNamedPatternConverter extends LoggerPatternConverter { - - /** - * @var integer - */ - var $precision; - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $precision - */ - function LoggerNamedPatternConverter($formattingInfo, $precision) - { - LoggerLog::debug("LoggerNamedPatternConverter::LoggerNamedPatternConverter() precision='$precision'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->precision = $precision; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - * @abstract - */ - function getFullyQualifiedName($event) - { - // abstract - return; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - $n = $this->getFullyQualifiedName($event); - if ($this->precision <= 0) { - return $n; - } else { - $len = strlen($n); - - // We substract 1 from 'len' when assigning to 'end' to avoid out of - // bounds exception in return r.substring(end+1, len). This can happen if - // precision is 1 and the category name ends with a dot. - $end = $len -1 ; - for($i = $this->precision; $i > 0; $i--) { - $end = strrpos(substr($n, 0, ($end - 1)), '.'); - if ($end == false) - return $n; - } - return substr($n, ($end + 1), $len); - } - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerClassNamePatternConverter extends LoggerNamedPatternConverter { - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $precision - */ - function LoggerClassNamePatternConverter($formattingInfo, $precision) - { - LoggerLog::debug("LoggerClassNamePatternConverter::LoggerClassNamePatternConverter() precision='$precision'"); - - $this->LoggerNamedPatternConverter($formattingInfo, $precision); - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function getFullyQualifiedName($event) - { - return $event->fqcn; - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerCategoryPatternConverter extends LoggerNamedPatternConverter { - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $precision - */ - function LoggerCategoryPatternConverter($formattingInfo, $precision) - { - LoggerLog::debug("LoggerCategoryPatternConverter::LoggerCategoryPatternConverter() precision='$precision'"); - - $this->LoggerNamedPatternConverter($formattingInfo, $precision); - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function getFullyQualifiedName($event) - { - return $event->getLoggerName(); - } -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage helpers + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +/** + * Array for fast space padding + * Used by {@link LoggerPatternConverter::spacePad()}. + */ +$GLOBALS['log4php.LoggerPatternConverter.spaces'] = array(" ", " ", " ", " ", //1,2,4,8 spaces + " ", // 16 spaces + " " ); // 32 spaces + +/** + * LoggerPatternConverter is an abstract class that provides the formatting + * functionality that derived classes need. + * + *

Conversion specifiers in a conversion patterns are parsed to + * individual PatternConverters. Each of which is responsible for + * converting a logging event in a converter specific manner.

+ * + * @author VxR + * @version $Revision: 1.13 $ + * @package log4php + * @subpackage helpers + * @abstract + * @since 0.3 + */ +class LoggerPatternConverter { + + /** + * @var LoggerPatternConverter next converter in converter chain + */ + var $next = null; + + var $min = -1; + var $max = 0x7FFFFFFF; + var $leftAlign = false; + + /** + * Constructor + * + * @param LoggerFormattingInfo $fi + */ + function LoggerPatternConverter($fi = null) + { + if ($fi !== null) { + $this->min = $fi->min; + $this->max = $fi->max; + $this->leftAlign = $fi->leftAlign; + } + } + + /** + * Derived pattern converters must override this method in order to + * convert conversion specifiers in the correct way. + * + * @param LoggerLoggingEvent $event + */ + function convert($event) {} + + /** + * A template method for formatting in a converter specific way. + * + * @param string &$sbuf string buffer + * @param LoggerLoggingEvent $e + */ + function format(&$sbuf, $e) + { + LoggerLog::debug("LoggerPatternConverter::format() sbuf='$sbuf'"); + + $s = $this->convert($e); + + LoggerLog::debug("LoggerPatternConverter::format() converted event is '$s'"); + + + if($s == null or empty($s)) { + if(0 < $this->min) + $this->spacePad($sbuf, $this->min); + return; + } + + $len = strlen($s); + + if($len > $this->max) { + $sbuf .= substr($s , 0, ($len - $this->max)); + } elseif($len < $this->min) { + if($this->leftAlign) { + $sbuf .= $s; + $this->spacePad($sbuf, ($this->min - $len)); + } else { + $this->spacePad($sbuf, ($this->min - $len)); + $sbuf .= $s; + } + } else { + $sbuf .= $s; + } + } + + + /** + * Fast space padding method. + * + * @param string &$sbuf string buffer + * @param integer $length pad length + * + * @todo reimplement using PHP string functions + */ + function spacePad(&$sbuf, $length) + { + LoggerLog::debug("LoggerPatternConverter::spacePad() sbuf='$sbuf' len='$length'"); + + while($length >= 32) { + $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5]; + $length -= 32; + } + + for($i = 4; $i >= 0; $i--) { + if(($length & (1<<$i)) != 0) { + $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i]; + } + } + + // $sbuf = str_pad($sbuf, $length); + } +} + +// --------------------------------------------------------------------- +// PatternConverters +// --------------------------------------------------------------------- + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerBasicPatternConverter extends LoggerPatternConverter { + + /** + * @var integer + */ + var $type; + + /** + * Constructor + * + * @param string $formattingInfo + * @param integer $type + */ + function LoggerBasicPatternConverter($formattingInfo, $type) + { + LoggerLog::debug("LoggerBasicPatternConverter::LoggerBasicPatternConverter() type='$type'"); + + $this->LoggerPatternConverter($formattingInfo); + $this->type = $type; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + switch($this->type) { + case LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER: + $timeStamp = $event->getTimeStamp(); + $startTime = LoggerLoggingEvent::getStartTime(); + return (string)(int)($timeStamp * 1000 - $startTime * 1000); + + case LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER: + return $event->getThreadName(); + + case LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER: + $level = $event->getLevel(); + return $level->toString(); + + case LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER: + return $event->getNDC(); + + case LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER: + return $event->getRenderedMessage(); + + default: + return ''; + } + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerLiteralPatternConverter extends LoggerPatternConverter { + + /** + * @var string + */ + var $literal; + + /** + * Constructor + * + * @param string $value + */ + function LoggerLiteralPatternConverter($value) + { + LoggerLog::debug("LoggerLiteralPatternConverter::LoggerLiteralPatternConverter() value='$value'"); + + $this->literal = $value; + } + + /** + * @param string &$sbuf + * @param LoggerLoggingEvent $event + */ + function format(&$sbuf, $event) + { + $sbuf .= $this->literal; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + return $this->literal; + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerDatePatternConverter extends LoggerPatternConverter { + + /** + * @var string + */ + var $df; + + /** + * Constructor + * + * @param string $formattingInfo + * @param string $df + */ + function LoggerDatePatternConverter($formattingInfo, $df) + { + LoggerLog::debug("LoggerDatePatternConverter::LoggerDatePatternConverter() dateFormat='$df'"); + + $this->LoggerPatternConverter($formattingInfo); + $this->df = $df; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + $timeStamp = $event->getTimeStamp(); + $usecs = round(($timeStamp - (int)$timeStamp) * 1000); + $this->df = str_replace("\u", "u", ereg_replace("[^\\]u", sprintf(',%03d', $usecs), $this->df)); + + return date($this->df, $event->getTimeStamp()); + + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerMDCPatternConverter extends LoggerPatternConverter { + + /** + * @var string + */ + var $key; + + /** + * Constructor + * + * @param string $formattingInfo + * @param string $key + */ + function LoggerMDCPatternConverter($formattingInfo, $key) + { + LoggerLog::debug("LoggerMDCPatternConverter::LoggerMDCPatternConverter() key='$key'"); + + $this->LoggerPatternConverter($formattingInfo); + $this->key = $key; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + return $event->getMDC($this->key); + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerLocationPatternConverter extends LoggerPatternConverter { + + /** + * @var integer + */ + var $type; + + /** + * Constructor + * + * @param string $formattingInfo + * @param integer $type + */ + function LoggerLocationPatternConverter($formattingInfo, $type) + { + LoggerLog::debug("LoggerLocationPatternConverter::LoggerLocationPatternConverter() type='$type'"); + + $this->LoggerPatternConverter($formattingInfo); + $this->type = $type; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + $locationInfo = $event->getLocationInformation(); + switch($this->type) { + case LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER: + return $locationInfo->fullInfo; + case LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER: + return $locationInfo->getMethodName(); + case LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER: + return $locationInfo->getLineNumber(); + case LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER: + return $locationInfo->getFileName(); + default: + return ''; + } + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + * @abstract + */ +class LoggerNamedPatternConverter extends LoggerPatternConverter { + + /** + * @var integer + */ + var $precision; + + /** + * Constructor + * + * @param string $formattingInfo + * @param integer $precision + */ + function LoggerNamedPatternConverter($formattingInfo, $precision) + { + LoggerLog::debug("LoggerNamedPatternConverter::LoggerNamedPatternConverter() precision='$precision'"); + + $this->LoggerPatternConverter($formattingInfo); + $this->precision = $precision; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + * @abstract + */ + function getFullyQualifiedName($event) + { + // abstract + return; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + $n = $this->getFullyQualifiedName($event); + if ($this->precision <= 0) { + return $n; + } else { + $len = strlen($n); + + // We substract 1 from 'len' when assigning to 'end' to avoid out of + // bounds exception in return r.substring(end+1, len). This can happen if + // precision is 1 and the category name ends with a dot. + $end = $len -1 ; + for($i = $this->precision; $i > 0; $i--) { + $end = strrpos(substr($n, 0, ($end - 1)), '.'); + if ($end == false) + return $n; + } + return substr($n, ($end + 1), $len); + } + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerClassNamePatternConverter extends LoggerNamedPatternConverter { + + /** + * Constructor + * + * @param string $formattingInfo + * @param integer $precision + */ + function LoggerClassNamePatternConverter($formattingInfo, $precision) + { + LoggerLog::debug("LoggerClassNamePatternConverter::LoggerClassNamePatternConverter() precision='$precision'"); + + $this->LoggerNamedPatternConverter($formattingInfo, $precision); + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function getFullyQualifiedName($event) + { + return $event->fqcn; + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerCategoryPatternConverter extends LoggerNamedPatternConverter { + + /** + * Constructor + * + * @param string $formattingInfo + * @param integer $precision + */ + function LoggerCategoryPatternConverter($formattingInfo, $precision) + { + LoggerLog::debug("LoggerCategoryPatternConverter::LoggerCategoryPatternConverter() precision='$precision'"); + + $this->LoggerNamedPatternConverter($formattingInfo, $precision); + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function getFullyQualifiedName($event) + { + return $event->getLoggerName(); + } +} + ?> Modified: vtigercrm/trunk/log4php/helpers/LoggerPatternParser.php ============================================================================== --- vtigercrm/trunk/log4php/helpers/LoggerPatternParser.php (original) +++ vtigercrm/trunk/log4php/helpers/LoggerPatternParser.php Wed May 3 22:11:21 2006 @@ -1,419 +1,419 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage helpers - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -if (!defined('LOG4PHP_LINE_SEP')) { - if (substr(php_uname(), 0, 7) == "Windows") { - /** - * @ignore - */ - define('LOG4PHP_LINE_SEP', "\r\n"); - } else { - /** - * @ignore - */ - define('LOG4PHP_LINE_SEP', "\n"); - } -} - -/** - */ -require_once(LOG4PHP_DIR . '/helpers/LoggerFormattingInfo.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerPatternConverter.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -define('LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR', '%'); - -define('LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE', 0); -define('LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE', 1); -define('LOG4PHP_LOGGER_PATTERN_PARSER_MINUS_STATE', 2); -define('LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE', 3); -define('LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE', 4); -define('LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE', 5); - -define('LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER', 1000); -define('LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER', 1001); -define('LOG4PHP_LOGGER_PATTERN_PARSER_CLASS_LOCATION_CONVERTER', 1002); -define('LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER', 1003); -define('LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER', 1004); - -define('LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER', 2000); -define('LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER', 2001); -define('LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER', 2002); -define('LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER', 2003); -define('LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER', 2004); - -define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601', 'Y-m-d H:i:s,u'); -define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE', 'H:i:s'); -define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE', 'd M Y H:i:s,u'); - -/** - * Most of the work of the {@link LoggerPatternLayout} class - * is delegated to the {@link LoggerPatternParser} class. - * - *

It is this class that parses conversion patterns and creates - * a chained list of {@link LoggerPatternConverter} converters.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage helpers - * - * @since 0.3 - */ -class LoggerPatternParser { - - var $state; - var $currentLiteral; - var $patternLength; - var $i; - - /** - * @var LoggerPatternConverter - */ - var $head = null; - - /** - * @var LoggerPatternConverter - */ - var $tail = null; - - /** - * @var LoggerFormattingInfo - */ - var $formattingInfo; - - /** - * @var string pattern to parse - */ - var $pattern; - - /** - * Constructor - * - * @param string $pattern - */ - function LoggerPatternParser($pattern) - { - LoggerLog::debug("LoggerPatternParser::LoggerPatternParser() pattern='$pattern'"); - - $this->pattern = $pattern; - $this->patternLength = strlen($pattern); - $this->formattingInfo = new LoggerFormattingInfo(); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - } - - /** - * @param LoggerPatternConverter $pc - */ - function addToList($pc) - { - // LoggerLog::debug("LoggerPatternParser::addToList()"); - - if($this->head == null) { - $this->head = $pc; - $this->tail =& $this->head; - } else { - $this->tail->next = $pc; - $this->tail =& $this->tail->next; - } - } - - /** - * @return string - */ - function extractOption() - { - if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) { - $end = strpos($this->pattern, '}' , $this->i); - if ($end !== false) { - $r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1)); - $this->i= $end + 1; - return $r; - } - } - return null; - } - - /** - * The option is expected to be in decimal and positive. In case of - * error, zero is returned. - */ - function extractPrecisionOption() - { - $opt = $this->extractOption(); - $r = 0; - if ($opt !== null) { - if (is_numeric($opt)) { - $r = (int)$opt; - if($r <= 0) { - LoggerLog::warn("Precision option ({$opt}) isn't a positive integer."); - $r = 0; - } - } else { - LoggerLog::warn("Category option \"{$opt}\" not a decimal integer."); - } - } - return $r; - } - - function parse() - { - LoggerLog::debug("LoggerPatternParser::parse()"); - - $c = ''; - $this->i = 0; - $this->currentLiteral = ''; - while ($this->i < $this->patternLength) { - $c = $this->pattern{$this->i++}; -// LoggerLog::debug("LoggerPatternParser::parse() char is now '$c' and currentLiteral is '{$this->currentLiteral}'"); - switch($this->state) { - case LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE'"); - // In literal state, the last char is always a literal. - if($this->i == $this->patternLength) { - $this->currentLiteral .= $c; - continue; - } - if($c == LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR) { - // LoggerLog::debug("LoggerPatternParser::parse() char is an escape char"); - // peek at the next char. - switch($this->pattern{$this->i}) { - case LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR: - // LoggerLog::debug("LoggerPatternParser::parse() next char is an escape char"); - $this->currentLiteral .= $c; - $this->i++; // move pointer - break; - case 'n': - // LoggerLog::debug("LoggerPatternParser::parse() next char is 'n'"); - $this->currentLiteral .= LOG4PHP_LINE_SEP; - $this->i++; // move pointer - break; - default: - if(strlen($this->currentLiteral) != 0) { - $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral)); - LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\"."); - } - $this->currentLiteral = $c; - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE; - $this->formattingInfo->reset(); - } - } else { - $this->currentLiteral .= $c; - } - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE'"); - $this->currentLiteral .= $c; - switch($c) { - case '-': - $this->formattingInfo->leftAlign = true; - break; - case '.': - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE; - break; - default: - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->min = ord($c) - ord('0'); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE; - } else { - $this->finalizeConverter($c); - } - } // switch - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE'"); - $this->currentLiteral .= $c; - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord(c) - ord('0')); - } elseif ($c == '.') { - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE; - } else { - $this->finalizeConverter($c); - } - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE'"); - $this->currentLiteral .= $c; - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->max = ord($c) - ord('0'); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE; - } else { - LoggerLog::warn("LoggerPatternParser::parse() Error occured in position {$this->i}. Was expecting digit, instead got char \"{$c}\"."); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - } - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE'"); - $this->currentLiteral .= $c; - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0')); - } else { - $this->finalizeConverter($c); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - } - break; - } // switch - } // while - if(strlen($this->currentLiteral) != 0) { - $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral)); - // LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\"."); - } - return $this->head; - } - - function finalizeConverter($c) - { - LoggerLog::debug("LoggerPatternParser::finalizeConverter() with char '$c'"); - - $pc = null; - switch($c) { - case 'c': - $pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption()); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() CATEGORY converter."); - // $this->formattingInfo->dump(); - $this->currentLiteral = ''; - break; - case 'C': - $pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption()); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() CLASSNAME converter."); - //$this->formattingInfo->dump(); - $this->currentLiteral = ''; - break; - case 'd': - $dateFormatStr = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT; - $dOpt = $this->extractOption(); - - if($dOpt !== null) - $dateFormatStr = $dOpt; - - if ($dateFormatStr == 'ISO8601') { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; - } elseif($dateFormatStr == 'ABSOLUTE') { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE; - } elseif($dateFormatStr == 'DATE') { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE; - } else { - $df = $dateFormatStr; - if ($df == null) { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; - } - } - $pc = new LoggerDatePatternConverter($this->formattingInfo, $df); - $this->currentLiteral = ''; - break; - case 'F': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() File name converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'l': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() Location converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'L': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() LINE NUMBER converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'm': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() MESSAGE converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'M': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER); - //LogLog.debug("METHOD converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'p': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER); - //LogLog.debug("LEVEL converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'r': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() RELATIVE TIME converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 't': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() THREAD converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'u': - if($this->i < $this->patternLength) { - $cNext = $this->pattern{$this->i}; - if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) { - $pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0'))); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() USER converter [{$cNext}]."); - // formattingInfo.dump(); - $this->currentLiteral = ''; - $this->i++; - } else { - LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char '{$cNext}' at position {$this->i}."); - } - } - break; - case 'x': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() NDC converter."); - $this->currentLiteral = ''; - break; - - case 'X': - $xOpt = $this->extractOption(); - $pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() MDC converter."); - $this->currentLiteral = ''; - break; - default: - LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char [$c] at position {$this->i} in conversion pattern."); - $pc = new LoggerLiteralPatternConverter($this->currentLiteral); - $this->currentLiteral = ''; - } - $this->addConverter($pc); - } - - function addConverter($pc) - { - $this->currentLiteral = ''; - // Add the pattern converter to the list. - $this->addToList($pc); - // Next pattern is assumed to be a literal. - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - // Reset formatting info - $this->formattingInfo->reset(); - } -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage helpers + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +if (!defined('LOG4PHP_LINE_SEP')) { + if (substr(php_uname(), 0, 7) == "Windows") { + /** + * @ignore + */ + define('LOG4PHP_LINE_SEP', "\r\n"); + } else { + /** + * @ignore + */ + define('LOG4PHP_LINE_SEP', "\n"); + } +} + +/** + */ +require_once(LOG4PHP_DIR . '/helpers/LoggerFormattingInfo.php'); +require_once(LOG4PHP_DIR . '/helpers/LoggerPatternConverter.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +define('LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR', '%'); + +define('LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE', 0); +define('LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE', 1); +define('LOG4PHP_LOGGER_PATTERN_PARSER_MINUS_STATE', 2); +define('LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE', 3); +define('LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE', 4); +define('LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE', 5); + +define('LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER', 1000); +define('LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER', 1001); +define('LOG4PHP_LOGGER_PATTERN_PARSER_CLASS_LOCATION_CONVERTER', 1002); +define('LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER', 1003); +define('LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER', 1004); + +define('LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER', 2000); +define('LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER', 2001); +define('LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER', 2002); +define('LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER', 2003); +define('LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER', 2004); + +define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601', 'Y-m-d H:i:s,u'); +define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE', 'H:i:s'); +define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE', 'd M Y H:i:s,u'); + +/** + * Most of the work of the {@link LoggerPatternLayout} class + * is delegated to the {@link LoggerPatternParser} class. + * + *

It is this class that parses conversion patterns and creates + * a chained list of {@link LoggerPatternConverter} converters.

+ * + * @author VxR + * @version $Revision: 1.10 $ + * @package log4php + * @subpackage helpers + * + * @since 0.3 + */ +class LoggerPatternParser { + + var $state; + var $currentLiteral; + var $patternLength; + var $i; + + /** + * @var LoggerPatternConverter + */ + var $head = null; + + /** + * @var LoggerPatternConverter + */ + var $tail = null; + + /** + * @var LoggerFormattingInfo + */ + var $formattingInfo; + + /** + * @var string pattern to parse + */ + var $pattern; + + /** + * Constructor + * + * @param string $pattern + */ + function LoggerPatternParser($pattern) + { + LoggerLog::debug("LoggerPatternParser::LoggerPatternParser() pattern='$pattern'"); + + $this->pattern = $pattern; + $this->patternLength = strlen($pattern); + $this->formattingInfo = new LoggerFormattingInfo(); + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; + } + + /** + * @param LoggerPatternConverter $pc + */ + function addToList($pc) + { + // LoggerLog::debug("LoggerPatternParser::addToList()"); + + if($this->head == null) { + $this->head = $pc; + $this->tail =& $this->head; + } else { + $this->tail->next = $pc; + $this->tail =& $this->tail->next; + } + } + + /** + * @return string + */ + function extractOption() + { + if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) { + $end = strpos($this->pattern, '}' , $this->i); + if ($end !== false) { + $r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1)); + $this->i= $end + 1; + return $r; + } + } + return null; + } + + /** + * The option is expected to be in decimal and positive. In case of + * error, zero is returned. + */ + function extractPrecisionOption() + { + $opt = $this->extractOption(); + $r = 0; + if ($opt !== null) { + if (is_numeric($opt)) { + $r = (int)$opt; + if($r <= 0) { + LoggerLog::warn("Precision option ({$opt}) isn't a positive integer."); + $r = 0; + } + } else { + LoggerLog::warn("Category option \"{$opt}\" not a decimal integer."); + } + } + return $r; + } + + function parse() + { + LoggerLog::debug("LoggerPatternParser::parse()"); + + $c = ''; + $this->i = 0; + $this->currentLiteral = ''; + while ($this->i < $this->patternLength) { + $c = $this->pattern{$this->i++}; +// LoggerLog::debug("LoggerPatternParser::parse() char is now '$c' and currentLiteral is '{$this->currentLiteral}'"); + switch($this->state) { + case LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE: + // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE'"); + // In literal state, the last char is always a literal From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 21:13:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:13:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5733 - in /vtigercrm/trunk/log4php/layouts: LoggerLayoutHtml.php LoggerLayoutSimple.php LoggerLayoutTTCC.php LoggerPatternLayout.php LoggerXmlLayout.php Message-ID: <20060504041310.EEF70709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:13:02 2006 New Revision: 5733 Log: log4php latest version has been update Modified: vtigercrm/trunk/log4php/layouts/LoggerLayoutHtml.php vtigercrm/trunk/log4php/layouts/LoggerLayoutSimple.php vtigercrm/trunk/log4php/layouts/LoggerLayoutTTCC.php vtigercrm/trunk/log4php/layouts/LoggerPatternLayout.php vtigercrm/trunk/log4php/layouts/LoggerXmlLayout.php Modified: vtigercrm/trunk/log4php/layouts/LoggerLayoutHtml.php ============================================================================== --- vtigercrm/trunk/log4php/layouts/LoggerLayoutHtml.php (original) +++ vtigercrm/trunk/log4php/layouts/LoggerLayoutHtml.php Wed May 3 22:13:02 2006 @@ -1,256 +1,256 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage layouts - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -if (!defined('LOG4PHP_LINE_SEP')) { - if (substr(php_uname(), 0, 7) == "Windows") { - /** - * @ignore - */ - define('LOG4PHP_LINE_SEP', "\r\n"); - } else { - /** - * @ignore - */ - define('LOG4PHP_LINE_SEP', "\n"); - } -} - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLayout.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php'); - -/** - * This layout outputs events in a HTML table. - * - * Parameters are: {@link $title}, {@link $locationInfo}. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage layouts - */ -class LoggerLayoutHtml extends LoggerLayout { - - /** - * The LocationInfo option takes a boolean value. By - * default, it is set to false which means there will be no location - * information output by this layout. If the the option is set to - * true, then the file name and line number of the statement - * at the origin of the log statement will be output. - * - *

If you are embedding this layout within a {@link LoggerAppenderMail} - * or a {@link LoggerAppenderMailEvent} then make sure to set the - * LocationInfo option of that appender as well. - * @var boolean - */ - var $locationInfo = false; - - /** - * The Title option takes a String value. This option sets the - * document title of the generated HTML document. - * Defaults to 'Log4php Log Messages'. - * @var string - */ - var $title = "Log4php Log Messages"; - - /** - * Constructor - */ - function LoggerLayoutHtml() - { - return; - } - - /** - * The LocationInfo option takes a boolean value. By - * default, it is set to false which means there will be no location - * information output by this layout. If the the option is set to - * true, then the file name and line number of the statement - * at the origin of the log statement will be output. - * - *

If you are embedding this layout within a {@link LoggerAppenderMail} - * or a {@link LoggerAppenderMailEvent} then make sure to set the - * LocationInfo option of that appender as well. - */ - function setLocationInfo($flag) - { - if (is_bool($flag)) { - $this->locationInfo = $flag; - } else { - $this->locationInfo = (bool)(strtolower($flag) == 'true'); - } - } - - /** - * Returns the current value of the LocationInfo option. - */ - function getLocationInfo() - { - return $this->locationInfo; - } - - /** - * The Title option takes a String value. This option sets the - * document title of the generated HTML document. - * Defaults to 'Log4php Log Messages'. - */ - function setTitle($title) - { - $this->title = $title; - } - - /** - * @return string Returns the current value of the Title option. - */ - function getTitle() - { - return $this->title; - } - - /** - * @return string Returns the content type output by this layout, i.e "text/html". - */ - function getContentType() - { - return "text/html"; - } - - /** - * No options to activate. - */ - function activateOptions() - { - return true; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function format($event) - { - $sbuf = LOG4PHP_LINE_SEP . "

" . LOG4PHP_LINE_SEP; - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - if ($this->locationInfo) { - $locInfo = $event->getLocationInformation(); - $sbuf .= "" . LOG4PHP_LINE_SEP; - } - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - if ($event->getNDC() != null) { - $sbuf .= "" . LOG4PHP_LINE_SEP; - } - - return $sbuf; - } - - /** - * @return string Returns appropriate HTML headers. - */ - function getHeader() - { - $sbuf = "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . $this->title . "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "
" . LOG4PHP_LINE_SEP; - $sbuf .= "Log session start time " . strftime('%c', time()) . "
" . LOG4PHP_LINE_SEP; - $sbuf .= "
" . LOG4PHP_LINE_SEP; - $sbuf .= "
{$MOD.LBL_USER_MANAGEMENT}{$MOD.LBL_FIELD_ORDERING_DESC}
{$MOD.LBL_FIELD_ORDERING}
 
{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}
{$MOD.NOTIFICATIONSCHEDULERS}
{$MOD.LBL_INVENTORY_NOTIFICATIONS}
+{$MOD.INVENTORYNOTIFICATION}
 
{$MOD.LBL_INVENTORY_NOTIFICATIONS}
-{$MOD.INVENTORYNOTIFICATION}
{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
+
{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
{$MOD.INVENTORYTERMSANDCONDITIONS}
   
  {$MOD.LBL_SETTINGS} - > {$MOD.LBL_USER_MANAGEMENT} + > {$MOD.LBL_USER_MANAGEMENT} > Users
{$MOD.LBL_SETTINGS} - > {$MOD.LBL_USER_MANAGEMENT} + > {$MOD.LBL_USER_MANAGEMENT} > User
*{$UMOD.LBL_EMAIL}{$EMAIL1} {$EMAIL1}  *{$UMOD.LBL_STATUS} {$STATUS} 
- @@ -55,6 +54,7 @@ +
'; -else { -$i=1; - // Main loop to create listview entries +$listview_entries = array(); + +if($numEmails <= 0) + $listview_entries[0][] = ''; +else { +$i=1; + // Main loop to create listview entries while ($i<$c) { $num = $mails[$start_message]->msgno; // TODO: scan the current db tables to find a @@ -256,24 +256,26 @@ // 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)) $flags.=' '; elseif (preg_match("/^fw:/i",$mails[$start_message]->subject)) $flags.=' '; else - $flags.=' '; - - // Add to Vtiger + $flags.=' '; + + // Add to Vtiger if($mails[$start_message]->flagged) $flags.=''; else $flags.=''; - $tmp=imap_mime_header_decode($mails[$start_message]->from); - $from = $tmp[0]->text; - $listview_entries[$num] = array(); + $tmp=imap_mime_header_decode($mails[$start_message]->from); + $from = $tmp[0]->text; + $listview_entries[$num] = array(); $listview_entries[$num][] = $flags.""; @@ -307,14 +309,14 @@
 
From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 01:04:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 08:04:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5694 - /vtigercrm/trunk/modules/Users/Save.php Message-ID: <20060503080443.A1595702F5F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 02:04:39 2006 New Revision: 5694 Log: Modified the verification while save users Modified: vtigercrm/trunk/modules/Users/Save.php Modified: vtigercrm/trunk/modules/Users/Save.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Wed May 3 01:08:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 08:08:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23284=3A_?= =?utf-8?q?Email_field_not_validated?= In-Reply-To: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> References: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> Message-ID: <085.fb184bd6ddc53d502f460bac5b80ac59@vtiger.fosslabs.com> #284: Email field not validated ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Users Email Validation ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: jerrydgeorge => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 01:09:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 08:09:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23284=3A_?= =?utf-8?q?Email_field_not_validated?= In-Reply-To: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> References: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> Message-ID: <085.e106151417391687b442495904e8264a@vtiger.fosslabs.com> #284: Email field not validated ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Users Email Validation ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - The other email id is validated and the field label rectified. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 01:12:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 08:12:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23382=3A_?= =?utf-8?q?No_validation_when_user_data_edited?= In-Reply-To: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> References: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> Message-ID: <085.0452cb3ca6d5ff36f892f4a99c1bd07f@vtiger.fosslabs.com> #382: No validation when user data edited ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User update ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: jerrydgeorge => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 01:13:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 08:13:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23382=3A_?= =?utf-8?q?No_validation_when_user_data_edited?= In-Reply-To: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> References: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> Message-ID: <085.c7be37f91a599aa2c09a06d39b9db252@vtiger.fosslabs.com> #382: No validation when user data edited ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: User update ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Validated done for Edit View in Users & My Preferences -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 01:52:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 08:52:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5695 - /vtigercrm/trunk/modules/Import/ImportButton.php Message-ID: <20060503085238.96978702F46@vtiger.fosslabs.com> Author: don Date: Wed May 3 02:52:34 2006 New Revision: 5695 Log: Removed the calling of permitted actions from session Modified: vtigercrm/trunk/modules/Import/ImportButton.php Modified: vtigercrm/trunk/modules/Import/ImportButton.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportButton.php (original) +++ vtigercrm/trunk/modules/Import/ImportButton.php Wed May 3 02:52:34 2006 @@ -20,7 +20,8 @@ --> - '.$display.' ##############'); - fetchPermissionData($module,$action); } else { From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 04:06:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 11:06:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5707 - /vtigercrm/trunk/modules/Users/listemailtemplates.php Message-ID: <20060503110631.DC94E702FD0@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 05:06:26 2006 New Revision: 5707 Log: Logs made proper for email templates listview - ahmed Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php ============================================================================== --- vtigercrm/trunk/modules/Users/listemailtemplates.php (original) +++ vtigercrm/trunk/modules/Users/listemailtemplates.php Wed May 3 05:06:26 2006 @@ -12,7 +12,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); - + +global $adb; +global $log; + +$log->info("Inside Email Templates List View"); + $sql = "select * from emailtemplates order by templateid DESC"; $result = $adb->query($sql); $temprow = $adb->fetch_array($result); @@ -49,6 +54,9 @@ $return_data[]=$templatearray; $cnt++; }while($temprow = $adb->fetch_array($result)); + +$log->info("Exiting Email Templates List View"); + $smarty->assign("TEMPLATES",$return_data); $smarty->display("ListEmailTemplates.tpl"); From vtiger-tickets at vtiger.fosslabs.com Wed May 3 04:07:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 11:07:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23603=3A_?= =?utf-8?q?no_logs_in_Fatal_mode?= In-Reply-To: <076.ea316911c5925862f169d538f823dc5f@vtiger.fosslabs.com> References: <076.ea316911c5925862f169d538f823dc5f@vtiger.fosslabs.com> Message-ID: <085.48a035ff3602540982156197e2b1b19d@vtiger.fosslabs.com> #603: no logs in Fatal mode --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed - proper logging done -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 04:25:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 11:25:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5708 - /vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Message-ID: <20060503112549.29583702FBF@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 05:25:44 2006 New Revision: 5708 Log: Logs made proper for email templates detailview - ahmed Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/detailviewemailtemplate.php (original) +++ vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Wed May 3 05:25:44 2006 @@ -12,7 +12,8 @@ require_once('data/Tracker.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/database/PearDatabase.php'); - +global $adb; +global $log; global $mod_strings; global $app_strings; global $current_language; @@ -20,6 +21,8 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); + +$log->info("Inside Email Template Detail View"); $smarty = new vtigerCRM_smarty; @@ -33,6 +36,7 @@ if(isset($_REQUEST['templateid']) && $_REQUEST['templateid']!='') { + $log->info("The templateid is set"); $tempid = $_REQUEST['templateid']; $sql = "select * from emailtemplates where templateid=".$tempid; $result = $adb->query($sql); From vtiger-tickets at vtiger.fosslabs.com Wed May 3 04:40:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 11:40:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23602=3A_?= =?utf-8?q?logs_in_emailtemplates?= In-Reply-To: <076.2924c9ae82ec9c46cc83995ee9586603@vtiger.fosslabs.com> References: <076.2924c9ae82ec9c46cc83995ee9586603@vtiger.fosslabs.com> Message-ID: <085.a4c63d1816acbdc84d7b8ae454d95fa4@vtiger.fosslabs.com> #602: logs in emailtemplates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Logs made proper -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 04:59:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 11:59:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5709 - in /vtigercrm/trunk/Smarty/templates: Emails.tpl Webmails.tpl Message-ID: <20060503115924.89B1A702FD6@vtiger.fosslabs.com> Author: richie Date: Wed May 3 05:59:17 2006 New Revision: 5709 Log: links provided Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl vtigercrm/trunk/Smarty/templates/Webmails.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Wed May 3 05:59:17 2006 @@ -24,16 +24,16 @@ {literal} function DeleteEmail(id) { - if(confirm("Are you sure you want to delete ?")) - { - show("status"); - var ajaxObj = new Ajax(ajaxDelResponse); - var urlstring ="module=Users&action=massdelete&return_module=Emails&idlist="+id; - ajaxObj.process("index.php?",urlstring); - } - else - { - return false; + if(confirm("Are you sure you want to delete ?")) + { + show("status"); + var ajaxObj = new Ajax(ajaxDelResponse); + var urlstring ="module=Users&action=massdelete&return_module=Emails&idlist="+id; + ajaxObj.process("index.php?",urlstring); + } + else + { + return false; } } function ajaxDelResponse(response) @@ -76,11 +76,11 @@
-  Compose +  Compose -  Settings +  Settings
@@ -96,7 +96,7 @@  All Mails
  •    - Inbox  + Inbox 
  •    Sent  Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Wed May 3 05:59:17 2006 @@ -33,7 +33,7 @@
-  Settings +  Settings From vtiger-tickets at vtiger.fosslabs.com Wed May 3 05:00:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 12:00:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23608=3A_?= =?utf-8?q?logs_in_mailmerge_templates?= In-Reply-To: <076.4d57a93c446723ad6c722eec13be7eb1@vtiger.fosslabs.com> References: <076.4d57a93c446723ad6c722eec13be7eb1@vtiger.fosslabs.com> Message-ID: <085.f216b1eebeb07120c30a33aa4647b42e@vtiger.fosslabs.com> #608: logs in mailmerge templates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Loggind made proper -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 05:01:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 03 May 2006 12:01:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5710 - in /vtigercrm/trunk/modules/Webmails: DetailView.php EditView.php ListView.php body.php Message-ID: <20060503120101.084F6702FD6@vtiger.fosslabs.com> Author: richie Date: Wed May 3 06:00:54 2006 New Revision: 5710 Log: mbox construction changed to older format. Commented out the javascript in body.php as it was repeatedly invoking the page due to which the system would crash frequently Modified: vtigercrm/trunk/modules/Webmails/DetailView.php vtigercrm/trunk/modules/Webmails/EditView.php vtigercrm/trunk/modules/Webmails/ListView.php vtigercrm/trunk/modules/Webmails/body.php Modified: vtigercrm/trunk/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/DetailView.php (original) +++ vtigercrm/trunk/modules/Webmails/DetailView.php Wed May 3 06:00:54 2006 @@ -1,92 +1,92 @@ -fetch_array($mailInfo); - -$login_username= $temprow["mail_username"]; -$secretkey=$temprow["mail_password"]; -$imapServerAddress=$temprow["mail_servername"]; -$start_message=$_REQUEST["start_message"]; -$box_refresh=$temprow["box_refresh"]; -$mails_per_page=$temprow["mails_per_page"]; -$mail_protocol=$temprow["mail_protocol"]; -$ssltype=$temprow["ssltype"]; -$sslmeth=$temprow["sslmeth"]; - -if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} -global $mbox; -$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); - +fetch_array($mailInfo); +$login_username= $temprow["mail_username"]; +$secretkey=$temprow["mail_password"]; +$imapServerAddress=$temprow["mail_servername"]; +$start_message=$_REQUEST["start_message"]; +$box_refresh=$temprow["box_refresh"]; +$mails_per_page=$temprow["mails_per_page"]; +$mail_protocol=$temprow["mail_protocol"]; +$ssltype=$temprow["ssltype"]; +$sslmeth=$temprow["sslmeth"]; + +if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} +global $mbox; +//$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); +$mbox = @imap_open('{'.$imapServerAddress.'/'.$mail_protocol.'}'.$mailbox, $login_username, $secretkey) or die("Connection to server failed with: ".imap_last_error()) + +echo ' after in DetailView '; $email = new Webmail($mbox, $mailid); $from = $email->from; -$subject=$email->subject; -$date=$email->date; - -$to = $email->to_name[0]." <".$email->to[0].">"; -for($l=1;$lto);$l++) { - $to .= "; ".$email->to_name[$l]." <".$email->to[$l].">"; -} -$cc_list = $email->cc_list_name[0]." <".$email->cc_list[0].">"; -for($l=1;$lcc_list);$l++) { - $cc_list .= "; ".$email->cc_list_name[$l]." <".$email->cc_list[$l].">"; -} -$bcc_list = $email->bcc_list_name[0]." <".$email->bcc_list[0].">"; -for($l=1;$lbcc_list);$l++) { - $bcc_list .= "; ".$email->bcc_list_name[$l]." <".$email->bcc_list[$l].">"; +$subject=$email->subject; +$date=$email->date; + +$to = $email->to_name[0]." <".$email->to[0].">"; +for($l=1;$lto);$l++) { + $to .= "; ".$email->to_name[$l]." <".$email->to[$l].">"; +} +$cc_list = $email->cc_list_name[0]." <".$email->cc_list[0].">"; +for($l=1;$lcc_list);$l++) { + $cc_list .= "; ".$email->cc_list_name[$l]." <".$email->cc_list[$l].">"; +} +$bcc_list = $email->bcc_list_name[0]." <".$email->bcc_list[0].">"; +for($l=1;$lbcc_list);$l++) { + $bcc_list .= "; ".$email->bcc_list_name[$l]." <".$email->bcc_list[$l].">"; } $reply_to = $from." <".$email->reply_to[0].">"; for($l=1;$lreply_to);$l++) { $reply_to .= "; ".$email->reply_to_name[$l]." <".$email->reply_to[$l].">"; } - -$email->loadMail(); -$body = $email->body; -$attachments=$email->attachments; -$inline=$email->inline; - -$atL="Attachments"; -$at="None"; -$atd=""; -$cnt=1; -if($attachments || $inline) { - $at=''; - for($i=0;$i 25) - $fname=substr($attachments[$i]["filename"],0,25)."..."; - else - $fname=$attachments[$i]["filename"]; - - $filesize = $attachments[$i]["filesize"]." bytes"; - if($attachments[$i]["filesize"] > 1000000) - $filesize= substr((($attachments[$i]["filesize"]/1024)/1024),0,5)." megabytes"; - elseif ($attachments[$i]["filesize"] > 1024) - $filesize= substr(($attachments[$i]["filesize"]/1024),0,5)." kilobytes"; - - $at.=" "; - $cnt++; - } - for($i=0;$i".$inline[$i]["filename"].""; - $cnt++; - } - $at.="
".$cnt.") ".$fname."
".$filesize."
"; - $tmp = (count($inline)+count($attachments)); - $atL= $tmp." Attachment(s)"; + +$email->loadMail(); +$body = $email->body; +$attachments=$email->attachments; +$inline=$email->inline; + +$atL="Attachments"; +$at="None"; +$atd=""; +$cnt=1; +if($attachments || $inline) { + $at=''; + for($i=0;$i 25) + $fname=substr($attachments[$i]["filename"],0,25)."..."; + else + $fname=$attachments[$i]["filename"]; + + $filesize = $attachments[$i]["filesize"]." bytes"; + if($attachments[$i]["filesize"] > 1000000) + $filesize= substr((($attachments[$i]["filesize"]/1024)/1024),0,5)." megabytes"; + elseif ($attachments[$i]["filesize"] > 1024) + $filesize= substr(($attachments[$i]["filesize"]/1024),0,5)." kilobytes"; + + $at.=" "; + $cnt++; + } + for($i=0;$i".$inline[$i]["filename"].""; + $cnt++; + } + $at.="
".$cnt.") ".$fname."
".$filesize."
"; + $tmp = (count($inline)+count($attachments)); + $atL= $tmp." Attachment(s)"; ?> -'index.php?module=Webmails&action=index','LBL_WEBMAILS_TITLE'=>'index.php?module=Webmailsaction=index'); - -$sec_arr = array('index.php?module=Emails&action=index'=>'Emails ','index.php?module=Webmails&action=index'=>'Webmails'); -echo '
'; - -$focus = new Email(); -$smarty = new vtigerCRM_Smarty(); - -if($_REQUEST['upload_error'] == true) -{ - echo '
The selected file has no data or a invalid file.
'; -} - -//Email Error handling -if($_REQUEST['mail_error'] != '') -{ - require_once("modules/Emails/mail.php"); - echo parseEmailErrorString($_REQUEST['mail_error']); -} - - -global $theme; - -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -$disp_view = getView($focus->mode); -$smarty->assign("MODULE","Webmails"); -$smarty->assign("SINGLE_MOD","Webmails"); - -$tmp_theme = $theme; -$msgData=''; -global $mbox; - -//WEBMAIL FUNCTIONS -define('SM_PATH','modules/Webmails/'); -require_once(SM_PATH . 'Webmail.php'); -require_once('include/utils/UserInfoUtil.php'); - -$mailInfo = getMailServerInfo($current_user); -$temprow = $adb->fetch_array($mailInfo); -$login_username= $temprow["mail_username"]; -$secretkey=$temprow["mail_password"]; -$imapServerAddress=$temprow["mail_servername"]; -$start_message=$_REQUEST["start_message"]; -$box_refresh=$temprow["box_refresh"]; -$mails_per_page=$temprow["mails_per_page"]; -$mail_protocol=$temprow["mail_protocol"]; -$ssltype=$temprow["ssltype"]; -$sslmeth=$temprow["sslmeth"]; - -$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); + +global $log; +global $app_strings; +global $app_list_strings; +global $mod_strings; +global $current_user; + +$submenu = array('LBL_EMAILS_TITLE'=>'index.php?module=Webmails&action=index','LBL_WEBMAILS_TITLE'=>'index.php?module=Webmailsaction=index'); + +$sec_arr = array('index.php?module=Emails&action=index'=>'Emails ','index.php?module=Webmails&action=index'=>'Webmails'); +echo '
'; + +$focus = new Email(); +$smarty = new vtigerCRM_Smarty(); + +if($_REQUEST['upload_error'] == true) +{ + echo '
The selected file has no data or a invalid file.
'; +} + +//Email Error handling +if($_REQUEST['mail_error'] != '') +{ + require_once("modules/Emails/mail.php"); + echo parseEmailErrorString($_REQUEST['mail_error']); +} + + +global $theme; + +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$disp_view = getView($focus->mode); +$smarty->assign("MODULE","Webmails"); +$smarty->assign("SINGLE_MOD","Webmails"); + +$tmp_theme = $theme; +$msgData=''; +global $mbox; + +//WEBMAIL FUNCTIONS +define('SM_PATH','modules/Webmails/'); +require_once(SM_PATH . 'Webmail.php'); +require_once('include/utils/UserInfoUtil.php'); + +$mailInfo = getMailServerInfo($current_user); +$temprow = $adb->fetch_array($mailInfo); +$login_username= $temprow["mail_username"]; +$secretkey=$temprow["mail_password"]; +$imapServerAddress=$temprow["mail_servername"]; +$start_message=$_REQUEST["start_message"]; +$box_refresh=$temprow["box_refresh"]; +$mails_per_page=$temprow["mails_per_page"]; +$mail_protocol=$temprow["mail_protocol"]; +$ssltype=$temprow["ssltype"]; +$sslmeth=$temprow["sslmeth"]; + +//$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); +$mbox = @imap_open('{'.$imapServerAddress.'/'.$mail_protocol.'}'.$mailbox, $login_username, $secretkey) or die("Connection to server failed with: ".imap_last_error()); $webmail = new Webmail($mbox,$mailid); -$webmail->loadMail(); -$focus->column_fields['description'] = strip_tags($webmail->body); -$focus->column_fields['subject'] = $webmail->subject; -for($i=0;$ireply_to);$i++) { - $reply_to .= $webmail->reply_to[$i].";"; -} -for($i=0;$ito);$i++) { - $to .= $webmail->to[$i].";"; -} -for($i=0;$icc_list);$i++) { - $cc .= $webmail->cc_list[$i].";"; -} -for($i=0;$ibcc_list);$i++) { - $bcc .= $webmail->bcc_list[$i].";"; -} - -$body = "



In reply to the message sent by "; -$body .= $webmail->fromname." < ".$webmail->from." > on ".$webmail->date.":
"; -$body .= "
".$webmail->body."
"; - -$theme = $tmp_theme; - -//get Email Information -$ddate = date("Y-m-d"); -$dtime = date("h:m"); -if($_REQUEST["reply"] == "all") +$webmail->loadMail(); +$focus->column_fields['description'] = strip_tags($webmail->body); +$focus->column_fields['subject'] = $webmail->subject; +for($i=0;$ireply_to);$i++) { + $reply_to .= $webmail->reply_to[$i].";"; +} +for($i=0;$ito);$i++) { + $to .= $webmail->to[$i].";"; +} +for($i=0;$icc_list);$i++) { + $cc .= $webmail->cc_list[$i].";"; +} +for($i=0;$ibcc_list);$i++) { + $bcc .= $webmail->bcc_list[$i].";"; +} + +$body = "



In reply to the message sent by "; +$body .= $webmail->fromname." < ".$webmail->from." > on ".$webmail->date.":
"; +$body .= "
".$webmail->body."
"; + +$theme = $tmp_theme; + +//get Email Information +$ddate = date("Y-m-d"); +$dtime = date("h:m"); +if($_REQUEST["reply"] == "all") $tmp = $reply_to."".$to; -else - $tmp = $reply_to; - - -$block["Email Information"][0][] = array(array(6),array("Date & Time Sent:"),array("date_start"),array(array($ddate=>$dtime),array("%Y-%m-%d"=>"yyyy-mm-dd 24:00"))); -$block["Email Information"][0][] = array(array(53),array("Assigned To:"),array("assigned_user_id"),array(array(1=>array($current_user->user_name=>"selected")))); - -$block["Email Information"][1][] = array(array(21),array("To:"),array("to_list"),array($tmp)); -$block["Email Information"][1][] = array(array(21),array("CC:"),array("cc_list"),array($cc)); - -$block["Email Information"][3][] = array(array(1),array("Subject:"),array("subject"),array($webmail->subject)); - -$block["Email Information"][3][] = array(array(1),array("BCC:"),array("bcc_list"),array($bcc)); -$block["Email Information"][4][] = array(array(19),array("Body :"),array("email_body"),array($body)); - -//$block["Email Information"][2][0] = array(array(357),array(array("Disabled"=>"selected")),array("parent_id"),array($tmp),array()); -//echo '
';print_r($block);echo '


'; -$smarty->assign("BLOCKS",$block); - -//$smarty->assign("BLOCKS",getBlocks("Emails",$disp_view,$mode,$focus->column_fields)); -//echo '
';print_r(getBlocks("Emails",$disp_view,$mode,$focus->column_fields));echo '
'; -$smarty->assign("OP_MODE",$disp_view); - -$disp_view = getView($focus->mode); - -//needed when creating a new email with default values passed in -if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) -{ - $focus->contact_name = $_REQUEST['contact_name']; -} -if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) -{ - $focus->contact_id = $_REQUEST['contact_id']; -} -if (isset($_REQUEST['parent_name']) && is_null($focus->parent_name)) -{ - $focus->parent_name = $_REQUEST['parent_name']; -} -if (isset($_REQUEST['parent_id']) && is_null($focus->parent_id)) -{ - $focus->parent_id = $_REQUEST['parent_id']; -} -if (isset($_REQUEST['parent_type'])) -{ - $focus->parent_type = $_REQUEST['parent_type']; -} -if (isset($_REQUEST['filename']) && $_REQUEST['isDuplicate'] != 'true') -{ - $focus->filename = $_REQUEST['filename']; -} -elseif (is_null($focus->parent_type)) -{ - $focus->parent_type = $app_list_strings['record_type_default_key']; -} - -$log->info("Email detail view"); - -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); +else + $tmp = $reply_to; + + +$block["Email Information"][0][] = array(array(6),array("Date & Time Sent:"),array("date_start"),array(array($ddate=>$dtime),array("%Y-%m-%d"=>"yyyy-mm-dd 24:00"))); +$block["Email Information"][0][] = array(array(53),array("Assigned To:"),array("assigned_user_id"),array(array(1=>array($current_user->user_name=>"selected")))); + +$block["Email Information"][1][] = array(array(21),array("To:"),array("to_list"),array($tmp)); +$block["Email Information"][1][] = array(array(21),array("CC:"),array("cc_list"),array($cc)); + +$block["Email Information"][3][] = array(array(1),array("Subject:"),array("subject"),array($webmail->subject)); + +$block["Email Information"][3][] = array(array(1),array("BCC:"),array("bcc_list"),array($bcc)); +$block["Email Information"][4][] = array(array(19),array("Body :"),array("email_body"),array($body)); + +//$block["Email Information"][2][0] = array(array(357),array(array("Disabled"=>"selected")),array("parent_id"),array($tmp),array()); +//echo '
';print_r($block);echo '


'; +$smarty->assign("BLOCKS",$block); + +//$smarty->assign("BLOCKS",getBlocks("Emails",$disp_view,$mode,$focus->column_fields)); +//echo '
';print_r(getBlocks("Emails",$disp_view,$mode,$focus->column_fields));echo '
'; +$smarty->assign("OP_MODE",$disp_view); + +$disp_view = getView($focus->mode); + +//needed when creating a new email with default values passed in +if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) +{ + $focus->contact_name = $_REQUEST['contact_name']; +} +if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) +{ + $focus->contact_id = $_REQUEST['contact_id']; +} +if (isset($_REQUEST['parent_name']) && is_null($focus->parent_name)) +{ + $focus->parent_name = $_REQUEST['parent_name']; +} +if (isset($_REQUEST['parent_id']) && is_null($focus->parent_id)) +{ + $focus->parent_id = $_REQUEST['parent_id']; +} +if (isset($_REQUEST['parent_type'])) +{ + $focus->parent_type = $_REQUEST['parent_type']; +} +if (isset($_REQUEST['filename']) && $_REQUEST['isDuplicate'] != 'true') +{ + $focus->filename = $_REQUEST['filename']; +} +elseif (is_null($focus->parent_type)) +{ + $focus->parent_type = $app_list_strings['record_type_default_key']; +} + +$log->info("Email detail view"); + +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); ?> name)) $smarty->assign("NAME", $focus->name); -else $smarty->assign("NAME", ""); - -if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); -else $smarty->assign("RETURN_MODULE",'Emails'); -if(isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); -else $smarty->assign("RETURN_ACTION",'index'); -if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); -if (isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); - - -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); -$smarty->assign("ID", $focus->id); -//$smarty->assign("ENTITY_ID", $_REQUEST["record"]); -$smarty->assign("ENTITY_TYPE",$_REQUEST["email_directing_module"]); -$tabid = getTabid("Webmails"); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); -$smarty->display("salesEditView.tpl"); -?> +if (isset($focus->name)) $smarty->assign("NAME", $focus->name); +else $smarty->assign("NAME", ""); + +if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); +else $smarty->assign("RETURN_MODULE",'Emails'); +if(isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); +else $smarty->assign("RETURN_ACTION",'index'); +if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); +if (isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); + + +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); +$smarty->assign("ID", $focus->id); +//$smarty->assign("ENTITY_ID", $_REQUEST["record"]); +$smarty->assign("ENTITY_TYPE",$_REQUEST["email_directing_module"]); +$tabid = getTabid("Webmails"); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); +$smarty->display("salesEditView.tpl"); +?> Modified: vtigercrm/trunk/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/ListView.php (original) +++ vtigercrm/trunk/modules/Webmails/ListView.php Wed May 3 06:00:54 2006 @@ -40,32 +40,32 @@ ); } -num_rows($mailInfo) < 1) { echo "

Please configure your mail settings

"; exit(); } -$temprow = $adb->fetch_array($mailInfo); -$login_username= $temprow["mail_username"]; -$secretkey=$temprow["mail_password"]; -$imapServerAddress=$temprow["mail_servername"]; -$box_refresh=$temprow["box_refresh"]; -$mails_per_page=$temprow["mails_per_page"]; -$mail_protocol=$temprow["mail_protocol"]; -$ssltype=$temprow["ssltype"]; -$sslmeth=$temprow["sslmeth"]; +$temprow = $adb->fetch_array($mailInfo); +$login_username= $temprow["mail_username"]; +$secretkey=$temprow["mail_password"]; +$imapServerAddress=$temprow["mail_servername"]; +$box_refresh=$temprow["box_refresh"]; +$mails_per_page=$temprow["mails_per_page"]; +$mail_protocol=$temprow["mail_protocol"]; +$ssltype=$temprow["ssltype"]; +$sslmeth=$temprow["sslmeth"]; $account_name=$temprow["account_name"]; $show_hidden=$_REQUEST["show_hidden"]; ?> @@ -76,8 +76,8 @@ "; $listview_header = array("Info","Subject","Date","From","Del"); -$listview_entries = array(); - -if($numEmails <= 0) - $listview_entries[0][] = '
No Emails In This FolderNo Emails In This Folder
        
Check for new e-Mails        Check for new e-Mails                           '; -$navigationOutput .= $boxes; -$navigationOutput .= '                        Viewing Messages: '.($start_message+$c).' to '.$start_message.' ('.$numEmails.' Total)                           '; +$navigationOutput .= $boxes; +$navigationOutput .= '                        Viewing Messages: '.($start_message+$c).' to '.$start_message.' ('.$numEmails.' Total)  
{$APP.LBL_REQUIRED_SYMBOL}Email's per Page Email's per Page  
"; - - $eventTime = (float)$event->getTimeStamp(); - $eventStartTime = (float)LoggerLoggingEvent::getStartTime(); - $sbuf .= number_format(($eventTime - $eventStartTime) * 1000, 0, '', ''); - $sbuf .= "getThreadName() . " thread\">"; - $sbuf .= $event->getThreadName(); - $sbuf .= ""; - - $level = $event->getLevel(); - - if ($level->equals(LoggerLevel::getLevelDebug())) { - $sbuf .= ""; - $sbuf .= $level->toString(); - $sbuf .= ""; - }elseif($level->equals(LoggerLevel::getLevelWarn())) { - $sbuf .= ""; - $sbuf .= $level->toString(); - $sbuf .= ""; - } else { - $sbuf .= $level->toString(); - } - $sbuf .= "getLoggerName(), ENT_QUOTES) . " category\">"; - $sbuf .= htmlentities($event->getLoggerName(), ENT_QUOTES); - $sbuf .= ""; - $sbuf .= htmlentities($locInfo->getFileName(), ENT_QUOTES). ':' . $locInfo->getLineNumber(); - $sbuf .= ""; - $sbuf .= htmlentities($event->getRenderedMessage(), ENT_QUOTES); - $sbuf .= "
"; - $sbuf .= "NDC: " . htmlentities($event->getNDC(), ENT_QUOTES); - $sbuf .= "
" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - if ($this->locationInfo) - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - - return $sbuf; - } - - /** - * @return string Returns the appropriate HTML footers. - */ - function getFooter() - { - $sbuf = "
TimeThreadLevelCategoryFile:LineMessage
" . LOG4PHP_LINE_SEP; - $sbuf .= "
" . LOG4PHP_LINE_SEP; - $sbuf .= ""; - - return $sbuf; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage layouts + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +if (!defined('LOG4PHP_LINE_SEP')) { + if (substr(php_uname(), 0, 7) == "Windows") { + /** + * @ignore + */ + define('LOG4PHP_LINE_SEP', "\r\n"); + } else { + /** + * @ignore + */ + define('LOG4PHP_LINE_SEP', "\n"); + } +} + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLayout.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php'); + +/** + * This layout outputs events in a HTML table. + * + * Parameters are: {@link $title}, {@link $locationInfo}. + * + * @author VxR + * @version $Revision: 1.14 $ + * @package log4php + * @subpackage layouts + */ +class LoggerLayoutHtml extends LoggerLayout { + + /** + * The LocationInfo option takes a boolean value. By + * default, it is set to false which means there will be no location + * information output by this layout. If the the option is set to + * true, then the file name and line number of the statement + * at the origin of the log statement will be output. + * + *

If you are embedding this layout within a {@link LoggerAppenderMail} + * or a {@link LoggerAppenderMailEvent} then make sure to set the + * LocationInfo option of that appender as well. + * @var boolean + */ + var $locationInfo = false; + + /** + * The Title option takes a String value. This option sets the + * document title of the generated HTML document. + * Defaults to 'Log4php Log Messages'. + * @var string + */ + var $title = "Log4php Log Messages"; + + /** + * Constructor + */ + function LoggerLayoutHtml() + { + return; + } + + /** + * The LocationInfo option takes a boolean value. By + * default, it is set to false which means there will be no location + * information output by this layout. If the the option is set to + * true, then the file name and line number of the statement + * at the origin of the log statement will be output. + * + *

If you are embedding this layout within a {@link LoggerAppenderMail} + * or a {@link LoggerAppenderMailEvent} then make sure to set the + * LocationInfo option of that appender as well. + */ + function setLocationInfo($flag) + { + if (is_bool($flag)) { + $this->locationInfo = $flag; + } else { + $this->locationInfo = (bool)(strtolower($flag) == 'true'); + } + } + + /** + * Returns the current value of the LocationInfo option. + */ + function getLocationInfo() + { + return $this->locationInfo; + } + + /** + * The Title option takes a String value. This option sets the + * document title of the generated HTML document. + * Defaults to 'Log4php Log Messages'. + */ + function setTitle($title) + { + $this->title = $title; + } + + /** + * @return string Returns the current value of the Title option From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 21:14:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:14:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5734 - in /vtigercrm/trunk/log4php/or: LoggerDefaultRenderer.php LoggerObjectRenderer.php LoggerRendererMap.php Message-ID: <20060504041442.4C7F8709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:14:36 2006 New Revision: 5734 Log: log4php latest version has been update Modified: vtigercrm/trunk/log4php/or/LoggerDefaultRenderer.php vtigercrm/trunk/log4php/or/LoggerObjectRenderer.php vtigercrm/trunk/log4php/or/LoggerRendererMap.php Modified: vtigercrm/trunk/log4php/or/LoggerDefaultRenderer.php ============================================================================== --- vtigercrm/trunk/log4php/or/LoggerDefaultRenderer.php (original) +++ vtigercrm/trunk/log4php/or/LoggerDefaultRenderer.php Wed May 3 22:14:36 2006 @@ -1,58 +1,58 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage or - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); - -/** - * The default Renderer renders objects by type casting - * - * @author VxR - * @package log4php - * @subpackage or - * @since 0.3 - */ -class LoggerDefaultRenderer extends LoggerObjectRenderer{ - - /** - * Constructor - */ - function LoggerDefaultRenderer() - { - return; - } - - /** - * Render objects by type casting - * - * @param mixed $o the object to render - * @return string - */ - function doRender($o) - { - return var_export($o, true); - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage or + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); + +/** + * The default Renderer renders objects by type casting + * + * @author VxR + * @package log4php + * @subpackage or + * @since 0.3 + */ +class LoggerDefaultRenderer extends LoggerObjectRenderer{ + + /** + * Constructor + */ + function LoggerDefaultRenderer() + { + return; + } + + /** + * Render objects by type casting + * + * @param mixed $o the object to render + * @return string + */ + function doRender($o) + { + return var_export($o, true); + } +} ?> Modified: vtigercrm/trunk/log4php/or/LoggerObjectRenderer.php ============================================================================== --- vtigercrm/trunk/log4php/or/LoggerObjectRenderer.php (original) +++ vtigercrm/trunk/log4php/or/LoggerObjectRenderer.php Wed May 3 22:14:36 2006 @@ -1,63 +1,63 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage or - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - * Subclass this abstract class in order to render objects as strings. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage or - * @abstract - * @since 0.3 - */ -class LoggerObjectRenderer { - - /** - * @param string $class classname - * @return LoggerObjectRenderer create LoggerObjectRenderer instances - */ - function factory($class) - { - if (!empty($class)) { - $class = basename($class); - @include_once(LOG4PHP_DIR . "/or/{$class}.php"); - if (class_exists($class)) { - return new $class(); - } - } - return null; - } - - /** - * Render the entity passed as parameter as a String. - * @param mixed $o entity to render - * @return string - */ - function doRender($o) - { - // abstract - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage or + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + * Subclass this abstract class in order to render objects as strings. + * + * @author VxR + * @version $Revision: 1.3 $ + * @package log4php + * @subpackage or + * @abstract + * @since 0.3 + */ +class LoggerObjectRenderer { + + /** + * @param string $class classname + * @return LoggerObjectRenderer create LoggerObjectRenderer instances + */ + function factory($class) + { + if (!empty($class)) { + $class = basename($class); + @include_once(LOG4PHP_DIR . "/or/{$class}.php"); + if (class_exists($class)) { + return new $class(); + } + } + return null; + } + + /** + * Render the entity passed as parameter as a String. + * @param mixed $o entity to render + * @return string + */ + function doRender($o) + { + // abstract + } +} ?> Modified: vtigercrm/trunk/log4php/or/LoggerRendererMap.php ============================================================================== --- vtigercrm/trunk/log4php/or/LoggerRendererMap.php (original) +++ vtigercrm/trunk/log4php/or/LoggerRendererMap.php Wed May 3 22:14:36 2006 @@ -1,184 +1,184 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage or - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/or/LoggerDefaultRenderer.php'); -require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -/** - * Map class objects to an {@link LoggerObjectRenderer}. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage or - * @since 0.3 - */ -class LoggerRendererMap { - - /** - * @var array - */ - var $map; - - /** - * @var LoggerDefaultRenderer - */ - var $defaultRenderer; - - /** - * Constructor - */ - function LoggerRendererMap() - { - $this->map = array(); - $this->defaultRenderer = new LoggerDefaultRenderer(); - } - - /** - * Add a renderer to a hierarchy passed as parameter. - * Note that hierarchy must implement getRendererMap() and setRenderer() methods. - * - * @param LoggerHierarchy &$repository a logger repository. - * @param string &$renderedClassName - * @param string &$renderingClassName - * @static - */ - function addRenderer(&$repository, $renderedClassName, $renderingClassName) - { - LoggerLog::debug("LoggerRendererMap::addRenderer() Rendering class: [{$renderingClassName}], Rendered class: [{$renderedClassName}]."); - $renderer = LoggerObjectRenderer::factory($renderingClassName); - if($renderer == null) { - LoggerLog::warn("LoggerRendererMap::addRenderer() Could not instantiate renderer [{$renderingClassName}]."); - return; - } else { - $repository->setRenderer($renderedClassName, $renderer); - } - } - - - /** - * Find the appropriate renderer for the class type of the - * o parameter. - * - * This is accomplished by calling the {@link getByObject()} - * method if o is object or using {@link LoggerDefaultRenderer}. - * Once a renderer is found, it is applied on the object o and - * the result is returned as a string. - * - * @param mixed $o - * @return string - */ - function findAndRender($o) - { - if($o == null) { - return null; - } else { - if (is_object($o)) { - $renderer = $this->getByObject($o); - if ($renderer !== null) { - return $renderer->doRender($o); - } else { - return null; - } - } else { - $renderer = $this->defaultRenderer; - return $renderer->doRender($o); - } - } - } - - /** - * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the - * class of the object parameter. - * - * @param mixed $o - * @return string - */ - function &getByObject($o) - { - return ($o == null) ? null : $this->getByClassName(get_class($o)); - } - - - /** - * Search the parents of clazz for a renderer. - * - * The renderer closest in the hierarchy will be returned. If no - * renderers could be found, then the default renderer is returned. - * - * @param string $class - * @return LoggerObjectRenderer - */ - function &getByClassName($class) - { - $r = null; - for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) { - if (isset($this->map[$c])) { - return $this->map[$c]; - } - } - return $this->defaultRenderer; - } - - /** - * @return LoggerDefaultRenderer - */ - function &getDefaultRenderer() - { - return $this->defaultRenderer; - } - - - function clear() - { - $this->map = array(); - } - - /** - * Register a {@link LoggerObjectRenderer} for clazz. - * @param string $class - * @param LoggerObjectRenderer $or - */ - function put($class, $or) - { - $this->map[strtolower($class)] = $or; - } - - /** - * @param string $class - * @return boolean - */ - function rendererExists($class) - { - $class = basename($class); - if (!class_exists($class)) { - @include_once(LOG4PHP_DIR ."/or/{$class}.php"); - } - return class_exists($class); - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage or + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/or/LoggerDefaultRenderer.php'); +require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +/** + * Map class objects to an {@link LoggerObjectRenderer}. + * + * @author VxR + * @version $Revision: 1.4 $ + * @package log4php + * @subpackage or + * @since 0.3 + */ +class LoggerRendererMap { + + /** + * @var array + */ + var $map; + + /** + * @var LoggerDefaultRenderer + */ + var $defaultRenderer; + + /** + * Constructor + */ + function LoggerRendererMap() + { + $this->map = array(); + $this->defaultRenderer = new LoggerDefaultRenderer(); + } + + /** + * Add a renderer to a hierarchy passed as parameter. + * Note that hierarchy must implement getRendererMap() and setRenderer() methods. + * + * @param LoggerHierarchy &$repository a logger repository. + * @param string &$renderedClassName + * @param string &$renderingClassName + * @static + */ + function addRenderer(&$repository, $renderedClassName, $renderingClassName) + { + LoggerLog::debug("LoggerRendererMap::addRenderer() Rendering class: [{$renderingClassName}], Rendered class: [{$renderedClassName}]."); + $renderer = LoggerObjectRenderer::factory($renderingClassName); + if($renderer == null) { + LoggerLog::warn("LoggerRendererMap::addRenderer() Could not instantiate renderer [{$renderingClassName}]."); + return; + } else { + $repository->setRenderer($renderedClassName, $renderer); + } + } + + + /** + * Find the appropriate renderer for the class type of the + * o parameter. + * + * This is accomplished by calling the {@link getByObject()} + * method if o is object or using {@link LoggerDefaultRenderer}. + * Once a renderer is found, it is applied on the object o and + * the result is returned as a string. + * + * @param mixed $o + * @return string + */ + function findAndRender($o) + { + if($o == null) { + return null; + } else { + if (is_object($o)) { + $renderer = $this->getByObject($o); + if ($renderer !== null) { + return $renderer->doRender($o); + } else { + return null; + } + } else { + $renderer = $this->defaultRenderer; + return $renderer->doRender($o); + } + } + } + + /** + * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the + * class of the object parameter. + * + * @param mixed $o + * @return string + */ + function &getByObject($o) + { + return ($o == null) ? null : $this->getByClassName(get_class($o)); + } + + + /** + * Search the parents of clazz for a renderer. + * + * The renderer closest in the hierarchy will be returned. If no + * renderers could be found, then the default renderer is returned. + * + * @param string $class + * @return LoggerObjectRenderer + */ + function &getByClassName($class) + { + $r = null; + for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) { + if (isset($this->map[$c])) { + return $this->map[$c]; + } + } + return $this->defaultRenderer; + } + + /** + * @return LoggerDefaultRenderer + */ + function &getDefaultRenderer() + { + return $this->defaultRenderer; + } + + + function clear() + { + $this->map = array(); + } + + /** + * Register a {@link LoggerObjectRenderer} for clazz. + * @param string $class + * @param LoggerObjectRenderer $or + */ + function put($class, $or) + { + $this->map[strtolower($class)] = $or; + } + + /** + * @param string $class + * @return boolean + */ + function rendererExists($class) + { + $class = basename($class); + if (!class_exists($class)) { + @include_once(LOG4PHP_DIR ."/or/{$class}.php"); + } + return class_exists($class); + } +} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 21:16:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:16:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5735 - in /vtigercrm/trunk/log4php/spi: LoggerConfigurator.php LoggerFactory.php LoggerFilter.php LoggerLocationInfo.php LoggerLoggingEvent.php Message-ID: <20060504041643.9C772709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:16:34 2006 New Revision: 5735 Log: log4php latest version has been update Modified: vtigercrm/trunk/log4php/spi/LoggerConfigurator.php vtigercrm/trunk/log4php/spi/LoggerFactory.php vtigercrm/trunk/log4php/spi/LoggerFilter.php vtigercrm/trunk/log4php/spi/LoggerLocationInfo.php vtigercrm/trunk/log4php/spi/LoggerLoggingEvent.php Modified: vtigercrm/trunk/log4php/spi/LoggerConfigurator.php ============================================================================== --- vtigercrm/trunk/log4php/spi/LoggerConfigurator.php (original) +++ vtigercrm/trunk/log4php/spi/LoggerConfigurator.php Wed May 3 22:16:34 2006 @@ -1,65 +1,65 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage spi - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - * Special level value signifying inherited behaviour. The current - * value of this string constant is inherited. - * {@link LOG4PHP_LOGGER_CONFIGURATOR_NULL} is a synonym. - */ -define('LOG4PHP_LOGGER_CONFIGURATOR_INHERITED', 'inherited'); - -/** - * Special level signifying inherited behaviour, same as - * {@link LOG4PHP_LOGGER_CONFIGURATOR_INHERITED}. - * The current value of this string constant is null. - */ -define('LOG4PHP_LOGGER_CONFIGURATOR_NULL', 'null'); - -/** - * Implemented by classes capable of configuring log4php using a URL. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage spi - * @since 0.5 - * @abstract - */ -class LoggerConfigurator { - - /** - * Interpret a resource pointed by a url and configure accordingly. - * - * The configuration is done relative to the repository - * parameter. - * - * @param string $url The URL to parse - * @param LoggerHierarchy &$repository The hierarchy to operation upon. - */ - function doConfigure($url, &$repository) - { - return; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage spi + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + * Special level value signifying inherited behaviour. The current + * value of this string constant is inherited. + * {@link LOG4PHP_LOGGER_CONFIGURATOR_NULL} is a synonym. + */ +define('LOG4PHP_LOGGER_CONFIGURATOR_INHERITED', 'inherited'); + +/** + * Special level signifying inherited behaviour, same as + * {@link LOG4PHP_LOGGER_CONFIGURATOR_INHERITED}. + * The current value of this string constant is null. + */ +define('LOG4PHP_LOGGER_CONFIGURATOR_NULL', 'null'); + +/** + * Implemented by classes capable of configuring log4php using a URL. + * + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @subpackage spi + * @since 0.5 + * @abstract + */ +class LoggerConfigurator { + + /** + * Interpret a resource pointed by a url and configure accordingly. + * + * The configuration is done relative to the repository + * parameter. + * + * @param string $url The URL to parse + * @param LoggerHierarchy &$repository The hierarchy to operation upon. + */ + function doConfigure($url, &$repository) + { + return; + } +} ?> Modified: vtigercrm/trunk/log4php/spi/LoggerFactory.php ============================================================================== --- vtigercrm/trunk/log4php/spi/LoggerFactory.php (original) +++ vtigercrm/trunk/log4php/spi/LoggerFactory.php Wed May 3 22:16:34 2006 @@ -1,52 +1,52 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage spi - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -/** - * Extend and implement this abstract class to create new instances of - * {@link Logger} or a sub-class of {@link Logger}. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage spi - * @since 0.5 - * @abstract - */ -class LoggerFactory { - - /** - * @abstract - * @param string $name - * @return Logger - */ - function makeNewLoggerInstance($name) - { - LoggerLog::warn("LoggerFactory:: makeNewLoggerInstance() is abstract."); - return null; - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage spi + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +/** + * Extend and implement this abstract class to create new instances of + * {@link Logger} or a sub-class of {@link Logger}. + * + * @author VxR + * @version $Revision: 1.3 $ + * @package log4php + * @subpackage spi + * @since 0.5 + * @abstract + */ +class LoggerFactory { + + /** + * @abstract + * @param string $name + * @return Logger + */ + function makeNewLoggerInstance($name) + { + LoggerLog::warn("LoggerFactory:: makeNewLoggerInstance() is abstract."); + return null; + } + +} ?> Modified: vtigercrm/trunk/log4php/spi/LoggerFilter.php ============================================================================== --- vtigercrm/trunk/log4php/spi/LoggerFilter.php (original) +++ vtigercrm/trunk/log4php/spi/LoggerFilter.php Wed May 3 22:16:34 2006 @@ -1,113 +1,113 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage spi - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - * The log event must be logged immediately without consulting with - * the remaining filters, if any, in the chain. - */ -define('LOG4PHP_LOGGER_FILTER_ACCEPT', 1); - -/** - * This filter is neutral with respect to the log event. The - * remaining filters, if any, should be consulted for a final decision. - */ -define('LOG4PHP_LOGGER_FILTER_NEUTRAL', 0); - -/** - * The log event must be dropped immediately without consulting - * with the remaining filters, if any, in the chain. - */ -define('LOG4PHP_LOGGER_FILTER_DENY', -1); - -/** - * Users should extend this class to implement customized logging - * event filtering. Note that {@link LoggerCategory} and {@link LoggerAppenderSkeleton}, - * the parent class of all standard - * appenders, have built-in filtering rules. It is suggested that you - * first use and understand the built-in rules before rushing to write - * your own custom filters. - * - *

This abstract class assumes and also imposes that filters be - * organized in a linear chain. The {@link #decide - * decide(LoggerLoggingEvent)} method of each filter is called sequentially, - * in the order of their addition to the chain. - * - *

The {@link decide()} method must return one - * of the integer constants {@link LOG4PHP_LOG4PHP_LOGGER_FILTER_DENY}, - * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_ACCEPT}. - * - *

If the value {@link LOG4PHP_LOGGER_FILTER_DENY} is returned, then the log event is - * dropped immediately without consulting with the remaining - * filters. - * - *

If the value {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned, then the next filter - * in the chain is consulted. If there are no more filters in the - * chain, then the log event is logged. Thus, in the presence of no - * filters, the default behaviour is to log all logging events. - * - *

If the value {@link LOG4PHP_LOGGER_FILTER_ACCEPT} is returned, then the log - * event is logged without consulting the remaining filters. - * - *

The philosophy of log4php filters is largely inspired from the - * Linux ipchains. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage spi - */ -class LoggerFilter { - - /** - * @var LoggerFilter Points to the next {@link LoggerFilter} in the filter chain. - */ - var $next; - - /** - * Usually filters options become active when set. We provide a - * default do-nothing implementation for convenience. - */ - function activateOptions() - { - return; - } - - /** - * Decide what to do. - *

If the decision is {@link LOG4PHP_LOGGER_FILTER_DENY}, then the event will be - * dropped. If the decision is {@link LOG4PHP_LOGGER_FILTER_NEUTRAL}, then the next - * filter, if any, will be invoked. If the decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} then - * the event will be logged without consulting with other filters in - * the chain. - * - * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to decide upon. - * @return integer {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_DENY}|{@link LOG4PHP_LOGGER_FILTER_ACCEPT} - */ - function decide($event) - { - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage spi + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + * The log event must be logged immediately without consulting with + * the remaining filters, if any, in the chain. + */ +define('LOG4PHP_LOGGER_FILTER_ACCEPT', 1); + +/** + * This filter is neutral with respect to the log event. The + * remaining filters, if any, should be consulted for a final decision. + */ +define('LOG4PHP_LOGGER_FILTER_NEUTRAL', 0); + +/** + * The log event must be dropped immediately without consulting + * with the remaining filters, if any, in the chain. + */ +define('LOG4PHP_LOGGER_FILTER_DENY', -1); + +/** + * Users should extend this class to implement customized logging + * event filtering. Note that {@link LoggerCategory} and {@link LoggerAppenderSkeleton}, + * the parent class of all standard + * appenders, have built-in filtering rules. It is suggested that you + * first use and understand the built-in rules before rushing to write + * your own custom filters. + * + *

This abstract class assumes and also imposes that filters be + * organized in a linear chain. The {@link #decide + * decide(LoggerLoggingEvent)} method of each filter is called sequentially, + * in the order of their addition to the chain. + * + *

The {@link decide()} method must return one + * of the integer constants {@link LOG4PHP_LOG4PHP_LOGGER_FILTER_DENY}, + * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_ACCEPT}. + * + *

If the value {@link LOG4PHP_LOGGER_FILTER_DENY} is returned, then the log event is + * dropped immediately without consulting with the remaining + * filters. + * + *

If the value {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned, then the next filter + * in the chain is consulted. If there are no more filters in the + * chain, then the log event is logged. Thus, in the presence of no + * filters, the default behaviour is to log all logging events. + * + *

If the value {@link LOG4PHP_LOGGER_FILTER_ACCEPT} is returned, then the log + * event is logged without consulting the remaining filters. + * + *

The philosophy of log4php filters is largely inspired from the + * Linux ipchains. + * + * @author VxR + * @version $Revision: 1.4 $ + * @package log4php + * @subpackage spi + */ +class LoggerFilter { + + /** + * @var LoggerFilter Points to the next {@link LoggerFilter} in the filter chain. + */ + var $next; + + /** + * Usually filters options become active when set. We provide a + * default do-nothing implementation for convenience. + */ + function activateOptions() + { + return; + } + + /** + * Decide what to do. + *

If the decision is {@link LOG4PHP_LOGGER_FILTER_DENY}, then the event will be + * dropped. If the decision is {@link LOG4PHP_LOGGER_FILTER_NEUTRAL}, then the next + * filter, if any, will be invoked. If the decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} then + * the event will be logged without consulting with other filters in + * the chain. + * + * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to decide upon. + * @return integer {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_DENY}|{@link LOG4PHP_LOGGER_FILTER_ACCEPT} + */ + function decide($event) + { + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + } + +} ?> Modified: vtigercrm/trunk/log4php/spi/LoggerLocationInfo.php ============================================================================== --- vtigercrm/trunk/log4php/spi/LoggerLocationInfo.php (original) +++ vtigercrm/trunk/log4php/spi/LoggerLocationInfo.php Wed May 3 22:16:34 2006 @@ -1,116 +1,116 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage spi - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - * When location information is not available the constant - * NA is returned. Current value of this string - * constant is ?. - */ -define('LOG4PHP_LOGGER_LOCATION_INFO_NA', 'NA'); - -/** - * The internal representation of caller location information. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage spi - * @since 0.3 - */ -class LoggerLocationInfo { - - /** - * @var string Caller's line number. - */ - var $lineNumber = null; - - /** - * @var string Caller's file name. - */ - var $fileName = null; - - /** - * @var string Caller's fully qualified class name. - */ - var $className = null; - - /** - * @var string Caller's method name. - */ - var $methodName = null; - - /** - * @var string - */ - var $fullInfo = null; - - /** - * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}. - * - * @param array $trace - * @param mixed $caller - */ - function LoggerLocationInfo($trace, $fqcn = null) - { - $this->lineNumber = isset($trace['line']) ? $trace['line'] : null; - $this->fileName = isset($trace['file']) ? $trace['file'] : null; - $this->className = isset($trace['class']) ? $trace['class'] : null; - $this->methodName = isset($trace['function']) ? $trace['function'] : null; - - $this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . - '(' . $this->getFileName() . ':' . $this->getLineNumber() . ')'; - } - - function getClassName() - { - return ($this->className === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->className; - } - - /** - * Return the file name of the caller. - *

This information is not always available. - */ - function getFileName() - { - return ($this->fileName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->fileName; - } - - /** - * Returns the line number of the caller. - *

This information is not always available. - */ - function getLineNumber() - { - return ($this->lineNumber === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->lineNumber; - } - - /** - * Returns the method name of the caller. - */ - function getMethodName() - { - return ($this->methodName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->methodName; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage spi + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + * When location information is not available the constant + * NA is returned. Current value of this string + * constant is ?. + */ +define('LOG4PHP_LOGGER_LOCATION_INFO_NA', 'NA'); + +/** + * The internal representation of caller location information. + * + * @author VxR + * @version $Revision: 1.5 $ + * @package log4php + * @subpackage spi + * @since 0.3 + */ +class LoggerLocationInfo { + + /** + * @var string Caller's line number. + */ + var $lineNumber = null; + + /** + * @var string Caller's file name. + */ + var $fileName = null; + + /** + * @var string Caller's fully qualified class name. + */ + var $className = null; + + /** + * @var string Caller's method name. + */ + var $methodName = null; + + /** + * @var string + */ + var $fullInfo = null; + + /** + * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}. + * + * @param array $trace + * @param mixed $caller + */ + function LoggerLocationInfo($trace, $fqcn = null) + { + $this->lineNumber = isset($trace['line']) ? $trace['line'] : null; + $this->fileName = isset($trace['file']) ? $trace['file'] : null; + $this->className = isset($trace['class']) ? $trace['class'] : null; + $this->methodName = isset($trace['function']) ? $trace['function'] : null; + + $this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . + '(' . $this->getFileName() . ':' . $this->getLineNumber() . ')'; + } + + function getClassName() + { + return ($this->className === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->className; + } + + /** + * Return the file name of the caller. + *

This information is not always available. + */ + function getFileName() + { + return ($this->fileName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->fileName; + } + + /** + * Returns the line number of the caller. + *

This information is not always available. + */ + function getLineNumber() + { + return ($this->lineNumber === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->lineNumber; + } + + /** + * Returns the method name of the caller. + */ + function getMethodName() + { + return ($this->methodName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->methodName; + } +} ?> Modified: vtigercrm/trunk/log4php/spi/LoggerLoggingEvent.php ============================================================================== --- vtigercrm/trunk/log4php/spi/LoggerLoggingEvent.php (original) +++ vtigercrm/trunk/log4php/spi/LoggerLoggingEvent.php Wed May 3 22:16:34 2006 @@ -1,384 +1,384 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage spi - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/spi/LoggerLocationInfo.php'); -require_once(LOG4PHP_DIR . '/LoggerManager.php'); -require_once(LOG4PHP_DIR . '/LoggerMDC.php'); -require_once(LOG4PHP_DIR . '/LoggerNDC.php'); - -/** - * The internal representation of logging event. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage spi - */ -class LoggerLoggingEvent { - - /** - * @var string Fully Qualified Class Name of the calling category class. - */ - var $fqcn; - - /** - * @var Logger reference - */ - var $logger = null; - - /** - * The category (logger) name. - * This field will be marked as private in future - * releases. Please do not access it directly. - * Use the {@link getLoggerName()} method instead. - * @deprecated - */ - var $categoryName; - - /** - * Level of logging event. - *

This field should not be accessed directly. You shoud use the - * {@link getLevel()} method instead. - * - * @deprecated - * @var LoggerLevel - */ - var $level; - - /** - * @var string The nested diagnostic context (NDC) of logging event. - */ - var $ndc; - - /** - * Have we tried to do an NDC lookup? If we did, there is no need - * to do it again. Note that its value is always false when - * serialized. Thus, a receiving SocketNode will never use it's own - * (incorrect) NDC. See also writeObject method. - * @var boolean - */ - var $ndcLookupRequired = true; - - /** - * Have we tried to do an MDC lookup? If we did, there is no need - * to do it again. Note that its value is always false when - * serialized. See also the getMDC and getMDCCopy methods. - * @var boolean - */ - var $mdcCopyLookupRequired = true; - - /** - * @var mixed The application supplied message of logging event. - */ - var $message; - - /** - * The application supplied message rendered through the log4php - * objet rendering mechanism. At present renderedMessage == message. - * @var string - */ - var $renderedMessage; - - /** - * The name of thread in which this logging event was generated. - * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} - * @var mixed - */ - var $threadName = null; - - /** - * The number of seconds elapsed from 1/1/1970 until logging event - * was created plus microseconds if available. - * @var float - */ - var $timeStamp; - - /** - * @var LoggerLocationInfo Location information for the caller. - */ - var $locationInfo = null; - - // Serialization - /* - var $serialVersionUID = -868428216207166145L; - var $PARAM_ARRAY = array(); - var $TO_LEVEL = "toLevel"; - var $TO_LEVEL_PARAMS = null; - var $methodCache = array(); // use a tiny table - */ - - /** - * Instantiate a LoggingEvent from the supplied parameters. - * - *

Except {@link $timeStamp} all the other fields of - * LoggerLoggingEvent are filled when actually needed. - * - * @param string $fqcn name of the caller class. - * @param mixed &$logger The {@link Logger} category of this event or the logger name. - * @param LoggerLevel $priority The level of this event. - * @param mixed $message The message of this event. - * @param integer $timeStamp the timestamp of this logging event. - */ - function LoggerLoggingEvent($fqcn, &$logger, $priority, $message, $timeStamp = null) - { - $this->fqcn = $fqcn; - if (is_a($logger, 'logger')) { - $this->logger =& $logger; - $this->categoryName = $logger->getName(); - } else { - $this->categoryName = (string)$logger; - } - $this->level = $priority; - $this->message = $message; - if ($timeStamp !== null and is_float($timeStamp)) { - $this->timeStamp = $timeStamp; - } else { - if (function_exists('microtime')) { - list($usecs, $secs) = explode(' ', microtime()); - $this->timeStamp = ((float)$usecs + (float)$secs); - } else { - $this->timeStamp = time(); - } - } - } - - /** - * Set the location information for this logging event. The collected - * information is cached for future use. - * - *

This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists) - * to collect informations about caller.

- *

It only recognize informations generated by {@link Logger} and its subclasses.

- * @return LoggerLocationInfo - */ - function getLocationInformation() - { - if($this->locationInfo === null) { - - $locationInfo = array(); - - if (function_exists('debug_backtrace')) { - $trace = debug_backtrace(); - $prevHop = null; - // make a downsearch to identify the caller - $hop = array_pop($trace); - while ($hop !== null) { - $className = @$hop['class']; - if ( !empty($className) and ($className == 'logger' or get_parent_class($className) == 'logger') ) { - $locationInfo['line'] = $hop['line']; - $locationInfo['file'] = $hop['file']; - break; - } - $prevHop = $hop; - $hop = array_pop($trace); - } - $locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main'; - if (isset($prevHop['function']) and - $prevHop['function'] !== 'include' and - $prevHop['function'] !== 'include_once' and - $prevHop['function'] !== 'require' and - $prevHop['function'] !== 'require_once') { - - $locationInfo['function'] = $prevHop['function']; - } else { - $locationInfo['function'] = 'main'; - } - } - - $this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn); - } - return $this->locationInfo; - } - - /** - * Return the level of this event. Use this form instead of directly - * accessing the {@link $level} field. - * @return LoggerLevel - */ - function getLevel() - { - return $this->level; - } - - /** - * Return the name of the logger. Use this form instead of directly - * accessing the {@link $categoryName} field. - * @return string - */ - function getLoggerName() - { - return $this->categoryName; - } - - /** - * Return the message for this logging event. - * - *

Before serialization, the returned object is the message - * passed by the user to generate the logging event. After - * serialization, the returned value equals the String form of the - * message possibly after object rendering. - * @return mixed - */ - function getMessage() - { - if($this->message !== null) { - return $this->message; - } else { - return $this->getRenderedMessage(); - } - } - - /** - * This method returns the NDC for this event. It will return the - * correct content even if the event was generated in a different - * thread or even on a different machine. The {@link LoggerNDC::get()} method - * should never be called directly. - * @return string - */ - function getNDC() - { - if ($this->ndcLookupRequired) { - $this->ndcLookupRequired = false; - $this->ndc = implode(' ',LoggerNDC::get()); - } - return $this->ndc; - } - - - /** - * Returns the the context corresponding to the key - * parameter. - * @return string - */ - function getMDC($key) - { - return LoggerMDC::get($key); - } - - /** - * Render message. - * @return string - */ - function getRenderedMessage() - { - if($this->renderedMessage === null and $this->message !== null) { - if (is_string($this->message)) { - $this->renderedMessage = $this->message; - } else { - if ($this->logger !== null) { - $repository =& $this->logger->getLoggerRepository(); - } else { - $repository =& LoggerManager::getLoggerRepository(); - } - if (method_exists($repository, 'getrenderermap')) { - $rendererMap =& $repository->getRendererMap(); - $this->renderedMessage= $rendererMap->findAndRender($this->message); - } else { - $this->renderedMessage = (string)$this->message; - } - } - } - return $this->renderedMessage; - } - - /** - * Returns the time when the application started, in seconds - * elapsed since 01.01.1970 plus microseconds if available. - * - * @return float - * @static - */ - function getStartTime() - { - static $startTime; - - if (!isset($startTime)) { - if (function_exists('microtime')) { - list($usec, $sec) = explode(' ', microtime()); - $startTime = ((float)$usec + (float)$sec); - } else { - $startTime = time(); - } - } - return $startTime; - } - - /** - * @return float - */ - function getTimeStamp() - { - return $this->timeStamp; - } - - /** - * @return mixed - */ - function getThreadName() - { - if ($this->threadName === null) - $this->threadName = (string)getmypid(); - return $this->threadName; - } - - /** - * @return mixed null - */ - function getThrowableInformation() - { - return null; - } - - /** - * Serialize this object - * @return string - */ - function toString() - { - serialize($this); - } - - /** - * Avoid serialization of the {@link $logger} object - */ - function __sleep() - { - return array( - 'fqcn','categoryName', - 'level', - 'ndc','ndcLookupRequired', - 'message','renderedMessage', - 'threadName', - 'timestamp', - 'locationInfo' - ); - } - -} - -LoggerLoggingEvent::getStartTime(); - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage spi + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/spi/LoggerLocationInfo.php'); +require_once(LOG4PHP_DIR . '/LoggerManager.php'); +require_once(LOG4PHP_DIR . '/LoggerMDC.php'); +require_once(LOG4PHP_DIR . '/LoggerNDC.php'); + +/** + * The internal representation of logging event. + * + * @author VxR + * @version $Revision: 1.16 $ + * @package log4php + * @subpackage spi + */ +class LoggerLoggingEvent { + + /** + * @var string Fully Qualified Class Name of the calling category class From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 21:18:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:18:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5736 - in /vtigercrm/trunk/log4php/varia: LoggerDenyAllFilter.php LoggerLevelMatchFilter.php LoggerLevelRangeFilter.php LoggerStringMatchFilter.php Message-ID: <20060504041843.670C8709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:18:30 2006 New Revision: 5736 Log: log4php latest version has been update Modified: vtigercrm/trunk/log4php/varia/LoggerDenyAllFilter.php vtigercrm/trunk/log4php/varia/LoggerLevelMatchFilter.php vtigercrm/trunk/log4php/varia/LoggerLevelRangeFilter.php vtigercrm/trunk/log4php/varia/LoggerStringMatchFilter.php Modified: vtigercrm/trunk/log4php/varia/LoggerDenyAllFilter.php ============================================================================== --- vtigercrm/trunk/log4php/varia/LoggerDenyAllFilter.php (original) +++ vtigercrm/trunk/log4php/varia/LoggerDenyAllFilter.php Wed May 3 22:18:30 2006 @@ -1,57 +1,57 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage varia - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); - -/** - * This filter drops all logging events. - * - *

You can add this filter to the end of a filter chain to - * switch from the default "accept all unless instructed otherwise" - * filtering behaviour to a "deny all unless instructed otherwise" - * behaviour.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage varia - * @since 0.3 - */ -class LoggerDenyAllFilter extends LoggerFilter { - - /** - * Always returns the integer constant {@link LOG4PHP_LOGGER_FILTER_DENY} - * regardless of the {@link LoggerLoggingEvent} parameter. - * - * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to filter. - * @return LOG4PHP_LOGGER_FILTER_DENY Always returns {@link LOG4PHP_LOGGER_FILTER_DENY} - */ - function decide($event) - { - return LOG4PHP_LOGGER_FILTER_DENY; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage varia + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); + +/** + * This filter drops all logging events. + * + *

You can add this filter to the end of a filter chain to + * switch from the default "accept all unless instructed otherwise" + * filtering behaviour to a "deny all unless instructed otherwise" + * behaviour.

+ * + * @author VxR + * @version $Revision: 1.4 $ + * @package log4php + * @subpackage varia + * @since 0.3 + */ +class LoggerDenyAllFilter extends LoggerFilter { + + /** + * Always returns the integer constant {@link LOG4PHP_LOGGER_FILTER_DENY} + * regardless of the {@link LoggerLoggingEvent} parameter. + * + * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to filter. + * @return LOG4PHP_LOGGER_FILTER_DENY Always returns {@link LOG4PHP_LOGGER_FILTER_DENY} + */ + function decide($event) + { + return LOG4PHP_LOGGER_FILTER_DENY; + } +} ?> Modified: vtigercrm/trunk/log4php/varia/LoggerLevelMatchFilter.php ============================================================================== --- vtigercrm/trunk/log4php/varia/LoggerLevelMatchFilter.php (original) +++ vtigercrm/trunk/log4php/varia/LoggerLevelMatchFilter.php Wed May 3 22:18:30 2006 @@ -1,119 +1,119 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage varia - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); - -/** - * This is a very simple filter based on level matching. - * - *

The filter admits two options LevelToMatch and - * AcceptOnMatch. If there is an exact match between the value - * of the LevelToMatch option and the level of the - * {@link LoggerLoggingEvent}, then the {@link decide()} method returns - * {@link LOG4PHP_LOGGER_FILTER_ACCEPT} in case the AcceptOnMatch - * option value is set to true, if it is false then - * {@link LOG4PHP_LOGGER_FILTER_DENY} is returned. If there is no match, - * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage varia - * @since 0.6 - */ -class LoggerLevelMatchFilter extends LoggerFilter { - - /** - * @var boolean - */ - var $acceptOnMatch = true; - - /** - * @var LoggerLevel - */ - var $levelToMatch; - - /** - * @return boolean - */ - function getAcceptOnMatch() - { - return $this->acceptOnMatch; - } - - /** - * @param boolean $acceptOnMatch - */ - function setAcceptOnMatch($acceptOnMatch) - { - $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); - } - - /** - * @return LoggerLevel - */ - function getLevelToMatch() - { - return $this->levelToMatch; - } - - /** - * @param string $l the level to match - */ - function setLevelToMatch($l) - { - $this->levelToMatch = LoggerOptionConverter::toLevel($l, null); - } - - /** - * Return the decision of this filter. - * - * Returns {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} if the LevelToMatch - * option is not set or if there is not match. Otherwise, if there is a - * match, then the returned decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} if the - * AcceptOnMatch property is set to true. The - * returned decision is {@link LOG4PHP_LOGGER_FILTER_DENY} if the - * AcceptOnMatch property is set to false. - * - * @param LoggerLoggingEvent $event - * @return integer - */ - function decide($event) - { - if($this->levelToMatch === null) - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - - if ($this->levelToMatch->equals($event->getLevel())) { - return $this->getAcceptOnMatch() ? - LOG4PHP_LOGGER_FILTER_ACCEPT : - LOG4PHP_LOGGER_FILTER_DENY; - } else { - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage varia + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); + +/** + * This is a very simple filter based on level matching. + * + *

The filter admits two options LevelToMatch and + * AcceptOnMatch. If there is an exact match between the value + * of the LevelToMatch option and the level of the + * {@link LoggerLoggingEvent}, then the {@link decide()} method returns + * {@link LOG4PHP_LOGGER_FILTER_ACCEPT} in case the AcceptOnMatch + * option value is set to true, if it is false then + * {@link LOG4PHP_LOGGER_FILTER_DENY} is returned. If there is no match, + * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned.

+ * + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @subpackage varia + * @since 0.6 + */ +class LoggerLevelMatchFilter extends LoggerFilter { + + /** + * @var boolean + */ + var $acceptOnMatch = true; + + /** + * @var LoggerLevel + */ + var $levelToMatch; + + /** + * @return boolean + */ + function getAcceptOnMatch() + { + return $this->acceptOnMatch; + } + + /** + * @param boolean $acceptOnMatch + */ + function setAcceptOnMatch($acceptOnMatch) + { + $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); + } + + /** + * @return LoggerLevel + */ + function getLevelToMatch() + { + return $this->levelToMatch; + } + + /** + * @param string $l the level to match + */ + function setLevelToMatch($l) + { + $this->levelToMatch = LoggerOptionConverter::toLevel($l, null); + } + + /** + * Return the decision of this filter. + * + * Returns {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} if the LevelToMatch + * option is not set or if there is not match. Otherwise, if there is a + * match, then the returned decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} if the + * AcceptOnMatch property is set to true. The + * returned decision is {@link LOG4PHP_LOGGER_FILTER_DENY} if the + * AcceptOnMatch property is set to false. + * + * @param LoggerLoggingEvent $event + * @return integer + */ + function decide($event) + { + if($this->levelToMatch === null) + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + + if ($this->levelToMatch->equals($event->getLevel())) { + return $this->getAcceptOnMatch() ? + LOG4PHP_LOGGER_FILTER_ACCEPT : + LOG4PHP_LOGGER_FILTER_DENY; + } else { + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + } + } +} ?> Modified: vtigercrm/trunk/log4php/varia/LoggerLevelRangeFilter.php ============================================================================== --- vtigercrm/trunk/log4php/varia/LoggerLevelRangeFilter.php (original) +++ vtigercrm/trunk/log4php/varia/LoggerLevelRangeFilter.php Wed May 3 22:18:30 2006 @@ -1,168 +1,168 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage varia - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); - -/** - * This is a very simple filter based on level matching, which can be - * used to reject messages with priorities outside a certain range. - * - *

The filter admits three options LevelMin, LevelMax - * and AcceptOnMatch.

- * - *

If the level of the {@link LoggerLoggingEvent} is not between Min and Max - * (inclusive), then {@link LOG4PHP_LOGGER_FILTER_DENY} is returned.

- * - *

If the Logging event level is within the specified range, then if - * AcceptOnMatch is true, - * {@link LOG4PHP_LOGGER_FILTER_ACCEPT} is returned, and if - * AcceptOnMatch is false, - * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned.

- * - *

If LevelMin is not defined, then there is no - * minimum acceptable level (ie a level is never rejected for - * being too "low"/unimportant). If LevelMax is not - * defined, then there is no maximum acceptable level (ie a - * level is never rejected for beeing too "high"/important).

- * - *

Refer to the {@link LoggerAppenderSkeleton::setThreshold()} method - * available to all appenders extending {@link LoggerAppenderSkeleton} - * for a more convenient way to filter out events by level.

- * - * @log4j-class org.apache.log4j.varia.LevelRangeFilter - * @log4j-author Simon Kitching - * @log4j-author based on code by Ceki Gülcü - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage varia - * @since 0.6 - */ -class LoggerLevelRangeFilter extends LoggerFilter { - - /** - * @var boolean - */ - var $acceptOnMatch = true; - - /** - * @var LoggerLevel - */ - var $levelMin; - - /** - * @var LoggerLevel - */ - var $levelMax; - - /** - * @return boolean - */ - function getAcceptOnMatch() - { - return $this->acceptOnMatch; - } - - /** - * @param boolean $acceptOnMatch - */ - function setAcceptOnMatch($acceptOnMatch) - { - $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); - } - - /** - * @return LoggerLevel - */ - function getLevelMin() - { - return $this->levelMin; - } - - /** - * @param string $l the level min to match - */ - function setLevelMin($l) - { - $this->levelMin = LoggerOptionConverter::toLevel($l, null); - } - - /** - * @return LoggerLevel - */ - function getLevelMax() - { - return $this->levelMax; - } - - /** - * @param string $l the level max to match - */ - function setLevelMax($l) - { - $this->levelMax = LoggerOptionConverter::toLevel($l, null); - } - - /** - * Return the decision of this filter. - * - * @param LoggerLoggingEvent $event - * @return integer - */ - function decide($event) - { - $level = $event->getLevel(); - - if($this->levelMin !== null) { - if ($level->isGreaterOrEqual($this->levelMin) == false) { - // level of event is less than minimum - return LOG4PHP_LOGGER_FILTER_DENY; - } - } - - if($this->levelMax !== null) { - if ($level->toInt() > $this->levelMax->toInt()) { - // level of event is greater than maximum - // Alas, there is no Level.isGreater method. and using - // a combo of isGreaterOrEqual && !Equal seems worse than - // checking the int values of the level objects.. - return LOG4PHP_LOGGER_FILTER_DENY; - } - } - - if ($this->getAcceptOnMatch()) { - // this filter set up to bypass later filters and always return - // accept if level in range - return LOG4PHP_LOGGER_FILTER_ACCEPT; - } else { - // event is ok for this filter; allow later filters to have a look.. - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage varia + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); + +/** + * This is a very simple filter based on level matching, which can be + * used to reject messages with priorities outside a certain range. + * + *

The filter admits three options LevelMin, LevelMax + * and AcceptOnMatch.

+ * + *

If the level of the {@link LoggerLoggingEvent} is not between Min and Max + * (inclusive), then {@link LOG4PHP_LOGGER_FILTER_DENY} is returned.

+ * + *

If the Logging event level is within the specified range, then if + * AcceptOnMatch is true, + * {@link LOG4PHP_LOGGER_FILTER_ACCEPT} is returned, and if + * AcceptOnMatch is false, + * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned.

+ * + *

If LevelMin is not defined, then there is no + * minimum acceptable level (ie a level is never rejected for + * being too "low"/unimportant). If LevelMax is not + * defined, then there is no maximum acceptable level (ie a + * level is never rejected for beeing too "high"/important).

+ * + *

Refer to the {@link LoggerAppenderSkeleton::setThreshold()} method + * available to all appenders extending {@link LoggerAppenderSkeleton} + * for a more convenient way to filter out events by level.

+ * + * @log4j-class org.apache.log4j.varia.LevelRangeFilter + * @log4j-author Simon Kitching + * @log4j-author based on code by Ceki Gülcü + * + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @subpackage varia + * @since 0.6 + */ +class LoggerLevelRangeFilter extends LoggerFilter { + + /** + * @var boolean + */ + var $acceptOnMatch = true; + + /** + * @var LoggerLevel + */ + var $levelMin; + + /** + * @var LoggerLevel + */ + var $levelMax; + + /** + * @return boolean + */ + function getAcceptOnMatch() + { + return $this->acceptOnMatch; + } + + /** + * @param boolean $acceptOnMatch + */ + function setAcceptOnMatch($acceptOnMatch) + { + $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); + } + + /** + * @return LoggerLevel + */ + function getLevelMin() + { + return $this->levelMin; + } + + /** + * @param string $l the level min to match + */ + function setLevelMin($l) + { + $this->levelMin = LoggerOptionConverter::toLevel($l, null); + } + + /** + * @return LoggerLevel + */ + function getLevelMax() + { + return $this->levelMax; + } + + /** + * @param string $l the level max to match + */ + function setLevelMax($l) + { + $this->levelMax = LoggerOptionConverter::toLevel($l, null); + } + + /** + * Return the decision of this filter. + * + * @param LoggerLoggingEvent $event + * @return integer + */ + function decide($event) + { + $level = $event->getLevel(); + + if($this->levelMin !== null) { + if ($level->isGreaterOrEqual($this->levelMin) == false) { + // level of event is less than minimum + return LOG4PHP_LOGGER_FILTER_DENY; + } + } + + if($this->levelMax !== null) { + if ($level->toInt() > $this->levelMax->toInt()) { + // level of event is greater than maximum + // Alas, there is no Level.isGreater method. and using + // a combo of isGreaterOrEqual && !Equal seems worse than + // checking the int values of the level objects.. + return LOG4PHP_LOGGER_FILTER_DENY; + } + } + + if ($this->getAcceptOnMatch()) { + // this filter set up to bypass later filters and always return + // accept if level in range + return LOG4PHP_LOGGER_FILTER_ACCEPT; + } else { + // event is ok for this filter; allow later filters to have a look.. + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + } + } +} ?> Modified: vtigercrm/trunk/log4php/varia/LoggerStringMatchFilter.php ============================================================================== --- vtigercrm/trunk/log4php/varia/LoggerStringMatchFilter.php (original) +++ vtigercrm/trunk/log4php/varia/LoggerStringMatchFilter.php Wed May 3 22:18:30 2006 @@ -1,108 +1,108 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage varia - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); - -/** - * This is a very simple filter based on string matching. - * - *

The filter admits two options {@link $stringToMatch} and - * {@link $acceptOnMatch}. If there is a match (using {@link PHP_MANUAL#strpos} - * between the value of the {@link $stringToMatch} option and the message - * of the {@link LoggerLoggingEvent}, - * then the {@link decide()} method returns {@link LOG4PHP_LOGGER_FILTER_ACCEPT} if - * the AcceptOnMatch option value is true, if it is false then - * {@link LOG4PHP_LOGGER_FILTER_DENY} is returned. If there is no match, {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} - * is returned.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage varia - * @since 0.3 - */ -class LoggerStringMatchFilter extends LoggerFilter { - - /** - * @var boolean - */ - var $acceptOnMatch = true; - - /** - * @var string - */ - var $stringToMatch = null; - - /** - * @return boolean - */ - function getAcceptOnMatch() - { - return $this->acceptOnMatch; - } - - /** - * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false') - */ - function setAcceptOnMatch($acceptOnMatch) - { - $this->acceptOnMatch = is_bool($acceptOnMatch) ? - $acceptOnMatch : - (bool)(strtolower($acceptOnMatch) == 'true'); - } - - /** - * @return string - */ - function getStringToMatch() - { - return $this->stringToMatch; - } - - /** - * @param string $s the string to match - */ - function setStringToMatch($s) - { - $this->stringToMatch = $s; - } - - /** - * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match. - */ - function decide($event) - { - $msg = $event->getRenderedMessage(); - - if($msg === null or $this->stringToMatch === null) - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - if( strpos($msg, $this->stringToMatch) !== false ) { - return ($this->acceptOnMatch) ? LOG4PHP_LOGGER_FILTER_ACCEPT : LOG4PHP_LOGGER_FILTER_DENY ; - } - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage varia + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); + +/** + * This is a very simple filter based on string matching. + * + *

The filter admits two options {@link $stringToMatch} and + * {@link $acceptOnMatch}. If there is a match (using {@link PHP_MANUAL#strpos} + * between the value of the {@link $stringToMatch} option and the message + * of the {@link LoggerLoggingEvent}, + * then the {@link decide()} method returns {@link LOG4PHP_LOGGER_FILTER_ACCEPT} if + * the AcceptOnMatch option value is true, if it is false then + * {@link LOG4PHP_LOGGER_FILTER_DENY} is returned. If there is no match, {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} + * is returned.

+ * + * @author VxR + * @version $Revision: 1.4 $ + * @package log4php + * @subpackage varia + * @since 0.3 + */ +class LoggerStringMatchFilter extends LoggerFilter { + + /** + * @var boolean + */ + var $acceptOnMatch = true; + + /** + * @var string + */ + var $stringToMatch = null; + + /** + * @return boolean + */ + function getAcceptOnMatch() + { + return $this->acceptOnMatch; + } + + /** + * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false') + */ + function setAcceptOnMatch($acceptOnMatch) + { + $this->acceptOnMatch = is_bool($acceptOnMatch) ? + $acceptOnMatch : + (bool)(strtolower($acceptOnMatch) == 'true'); + } + + /** + * @return string + */ + function getStringToMatch() + { + return $this->stringToMatch; + } + + /** + * @param string $s the string to match + */ + function setStringToMatch($s) + { + $this->stringToMatch = $s; + } + + /** + * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match. + */ + function decide($event) + { + $msg = $event->getRenderedMessage(); + + if($msg === null or $this->stringToMatch === null) + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + if( strpos($msg, $this->stringToMatch) !== false ) { + return ($this->acceptOnMatch) ? LOG4PHP_LOGGER_FILTER_ACCEPT : LOG4PHP_LOGGER_FILTER_DENY ; + } + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + } +} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 21:19:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:19:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5737 - /vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php Message-ID: <20060504041959.69FA9709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:19:54 2006 New Revision: 5737 Log: log4php latest version has been update Modified: vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php Modified: vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php ============================================================================== --- vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php (original) +++ vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php Wed May 3 22:19:54 2006 @@ -1,609 +1,609 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

- *

Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

- * - *

PHP port, extensions and modifications by VxR. All rights reserved.
- * For more information, please see {@link http://www.vxr.it/log4php/}.

- * - *

This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

- * - * @package log4php - * @subpackage xml - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); -require_once(LOG4PHP_DIR . '/LoggerAppender.php'); -require_once(LOG4PHP_DIR . '/LoggerLayout.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); -require_once(LOG4PHP_DIR . '/LoggerManager.php'); - -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE', 1000); -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE', 1010); -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE', 1020); -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE', 1030); -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE', 1040); - -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_FILENAME', './log4php.xml'); - -/** - * @var string the default configuration document - */ -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION', -' - - - - - - - - -'); - -/** - * @var string the elements namespace - */ -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS', 'HTTP://WWW.VXR.IT/LOG4PHP/'); - -/** - * Use this class to initialize the log4php environment using expat parser. - * - *

Read the log4php.dtd included in the documentation directory. Note that - * php parser does not validate the document.

- * - *

Sometimes it is useful to see how log4php is reading configuration - * files. You can enable log4php internal logging by setting the debug - * attribute in the log4php:configuration element. As in - *

- * <log4php:configuration debug="true" xmlns:log4php="http://www.vxr.it/log4php/">
- * ...
- * </log4php:configuration>
- * 
- * - *

There are sample XML files included in the package under tests/ - * subdirectories.

- * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage xml - * @since 0.4 - */ -class LoggerDOMConfigurator extends LoggerConfigurator { - - /** - * @var LoggerHierarchy - */ - var $repository; - - /** - * @var array state stack - */ - var $state; - - /** - * @var Logger parsed Logger - */ - var $logger; - - /** - * @var LoggerAppender parsed LoggerAppender - */ - var $appender; - - /** - * @var LoggerFilter parsed LoggerFilter - */ - var $filter; - - /** - * @var LoggerLayout parsed LoggerLayout - */ - var $layout; - - /** - * Constructor - */ - function LoggerDOMConfigurator() - { - $this->state = array(); - $this->logger = null; - $this->appender = null; - $this->filter = null; - $this->layout = null; - } - - /** - * Configure the default repository using the resource pointed by url. - * Url is any valid resurce as defined in {@link PHP_MANUAL#file} function. - * Note that the resource will be search with use_include_path parameter - * set to "1". - * - * @param string $url - * @static - */ - function configure($url = '') - { - $configurator = new LoggerDOMConfigurator(); - $repository =& LoggerManager::getLoggerRepository(); - return $configurator->doConfigure($url, $repository); - } - - /** - * Configure the given repository using the resource pointed by url. - * Url is any valid resurce as defined in {@link PHP_MANUAL#file} function. - * Note that the resource will be search with use_include_path parameter - * set to "1". - * - * @param string $url - * @param LoggerHierarchy &$repository - */ - function doConfigure($url = '', &$repository) - { - $xmlData = ''; - if (!empty($url)) - $xmlData = implode('', file($url, 1)); - return $this->doConfigureByString($xmlData, $repository); - } - - /** - * Configure the given repository using the configuration written in xmlData. - * Do not call this method directly. Use {@link doConfigure()} instead. - * @param string $xmlData - * @param LoggerHierarchy &$repository - */ - function doConfigureByString($xmlData, &$repository) - { - return $this->parse($xmlData, $repository); - } - - /** - * @param LoggerHierarchy &$repository - */ - function doConfigureDefault(&$repository) - { - return $this->doConfigureByString(LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION, $repository); - } - - /** - * @param string $xmlData - */ - function parse($xmlData, &$repository) - { - // LoggerManager::resetConfiguration(); - $this->repository =& $repository; - - $parser = xml_parser_create_ns(); - - xml_set_object($parser, &$this); - xml_set_element_handler($parser, "tagOpen", "tagClose"); - - $result = xml_parse($parser, $xmlData, true); - if (!$result) { - $errorCode = xml_get_error_code($parser); - $errorStr = xml_error_string($errorCode); - $errorLine = xml_get_current_line_number($parser); - LoggerLog::warn( - "LoggerDOMConfigurator::parse() ". - "Parsing error [{$errorCode}] {$errorStr}, line {$errorLine}" - ); - $this->repository->resetConfiguration(); - } else { - xml_parser_free($parser); - } - return $result; - } - - /** - * @param mixed $parser - * @param string $tag - * @param array $attribs - * - * @todo In 'LOGGER' case find a better way to detect 'getLogger()' method - */ - function tagOpen($parser, $tag, $attribs) - { - switch ($tag) { - - case 'CONFIGURATION' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION': - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() CONFIGURATION"); - - if (isset($attribs['THRESHOLD'])) { - - $this->repository->setThreshold( - LoggerOptionConverter::toLevel( - $this->subst($attribs['THRESHOLD']), - $this->repository->getThreshold() - ) - ); - } - if (isset($attribs['DEBUG'])) { - $debug = LoggerOptionConverter::toBoolean($this->subst($attribs['DEBUG']), LoggerLog::internalDebugging()); - $this->repository->debug = $debug; - LoggerLog::internalDebugging($debug); - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LOG4PHP:CONFIGURATION. Internal Debug turned ".($debug ? 'on':'off')); - - } - break; - - case 'APPENDER' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER': - - unset($this->appender); - $this->appender = null; - - $name = $this->subst(@$attribs['NAME']); - $class = $this->subst(@$attribs['CLASS']); - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen():tag=[$tag]:name=[$name]:class=[$class]"); - - $this->appender =& LoggerAppender::singleton($name, $class); - if ($this->appender === null) { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER cannot instantiate appender '$name'"); - } - $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE; - break; - - case 'APPENDER_REF' : - case 'APPENDER-REF' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER_REF': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER-REF': - - - if (isset($attribs['REF']) and !empty($attribs['REF'])) { - $appenderName = $this->subst($attribs['REF']); - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref='$appenderName'"); - - $appender =& LoggerAppender::singleton($appenderName); - if ($appender !== null) { - switch (end($this->state)) { - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE: - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE: - $this->logger->addAppender($appender); - break; - } - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref '$appenderName' points to a null appender"); - } - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref not set or empty"); - } - break; - - case 'FILTER' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER': - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() FILTER"); - - unset($this->filter); - $this->filter = null; - - $filterName = basename($this->subst(@$attribs['CLASS'])); - if (!empty($filterName)) { - if (!class_exists($filterName)) { - @include_once(LOG4PHP_DIR . "/varia/{$filterName}.php"); - } - if (class_exists($filterName)) { - $this->filter = new $filterName(); - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER. class '$filterName' doesnt exist"); - } - $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE; - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER filter name cannot be empty"); - } - break; - - case 'LAYOUT': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT': - - $class = @$attribs['CLASS']; - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LAYOUT class='{$class}'"); - - $this->layout = LoggerLayout::factory($this->subst($class)); - if ($this->layout === null) - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LAYOUT unable to instanciate class='{$class}'"); - - $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE; - break; - - case 'LOGGER': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER': - - // $this->logger is assigned by reference. - // Only '$this->logger=null;' destroys referenced object - unset($this->logger); - $this->logger = null; - - $loggerName = $this->subst(@$attribs['NAME']); - if (!empty($loggerName)) { - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LOGGER. name='$loggerName'"); - - $class = $this->subst(@$attribs['CLASS']); - if (empty($class)) { - $this->logger =& $this->repository->getLogger($loggerName); - } else { - $className = basename($class); - if (!class_exists($className)) - @include_once("{$class}.php"); - if (!class_exists($className)) { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() LOGGER. ". - "cannot find '$className'." - ); - } else { - - if (in_array('getlogger', get_class_methods($className))) { - $this->logger =& call_user_func(array($className, 'getlogger'), $loggerName); - } else { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() LOGGER. ". - "class '$className' doesnt implement 'getLogger()' method." - ); - } - } - } - if ($this->logger !== null and isset($attribs['ADDITIVITY'])) { - $additivity = LoggerOptionConverter::toBoolean($this->subst($attribs['ADDITIVITY']), true); - $this->logger->setAdditivity($additivity); - } - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LOGGER. Attribute 'name' is not set or is empty."); - } - $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE;; - break; - - case 'LEVEL': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LEVEL': - case 'PRIORITY': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PRIORITY': - - if (!isset($attribs['VALUE'])) { - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL value not set"); - break; - } - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL value={$attribs['VALUE']}"); - - if ($this->logger === null) { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL. parent logger is null"); - break; - } - - switch (end($this->state)) { - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE: - $this->logger->setLevel( - LoggerOptionConverter::toLevel( - $this->subst($attribs['VALUE']), - $this->logger->getLevel() - ) - ); - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL root level is now '{$attribs['VALUE']}' "); - break; - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE: - $this->logger->setLevel( - LoggerOptionConverter::toLevel( - $this->subst($attribs['VALUE']), - $this->logger->getLevel() - ) - ); - break; - default: - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL state '{$this->state}' not allowed here"); - } - break; - - case 'PARAM': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PARAM': - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() PARAM"); - - if (!isset($attribs['NAME'])) { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() PARAM. ". - "attribute 'name' not defined." - ); - break; - } - if (!isset($attribs['VALUE'])) { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() PARAM. ". - "attribute 'value' not defined." - ); - break; - } - - switch (end($this->state)) { - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE: - if ($this->appender !== null) { - $this->setter($this->appender, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE'])); - } else { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() PARAM. ". - " trying to set property to a null appender." - ); - } - break; - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE: - if ($this->layout !== null) { - $this->setter($this->layout, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE'])); - } else { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() PARAM. ". - " trying to set property to a null layout." - ); - } - break; - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE: - if ($this->filter !== null) { - $this->setter($this->filter, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE'])); - } else { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() PARAM. ". - " trying to set property to a null filter." - ); - } - break; - default: - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() PARAM state '{$this->state}' not allowed here"); - } - break; - - case 'RENDERER': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':RENDERER': - - $renderedClass = $this->subst(@$attribs['RENDEREDCLASS']); - $renderingClass = $this->subst(@$attribs['RENDERINGCLASS']); - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() RENDERER renderedClass='$renderedClass' renderingClass='$renderingClass'"); - - if (!empty($renderedClass) and !empty($renderingClass)) { - $renderer = LoggerObjectRenderer::factory($renderingClass); - if ($renderer === null) { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() RENDERER cannot instantiate '$renderingClass'"); - } else { - $this->repository->setRenderer($renderedClass, $renderer); - } - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() RENDERER renderedClass or renderingClass is empty"); - } - break; - - case 'ROOT': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT': - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() ROOT"); - - $this->logger =& LoggerManager::getRootLogger(); - - $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE; - break; - - } - - } - - - /** - * @param mixed $parser - * @param string $tag - */ - function tagClose($parser, $tag) - { - switch ($tag) { - - case 'CONFIGURATION' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() CONFIGURATION"); - break; - - case 'APPENDER' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() APPENDER"); - - if ($this->appender !== null) { - if ($this->appender->requiresLayout() and $this->appender->layout === null) { - $appenderName = $this->appender->getName(); - LoggerLog::warn( - "LoggerDOMConfigurator::tagClose() APPENDER. ". - "'$appenderName' requires a layout that is not defined. ". - "Using a simple layout" - ); - $this->appender->setLayout(LoggerLayout::factory('LoggerLayoutSimple')); - } - $this->appender->activateOptions(); - } - array_pop($this->state); - break; - - case 'FILTER' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() FILTER"); - - if ($this->filter !== null) { - $this->filter->activateOptions(); - $this->appender->addFilter($this->filter); - $this->filter = null; - } - array_pop($this->state); - break; - - case 'LAYOUT': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() LAYOUT"); - - if ($this->appender !== null and $this->layout !== null and $this->appender->requiresLayout()) { - $this->layout->activateOptions(); - $this->appender->setLayout($this->layout); - $this->layout = null; - } - array_pop($this->state); - break; - - case 'LOGGER': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() LOGGER"); - - array_pop($this->state); - break; - - case 'ROOT': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() ROOT"); - - array_pop($this->state); - break; - } - } - - /** - * @param object $object - * @param string $name - * @param mixed $value - */ - function setter(&$object, $name, $value) - { - if (empty($name)) { - LoggerLog::debug("LoggerDOMConfigurator::setter() 'name' param cannot be empty"); - return false; - } - $methodName = 'set'.ucfirst($name); - if (method_exists($object, $methodName)) { - LoggerLog::debug("LoggerDOMConfigurator::setter() Calling ".get_class($object)."::{$methodName}({$value})"); - return call_user_func(array(&$object, $methodName), $value); - } else { - LoggerLog::warn("LoggerDOMConfigurator::setter() ".get_class($object)."::{$methodName}() does not exists"); - return false; - } - } - - function subst($value) - { - return LoggerOptionConverter::substVars($value); - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

+ *

Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

+ * + *

PHP port, extensions and modifications by VxR. All rights reserved.
+ * For more information, please see {@link http://www.vxr.it/log4php/}.

+ * + *

This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

+ * + * @package log4php + * @subpackage xml + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); +require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); +require_once(LOG4PHP_DIR . '/LoggerAppender.php'); +require_once(LOG4PHP_DIR . '/LoggerLayout.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); +require_once(LOG4PHP_DIR . '/LoggerManager.php'); + +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE', 1000); +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE', 1010); +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE', 1020); +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE', 1030); +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE', 1040); + +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_FILENAME', './log4php.xml'); + +/** + * @var string the default configuration document + */ +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION', +' + + + + + + + + +'); + +/** + * @var string the elements namespace + */ +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS', 'HTTP://WWW.VXR.IT/LOG4PHP/'); + +/** + * Use this class to initialize the log4php environment using expat parser From vtiger-tickets at vtiger.fosslabs.com Wed May 3 21:24:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 04:24:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23277=3A_?= =?utf-8?q?Create_New_Ticket_Error?= In-Reply-To: <076.a16680abbe7e676034a699a2d73d9ba1@vtiger.fosslabs.com> References: <076.a16680abbe7e676034a699a2d73d9ba1@vtiger.fosslabs.com> Message-ID: <085.d830ce31b8f3e3477da97397ac549966@vtiger.fosslabs.com> #277: Create New Ticket Error ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => invalid * status: assigned => closed Comment: This is not an error. when create or edit the ticket notification mail will be sent to the assigned to user and to the parent(contact or account). when we have not configured the mail server or the user doesnot have email id these messages will be shown. This is expected behaviour. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 22:12:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 05:12:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23314=3A_?= =?utf-8?q?Send_Mail_Error?= In-Reply-To: <076.e5bca6e3a669f482cc6bea329d21616f@vtiger.fosslabs.com> References: <076.e5bca6e3a669f482cc6bea329d21616f@vtiger.fosslabs.com> Message-ID: <085.aac36f903fbffea3b2b216cc9aa0a131@vtiger.fosslabs.com> #314: Send Mail Error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: sendmail ---------------------------+------------------------------------------------ Changes (by mickie): * resolution: => invalid * status: assigned => closed Comment: when click on sendmail button with a selected account (in a customview)then it is asking to select email or otheremail of the account. This error is not reproduced. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 00:14:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 07:14:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23379=3A_?= =?utf-8?q?Convert_Ticket_as_FAQ_Issues_-_HelpDesk?= In-Reply-To: <076.e5a75db78368710b1013ac9acdcc85ef@vtiger.fosslabs.com> References: <076.e5a75db78368710b1013ac9acdcc85ef@vtiger.fosslabs.com> Message-ID: <085.cb7107edea987081c62181541386e05e@vtiger.fosslabs.com> #379: Convert Ticket as FAQ Issues - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => invalid * status: assigned => closed Comment: This is an expected behaviour. when we convert the ticket as FAQ all the comments, description and solution will be considered as ans answer for the FAQ. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 00:17:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 07:17:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5738 - /vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php Message-ID: <20060504071737.B298A709F87@vtiger.fosslabs.com> Author: saraj Date: Thu May 4 01:17:27 2006 New Revision: 5738 Log: * Modified the Module FAQ to Faq as when get the tabid from tabdata.php file the tabid returns as empty as the file contains the name Faq Modified: vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php Modified: vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php Thu May 4 01:17:27 2006 @@ -31,7 +31,7 @@ $focus->column_fields[$faq_column] = $adb->query_result($res,0,$ticket_column); } -$focus->save("FAQ"); +$focus->save("Faq"); if($focus->id != '') { From vtiger-tickets at vtiger.fosslabs.com Thu May 4 00:22:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 07:22:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23536=3A_?= =?utf-8?q?Ticketsystem_Emails?= In-Reply-To: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> References: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> Message-ID: <085.328ebe13275f1455bfba4eddb40c09be@vtiger.fosslabs.com> #536: Ticketsystem Emails -----------------------------+---------------------------------------------- Reporter: anonymous | Owner: mickie Type: enhancement | Status: assigned Priority: major | Milestone: Component: customerportal | Version: 5.0.0 Resolution: | Keywords: Ticket mail -----------------------------+---------------------------------------------- Comment (by mickie): i agree that the email id is displayed in ticket comments. But the ticket can be only viewable by the crm user or the customer (customerportal user). How can others view this ticket and how can they spam? Please let me know if i am wrong. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 01:30:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 08:30:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23755=3A_?= =?utf-8?q?Image_Graph_implementation_for_4=2E2=2E5_jpgraph_replacement?= Message-ID: <076.48939851ba2c8a6f490b5e0d7b8c550b@vtiger.fosslabs.com> #755: Image Graph implementation for 4.2.5 jpgraph replacement ---------------------------------+------------------------------------------ Reporter: jacquemesm | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: Image Graph jpgraph | ---------------------------------+------------------------------------------ Installation : {{{ suppress jpgraph folder unzip attached file. This will create Image folder, include/utils/GraphUtils.php and Pear.php apply the patch file }}} -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 02:58:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 09:58:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5739 - /vtigercrm/trunk/Smarty/libs/Smarty.class.php Message-ID: <20060504095841.CD8DF709E8B@vtiger.fosslabs.com> Author: saraj Date: Thu May 4 03:58:36 2006 New Revision: 5739 Log: Modified = true; - Ahmed Modified: vtigercrm/trunk/Smarty/libs/Smarty.class.php Modified: vtigercrm/trunk/Smarty/libs/Smarty.class.php ============================================================================== --- vtigercrm/trunk/Smarty/libs/Smarty.class.php (original) +++ vtigercrm/trunk/Smarty/libs/Smarty.class.php Thu May 4 03:58:36 2006 @@ -138,7 +138,7 @@ * * @var boolean */ - var $compile_check = false; + var $compile_check = true; /** * This forces templates to compile every time. Useful for development From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 06:55:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 13:55:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5740 - /vtigercrm/trunk/index.php Message-ID: <20060504135532.1A729706500@vtiger.fosslabs.com> Author: saraj Date: Thu May 4 07:55:23 2006 New Revision: 5740 Log: licensing contents skipped for changepassword popup Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Thu May 4 07:55:23 2006 @@ -556,7 +556,7 @@ "; echo $copyrightstatement; - if($action != "about_us" && $action != "vtchat") + if($action != "about_us" && $action != "vtchat" && $action != "ChangePassword") { echo ""; echo " + +
\n"; From vtiger-tickets at vtiger.fosslabs.com Thu May 4 08:23:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 15:23:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23756=3A_?= =?utf-8?q?Option_to_skip_use_of_shipping-address?= Message-ID: <076.3c2c9c5476bb8606fa576a8304f090c1@vtiger.fosslabs.com> #756: Option to skip use of shipping-address ----------------------------------+----------------------------------------- Reporter: hpw at softechmatrix.nl | Owner: developer Type: enhancement | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 4.2.3 Keywords: shipping address | ----------------------------------+----------------------------------------- Currently the shipping-address is mandatory in most places of the system (like orders and invoices). However, many businesses don't 'ship' anything (example: hotels) and don't need a shipping address from their clients. It would be a nice enhancement if we could switch off the use of shipping- addresses altogether. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 11:24:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 18:24:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5741 - in /vtigercrm/trunk: Smarty/templates/ComposeEmail.tpl include/utils/EditViewUtils.php Message-ID: <20060504182445.DEF8F709FB3@vtiger.fosslabs.com> Author: saraj Date: Thu May 4 12:24:38 2006 New Revision: 5741 Log: * Modified to display the entities as red which dont have email id, when use sendmail from entity listview Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Thu May 4 12:24:38 2006 @@ -27,84 +27,93 @@ - + + + {foreach item=row from=$BLOCKS} {foreach item=elements from=$row} {if $elements.2.0 eq 'parent_id'} - + + + + + + + + + + + - - - - - - - - - - - + {elseif $elements.2.0 eq 'subject'} - + - + {elseif $elements.2.0 eq 'filename'} - - + + + + {$elements.3.0} + - + {elseif $elements.2.0 eq 'description'} - + - + {/if} {/foreach} {/foreach} - + - -
- - - - - - -
 
-
+ + + + + + +
 
+
To : - -   - + + {assign var=str_len value=$elements.3.0|count_characters:true} + {assign var=div_height value="35"} + {if $str_len gt 700} + {assign var=div_height value="50"} + {/if} +
{$elements.3.0}
+
+   + Select  - + +
Cc : +   +  
Bcc : +    
CC: - -   -  
BCC: -   - -  
*{$elements.1.0} :
{$elements.1.0} : - - {$elements.3.0}  
- +
-   -   - +   +   +
+
Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Thu May 4 12:24:38 2006 @@ -721,7 +721,25 @@ $result=$adb->query($querystr); $temp=$adb->query_result($result,0,'columnname'); $temp1=br2nl($myfocus->column_fields[$temp]); - $parent_name.=$fullname.'<'.$temp1.'>; '; + + //Modified to display the entities in red which don't have email id + if(strlen($temp_parent_name) > 150) + { + $parent_name .= '
'; + $temp_parent_name = ''; + } + + if($temp1 != '') + { + $parent_name .= $fullname.'<'.$temp1.'>; '; + $temp_parent_name .= $fullname.'<'.$temp1.'>; '; + } + else + { + $parent_name .= "".$fullname.'<'.$temp1.'>; '.""; + $temp_parent_name .= "".$fullname.'<'.$temp1.'>; '.""; + } + } } } From vtiger-tickets at vtiger.fosslabs.com Thu May 4 11:25:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:25:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23114=3A_?= =?utf-8?q?Issue_in_Send_Mail?= In-Reply-To: <076.ddc63533a52d7768a57c17d8f409428d@vtiger.fosslabs.com> References: <076.ddc63533a52d7768a57c17d8f409428d@vtiger.fosslabs.com> Message-ID: <085.47fdc6b2e06c03c772cad07871ac6390@vtiger.fosslabs.com> #114: Issue in Send Mail ------------------------+--------------------------------------------------- Reporter: jeri | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Accounts,Send mail ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This has been fixed as the entity names will be displayed in red which dont have email -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 11:31:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:31:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23444=3A_?= =?utf-8?q?Issue_in_contact_send_mail?= In-Reply-To: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> References: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> Message-ID: <085.a508f193fa5e7a5d2c5533e45e53e12a@vtiger.fosslabs.com> #444: Issue in contact send mail ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This is expected behaviour. when click sendmail from listiview it will ask the user to select any one of the available email because here we can select multiple entities.so the user can decide whether use a single email or all available emails. but when we click sendmail from detailview it will directly go to email editview to create new email to send where the email id will be automatically selected. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 11:31:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:31:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23444=3A_?= =?utf-8?q?Issue_in_contact_send_mail?= In-Reply-To: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> References: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> Message-ID: <085.ab76db464715827345e477ccfe27efd4@vtiger.fosslabs.com> #444: Issue in contact send mail ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: reopened Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: fixed => * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 11:32:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:32:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23444=3A_?= =?utf-8?q?Issue_in_contact_send_mail?= In-Reply-To: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> References: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> Message-ID: <085.c5966e34293320fe16b4ed8e328d0b77@vtiger.fosslabs.com> #444: Issue in contact send mail ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => invalid * status: reopened => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 11:34:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:34:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2387=3A_C?= =?utf-8?q?all_to_undefined_function_error_when_creating_portal_user?= In-Reply-To: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> References: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> Message-ID: <085.5601d2f5d75dd9ff6c357e88827876a2@vtiger.fosslabs.com> #87: Call to undefined function error when creating portal user ------------------------------------+--------------------------------------- Reporter: james at itextension.com | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: customer portal, contacts ------------------------------------+--------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue has been fixed already and the related file has been checkedin in svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 11:38:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:38:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23443=3A_?= =?utf-8?q?Issue_in_contact_send_mail?= In-Reply-To: <076.430c5dc35b1c3f501f0bbe602ea65fa9@vtiger.fosslabs.com> References: <076.430c5dc35b1c3f501f0bbe602ea65fa9@vtiger.fosslabs.com> Message-ID: <085.cd92464c57963f95e102312d173744ff@vtiger.fosslabs.com> #443: Issue in contact send mail ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => invalid * status: assigned => closed Comment: when click on sendmail after select a contact from listview goes to the specified page where we can select one of the or all email options which are all avalilable. Not reproduced. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 13:16:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 20:16:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23757=3A_?= =?utf-8?q?Update_to_new_adodb-4=2E81_release?= Message-ID: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> #757: Update to new adodb-4.81 release ------------------------------------+--------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: adodb database package | ------------------------------------+--------------------------------------- There is a new release of adodb-4.81. The changelog seems to have several useful features and fixes. I would like to update the snapshotted adodb in source:vtigercrm/trunk/adodb and source:vtigercrm/branches/4.2/adodb to be zero-diff with the release files of adodb-4.81. I would be comfortable doing this without feedback on source:vtigercrm/branches/4.2 since we have been keeping that snapshot in sync with adodb releases. However, since the trunk's adodb is of indeterminate version, and since I am new to the development cycle on the source:vtigercrm/trunk, I would like someone to weigh in with approval first. The changes in adodb-4.81 are as follows: * This release can cache table metadata (field names, types, and other info such primary keys). It only updates fields that have changed. * Variable ref errors in adodb-ado5.inc.php have been fixed. * There is a Mysqli setcharset fix using method_exists(). * The adodb-perf.inc.php CreateLogTable() code now works for user-defined table names * An error in ibase_blob_open() has been fixed. * This release no longer includes auto_increment fields in replace(). Previous changelogs are available at: http://phplens.com/lens/adodb/docs-adodb.htm#changes -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 14:50:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 21:50:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23757=3A_?= =?utf-8?q?Update_to_new_adodb-4=2E81_release?= In-Reply-To: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> References: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> Message-ID: <085.1bf73978993f8d311a1731431fe56488@vtiger.fosslabs.com> #757: Update to new adodb-4.81 release ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: adodb database package ------------------------+--------------------------------------------------- Comment (by jeffk): (In [5742]) refs #757. update adodb-4.72 to adodb-4.81 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 14:50:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 21:50:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5742 - in /vtigercrm/branches/4.2/adodb: ./ datadict/ drivers/ perf/ session/ session/old/ tests/ xsl/ Message-ID: <20060504215025.447245D3B07@vtiger.fosslabs.com> Author: jeffk Date: Thu May 4 15:49:28 2006 New Revision: 5742 Log: refs #757. update adodb-4.72 to adodb-4.81 Added: vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php vtigercrm/branches/4.2/adodb/adodb-xmlschema03.inc.php vtigercrm/branches/4.2/adodb/tests/test-active-record.php vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php vtigercrm/branches/4.2/adodb/xsl/convert-0.1-0.3.xsl vtigercrm/branches/4.2/adodb/xsl/convert-0.2-0.3.xsl vtigercrm/branches/4.2/adodb/xsl/remove-0.3.xsl Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php vtigercrm/branches/4.2/adodb/adodb-error.inc.php vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php vtigercrm/branches/4.2/adodb/adodb-lib.inc.php vtigercrm/branches/4.2/adodb/adodb-pager.inc.php vtigercrm/branches/4.2/adodb/adodb-pear.inc.php vtigercrm/branches/4.2/adodb/adodb-perf.inc.php vtigercrm/branches/4.2/adodb/adodb-php4.inc.php vtigercrm/branches/4.2/adodb/adodb-time.inc.php vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php vtigercrm/branches/4.2/adodb/adodb.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-sapdb.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php vtigercrm/branches/4.2/adodb/pivottable.inc.php vtigercrm/branches/4.2/adodb/rsfilter.inc.php vtigercrm/branches/4.2/adodb/server.php vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php vtigercrm/branches/4.2/adodb/session/adodb-session.php vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php vtigercrm/branches/4.2/adodb/session/old/adodb-session.php vtigercrm/branches/4.2/adodb/tests/benchmark.php vtigercrm/branches/4.2/adodb/tests/client.php vtigercrm/branches/4.2/adodb/tests/test-datadict.php vtigercrm/branches/4.2/adodb/tests/test-php5.php vtigercrm/branches/4.2/adodb/tests/test-xmlschema.php vtigercrm/branches/4.2/adodb/tests/test.php vtigercrm/branches/4.2/adodb/tests/test3.php vtigercrm/branches/4.2/adodb/tests/test4.php vtigercrm/branches/4.2/adodb/tests/test5.php vtigercrm/branches/4.2/adodb/tests/testcache.php vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php vtigercrm/branches/4.2/adodb/tests/testmssql.php vtigercrm/branches/4.2/adodb/tests/testoci8.php vtigercrm/branches/4.2/adodb/tests/testoci8cursor.php vtigercrm/branches/4.2/adodb/tests/testpaging.php vtigercrm/branches/4.2/adodb/tests/testpear.php vtigercrm/branches/4.2/adodb/tests/testsessions.php vtigercrm/branches/4.2/adodb/toexport.inc.php vtigercrm/branches/4.2/adodb/tohtml.inc.php vtigercrm/branches/4.2/adodb/xsl/convert-0.1-0.2.xsl Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php Thu May 4 15:49:28 2006 @@ -8,7 +8,7 @@ /* - V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved. + V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released under both BSD license and Lesser GPL library license. Whenever there is any discrepancy between the two licenses, the BSD license will take precedence. See License.txt. Modified: vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,7 @@ NameQuote($name); } - // temporary for debuging vtiger - GS - - function println($msg) - { - require_once('include/logging.php'); - $log1 =& LoggerManager::getLogger('VT'); - if(is_array($msg)) - { - $log1->fatal("Install ->".print_r($msg,true)); - } - else - { - $log1->fatal("Install ->".$msg); - } - return $msg; - } - - -//---------------- - - // Executes the sql array returned by GetTableSQL and GetIndexSQL function ExecuteSQLArray($sql, $continueOnError = true) { @@ -286,18 +266,10 @@ foreach($sql as $line) { if ($this->debug) $conn->debug = true; - $this->println($line); $ok = $conn->Execute($line); $conn->debug = $saved; if (!$ok) { - $this->println("Table Creation Error: Query Failed"); - $this->println(" "); - if ($this->debug) - { - - $this->println("InstallError: ".$conn->ErrorMsg()); - ADOConnection::outp($conn->ErrorMsg()); - } + if ($this->debug) ADOConnection::outp($conn->ErrorMsg()); if (!$continueOnError) return 0; $rez = 1; } @@ -737,7 +709,7 @@ This function changes/adds new fields to your table. You don't have to know if the col is new or not. It will check on its own. */ - function ChangeTableSQL($tablename, $flds, $tableoptions = false, $forceAlter = false) // GS Fix for constraint impl - forceAlter + function ChangeTableSQL($tablename, $flds, $tableoptions = false) { global $ADODB_FETCH_MODE; @@ -754,7 +726,7 @@ if (isset($savem)) $this->connection->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; - if ( $forceAlter == false && empty($cols)) { // GS Fix for constraint impl + if ( empty($cols)) { return $this->CreateTableSQL($tablename, $flds, $tableoptions); } @@ -806,33 +778,7 @@ } } - // GS Fix for constraint impl -- start - if($forceAlter == false) return $sql; - $sqlarray = array(); - - $alter .= implode(",\n", $sql); - if (sizeof($pkey)>0) { - $alter .= ",\n PRIMARY KEY ("; - $alter .= implode(", ",$pkey).")"; - } - - if (isset($tableoptions['CONSTRAINTS'])) - $alter .= "\n".$tableoptions['CONSTRAINTS']; - - if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) - $alter .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS']; - - if (isset($tableoptions[$this->upperName])) $alter .= $tableoptions[$this->upperName]; - $sqlarray[] = $alter; - - - $taboptions = $this->_Options($tableoptions); - $tsql = $this->_Triggers($this->TableName($tablename),$taboptions); - foreach($tsql as $s) $sqlarray[] = $s; - - // GS Fix for constraint impl -- end - - return $sqlarray; + return $sql; } } // class ?> Modified: vtigercrm/branches/4.2/adodb/adodb-error.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-error.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-error.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ dbms = $dbms; - $this->host = $thisConnection->host; - $this->database = $thisConnection->database; + if ($thisConnection) { + $this->host = $thisConnection->host; + $this->database = $thisConnection->database; + } $this->fn = $fn; $this->msg = $errmsg; Modified: vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php Thu May 4 15:49:28 2006 @@ -1,7 +1,7 @@ Modified: vtigercrm/branches/4.2/adodb/adodb-lib.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-lib.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-lib.inc.php Thu May 4 15:49:28 2006 @@ -7,7 +7,7 @@ $ADODB_INCLUDED_LIB = 1; /* - @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved. + @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved. Released under both BSD license and Lesser GPL library license. Whenever there is any discrepancy between the two licenses, the BSD license will take precedence. See License.txt. @@ -933,19 +933,18 @@ $dbt = $zthis->databaseType; if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType; -/* - if ($inBrowser) { - if ($ss) { - $ss = ''.htmlspecialchars($ss).''; - } - if ($zthis->debug === -1) - ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); - else - ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); - } else { - ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); - } -// */ + if ($inBrowser) { + if ($ss) { + $ss = ''.htmlspecialchars($ss).''; + } + if ($zthis->debug === -1) + ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); + else + ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); + } else { + ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); + } + $qID = $zthis->_query($sql,$inputarr); /* @@ -958,17 +957,6 @@ if ($err = $zthis->ErrorNo()) ADOConnection::outp($err.': '.$emsg); } } else if (!$qID) { - if ($inBrowser) { - if ($ss) { - $ss = ''.htmlspecialchars($ss).''; - } - if ($zthis->debug === -1) - ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); - else - ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); - } else { - ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); - } ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg()); } @@ -1030,4 +1018,4 @@ return $s; } -?> +?> Modified: vtigercrm/branches/4.2/adodb/adodb-pager.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-pager.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-pager.inc.php Thu May 4 15:49:28 2006 @@ -1,7 +1,7 @@ createTableSQL) return false; + $table = $this->table(); + $sql = str_replace('adodb_logsql',$table,$this->createTableSQL); + $savelog = $this->conn->LogSQL(false); - $ok = $this->conn->Execute($this->createTableSQL); + $ok = $this->conn->Execute($sql); $this->conn->LogSQL($savelog); return ($ok) ? true : false; } Modified: vtigercrm/branches/4.2/adodb/adodb-php4.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-php4.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-php4.inc.php Thu May 4 15:49:28 2006 @@ -1,7 +1,7 @@ parent =& $parent; $this->name = $this->prefix($attributes['NAME']); - // GS Fix for constraint impl - if(isset($attributes['ALTER'])) - { - $this->alter = $attributes['ALTER']; - } } /** @@ -329,12 +323,12 @@ if( isset( $this->current_field ) ) { $this->addFieldOpt( $this->current_field, $this->currentElement, $cdata ); } else { - $this->addTableOpt('CONSTRAINTS', $cdata ); // GS Fix for constraint impl + $this->addTableOpt( $cdata ); } break; // Table option case 'OPT': - $this->addTableOpt('mysql', $cdata ); // GS Fix for constraint impl + $this->addTableOpt( $cdata ); break; default: @@ -468,9 +462,8 @@ * @param string $opt Table option * @return array Options */ - function addTableOpt($key, $opt ) { // GS Fix for constraint impl - //$this->opts[] = $opt; - $this->opts[$key] = $opt; + function addTableOpt( $opt ) { + $this->opts[] = $opt; return $this->opts; } @@ -552,7 +545,7 @@ } } - if( empty( $legacy_fields ) && !isset($this->alter)) { // GS Fix for constraint impl + if( empty( $legacy_fields ) ) { // Create the new table $sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts ); logMsg( end( $sql ), 'Generated CreateTableSQL' ); @@ -563,7 +556,7 @@ // Use ChangeTableSQL case 'ALTER': logMsg( 'Generated ChangeTableSQL (ALTERing table)' ); - $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts, $this->alter ); // GS Fix for constraint impl + $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts ); break; case 'REPLACE': logMsg( 'Doing upgrade REPLACE (testing)' ); @@ -2225,4 +2218,4 @@ echo ''; } } -?> +?> Modified: vtigercrm/branches/4.2/adodb/adodb.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb.inc.php Thu May 4 15:49:28 2006 @@ -14,7 +14,7 @@ /** \mainpage - @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. + @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released under both BSD license and Lesser GPL library license. You can choose which license you prefer. @@ -171,7 +171,7 @@ /** * ADODB version as a string. */ - $ADODB_vers = 'V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.'; + $ADODB_vers = 'V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.'; /** * Determines whether recordset->RecordCount() is used. @@ -314,7 +314,6 @@ var $_evalAll = false; var $_affected = false; var $_logsql = false; - /** * Constructor @@ -554,6 +553,7 @@ function q(&$s) { + #if (!empty($this->qNull)) if ($s == 'null') return $s; $s = $this->qstr($s,false); } @@ -747,7 +747,7 @@ $this->_transOK = false; if ($this->debug) ADOConnection::outp("Smart Commit failed"); } else - if (false) ADOConnection::outp("Smart Commit occurred"); + if ($this->debug) ADOConnection::outp("Smart Commit occurred"); } else { $this->_transOK = false; $this->RollbackTrans(); @@ -865,7 +865,7 @@ { if ($this->debug) { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); $this->_queryID = _adodb_debug_execute($this, $sql,$inputarr); } else { $this->_queryID = @$this->_query($sql,$inputarr); @@ -896,7 +896,6 @@ $rs->connection = &$this; // Pablo suggestion $rs->Init(); if (is_array($sql)) $rs->sql = $sql[0]; - //New memory copy of input created here -mikefedyk else $rs->sql = $sql; if ($rs->_numOfRows <= 0) { global $ADODB_COUNTRECS; @@ -1463,7 +1462,7 @@ function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false) { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc); } @@ -1530,7 +1529,7 @@ } global $ADODB_INCLUDED_CSV; - if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php'); + if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php'); $f = $this->_gencachename($sql.serialize($inputarr),false); adodb_write_file($f,''); // is adodb_write_file needed? @@ -1582,7 +1581,7 @@ } global $ADODB_INCLUDED_CSV; - if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php'); + if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php'); $f = $this->_gencachename($sql.serialize($inputarr),false); adodb_write_file($f,''); // is adodb_write_file needed? @@ -1657,7 +1656,7 @@ $sqlparam = $sql; global $ADODB_INCLUDED_CSV; - if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php'); + if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php'); $md5file = $this->_gencachename($sql.serialize($inputarr),true); $err = ''; @@ -1788,7 +1787,7 @@ } //********************************************************// - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force); } @@ -1808,7 +1807,7 @@ $force = $ADODB_FORCE_TYPE; } - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force); } @@ -1958,6 +1957,48 @@ } } + function &GetActiveRecordsClass($class, $table,$whereOrderBy=false,$bindarr=false, $primkeyArr=false) + { + global $_ADODB_ACTIVE_DBS; + + $save = $this->SetFetchMode(ADODB_FETCH_NUM); + if (empty($whereOrderBy)) $whereOrderBy = '1=1'; + $rows = $this->GetAll("select * from ".$table.' WHERE '.$whereOrderBy,$bindarr); + $this->SetFetchMode($save); + + $false = false; + + if ($rows === false) { + return $false; + } + + + if (!isset($_ADODB_ACTIVE_DBS)) { + include(ADODB_DIR.'/adodb-active-record.inc.php'); + } + if (!class_exists($class)) { + ADOConnection::outp("Unknown class $class in GetActiveRcordsClass()"); + return $false; + } + $arr = array(); + foreach($rows as $row) { + + $obj =& new $class($table,$primkeyArr,$this); + if ($obj->ErrorMsg()){ + $this->_errorMsg = $obj->ErrorMsg(); + return $false; + } + $obj->Set($row); + $arr[] =& $obj; + } + return $arr; + } + + function &GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false) + { + $arr =& $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr); + return $arr; + } /** * Close Connection @@ -2022,6 +2063,7 @@ return false; } + /** * @param ttype can either be 'VIEW' or 'TABLE' or false. @@ -2422,7 +2464,7 @@ function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); if ($this->pageExecuteCountRows) $rs =& _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache); else $rs =& _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache); return $rs; @@ -2494,7 +2536,7 @@ //============================================================================================== // DATE AND TIME FUNCTIONS //============================================================================================== - include_once(ADODB_DIR.'/adodb-time.inc.php'); + if (!defined('ADODB_DATE_VERSION')) include(ADODB_DIR.'/adodb-time.inc.php'); //============================================================================================== // CLASS ADORecordSet @@ -2605,7 +2647,7 @@ $size=0, $selectAttr='',$compareFields0=true) { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple, $size, $selectAttr,$compareFields0); } @@ -2632,7 +2674,7 @@ $size=0, $selectAttr='') { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_getmenu_gp($this, $name,$defstr,$blank1stItem,$multiple, $size, $selectAttr,false); } @@ -3147,6 +3189,7 @@ } return $lnumrows; } + /** * @return the current row in the recordset. If at EOF, will return the last row. 0-based. @@ -3878,7 +3921,6 @@ case 'oracle': $drivername = 'oci8'; break; case 'access': if ($perf) $drivername = ''; break; case 'db2' : break; - case 'odbc_db2': $drivername = 'db2'; break; case 'sapdb' : break; default: $drivername = 'generic'; @@ -3911,7 +3953,7 @@ $path = ADODB_DIR."/datadict/datadict-$drivername.inc.php"; if (!file_exists($path)) { - ADOConnection::outp("Database driver '$path' not available"); + ADOConnection::outp("Dictionary driver '$path' not available"); return $false; } include_once($path); @@ -3957,7 +3999,7 @@ function adodb_backtrace($printOrArr=true,$levels=9999) { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_backtrace($printOrArr,$levels); } Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php (original) +++ vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php Thu May 4 15:49:28 2006 @@ -1,7 +1,7 @@ transCnt += 1; return true; } + function CommitTrans($ok=true) { if (!$ok) return $this->RollbackTrans(); @@ -283,7 +284,9 @@ function ErrorMsg() { + if (!$this->_connectionID) return "No connection established"; $errc = $this->_connectionID->Errors; + if (!$errc) return "No Errors object found"; if ($errc->Count == 0) return ''; $err = $errc->Item($errc->Count-1); return $err->Description; Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ _connectionID; // return rs + + $false = false; + if ($inputarr) { if (!empty($this->charPage)) @@ -236,22 +239,24 @@ $p = false; $rs = $oCmd->Execute(); $e = $dbc->Errors; - if ($dbc->Errors->Count > 0) return false; + if ($dbc->Errors->Count > 0) return $false; return $rs; } $rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option); - if ($dbc->Errors->Count > 0) return false; - if (! $rs) return false; - - if ($rs->State == 0) return true; // 0 = adStateClosed means no records returned - return $rs; + if ($dbc->Errors->Count > 0) return $false; + if (! $rs) return $false; + + if ($rs->State == 0) { + $true = true; + return $true; // 0 = adStateClosed means no records returned + } return $rs; } catch (exception $e) { } - return false; + return $false; } @@ -290,7 +295,9 @@ function ErrorMsg() { + if (!$this->_connectionID) return "No connection established"; $errc = $this->_connectionID->Errors; + if (!$errc) return "No Errors object found"; if ($errc->Count == 0) return ''; $err = $errc->Item($errc->Count-1); return $err->Description; Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ _connectionID, $blob ); $realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet while($string = ibase_blob_get($blobid, 8192)){ $realblob .= $string; Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ compat323 == false && strncasecmp($sql,'sele',4) == 0) { $rs =& $this->SelectLimit($sql,1,-1,$inputarr); if ($rs) { $rs->Close(); @@ -171,7 +172,7 @@ function BeginTrans() { - //if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); + if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); } function _affectedrows() @@ -636,8 +637,8 @@ function &GetRowAssoc($upper=true) { - if ($this->fetchMode == MYSQL_ASSOC && !$upper) return $this->fields; - $row =& ADORecordSet::GetRowAssoc($upper); + if ($this->fetchMode == MYSQL_ASSOC && !$upper) $row = $this->fields; + else $row =& ADORecordSet::GetRowAssoc($upper); return $row; } @@ -772,4 +773,4 @@ } -?> +?> Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ _connectionID,'character_set_name')) + if (!method_exists($this->_connectionID,'character_set_name')) return false; $this->charSet = @$this->_connectionID->character_set_name(); @@ -694,7 +694,7 @@ // SetCharSet - switch the client encoding function SetCharSet($charset_name) { - if (!is_callable($this->_connectionID,'set_charset')) + if (!method_exists($this->_connectionID,'set_charset')) return false; if ($this->charSet !== $charset_name) { Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php Thu May 4 15:49:28 2006 @@ -1,7 +1,7 @@ _resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false; Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ $dbType

"; $db = NewADOConnection($dbType); $dict = NewDataDictionary($db); @@ -21,7 +21,7 @@ if (!$dict) continue; $dict->debug = 1; - $opts = array('REPLACE','mysql' => 'TYPE=INNODB', 'oci8' => 'TABLESPACE USERS'); + $opts = array('REPLACE','mysql' => 'ENGINE=INNODB', 'oci8' => 'TABLESPACE USERS'); /* $flds = array( array('id', 'I', Modified: vtigercrm/branches/4.2/adodb/tests/test-php5.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test-php5.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test-php5.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ Connect('localhost','roots','','northwind'); + $db->Connect('localhost','root','','northwind'); break; case 'mysqli': @@ -74,5 +74,35 @@ } $rs = $db->Execute("select distinct id, firstname,lastname from adoxyz order by id"); -echo "Result=\n",$rs; +echo "Result=\n",$rs,"

"; + +echo "

Active Record

"; +try { + include_once("../adodb-active-record.inc.php"); + class City extends ADOdb_Active_Record{}; + $a = new City(); + +} catch(exception $e){ + echo $e->getMessage(); +} + +try { + + ADOdb_Active_Record::SetDatabaseAdapter($db); + $a = new City(); + + echo "

Successfully created City()
"; + var_dump($a->GetPrimaryKeys()); + $a->city = 'Kuala Lumpur'; + $a->Save(); + $a->Update(); + $a->SetPrimaryKeys(array('city')); + $a->country = "M'sia"; + $a->save(); + $a->Delete(); +} catch(exception $e){ + echo $e->getMessage(); +} + +include_once("test-active-record.php"); ?> Modified: vtigercrm/branches/4.2/adodb/tests/test-xmlschema.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test-xmlschema.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test-xmlschema.php Thu May 4 15:49:28 2006 @@ -1,54 +1,54 @@ -Connect( 'localhost', 'root', '', 'schematest' ); - -// To create a schema object and build the query array. -$schema = new adoSchema( $db ); - -// To upgrade an existing schema object, use the following -// To upgrade an existing database to the provided schema, -// uncomment the following line: -#$schema->upgradeSchema(); - -print "SQL to build xmlschema.xml:\n

";
-// Build the SQL array
-$sql = $schema->ParseSchema( "xmlschema.xml" );
-
-print_r( $sql );
-print "
\n"; - -// Execute the SQL on the database -//$result = $schema->ExecuteSchema( $sql ); - -// Finally, clean up after the XML parser -// (PHP won't do this for you!) -//$schema->Destroy(); - - - -print "SQL to build xmlschema-mssql.xml:\n
";
-
-$db2 = ADONewConnection('mssql');
-$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
-
-$db2->Execute("drop table simple_table");
-
-$schema = new adoSchema( $db2 );
-$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
-
-print_r( $sql );
-print "
\n"; - -$db2->debug=1; - -foreach ($sql as $s) -$db2->Execute($s); +Connect( 'localhost', 'root', '', 'schematest' ); + +// To create a schema object and build the query array. +$schema = new adoSchema( $db ); + +// To upgrade an existing schema object, use the following +// To upgrade an existing database to the provided schema, +// uncomment the following line: +#$schema->upgradeSchema(); + +print "SQL to build xmlschema.xml:\n
";
+// Build the SQL array
+$sql = $schema->ParseSchema( "xmlschema.xml" );
+
+print_r( $sql );
+print "
\n"; + +// Execute the SQL on the database +//$result = $schema->ExecuteSchema( $sql ); + +// Finally, clean up after the XML parser +// (PHP won't do this for you!) +//$schema->Destroy(); + + + +print "SQL to build xmlschema-mssql.xml:\n
";
+
+$db2 = ADONewConnection('mssql');
+$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
+
+$db2->Execute("drop table simple_table");
+
+$schema = new adoSchema( $db2 );
+$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
+
+print_r( $sql );
+print "
\n"; + +$db2->debug=1; + +foreach ($sql as $s) +$db2->Execute($s); ?> Modified: vtigercrm/branches/4.2/adodb/tests/test.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ "; $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ"); + + if ($rs) print ' 1st line set to **** , Steven selected: '. $rs->GetMenu('menu','Steven','1st:****').'
'; + else print " Fail
"; + + + + $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ"); if ($rs) print ' Multiple, Alan selected: '. $rs->GetMenu('menu','Alan',false,true).'
'; else print " Fail
"; print '


'; Modified: vtigercrm/branches/4.2/adodb/tests/test3.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test3.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test3.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 15:08:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 04 May 2006 22:08:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5743 - in /vtigercrm/trunk: Smarty/templates/ImportMap.tpl Smarty/templates/ImportStep1.tpl Smarty/templates/ImportStep2.tpl modules/Import/ImportSteplast.php Message-ID: <20060504220853.982BE5CF3CC@vtiger.fosslabs.com> Author: saraj Date: Thu May 4 16:08:45 2006 New Revision: 5743 Log: * Modified for UI changes and the unwanted tags have been removed and form tags has been put in correct location to avoid the error when click on any buttons Modified: vtigercrm/trunk/Smarty/templates/ImportMap.tpl vtigercrm/trunk/Smarty/templates/ImportStep1.tpl vtigercrm/trunk/Smarty/templates/ImportStep2.tpl vtigercrm/trunk/modules/Import/ImportSteplast.php Modified: vtigercrm/trunk/Smarty/templates/ImportMap.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ImportMap.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ImportMap.tpl Thu May 4 16:08:45 2006 @@ -1,14 +1,27 @@ -{assign var="Firstrow" value=$FIRSTROW} - - {foreach name=iter item=row from=$Firstrow} - {assign var="counter" value=$smarty.foreach.iter.iteration} - {math assign="num" equation="x - y" x=$counter y=1} - - - - {/foreach} -
- {$SELECTFIELD[$counter]} -
+{**} +{assign var="Firstrow" value=$FIRSTROW} + + {foreach name=iter item=row from=$Firstrow} + {assign var="counter" value=$smarty.foreach.iter.iteration} + {math assign="num" equation="x - y" x=$counter y=1} + + + + + {/foreach} +
+ {$SELECTFIELD[$counter]} +
+ Modified: vtigercrm/trunk/Smarty/templates/ImportStep1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ImportStep1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ImportStep1.tpl Thu May 4 16:08:45 2006 @@ -1,4 +1,14 @@ - +{**} @@ -6,102 +16,104 @@
- - - - - - - - - + + + + + + + +
{$CATEGORY} > {$MODULE}
{$CATEGORY} > {$MODULE}
- - - - +
+ + + + +
- + + + + +
+
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + {* + + + + + + + + + + + + + *} + -
{$MOD.LBL_MODULE_NAME} {$MODULE}
 
+ {$MOD.LBL_STEP_1}  + {$MOD.LBL_STEP_1_TITLE} +
+ {$MOD.LBL_STEP_1_TEXT} +
 
File Location : +   +   {$MOD.LBL_HAS_HEADER} +
Delimeter : +   +
+ Use Data Source : + +  Custom +
  + Pre - Defined +
 
- - + + + + + + + +
- - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -{* - - - - - - - - - - - - - - *} - - - - - - - - -
{$MOD.LBL_MODULE_NAME} {$MODULE}
 
- {$MOD.LBL_STEP_1}  - {$MOD.LBL_STEP_1_TITLE} -
{$MOD.LBL_STEP_1_TEXT} -
 
File Location : -   -   {$MOD.LBL_HAS_HEADER} -
Delimeter : -   -
- Use Data Source : - -  Custom -
  - Pre - Defined
 

- -
 
-
- - - -

+ +
 
+ +
+ +
+
Modified: vtigercrm/trunk/Smarty/templates/ImportStep2.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ImportStep2.tpl Thu May 4 16:08:45 2006 @@ -1,3 +1,16 @@ +{**} + + {literal} From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 07:39:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:39:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5764 - /vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Message-ID: <20060508143910.2ECE6702FF1@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:39:06 2006 New Revision: 5764 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Mon May 8 08:39:06 2006 @@ -1,3 +1,14 @@ +{**}
From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 07:39:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:39:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5765 - /vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Message-ID: <20060508143943.838CB719115@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:39:39 2006 New Revision: 5765 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Mon May 8 08:39:39 2006 @@ -1,3 +1,14 @@ +{**}
From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 07:42:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:42:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5766 - /vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Message-ID: <20060508144243.03B22719115@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:42:40 2006 New Revision: 5766 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Mon May 8 08:42:40 2006 @@ -1,3 +1,14 @@ +{**}
From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 07:43:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:43:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5767 - /vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Message-ID: <20060508144309.C32EF71921A@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:43:05 2006 New Revision: 5767 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Mon May 8 08:43:05 2006 @@ -1,3 +1,14 @@ +{**}
From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 07:47:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:47:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5768 - /vtigercrm/trunk/Smarty/templates/Settings/ Message-ID: <20060508144733.AB99D7192DA@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:47:22 2006 New Revision: 5768 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl Mon May 8 08:47:22 2006 @@ -1,4 +1,14 @@ - +{**}
Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Mon May 8 08:47:22 2006 @@ -1,4 +1,15 @@ - {$MOD.LBL_PICKLIST_AVAIL} {$MODULE}
+{**} +{$MOD.LBL_PICKLIST_AVAIL} {$MODULE}
{$MOD.LBL_PICKLIST_AVAILINFO1} {$MODULE} {$MOD.LBL_PICKLIST_AVAILINFO2}
From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 07:52:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:52:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5769 - /vtigercrm/trunk/Smarty/templates/ Message-ID: <20060508145214.7887D7191D6@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:52:01 2006 New Revision: 5769 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/trunk/Smarty/templates/CreateProfile.tpl vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl vtigercrm/trunk/Smarty/templates/EditProfile.tpl vtigercrm/trunk/Smarty/templates/EmailContents.tpl vtigercrm/trunk/Smarty/templates/EmailDetails.tpl vtigercrm/trunk/Smarty/templates/Emails.tpl Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Mon May 8 08:52:01 2006 @@ -1,4 +1,14 @@ - +{**}
Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Mon May 8 08:52:01 2006 @@ -1,4 +1,14 @@ - +{**}
Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**} {*//Hidden fields for modules DetailView// *} {if $MODULE eq 'Accounts'} Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/EmailContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EmailContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EmailContents.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
 
Modified: vtigercrm/trunk/Smarty/templates/FieldAccessindex.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/FieldAccessindex.tpl (original) +++ vtigercrm/trunk/Smarty/templates/FieldAccessindex.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**}
{include file='SettingsMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/FieldOrderindex.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/FieldOrderindex.tpl (original) +++ vtigercrm/trunk/Smarty/templates/FieldOrderindex.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**}
{include file='SettingsMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/Importerror.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Importerror.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Importerror.tpl Mon May 8 08:55:31 2006 @@ -1,4 +1,14 @@ - +{**}
+ {$APP.LBL_REQUIRED_SYMBOL} {$CMOD.LBL_NEW_PROFILE_NAME} : @@ -60,9 +61,9 @@ From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 00:42:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 07:42:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5811 - /vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl Message-ID: <20060510074211.80CFF719541@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 01:41:59 2006 New Revision: 5811 Log: i18n done for createprofile1 template file - ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl Wed May 10 01:41:59 2006 @@ -41,8 +41,8 @@
Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/ListGroup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListGroup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListGroup.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} @@ -93,4 +104,4 @@ {/section} - --> + --> Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} &#&#&#{$ERROR}&#&#&# Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 08:01:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 08 May 2006 15:01:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5771 - /vtigercrm/trunk/Smarty/templates/ Message-ID: <20060508150119.031427192D8@vtiger.fosslabs.com> Author: richie Date: Mon May 8 09:01:03 2006 New Revision: 5771 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl vtigercrm/trunk/Smarty/templates/Organizationindex.tpl vtigercrm/trunk/Smarty/templates/PickListindex.tpl vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl vtigercrm/trunk/Smarty/templates/QuickCreate.tpl vtigercrm/trunk/Smarty/templates/ReportColumns.tpl vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl vtigercrm/trunk/Smarty/templates/ReportContents.tpl vtigercrm/trunk/Smarty/templates/ReportFilters.tpl vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl vtigercrm/trunk/Smarty/templates/ReportsType.tpl vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl vtigercrm/trunk/Smarty/templates/RoleEditView.tpl vtigercrm/trunk/Smarty/templates/Rss.tpl vtigercrm/trunk/Smarty/templates/RssFeeds.tpl Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
{$LIST_ENTRIES[entries].description} 
Modified: vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/Organizationindex.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Organizationindex.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Organizationindex.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
{include file='SettingsMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/PickListindex.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/PickListindex.tpl (original) +++ vtigercrm/trunk/Smarty/templates/PickListindex.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
{include file='SettingsMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Mon May 8 09:01:03 2006 @@ -1,4 +1,14 @@ - +{**} Modified: vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/ReportContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportContents.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/ReportFilters.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportFilters.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportFilters.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} - Modified: vtigercrm/branches/5.0_postgresql_integration/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/install/5createTables.inc.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/install/5createTables.inc.php Tue May 9 19:18:27 2006 @@ -213,6 +213,11 @@ create_tab_data_file(); create_parenttab_data_file(); +// ensure required sequences are created (adodb creates them as needed, but if +// creation occurs within a transaction we get problems +$db->getUniqueID("crmentity"); +$db->getUniqueID("seactivityrel"); + // populate the db with seed data if ($db_populate) { eecho ("Populate seed data into $db_name"); Modified: vtigercrm/branches/5.0_postgresql_integration/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/install/populateSeedData.php Tue May 9 19:18:27 2006 @@ -81,9 +81,9 @@ { $date = ""; $date .= "2006"; - $date .= "/"; + $date .= "-"; $date .= rand(1,9); - $date .= "/"; + $date .= "-"; $date .= rand(1,28); return $date; @@ -758,7 +758,6 @@ //$rand_key = array_rand($s);$contact_key = array_rand($contact_ids); $notes->column_fields["contact_id"] = $contact_ids[$contact_key]; $helpdesk->column_fields["ticket_title"] = $ticket_title_array[$i]; - $helpdesk->column_fields["assigned_user_id"] = $assigned_user_id; $helpdesk->save("HelpDesk"); @@ -779,7 +778,7 @@ $rand_num=array_rand($num_array); $rand_date = & create_date(); - $en=explode("/",$rand_date); + $en=explode("-",$rand_date); if($en[1]<10) $en[1]="0".$en[1]; if($en[2]<10) @@ -847,7 +846,7 @@ } -$adb->query("update crmentity set crmentity.smcreatorid=".$assigned_user_id); +$adb->query("update crmentity set smcreatorid=".$assigned_user_id); $expected_revenue = Array("250000","750000","500000"); $budget_cost = Array("25000","50000","90000"); Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Reports/PopulateReports.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/Reports/PopulateReports.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/Reports/PopulateReports.php Tue May 9 19:18:27 2006 @@ -417,8 +417,8 @@ { global $adb; $sql = "INSERT INTO reportfolder "; - $sql .= "(FOLDERID,FOLDERNAME,DESCRIPTION,STATE) "; - $sql .= "VALUES (null,'".$fldrname."','".$fldrdescription."','SAVED')"; + $sql .= "(FOLDERNAME,DESCRIPTION,STATE) "; + $sql .= "VALUES ('".$fldrname."','".$fldrdescription."','SAVED')"; $result = $adb->query($sql); } Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/LoginHistory.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/Users/LoginHistory.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/LoginHistory.php Tue May 9 19:18:27 2006 @@ -60,7 +60,7 @@ /** Records the Login info */ function user_login(&$usname,&$usip,&$intime) { - $query = "Insert into loginhistory values (null,'$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')"; + $query = "Insert into loginhistory (user_name, user_ip, logout_time, login_time, status) values ('$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')"; $result = $this->db->query($query) or die("MySQL error: ".mysql_error()); Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php Tue May 9 19:18:27 2006 @@ -2062,56 +2062,51 @@ $this->db->query("insert into moduleowners values(".getTabid($mod).",1)"); } //added by jeri for category view from db - $this->db->query("insert into parenttab values - (1,'My Home Page',1,0), - (2,'Marketing',2,0), - (3,'Sales',3,0), - (4,'Support',4,0), - (5,'Analytics',5,0), - (6,'Inventory',6,0), - (7,'Tools',7,0), - (8,'Settings',8,0) - "); - - $this->db->query("insert into parenttabrel values - (1,9,2), - (1,17,3), - (1,10,4), - (1,3,1), - (3,7,1), - (3,6,2), - (3,4,3), - (3,2,4), - (3,20,5), - (3,22,6), - (3,23,7), - (3,14,8), - (3,19,9), - (3,8,10), - (4,13,1), - (4,15,2), - (4,6,3), - (4,4,4), - (4,14,5), - (4,8,6), - (5,1,1), - (5,25,2), - (6,14,1), - (6,18,2), - (6,19,3), - (6,21,4), - (6,22,5), - (6,20,6), - (6,23,7), - (7,24,1), - (7,27,2), - (7,8,3), - (2,26,1), - (2,6,2), - (2,4,3)"); - - - } - + $this->db->query("insert into parenttab values (1,'My Home Page',1,0)"); + $this->db->query("insert into parenttab values (2,'Marketing',2,0)"); + $this->db->query("insert into parenttab values (3,'Sales',3,0)"); + $this->db->query("insert into parenttab values (4,'Support',4,0)"); + $this->db->query("insert into parenttab values (5,'Analytics',5,0)"); + $this->db->query("insert into parenttab values (6,'Inventory',6,0)"); + $this->db->query("insert into parenttab values (7,'Tools',7,0)"); + $this->db->query("insert into parenttab values (8,'Settings',8,0)"); + + $this->db->query("insert into parenttabrel values (1,9,2)"); + $this->db->query("insert into parenttabrel values (1,17,3)"); + $this->db->query("insert into parenttabrel values (1,10,4)"); + $this->db->query("insert into parenttabrel values (1,3,1)"); + $this->db->query("insert into parenttabrel values (3,7,1)"); + $this->db->query("insert into parenttabrel values (3,6,2)"); + $this->db->query("insert into parenttabrel values (3,4,3)"); + $this->db->query("insert into parenttabrel values (3,2,4)"); + $this->db->query("insert into parenttabrel values (3,20,5)"); + $this->db->query("insert into parenttabrel values (3,22,6)"); + $this->db->query("insert into parenttabrel values (3,23,7)"); + $this->db->query("insert into parenttabrel values (3,14,8)"); + $this->db->query("insert into parenttabrel values (3,19,9)"); + $this->db->query("insert into parenttabrel values (3,8,10)"); + $this->db->query("insert into parenttabrel values (4,13,1)"); + $this->db->query("insert into parenttabrel values (4,15,2)"); + $this->db->query("insert into parenttabrel values (4,6,3)"); + $this->db->query("insert into parenttabrel values (4,4,4)"); + $this->db->query("insert into parenttabrel values (4,14,5)"); + $this->db->query("insert into parenttabrel values (4,8,6)"); + $this->db->query("insert into parenttabrel values (5,1,1)"); + $this->db->query("insert into parenttabrel values (5,25,2)"); + $this->db->query("insert into parenttabrel values (6,14,1)"); + $this->db->query("insert into parenttabrel values (6,18,2)"); + $this->db->query("insert into parenttabrel values (6,19,3)"); + $this->db->query("insert into parenttabrel values (6,21,4)"); + $this->db->query("insert into parenttabrel values (6,22,5)"); + $this->db->query("insert into parenttabrel values (6,20,6)"); + $this->db->query("insert into parenttabrel values (6,23,7)"); + $this->db->query("insert into parenttabrel values (7,24,1)"); + $this->db->query("insert into parenttabrel values (7,27,2)"); + $this->db->query("insert into parenttabrel values (7,8,3)"); + $this->db->query("insert into parenttabrel values (2,26,1)"); + $this->db->query("insert into parenttabrel values (2,6,2)"); + $this->db->query("insert into parenttabrel values (2,4,3)"); + + } } ?> Modified: vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml Tue May 9 19:18:27 2006 @@ -752,9 +752,7 @@ - - - + @@ -771,6 +769,7 @@ + @@ -1730,53 +1729,6 @@ Type=InnoDB
Modified: vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/ReportsType.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsType.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsType.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} @@ -160,10 +160,10 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 08:42:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 15:42:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5804 - /vtigercrm/trunk/modules/Webmails/language/en_us.lang.php Message-ID: <20060509154251.18CAF70A9F1@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 09:42:47 2006 New Revision: 5804 Log: Updated the language file for webmails modules - ahmed Modified: vtigercrm/trunk/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Webmails/language/en_us.lang.php Tue May 9 09:42:47 2006 @@ -1,4 +1,22 @@ 'Emails', 'LBL_MODULE_TITLE'=>'Emails: Home', @@ -14,16 +32,40 @@ 'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.", 'LBL_DATE_SENT'=>'Date Sent:', -'LBL_SUBJECT'=>'Subject:', +'LBL_SUBJECT'=>'Subject :', 'LBL_BODY'=>'Body:', 'LBL_DATE_AND_TIME'=>'Date & Time Sent:', -'LBL_DATE'=>'Date Sent:', +'LBL_DATE'=>'Date :', 'LBL_TIME'=>'Time Sent:', -'LBL_SUBJECT'=>'Subject:', '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'=>'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', +'LBL_EXPUNGE_MAILBOX'=>'Expunge Mailbox', 'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', 'LBL_INVITEE'=>'Recipients', From vtiger-tickets at vtiger.fosslabs.com Tue May 9 10:43:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:43:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23331=3A_?= =?utf-8?q?advanced_filter_not_intuitive?= In-Reply-To: <076.96bb670faa496bed07be33cd626927d2@vtiger.fosslabs.com> References: <076.96bb670faa496bed07be33cd626927d2@vtiger.fosslabs.com> Message-ID: <085.9a30c0eebb6e80508d1cc596c8a50cbe@vtiger.fosslabs.com> #331: advanced filter not intuitive ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 10:44:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:44:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23332=3A_?= =?utf-8?q?From_Validatiion_is_not_supported_for_quick_edit_in_the_Detail_?= =?utf-8?q?View?= In-Reply-To: <076.c356e18081f12c626aa7fcdcb8ca7416@vtiger.fosslabs.com> References: <076.c356e18081f12c626aa7fcdcb8ca7416@vtiger.fosslabs.com> Message-ID: <085.de81f72104d6b75a49a4092466f6bd6a@vtiger.fosslabs.com> #332: From Validatiion is not supported for quick edit in the Detail View ------------------------+--------------------------------------------------- Reporter: don | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 10:54:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:54:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23344=3A_?= =?utf-8?q?Improper_Send_Mail_UI?= In-Reply-To: <076.490e968fe092049a33de8c47ae8a3e48@vtiger.fosslabs.com> References: <076.490e968fe092049a33de8c47ae8a3e48@vtiger.fosslabs.com> Message-ID: <085.562da2d496397cede51a3bc4183ac57c@vtiger.fosslabs.com> #344: Improper Send Mail UI ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 10:55:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:55:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23350=3A_?= =?utf-8?q?Fatal_Error_in_Creating_Custom_View_for_HelpDesk?= In-Reply-To: <076.85ae4ededa11be9716ad6ff3d10064c3@vtiger.fosslabs.com> References: <076.85ae4ededa11be9716ad6ff3d10064c3@vtiger.fosslabs.com> Message-ID: <085.1d50626652d6d93a14711072886c5c4a@vtiger.fosslabs.com> #350: Fatal Error in Creating Custom View for HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 10:56:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:56:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23365=3A_?= =?utf-8?q?Not_able_to_create_a_Email_from_Lead_relates_list?= In-Reply-To: <076.c4107f32501db5f2db2c902fc70e62ab@vtiger.fosslabs.com> References: <076.c4107f32501db5f2db2c902fc70e62ab@vtiger.fosslabs.com> Message-ID: <085.cdf89ffb61aad50304ad1c8b97fbdd07@vtiger.fosslabs.com> #365: Not able to create a Email from Lead relates list ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 10:56:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:56:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23377=3A_?= =?utf-8?q?Cannot_view_the_Activity_detail_view_from_history?= In-Reply-To: <076.e4b44c6ce056d50d4098c7617ab39316@vtiger.fosslabs.com> References: <076.e4b44c6ce056d50d4098c7617ab39316@vtiger.fosslabs.com> Message-ID: <085.1da925bfb9bd24cf4917c65c9532a330@vtiger.fosslabs.com> #377: Cannot view the Activity detail view from history ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 10:58:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:58:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23400=3A_?= =?utf-8?q?message_change_while_using_installed_apache_case?= In-Reply-To: <076.ee0849eeb6352f498966d076015fc27d@vtiger.fosslabs.com> References: <076.ee0849eeb6352f498966d076015fc27d@vtiger.fosslabs.com> Message-ID: <085.3d6bf42de195568b7969bdbfb21332b9@vtiger.fosslabs.com> #400: message change while using installed apache case ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: installation ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 11:00:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 18:00:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23401=3A_?= =?utf-8?q?Issue_Delete_Role?= In-Reply-To: <076.c940b05aa79da5437db8ddb176742e6b@vtiger.fosslabs.com> References: <076.c940b05aa79da5437db8ddb176742e6b@vtiger.fosslabs.com> Message-ID: <085.7be78be280199b4f272c3a5be2c83542@vtiger.fosslabs.com> #401: Issue Delete Role ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 11:39:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 18:39:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23502=3A_?= =?utf-8?q?Cursor_pointer_broken_in_notes_basic_search?= In-Reply-To: <076.0558cc0faba8b25484ce0346df184d1d@vtiger.fosslabs.com> References: <076.0558cc0faba8b25484ce0346df184d1d@vtiger.fosslabs.com> Message-ID: <085.fd34bed5e8eeab597c72d4871a53a7cb@vtiger.fosslabs.com> #502: Cursor pointer broken in notes basic search --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: philip Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5805]) Search form modified to show search values. Fixes #502 and #200, and refs #502. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 11:39:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 18:39:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23200=3A_?= =?utf-8?q?=22Search_Results=22_Print_Missing_in_List_View?= In-Reply-To: <076.2bbd844f8409e4d40315f251a24550c3@vtiger.fosslabs.com> References: <076.2bbd844f8409e4d40315f251a24550c3@vtiger.fosslabs.com> Message-ID: <085.9444384a2d2a77cfa46acce08975dd36@vtiger.fosslabs.com> #200: "Search Results" Print Missing in List View ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5805]) Search form modified to show search values. Fixes #502 and #200, and refs #502. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 11:39:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 18:39:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5805 - in /vtigercrm/trunk: Smarty/templates/ListView.tpl include/js/general.js include/utils/SearchUtils.php Message-ID: <20060509183927.751887173D6@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 12:38:58 2006 New Revision: 5805 Log: Search form modified to show search values. Fixes #502 and #200, and refs #502. Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/include/js/general.js vtigercrm/trunk/include/utils/SearchUtils.php Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Tue May 9 12:38:58 2006 @@ -17,7 +17,7 @@ {if $MODULE eq 'Contacts'} -
+
{/if} {include file='Buttons_List.tpl'} -
Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/RssFeeds.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RssFeeds.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RssFeeds.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
Feeds list from : {$TITLE}
From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 08:03:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 08 May 2006 15:03:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5772 - in /vtigercrm/trunk/Smarty/templates: Settings.tpl SettingsMenu.tpl UserDetailView.tpl UserEditView.tpl UserListView.tpl UserProfile.tpl Webmails.tpl Message-ID: <20060508150306.8D7F67192EB@vtiger.fosslabs.com> Author: richie Date: Mon May 8 09:02:58 2006 New Revision: 5772 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/Smarty/templates/UserDetailView.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/Smarty/templates/UserListView.tpl vtigercrm/trunk/Smarty/templates/UserProfile.tpl vtigercrm/trunk/Smarty/templates/Webmails.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**}
Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**}
From vtiger-tickets at vtiger.fosslabs.com Mon May 8 18:12:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 01:12:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23757=3A_?= =?utf-8?q?Update_to_new_adodb-4=2E81_release?= In-Reply-To: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> References: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> Message-ID: <085.6147e324802470df4f28e482d78eb1b4@vtiger.fosslabs.com> #757: Update to new adodb-4.81 release ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: reopened Priority: minor | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: adodb database package ------------------------+--------------------------------------------------- Changes (by allanbush): * milestone: 5.0.0 => 4.2.4 * version: 5.0.0 => 4.2.4rc3 Comment: These changes should have no effect on migration as the database schema didn't change (other then some constraints and indexes getting new names). It would be nice for distro maintainers to have 4.2.4 changed however I think it's too close to release (in terms of code/testing as I don't know if anyone is ever going to actually release 4.2.4). -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 8 21:49:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 04:49:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23693=3A_?= =?utf-8?q?Migration_Issues_-_Currency_Module_Non_Functional_-_Settings?= In-Reply-To: <076.c30240612ce8e94bbabb7a239dbf317d@vtiger.fosslabs.com> References: <076.c30240612ce8e94bbabb7a239dbf317d@vtiger.fosslabs.com> Message-ID: <085.d311e4fc3cf368aa764e94a8b215df1f@vtiger.fosslabs.com> #693: Migration Issues - Currency Module Non Functional - Settings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: mangai => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 8 22:04:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 05:04:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23712=3A_?= =?utf-8?q?Campaign_-_empty_values_in_Expected_Response_column?= In-Reply-To: <076.7541dde002644ee31a61a29067c45262@vtiger.fosslabs.com> References: <076.7541dde002644ee31a61a29067c45262@vtiger.fosslabs.com> Message-ID: <085.3ec58d1c19f79ac9cc8962ccb7ab62f4@vtiger.fosslabs.com> #712: Campaign - empty values in Expected Response column ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Campaigns ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: 'Expected Response' field is not a manditory field.So manditory symbol has been removed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 22:10:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 05:10:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5773 - /vtigercrm/trunk/modules/Migration/language/en_us.lang.php Message-ID: <20060509051000.3B3BA4E8CBC@vtiger.fosslabs.com> Author: don Date: Mon May 8 23:09:55 2006 New Revision: 5773 Log: * Modified the SET_FOREIGN_KEY_CHECKS to SET FOREIGN_KEY_CHECKS Modified: vtigercrm/trunk/modules/Migration/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Migration/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Migration/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Migration/language/en_us.lang.php Mon May 8 23:09:55 2006 @@ -26,8 +26,8 @@ 'LBL_NOTES_LIST2'=>'If Current MySQL Exist in different Machine then enter the (Source) Dump filename with the full Path.', 'LBL_NOTES_DUMP_PROCESS'=>'To take Database dump please execute the following command
mysqldump --user="mysql_username" --password="mysql-password" -h "hostname" --port="mysql_port" "database_name" > dump_filename -
add SET_FOREIGN_KEY_CHECKS = 0; -- at the start of the dump file -
add SET_FOREIGN_KEY_CHECKS = 1; -- at the end of the dump file', +
add SET FOREIGN_KEY_CHECKS = 0; -- at the start of the dump file +
add SET FOREIGN_KEY_CHECKS = 1; -- at the end of the dump file', 'LBL_NOTES_LIST3'=>'Give the MySQL path like /home/crm/vtigerCRM4_5/mysql', 'LBL_NOTES_LIST4'=>'Give the Dump filename with full Path like /home/fullpath/4_2_dump.txt', From vtiger-tickets at vtiger.fosslabs.com Mon May 8 22:23:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 05:23:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23750=3A_?= =?utf-8?q?Integrate_code_contributions?= In-Reply-To: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> References: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> Message-ID: <085.d4a26a069e24965cc75eda042d0c3443@vtiger.fosslabs.com> #750: Integrate code contributions ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: richie Type: defect | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5774]) Turns address information into a link to google maps as per http://forums.vtiger.com/viewtopic.php?t=3143 This is user configurable to either give directions from the users address, the company address or just give the location of the target address. I'm uncertain how this handles international location, we may wish to make the google url configurable at least (maps.google.com vs. maps.google.ca, etc). Refs #750. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 22:23:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 05:23:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5774 - in /vtigercrm/branches/4.2: ./ include/ modules/Users/ modules/Users/language/ schema/ Message-ID: <20060509052322.2FC8A506415@vtiger.fosslabs.com> Author: allanbush Date: Mon May 8 23:22:59 2006 New Revision: 5774 Log: Turns address information into a link to google maps as per http://forums.vtiger.com/viewtopic.php?t=3143 This is user configurable to either give directions from the users address, the company address or just give the location of the target address. I'm uncertain how this handles international location, we may wish to make the google url configurable at least (maps.google.com vs. maps.google.ca, etc). Refs #750. Added: vtigercrm/branches/4.2/mapme.php Modified: vtigercrm/branches/4.2/include/utils.php vtigercrm/branches/4.2/modules/Users/DetailView.html vtigercrm/branches/4.2/modules/Users/DetailView.php vtigercrm/branches/4.2/modules/Users/EditView.html vtigercrm/branches/4.2/modules/Users/EditView.php vtigercrm/branches/4.2/modules/Users/User.php vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Mon May 8 23:22:59 2006 @@ -1768,7 +1768,7 @@ { $col_fields[$fieldname]=nl2br($col_fields[$fieldname]); $custfld .= '
'; - $custfld .= ''; // Armando LC B'descriptionSpan -> Desc: inserted colspan="3" + $custfld .= ''; // Armando LC B'descriptionSpan -> Desc: inserted colspan="3" } elseif($uitype == 51 || $uitype == 50 || $uitype == 73) { Modified: vtigercrm/branches/4.2/modules/Users/DetailView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Users/DetailView.html (original) +++ vtigercrm/branches/4.2/modules/Users/DetailView.html Mon May 8 23:22:59 2006 @@ -123,6 +123,12 @@ + + + + + + - - - - Modified: vtigercrm/branches/4.2/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/DetailView.php (original) +++ vtigercrm/branches/4.2/modules/Users/DetailView.php Mon May 8 23:22:59 2006 @@ -168,6 +168,7 @@ $xtpl->assign("ADDRESS_POSTALCODE", $focus->address_postalcode); $xtpl->assign("ADDRESS_COUNTRY", $focus->address_country); $xtpl->assign("SIGNATURE", nl2br($focus->signature)); +$xtpl->assign("MAP_START", nl2br($focus->map_source)); $xtpl->parse("user_info"); $xtpl->out("user_info"); Modified: vtigercrm/branches/4.2/modules/Users/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Users/EditView.html (original) +++ vtigercrm/branches/4.2/modules/Users/EditView.html Mon May 8 23:22:59 2006 @@ -162,6 +162,8 @@ + +
'.$mod_strings[$fieldlabel].':'.$col_fields[$fieldname].''.$col_fields[$fieldname].'{MOD.LBL_USER_ROLE} : {ROLEASSIGNED}
{MOD.LBL_GROUP_NAME}:{GROUPASSIGNED}{MOD.LBL_MAP_START}:{MAP_START}
{MOD.LBL_ADDRESS} {ADDRESS_STREET}
{ADDRESS_CITY} {ADDRESS_STATE}  {ADDRESS_POSTALCODE}
@@ -130,10 +136,6 @@
{MOD.LBL_SIGNATURE}: {SIGNATURE}
{MOD.LBL_GROUP_NAME}:{GROUPASSIGNED}
{MOD.LBL_NOTES}: {DESCRIPTION}
{MOD.LBL_COUNTRY} {MOD.LBL_MAP_START}:{MAP_START_OPTIONS}
Modified: vtigercrm/branches/4.2/modules/Users/EditView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/EditView.php (original) +++ vtigercrm/branches/4.2/modules/Users/EditView.php Mon May 8 23:22:59 2006 @@ -98,6 +98,15 @@ $xtpl->assign("ADDRESS_COUNTRY", $focus->address_country); $xtpl->assign("SIGNATURE", $focus->signature); $xtpl->assign("DESCRIPTION", $focus->description); + +$map_options = array('--None--', 'Home', 'Work'); +$map_start_options = ''; +$xtpl->assign("MAP_START_OPTIONS", $map_start_options); $DATE_FORMAT_SELECT_OPTION = ' + {if $module eq $MODULE_NAME} + + {else} + + {/if} {/foreach} {/if} {/foreach} From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:23:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:23:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23182=3A_?= =?utf-8?q?all_custom_fields_are_of_type_integer?= In-Reply-To: <076.495572d2564db064fa7d20705a8d0250@vtiger.fosslabs.com> References: <076.495572d2564db064fa7d20705a8d0250@vtiger.fosslabs.com> Message-ID: <085.2bec937814d16f8cd6572c9607e873ce@vtiger.fosslabs.com> #182: all custom fields are of type integer ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: custom field ------------------------+--------------------------------------------------- Changes (by don): * priority: blocker => critical * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 03:24:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:24:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5779 - in /vtigercrm/trunk: Smarty/templates/DetailView.tpl include/utils/ListViewUtils.php modules/SalesOrder/SalesOrder.js Message-ID: <20060509102423.03E75719B5C@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:24:08 2006 New Revision: 5779 Log: * Modified to fix the issue when select sales order from invoice - track issue-287 Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/include/utils/ListViewUtils.php vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue May 9 04:24:08 2006 @@ -338,7 +338,7 @@ {elseif $keyid eq 80} From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:33:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:33:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23256=3A_?= =?utf-8?q?rss_addition_takes_long_time?= In-Reply-To: <076.e36f89d08260315b38015eec83af2fff@vtiger.fosslabs.com> References: <076.e36f89d08260315b38015eec83af2fff@vtiger.fosslabs.com> Message-ID: <085.96ecfddf44f45c33a18dd6eda6ed373e@vtiger.fosslabs.com> #256: rss addition takes long time ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: rss ------------------------+--------------------------------------------------- Changes (by don): * priority: blocker => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 03:35:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:35:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5785 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060509103511.17E20719BCC@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:35:00 2006 New Revision: 5785 Log: Added Strings in App Level for Header Template - Ahmed Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Tue May 9 04:35:00 2006 @@ -46,9 +46,11 @@ 'LBL_CHARSET'=>'ISO-8859-1', -'LBL_BROWSER_TITLE'=>'vtiger CRM - Commercial Open Source CRM', +'LBL_BROWSER_TITLE'=>'vtiger CRM 5 - Commercial Open Source CRM', 'LBL_MY_ACCOUNT'=>'My Account', + +'LBL_MY_PREFERENCES'=>'My Preferences', 'LBL_ADMIN'=>'Admin', @@ -101,6 +103,8 @@ 'LBL_DELETE_BUTTON_TITLE'=>'Delete [Alt+D]', 'LBL_DELETE_BUTTON'=>'Delete', + +'LBL_FIND_BUTTON'=>'Find', 'LBL_CONVERT_BUTTON_TITLE'=>'Convert [Alt+C]', From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 03:36:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:36:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5786 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060509103626.CBB7A719BCC@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:36:20 2006 New Revision: 5786 Log: i18n done for Header template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Tue May 9 04:36:20 2006 @@ -85,7 +85,7 @@ From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:37:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:37:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23288=3A_?= =?utf-8?q?Day_View_-_Add_To-do_not_working?= In-Reply-To: <076.5cb82fbfb3bbd516a8e11e12a5f534b8@vtiger.fosslabs.com> References: <076.5cb82fbfb3bbd516a8e11e12a5f534b8@vtiger.fosslabs.com> Message-ID: <085.df6b8dffe3bebeca39e2788e6319d01b@vtiger.fosslabs.com> #288: Day View - Add To-do not working ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:38:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:38:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23301=3A_?= =?utf-8?q?Event_not_displayed_in_Day_View?= In-Reply-To: <076.16c51d0257d0641cf1abc7c0ccaac8fa@vtiger.fosslabs.com> References: <076.16c51d0257d0641cf1abc7c0ccaac8fa@vtiger.fosslabs.com> Message-ID: <085.c1973bf26decf362c253ec5e581e0244@vtiger.fosslabs.com> #301: Event not displayed in Day View ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 03:38:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:38:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5787 - in /vtigercrm/trunk/themes/blue/images: cal_add.jpg cal_event.jpg cal_hdr.jpg cal_nav.gif cal_next_nav.gif cal_prev_nav.gif cal_sel.jpg cal_title.jpg Message-ID: <20060509103853.18F26621991@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:38:21 2006 New Revision: 5787 Log: images for calendar has been integrated Added: vtigercrm/trunk/themes/blue/images/cal_add.jpg (with props) vtigercrm/trunk/themes/blue/images/cal_event.jpg (with props) vtigercrm/trunk/themes/blue/images/cal_hdr.jpg (with props) vtigercrm/trunk/themes/blue/images/cal_nav.gif (with props) vtigercrm/trunk/themes/blue/images/cal_next_nav.gif (with props) vtigercrm/trunk/themes/blue/images/cal_prev_nav.gif (with props) vtigercrm/trunk/themes/blue/images/cal_sel.jpg (with props) vtigercrm/trunk/themes/blue/images/cal_title.jpg (with props) From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:40:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:40:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23286=3A_?= =?utf-8?q?New_Event_-_Pop-up_Date/Time_not_working?= In-Reply-To: <076.2c96b6359253e6f060b463bdfa5eceff@vtiger.fosslabs.com> References: <076.2c96b6359253e6f060b463bdfa5eceff@vtiger.fosslabs.com> Message-ID: <085.478501b4c3330d0de0f98bd3798453f8@vtiger.fosslabs.com> #286: New Event - Pop-up Date/Time not working ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed already. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:44:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:44:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23403=3A_?= =?utf-8?q?using_installed_apache_fails?= In-Reply-To: <076.a338a120bf8c5dcb075333a6d2d2c8dd@vtiger.fosslabs.com> References: <076.a338a120bf8c5dcb075333a6d2d2c8dd@vtiger.fosslabs.com> Message-ID: <085.7f0d72f0a5e52dd1b68524ac6cfaf34e@vtiger.fosslabs.com> #403: using installed apache fails ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: installation ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:46:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:46:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23541=3A_?= =?utf-8?q?quotes_not_adding_to_potentials_related_lists?= In-Reply-To: <076.1b48c23ce877ca31ac00797fc0803bc5@vtiger.fosslabs.com> References: <076.1b48c23ce877ca31ac00797fc0803bc5@vtiger.fosslabs.com> Message-ID: <085.e1fb2c3bc8f01a5b79bf8857cccdff5a@vtiger.fosslabs.com> #541: quotes not adding to potentials related lists ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Related Lists ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:49:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:49:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23736=3A_?= =?utf-8?q?Changing_existing_quote_line_items_causes_improper_subtotal?= In-Reply-To: <076.1175e17764a34c299e4966098111d634@vtiger.fosslabs.com> References: <076.1175e17764a34c299e4966098111d634@vtiger.fosslabs.com> Message-ID: <085.a769ca89a4bc43df7323aaedfbcc7bac@vtiger.fosslabs.com> #736: Changing existing quote line items causes improper subtotal ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: quote ------------------------+--------------------------------------------------- Changes (by don): * priority: blocker => critical * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 03:58:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:58:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5788 - /vtigercrm/trunk/modules/Settings/DeleteCustomField.php Message-ID: <20060509105822.828A7719DEC@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:58:18 2006 New Revision: 5788 Log: parenttab has been parsed Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/DeleteCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/DeleteCustomField.php Tue May 9 04:58:18 2006 @@ -73,5 +73,5 @@ $deltablequery = 'drop table '.$colName; $adb->query($deltablequery); } -header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module); +header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings"); ?> From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:08:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:08:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23747=3A_?= =?utf-8?q?Handling_=3CNew=3ERecord=3A_Tasks_and_Events?= In-Reply-To: <076.2ad5054a596cd3d9eadad40186d30945@vtiger.fosslabs.com> References: <076.2ad5054a596cd3d9eadad40186d30945@vtiger.fosslabs.com> Message-ID: <085.46bc98c02c611d7e4cc761e04d4cbe56@vtiger.fosslabs.com> #747: Handling Record: Tasks and Events ------------------------+--------------------------------------------------- Reporter: gopal | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:09:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:09:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2379=3A_A?= =?utf-8?q?ddress_inheritance?= In-Reply-To: <076.cc7367ebe2ccb8423599b01e9c951b5c@vtiger.fosslabs.com> References: <076.cc7367ebe2ccb8423599b01e9c951b5c@vtiger.fosslabs.com> Message-ID: <085.2573b9ab3fc562254552ab51cc9125d4@vtiger.fosslabs.com> #79: Address inheritance -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: saraj Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------+-------------------------------------------- Changes (by don): * owner: developer => saraj -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:10:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:10:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23112=3A_?= =?utf-8?q?Issue_in_Editing_Leads?= In-Reply-To: <076.d54b105c64a2b31424bdf842ee2dfd70@vtiger.fosslabs.com> References: <076.d54b105c64a2b31424bdf842ee2dfd70@vtiger.fosslabs.com> Message-ID: <085.eddc06e23e1b6809cfc4f459070b642c@vtiger.fosslabs.com> #112: Issue in Editing Leads ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:13:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:13:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23170=3A_?= =?utf-8?q?loginhistory_screen_old?= In-Reply-To: <076.9aaf0607dd54df7e9b03323b2ad1fd80@vtiger.fosslabs.com> References: <076.9aaf0607dd54df7e9b03323b2ad1fd80@vtiger.fosslabs.com> Message-ID: <085.a26809a91ebfa16b6d8c31fb823a4fae@vtiger.fosslabs.com> #170: loginhistory screen old ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 04:17:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:17:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5789 - in /vtigercrm/trunk/Smarty/templates: CustomFieldCombo.tpl CustomFieldEntries.tpl CustomFieldList.tpl Message-ID: <20060509111753.A05CC719E86@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:17:48 2006 New Revision: 5789 Log: changes made to fix the issue Added: vtigercrm/trunk/Smarty/templates/CustomFieldCombo.tpl Modified: vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Modified: vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl Tue May 9 05:17:48 2006 @@ -16,12 +16,11 @@ - +
{$module} {$module} {$module} {$keyval} Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Tue May 9 04:24:08 2006 @@ -1178,8 +1178,12 @@ } $temp_val = str_replace("'",'\"',$temp_val); - - $value = ''.$temp_val.''; + + //Added to avoid the error when select SO from Invoice through AjaxEdit + if($module == 'SalesOrder') + $value = ''.$temp_val.''; + else + $value = ''.$temp_val.''; } elseif($popuptype == "detailview") { Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.js ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.js (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Tue May 9 04:24:08 2006 @@ -14,16 +14,19 @@ window.opener.document.EditView.parent_name.value = product_name; window.opener.document.EditView.parent_id.value = product_id; } -function set_return_specific(product_id, product_name) { - +function set_return_specific(product_id, product_name, mode) { + //getOpenerObj used for DetailView var fldName = getOpenerObj("salesorder_name"); var fldId = getOpenerObj("salesorder_id"); fldName.value = product_name; fldId.value = product_id; - window.opener.document.EditView.action.value = 'EditView'; - window.opener.document.EditView.convertmode.value = 'update_so_val'; - window.opener.document.EditView.submit(); + if(mode != 'DetailView') + { + window.opener.document.EditView.action.value = 'EditView'; + window.opener.document.EditView.convertmode.value = 'update_so_val'; + window.opener.document.EditView.submit(); + } } function set_return_formname_specific(formname, product_id, product_name) { window.opener.document.EditView1.purchaseorder_name.value = product_name; From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 03:25:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:25:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5780 - in /vtigercrm/trunk/modules/Calendar: Appointment.php Date.php calendarLayout.php Message-ID: <20060509102524.5DD7E719B5C@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:25:13 2006 New Revision: 5780 Log: files integrated for new calendar UI Added: vtigercrm/trunk/modules/Calendar/Appointment.php vtigercrm/trunk/modules/Calendar/Date.php vtigercrm/trunk/modules/Calendar/calendarLayout.php From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 03:26:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:26:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5781 - in /vtigercrm/trunk/modules/Calendar: Calendar.php CalendarAjax.php Message-ID: <20060509102616.95344621991@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:26:02 2006 New Revision: 5781 Log: files integrated for new calendar UI Added: vtigercrm/trunk/modules/Calendar/Calendar.php vtigercrm/trunk/modules/Calendar/CalendarAjax.php From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:27:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:27:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23287=3A_?= =?utf-8?q?Selecting_Sales_Order_from_Invoice?= In-Reply-To: <076.5477c72183257b6360bcaa69066ebc75@vtiger.fosslabs.com> References: <076.5477c72183257b6360bcaa69066ebc75@vtiger.fosslabs.com> Message-ID: <085.0365200bc0e3cd37b33722e1fb77664d@vtiger.fosslabs.com> #287: Selecting Sales Order from Invoice ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Salesorder popup ---------------------------+------------------------------------------------ Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue and the Popup issue has been fixed and the files checkedin in svn -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:28:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:28:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23183=3A_?= =?utf-8?q?custom_field_settings_fails?= In-Reply-To: <076.ee625b98c37a625b546c40e22641d760@vtiger.fosslabs.com> References: <076.ee625b98c37a625b546c40e22641d760@vtiger.fosslabs.com> Message-ID: <085.82e8b1a0dd4165d737b7204b326fc0f6@vtiger.fosslabs.com> #183: custom field settings fails ------------------------+--------------------------------------------------- Reporter: richie | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: custom field setting ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 03:30:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:30:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23186=3A_?= =?utf-8?q?Calendar_pop-up_is_not_working?= In-Reply-To: <076.1eb60a49e607443d60d26a9b056caddb@vtiger.fosslabs.com> References: <076.1eb60a49e607443d60d26a9b056caddb@vtiger.fosslabs.com> Message-ID: <085.67963fb3ecbcb6424d4e8f0c349f461e@vtiger.fosslabs.com> #186: Calendar pop-up is not working ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 03:30:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:30:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5782 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060509103044.01AA96A8FB6@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:30:35 2006 New Revision: 5782 Log: js functions have been included for new calendar UI Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Tue May 9 04:30:35 2006 @@ -260,3 +260,53 @@ } document.SharingForm.sharedid.value = selectedColStr; } + +function ajaxCalSaveResponse(response) +{ + document.getElementById("hrView_default").style.display = "none"; + document.getElementById("toggleDiv").innerHTML=response.responseText; +} + +function fnRedirect(view,hour,day,month,year){ + var ajaxObj = new Ajax(ajaxCalSaveResponse); + var tagName = document.getElementById('viewBox'); + var OptionData = tagName.options[tagName.selectedIndex].value; + if(OptionData == 'hourview'){ + var urlstring ="module=Calendar&action=CalendarAjax&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&type="+OptionData+"&parenttab=My Home Page&ajax=true"; + } + else if(OptionData == 'listview'){ + var urlstring ="module=Calendar&action=CalendarAjax&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&type="+OptionData+"&parenttab=My Home Page&ajax=true"; + } + ajaxObj.process("index.php?",urlstring); +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 03:32:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:32:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5783 - /vtigercrm/trunk/modules/Calendar/new_calendar.php Message-ID: <20060509103205.434F6719BCC@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:31:55 2006 New Revision: 5783 Log: changes made for new calendar UI Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/new_calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/new_calendar.php Tue May 9 04:31:55 2006 @@ -1,26 +1,68 @@ - + - - vtiger CRM 5 - Free, Commercial grade Open Source CRM - + $date_data['day'] = $_REQUEST['day']; +} - - +if ( isset($_REQUEST['month'])) +{ + $date_data['month'] = $_REQUEST['month']; +} - +if ( isset($_REQUEST['week'])) +{ + $date_data['week'] = $_REQUEST['week']; +} - - +if ( isset($_REQUEST['year'])) +{ + if ($_REQUEST['year'] > 2037 || $_REQUEST['year'] < 1970) + { + print("Sorry, Year must be between 1970 and 2037"); + exit; + } + $date_data['year'] = $_REQUEST['year']; +} +if(empty($date_data)) +{ + $data_value=date('Y-m-d H:i:s'); + preg_match('/(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})/',$data_value,$value); + $date_data = Array( + 'day'=>$value[3], + 'month'=>$value[2], + 'year'=>$value[1], + 'hour'=>$value[4], + 'min'=>$value[5], + ); + +} +//echo '
';print_r($date_data);echo '
'; +$calendar_arr['calendar'] = new Calendar($mysel,$date_data); +//echo '
';print_r($calendar_arr['calendar']);echo '
'; +if ($mysel == 'day' || $mysel == 'week' || $mysel == 'month') +{ + global $current_user; + $calendar_arr['calendar']->add_Activities($current_user); +} +$calendar_arr['view'] = $mysel; +calendar_layout($calendar_arr); +//echo '
';print_r($calendar_arr);echo'
'; +?> + From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 03:32:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:32:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5784 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060509103211.513B7719C4A@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:32:01 2006 New Revision: 5784 Log: i18n done for Header template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Tue May 9 04:32:01 2006 @@ -13,7 +13,7 @@ - {$CURRENT_USER} - {$CATEGORY} - {$MODULE_NAME} - vtiger CRM 5 + {$CURRENT_USER} - {$CATEGORY} - {$MODULE_NAME} - {$APP.LBL_BROWSER_TITLE} @@ -38,8 +38,8 @@
- - + +
My Preferences Logout ({$CURRENT_USER}) {$APP.LBL_MY_PREFERENCES} {$APP.LBL_LOGOUT} ({$CURRENT_USER})
- +
-
+ -
@@ -51,13 +50,10 @@ Field Mapping allows you to ....
{/if}
-{*
- {include file='CreateCustomField.tpl'} -
*} Modified: vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Tue May 9 05:17:48 2006 @@ -13,7 +13,6 @@ function ajaxSaveResponse(response) {ldelim} document.getElementById("cfList").innerHTML=response.responseText; - //document.getElementById("test").value=response.responseText; {rdelim} function getCustomFieldList(customField) {ldelim} @@ -44,6 +43,12 @@ ajaxObj.process("index.php?",urlstring); {rdelim} +function CustomFieldMapping() +{ldelim} + document.form.action="index.php?module=Settings&action=LeadCustomFieldMapping"; + document.form.submit(); +{rdelim} +
@@ -70,27 +75,10 @@ Custom Field Settings
Create and Manage user defined fields...... - {**} - - - - - - - - - - + {include file="CustomFieldCombo.tpl"} @@ -60,13 +60,13 @@ - + - + @@ -145,13 +145,13 @@
 
Select Module
  - Select the CRM module to show CustomFields : - -
 
From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:20:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:20:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23597=3A_?= =?utf-8?q?Could_Not_Delete_Custom_field?= In-Reply-To: <076.9c60b0908294d48b138cbb0101c00ede@vtiger.fosslabs.com> References: <076.9c60b0908294d48b138cbb0101c00ede@vtiger.fosslabs.com> Message-ID: <085.dd98043867dbaf4638395b5150d04db7@vtiger.fosslabs.com> #597: Could Not Delete Custom field ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: This has been fixed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:21:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:21:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23575=3A_?= =?utf-8?q?Slected_module_is_not_displayed?= In-Reply-To: <076.afbb6baa5fe07092c5316e5b81fd684e@vtiger.fosslabs.com> References: <076.afbb6baa5fe07092c5316e5b81fd684e@vtiger.fosslabs.com> Message-ID: <085.613fdf720f61ab32ccad65df6292193e@vtiger.fosslabs.com> #575: Slected module is not displayed ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: This has been fixed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:21:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:21:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23184=3A_?= =?utf-8?q?can_not_get_webmails?= In-Reply-To: <076.b85ac696b78707a51f9cbe3858f9ec96@vtiger.fosslabs.com> References: <076.b85ac696b78707a51f9cbe3858f9ec96@vtiger.fosslabs.com> Message-ID: <085.00ae14543b7de6dc12c580a43095f12f@vtiger.fosslabs.com> #184: can not get webmails --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: webmail --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:23:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:23:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23191=3A_?= =?utf-8?q?Inbox_link_under_All_Mails_box_is_not_working?= In-Reply-To: <076.d02cb4829d8fb8d82d729087d4ada220@vtiger.fosslabs.com> References: <076.d02cb4829d8fb8d82d729087d4ada220@vtiger.fosslabs.com> Message-ID: <085.24007bc360c1a2f427ba4415ad97a438@vtiger.fosslabs.com> #191: Inbox link under All Mails box is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: webmail inbox --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:28:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:28:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23193=3A_?= =?utf-8?q?Sent_link_under_All_Mails_box_is_not_working?= In-Reply-To: <076.96dd4b6b5a3e60c9a1fa3b5abd5e58eb@vtiger.fosslabs.com> References: <076.96dd4b6b5a3e60c9a1fa3b5abd5e58eb@vtiger.fosslabs.com> Message-ID: <085.f38527f8e4198530e9d48e3373086e81@vtiger.fosslabs.com> #193: Sent link under All Mails box is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: webmail sent list --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:30:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:30:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23196=3A_?= =?utf-8?q?Trash_link_under_All_Mails_box_is_not_working?= In-Reply-To: <076.de81e19fd24df328d9b807a0b1bdf079@vtiger.fosslabs.com> References: <076.de81e19fd24df328d9b807a0b1bdf079@vtiger.fosslabs.com> Message-ID: <085.0b35157ceb0458ce589c54790f2851a7@vtiger.fosslabs.com> #196: Trash link under All Mails box is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: webmails trashlink --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:31:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:31:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23201=3A_?= =?utf-8?q?Click_on_Qualified_Mails_box_is_not_working?= In-Reply-To: <076.07cbf9582595088f4eeecb2683e2a13d@vtiger.fosslabs.com> References: <076.07cbf9582595088f4eeecb2683e2a13d@vtiger.fosslabs.com> Message-ID: <085.3bc10d46f73b1184989fd38cad0b5116@vtiger.fosslabs.com> #201: Click on Qualified Mails box is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: qualified mails --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:33:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:33:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23215=3A_?= =?utf-8?q?Sent_link_under_=27Qualified_Mails=27_Box_is_not_working?= In-Reply-To: <076.39cda209b59e01355da1d06bc0d39dc7@vtiger.fosslabs.com> References: <076.39cda209b59e01355da1d06bc0d39dc7@vtiger.fosslabs.com> Message-ID: <085.8d07870756d20f154dd0a64f7aec8445@vtiger.fosslabs.com> #215: Sent link under 'Qualified Mails' Box is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: email sent list --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:33:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:33:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23218=3A_?= =?utf-8?q?Trash_link_under_=27Qualified_Mails=27_is_not_working?= In-Reply-To: <076.298372623b0f07c5acbf95b0cbb1a263@vtiger.fosslabs.com> References: <076.298372623b0f07c5acbf95b0cbb1a263@vtiger.fosslabs.com> Message-ID: <085.ccc00c7b4506a0ba97fac1b4a26e231a@vtiger.fosslabs.com> #218: Trash link under 'Qualified Mails' is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: email trashed list --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:34:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:34:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23229=3A_?= =?utf-8?q?Issue_in_All_view?= In-Reply-To: <076.f0a1dd6eeb4bf317ac693fe12fd2eb99@vtiger.fosslabs.com> References: <076.f0a1dd6eeb4bf317ac693fe12fd2eb99@vtiger.fosslabs.com> Message-ID: <085.c5f7a965e35e4f508f16ab6bad273ba5@vtiger.fosslabs.com> #229: Issue in All view ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:39:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:39:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23253=3A_?= =?utf-8?q?=27Related_To=27_field_shows_number_instead_of_name?= In-Reply-To: <076.fa289fb6c058db787dc0b9e33f2d5c16@vtiger.fosslabs.com> References: <076.fa289fb6c058db787dc0b9e33f2d5c16@vtiger.fosslabs.com> Message-ID: <085.1a3ff2188ba18918fc7048736f43fbdd@vtiger.fosslabs.com> #253: 'Related To' field shows number instead of name --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: related to --------------------------------+------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:40:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:40:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23255=3A_?= =?utf-8?q?RSS_ui_not_proper?= In-Reply-To: <076.58432ae9917c5691b29642fe5cc50373@vtiger.fosslabs.com> References: <076.58432ae9917c5691b29642fe5cc50373@vtiger.fosslabs.com> Message-ID: <085.afbb1bbbeb3e3042fb62840da7cd44f6@vtiger.fosslabs.com> #255: RSS ui not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: rss ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:45:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:45:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23260=3A_?= =?utf-8?q?Issue_in_Change_Owner?= In-Reply-To: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com> References: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com> Message-ID: <085.d3972588dde8f9e0c92337c062190212@vtiger.fosslabs.com> #260: Issue in Change Owner ------------------------+--------------------------------------------------- Reporter: don | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:47:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:47:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23289=3A_?= =?utf-8?q?Usability_issue_in_change_owner_and_change_status?= In-Reply-To: <076.28fa78da16a5405b15bb23922a87b24e@vtiger.fosslabs.com> References: <076.28fa78da16a5405b15bb23922a87b24e@vtiger.fosslabs.com> Message-ID: <085.fa831af011ac7dcb8da992205cf0b82a@vtiger.fosslabs.com> #289: Usability issue in change owner and change status ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 04:47:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:47:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5790 - /vtigercrm/trunk/include/utils/EditViewUtils.php Message-ID: <20060509114743.C275871A278@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:47:33 2006 New Revision: 5790 Log: changes made to fix the issue 699 Modified: vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue May 9 05:47:33 2006 @@ -148,7 +148,7 @@ if($fieldname == 'terms_conditions')//for default Terms & Conditions { - if($focus->mode=='edit') $value=getTermsandConditions(); + $value=getTermsandConditions(); } $editview_label[]=$mod_strings[$fieldlabel]; From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 04:47:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:47:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5791 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060509114746.C4B7271A277@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:47:37 2006 New Revision: 5791 Log: i18n done for Homepage template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 9 05:47:37 2006 @@ -24,9 +24,9 @@ {if isset($LOGINHISTORY.0)}
- +="document.getElementById('loginhistory').style.display='none';">{$MOD.LBL_MODIFIED_TIME} {foreach key=label item=detail from=$LOGINHISTORY} @@ -38,7 +38,7 @@
IDTypeModified By{$MOD.LBL_LOGIN_ID}{$MOD.LBL_TYPE}{$MOD.LBL_MODIFIED_BY}CloseModified Time
{$detail.crmid}{$detail.setype}{$detail.modifiedby}{$detail.modifiedtime}
- + @@ -65,18 +65,18 @@ {else} From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:20:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 14:20:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5798 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060509142023.67FF55C3713@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 08:20:18 2006 New Revision: 5798 Log: Updated the language file for lis mail server - ahmed Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue May 9 08:20:18 2006 @@ -453,14 +453,23 @@ 'LBL_DISPLAY_NAME'=>'Display Name', 'LBL_MAIL_PROTOCOL'=>'Mail Protocol', 'LBL_LIST_PASSWORD'=>'Password', -'LBL_MAIL_SERVER_NAME'=>'Mail Server Name', +'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP', +'LBL_MAIL_SERVER_SETTINGS'=>'Mail Server Settings', 'LBL_TEST_SETTINGS'=>'Test my account setting immediately', 'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]', 'LBL_TEST_BUTTON_KEY'=>'T', 'LBL_TEST_BUTTON_LABEL'=>'Test my account now!', 'LBL_DEFAULT'=>'Default', 'LBL_IMAP'=>'IMAP', +'LBL_IMAP2'=>'IMAP2', +'LBL_IMAP4'=>'IMAP4', 'LBL_POP'=>'POP', +'LBL_SSL_OPTIONS'=>'SSL Options', +'LBL_TLS'=>'TLS', +'LBL_NO_TLS'=>'No TLS', +'LBL_CERT_VAL'=>'Certificate Validations', +'LBL_VAL_SSL_CERT'=>'Validate SSL Cert', +'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert', 'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration', 'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail', 'LBL_LIST_MAIL_ACCOUNT'=>' List Mail Account', @@ -469,6 +478,18 @@ 'LBL_QUOTE_STAGE'=>'Quote Stage', 'LBL_CARRIER'=>'Carrier', 'LBL_TAXCLASS'=>'Tax Class', +'LBL_MY_DETAILS'=>'My Details', +'LBL_MY_MAIL_SERVER_DET'=>'My Mail Server Details', +'LBL_EMAIL_ID'=>'Email ID', +'LBL_NAME_EXAMPLE'=>'(example : John Fenner)', +'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at mailserver.com)', +'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout', +'LBL_1_MIN'=>'1 minute', +'LBL_2_MIN'=>'2 minutes', +'LBL_3_MIN'=>'3 minutes', +'LBL_4_MIN'=>'4 minutes', +'LBL_5_MIN'=>'5 minutes', +'LBL_EMAILS_PER_PAGE'=>'Emails per Page', //Added for Organization Details (4.2 release) 'LBL_ORGANIZATION_NAME'=>'Company Name', From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:22:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 14:22:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5799 - /vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Message-ID: <20060509142259.C89825C3713@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 08:22:56 2006 New Revision: 5799 Log: i18n done for list mail server - ahmed Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Tue May 9 08:22:56 2006 @@ -25,7 +25,7 @@ @@ -33,9 +33,9 @@ {foreach item=elements key=title from=$row} {if $title eq 'Subject'}
My Home {$MOD.LBL_MY_HOME} @@ -54,12 +54,12 @@ @@ -68,18 +68,18 @@ {else} From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:02:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 13:02:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5797 - /vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Message-ID: <20060509130231.4702971A7D4@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 07:02:21 2006 New Revision: 5797 Log: i18n updated for all the buttons in list/edit/detail view - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 9 07:02:21 2006 @@ -24,13 +24,13 @@ {if $CHECK.EditView eq 'yes'} {if $MODULE eq 'Activities'} - + {else} - + {/if} {/if} -
- + - - + + - +
Open Calendar...{$APP.LBL_CALENDAR_ALT}Show World Clock...Open Calculator...{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}  Open All Menu...{$APP.LBL_ALL_MENU_ALT}
@@ -113,14 +113,14 @@ - +
Leads By Source {$MOD.LBL_LEADS_BY_SOURCE}
- Total : 340 + {$MOD.LBL_TOTAL}340
@@ -128,14 +128,14 @@ - +
Leads By Status {$MOD.LBL_LEADS_BY_STATUS}
- Total : 340 + {$MOD.LBL_TOTAL}340
@@ -153,7 +153,7 @@
- + @@ -172,7 +172,7 @@ From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:48:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:48:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23293=3A_?= =?utf-8?q?Error_in_Duplication_of_Accounts?= In-Reply-To: <076.f1a114ae4c5ca503f4cadd664a8db2b7@vtiger.fosslabs.com> References: <076.f1a114ae4c5ca503f4cadd664a8db2b7@vtiger.fosslabs.com> Message-ID: <085.76d035e1d2c20f6ee4e47260876e13b0@vtiger.fosslabs.com> #293: Error in Duplication of Accounts ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Relatedlists ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:48:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:48:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23699=3A_?= =?utf-8?q?Terms_and_conditions_not_displayed?= In-Reply-To: <076.8ceb39e1fc6b6dce5fd6e37258006294@vtiger.fosslabs.com> References: <076.8ceb39e1fc6b6dce5fd6e37258006294@vtiger.fosslabs.com> Message-ID: <085.eb006db09e3a9ad9047cdedd9af83b87@vtiger.fosslabs.com> #699: Terms and conditions not displayed ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Terms and Condtions ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: This has been fixed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 04:51:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:51:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5792 - /vtigercrm/trunk/modules/Home/language/en_us.lang.php Message-ID: <20060509115148.C9B5671A279@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:51:38 2006 New Revision: 5792 Log: Update the language file for Home module - Ahmed Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Home/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Home/language/en_us.lang.php Tue May 9 05:51:38 2006 @@ -26,12 +26,27 @@ 'LBL_LIST_ACCOUNT_NAME'=>'Account Name', 'LBL_PHONE'=>'Phone:', 'LBL_EMAIL_ADDRESS'=>'Email:', +'LBL_TOTAL'=>'Total : ', + +'LBL_MY_HOME'=>'My Home', +'LBL_MODIFIED_TIME'=>'Modified Time', +'LBL_LOGIN_ID'=>'ID', +'LBL_MODIFIED_BY'=>'Modified By', +'LBL_TYPE'=>'Type', 'LBL_PIPELINE_FORM_TITLE'=>'My Pipeline', 'ERR_ONE_CHAR'=>'Please enter at least one letter or number for your search ...', 'LBL_OPEN_TASKS'=>'My Open Tasks', + +'LBL_LEADS_BY_SOURCE'=>'Leads By Source', +'LBL_LEADS_BY_STATUS'=>'Leads By Status', + +'LBL_UPCOMING_EVENTS'=>'Upcoming Events', +'LBL_PENDING_EVENTS'=>'Pending Events', + + ); ?> From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 04:53:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:53:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5793 - /vtigercrm/trunk/modules/Campaigns/DetailView.php Message-ID: <20060509115356.D017171A277@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:53:45 2006 New Revision: 5793 Log: unwanted comma at line no 26 has been removed Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailView.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailView.php Tue May 9 05:53:45 2006 @@ -26,7 +26,7 @@ { $focus->id = ""; } -global $app_strings,$mod_strings,$theme,; +global $app_strings,$mod_strings,$theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 04:54:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:54:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5794 - /vtigercrm/trunk/modules/Home/index.php Message-ID: <20060509115412.1303B71A277@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:54:02 2006 New Revision: 5794 Log: Update index.php for Home module - Ahmed Modified: vtigercrm/trunk/modules/Home/index.php Modified: vtigercrm/trunk/modules/Home/index.php ============================================================================== --- vtigercrm/trunk/modules/Home/index.php (original) +++ vtigercrm/trunk/modules/Home/index.php Tue May 9 05:54:02 2006 @@ -145,6 +145,7 @@ return $acti_type; } + $query="select tagcloud from users where id=".$current_user->id; $result=$adb->query($query); $tagcloud_js=$adb->query_result($result,0,'tagcloud'); @@ -156,6 +157,8 @@ $t=Date("Ymd"); $smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP",$app_strings); +$smarty->assign("MOD",$mod_strings); $smarty->assign("HOMEDETAILS",$home_values); $smarty->assign("HOMEDEFAULTVIEW",DefHomeView()); $smarty->assign("ACTIVITIES",$activities); From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:58:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:58:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23297=3A_?= =?utf-8?q?Day_View_-_Time_properly_not_displayed?= In-Reply-To: <076.6faf89031af0b3a4e3f0a66825b4c14b@vtiger.fosslabs.com> References: <076.6faf89031af0b3a4e3f0a66825b4c14b@vtiger.fosslabs.com> Message-ID: <085.5b41b6dd1716a674118db1053076417d@vtiger.fosslabs.com> #297: Day View - Time properly not displayed ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:58:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:58:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23309=3A_?= =?utf-8?q?Quotes_by_Accounts_on_drill_down_shows_List_View?= In-Reply-To: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> References: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> Message-ID: <085.85471f9f10c345370807ab48978185a9@vtiger.fosslabs.com> #309: Quotes by Accounts on drill down shows List View ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 04:59:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:59:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23311=3A_?= =?utf-8?q?SalesOrder_by_Accounts_on_drilldown_shows_list_view?= In-Reply-To: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com> References: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com> Message-ID: <085.42c7e5b5194c18c59327c22b55f6eca8@vtiger.fosslabs.com> #311: SalesOrder by Accounts on drilldown shows list view ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dashboard ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 05:01:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:01:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23325=3A_?= =?utf-8?q?parenttab_attribut_missing_in_most_of_the_links?= In-Reply-To: <076.af60b9022c8de093954e19042c359d44@vtiger.fosslabs.com> References: <076.af60b9022c8de093954e19042c359d44@vtiger.fosslabs.com> Message-ID: <085.bdf4277647d18920a6c30c47fe296d4d@vtiger.fosslabs.com> #325: parenttab attribut missing in most of the links ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 05:02:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:02:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23326=3A_?= =?utf-8?q?Why_account_reference_in_Custom_View=3F?= In-Reply-To: <076.06719fa2c8cfe743496ac0146090cc68@vtiger.fosslabs.com> References: <076.06719fa2c8cfe743496ac0146090cc68@vtiger.fosslabs.com> Message-ID: <085.55c33b4a61bc4891798ae9dcf064fa98@vtiger.fosslabs.com> #326: Why account reference in Custom View? ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 05:03:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:03:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23327=3A_?= =?utf-8?q?edit_custom_view_not_storing_all_values?= In-Reply-To: <076.b608ede2ea004d9070cb1b70eb3f6ebe@vtiger.fosslabs.com> References: <076.b608ede2ea004d9070cb1b70eb3f6ebe@vtiger.fosslabs.com> Message-ID: <085.df9efb989a72819ef1f1c9e26328fa16@vtiger.fosslabs.com> #327: edit custom view not storing all values ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 05:05:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:05:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23328=3A_?= =?utf-8?q?Duplicate_of_Leads_not_working?= In-Reply-To: <076.0d6a38a1ab29e288c9243566e326d0a4@vtiger.fosslabs.com> References: <076.0d6a38a1ab29e288c9243566e326d0a4@vtiger.fosslabs.com> Message-ID: <085.4c8e265a5970eaeb43198b3731c43ca5@vtiger.fosslabs.com> #328: Duplicate of Leads not working ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 05:05:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 12:05:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5795 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060509120516.3EBBF71A621@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 06:04:57 2006 New Revision: 5795 Log: update the app level lang file - ahmed Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Tue May 9 06:04:57 2006 @@ -423,9 +423,25 @@ 'LBL_ADD_ITEM'=>'Add', - - - +//Added for version 5 + +'LBL_CALENDAR_TITLE'=>'Open Calendar...', +'LBL_CALENDAR_ALT'=>'Open Calendar...', + +'LBL_CALCULATOR_TITLE'=>'Open Calculator...', +'LBL_CALCULATOR_ALT'=>'Open Calculator...', + +'LBL_CLOCK_TITLE'=>'Show World Clock...', +'LBL_CLOCK_ALT'=>'Show World Clock...', + +'LBL_ALL_MENU_TITLE'=>'Open All Menu...', +'LBL_ALL_MENU_ALT'=>'Open All Menu...', + +'LBL_CHAT_TITLE'=>'Chat...', +'LBL_CHAT_ALT'=>'Chat...', + +'LBL_SEARCH_TITLE'=>'Search in ', +'LBL_SEARCH_ALT'=>'Search in ', // Added fields for Related Field Display Informations in Detail View of All Modules From vtiger-tickets at vtiger.fosslabs.com Tue May 9 05:06:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:06:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23329=3A_?= =?utf-8?q?advanced_filter_criteria_not_proper?= In-Reply-To: <076.28b21066b37581172e48c7a90c2763ab@vtiger.fosslabs.com> References: <076.28b21066b37581172e48c7a90c2763ab@vtiger.fosslabs.com> Message-ID: <085.264be03324d6d68720b701a5b7f7a5cf@vtiger.fosslabs.com> #329: advanced filter criteria not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 05:07:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:07:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23329=3A_?= =?utf-8?q?advanced_filter_criteria_not_proper?= In-Reply-To: <076.28b21066b37581172e48c7a90c2763ab@vtiger.fosslabs.com> References: <076.28b21066b37581172e48c7a90c2763ab@vtiger.fosslabs.com> Message-ID: <085.e4d000aaf57b677416ea574fdf141a55@vtiger.fosslabs.com> #329: advanced filter criteria not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:01:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 13:01:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5796 - /vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Message-ID: <20060509130140.4EDA271A6F3@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 07:01:29 2006 New Revision: 5796 Log: i18n updated for all the buttons in list/edit/detail view - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue May 9 07:01:29 2006 @@ -24,16 +24,16 @@ {if $CHECK.EditView eq 'yes'} {if $MODULE eq 'Activities'} - + {else} - + {/if} {/if} {if $CHECK.index eq 'yes'} - + {/if} -
Upcoming Events
23 Events For Today
{$MOD.LBL_UPCOMING_EVENTS}
23 Events For Today
- Pending Events
+ {$MOD.LBL_PENDING_EVENTS}
7 Events in Past 10 days
 
Create {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...Create {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...Search in {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...Chat... + {$APP.LBL_CHAT_ALT}
@@ -43,11 +43,11 @@ - - - + + + - +
Open Calendar...Show World Clock...Open Calculator...{$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}  Open All Menu...{$APP.LBL_ALL_MENU_ALT}
{if $CHECK.Import eq 'yes' && $CHECK.Export eq 'yes'} - Import {$MODULE} | - Export {$MODULE} + {$APP.LBL_IMPORT} {$MODULE} | + {$APP.LBL_EXPORT} {$MODULE} {elseif $CHECK.Import eq 'yes' && $CHECK.Export eq 'no'} - Import {$MODULE} + {$APP.LBL_IMPORT} {$MODULE} {elseif $CHECK.Import eq 'no' && $CHECK.Export eq 'yes' } - Export {$MODULE} + {$APP.LBL_EXPORT} {$MODULE} {/if} {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} {if $CHECK.Export eq 'yes'} - Export {$MODULE} + {$APP.LBL_EXPORT} {$MODULE} {/if}
Create {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...Create {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...Chat... + {$APP.LBL_CHAT_ALT}
@@ -40,11 +40,11 @@ - - - + + + - +
Open Calendar...Show World Clock...Open Calculator...{$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}  Open All Menu...{$APP.LBL_ALL_MENU_ALT}
{if $CHECK.Import eq 'yes' && $CHECK.Export eq 'yes'} - Import {$MODULE} | - Export {$MODULE} + {$APP.LBL_IMPORT} {$MODULE} | + {$APP.LBL_EXPORT} {$MODULE} {elseif $CHECK.Import eq 'yes' && $CHECK.Export eq 'no'} - Import {$MODULE} + {$APP.LBL_IMPORT} {$MODULE} {elseif $CHECK.Import eq 'no' && $CHECK.Export eq 'yes' } - Export {$MODULE} + {$APP.LBL_EXPORT} {$MODULE} {/if} {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} {if $CHECK.Export eq 'yes'} - Export {$MODULE} + {$APP.LBL_EXPORT} {$MODULE} {/if}
- My Preferences
+ {$APP.LBL_MY_PREFERENCES}


@@ -45,8 +45,8 @@ - - + + @@ -65,34 +65,34 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:56:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 14:56:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5801 - /vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Message-ID: <20060509145617.70C46709FF6@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 08:56:10 2006 New Revision: 5801 Log: i18n done for emails - ahmed Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Tue May 9 08:56:10 2006 @@ -16,12 +16,12 @@
 My DetailsMy Mail Server Details {$MOD.LBL_MY_DETAILS}{$MOD.LBL_MY_MAIL_SERVER_DET}  
- + - + - + - + - + - + - + @@ -100,45 +100,45 @@ - + - + +  {$MOD.LBL_NO_TLS} +   {$MOD.LBL_TLS} - + - + - + From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:55:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 14:55:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5800 - /vtigercrm/trunk/Smarty/templates/Emails.tpl Message-ID: <20060509145523.060866146F5@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 08:55:19 2006 New Revision: 5800 Log: i18n done for emails - ahmed Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Tue May 9 08:55:19 2006 @@ -60,7 +60,7 @@
Email ID{$MOD.LBL_EMAIL_ID}
{$MOD.LBL_DISPLAY_NAME} (example : John Fenner) {$MOD.LBL_NAME_EXAMPLE}
{$APP.LBL_REQUIRED_SYMBOL} {$MOD.LBL_EMAIL_ADDRESS} ( example : johnfenner at mailserver.com ){$MOD.LBL_EMAIL_EXAMPLE}
 
Mail Server Settings{$MOD.LBL_MAIL_SERVER_SETTINGS}
{$APP.LBL_REQUIRED_SYMBOL}Mail Server Name or IP {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_MAIL_SERVER_NAME}  
{$APP.LBL_REQUIRED_SYMBOL}User Name{$APP.LBL_REQUIRED_SYMBOL}{$APP.LBL_LIST_USER_NAME}  
{$APP.LBL_REQUIRED_SYMBOL}Password{$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_LIST_PASSWORD}  
 
Mail Protocol{$MOD.LBL_MAIL_PROTOCOL}  {$MOD.LBL_IMAP}  {$MOD.LBL_POP} -  IMAP2 -  IMAP4 +  {$MOD.LBL_IMAP2} +  {$MOD.LBL_IMAP4}  
SSL Options {$MOD.LBL_SSL_OPTIONS} -  No TLS -   TLS  
Certificate Validations {$MOD.LBL_CERT_VAL} -  Validate SSL Cert -  Don't Validate SSL Cert +  {$MOD.LBL_VAL_SSL_CERT} +  {$MOD.LBL_DONOT_VAL_SSL_CERT}  
Refresh Timeout {$MOD.LBL_REFRESH_TIMEOUT}  
Email's per Page {$MOD.LBL_EMAILS_PER_PAGE}  
@@ -83,15 +83,15 @@ @@ -99,40 +99,40 @@ - + - + @@ -141,13 +141,13 @@ -

- Home> Web Mail + {$CATEGORY} > {$MODULE}
 
-  Check Mail +  {$MOD.LBL_CHK_MAIL} -  Compose +  {$MOD.LBL_COMPOSE} -  Settings +  {$MOD.LBL_SETTINGS}
Email Folders {$MOD.LBL_EMAIL_FOLDERS}  Mails {$MOD.LBL_MAILS}
-  INBOX +  {$MOD.LBL_INBOX}
-  Sent Mails +  {$MOD.LBL_SENT_MAILS}
-  Trash +  {$MOD.LBL_TRASH}
  - +   + - Search:   + {$APP.LBL_SEARCH}     - +
- +
-   -   -   - +   +   +   +
- - - + + +
From :  
CC :  
Subject : {$BLOCKS.3.Subject.value}
{$MOD.LBL_FROM}  
{$MOD.LBL_CC}  
{$MOD.LBL_SUBJECT} {$BLOCKS.3.Subject.value}
 
{elseif $title eq 'Description'} From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:59:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 14:59:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5802 - /vtigercrm/trunk/modules/Emails/language/en_us.lang.php Message-ID: <20060509145902.C2594709FFE@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 08:58:58 2006 New Revision: 5802 Log: Updated the language file for emails modules - ahmed Modified: vtigercrm/trunk/modules/Emails/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Emails/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Emails/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Emails/language/en_us.lang.php Tue May 9 08:58:58 2006 @@ -35,7 +35,7 @@ 'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.", 'LBL_DATE_SENT'=>'Date Sent:', -'LBL_SUBJECT'=>'Subject:', +'LBL_SUBJECT'=>'Subject :', 'LBL_BODY'=>'Body:', 'LBL_DATE_AND_TIME'=>'Date & Time Sent:', 'LBL_DATE'=>'Date Sent:', @@ -45,6 +45,26 @@ 'LBL_CONTACT_NAME'=>' Contact Name: ', 'LBL_EMAIL'=>'Email:', 'LBL_COLON'=>':', +'LBL_CHK_MAIL'=>'Check Mail', +'LBL_COMPOSE'=>'Compose', +'LBL_SETTINGS'=>'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 :', 'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', 'LBL_INVITEE'=>'Recipients', From vtiger-tickets at vtiger.fosslabs.com Tue May 9 08:17:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 15:17:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23536=3A_?= =?utf-8?q?Ticketsystem_Emails?= In-Reply-To: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> References: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> Message-ID: <085.3a3b86154ddb68a8a0bdf1aa3f5eee84@vtiger.fosslabs.com> #536: Ticketsystem Emails -----------------------------+---------------------------------------------- Reporter: anonymous | Owner: mmbrich Type: enhancement | Status: new Priority: major | Milestone: Component: customerportal | Version: 5.0.0 Resolution: | Keywords: Ticket mail -----------------------------+---------------------------------------------- Changes (by mickie): * status: assigned => new * owner: mickie => mmbrich Comment: Thanks for your information. This trac is customized by mmbrich, mfedyk and fathi. so for this any one of these friends can made reply. if you give username then the username will be displayed when you give mailid as username then the mailid will be displayed.so you can give name instead of mailid. May be i am wrong. i will transfer this ticket to mmbrich. he will help you to understand the motivation to make this email id displayed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 08:40:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 09 May 2006 15:40:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5803 - /vtigercrm/trunk/Smarty/templates/Webmails.tpl Message-ID: <20060509154017.B3902709FF7@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 09:40:10 2006 New Revision: 5803 Log: i18n done for webmails - ahmed Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Tue May 9 09:40:10 2006 @@ -36,23 +36,23 @@
-  Check Mail +  {$MOD.LBL_CHK_MAIL} -  Compose +  {$MOD.LBL_COMPOSE} -  Settings +  {$MOD.LBL_SETTINGS} -  Show Hidden +  {$MOD.LBL_SHOW_HIDDEN} -  Expunge Mailbox +  {$MOD.LBL_EXPUNGE_MAILBOX}
Email Folders {$MOD.LBL_EMAIL_FOLDERS}  Mails in {$ACCOUNT} > {$MAILBOX} {$MOD.LBL_MAILS} {$ACCOUNT} > {$MAILBOX}
-  My Mails +  {$MOD.LBL_MY_MAILS}
    @@ -79,22 +79,22 @@

-  Sent Mails +  {$MOD.LBL_SENT_MAILS}
-  Trash +  {$MOD.LBL_TRASH} @@ -102,12 +102,12 @@
  -
{$FOLDER_SELECT}  + {$FOLDER_SELECT}  - Search:   + {$APP.LBL_SEARCH}     - +
- +
-   -   -   -   - +   +   +   +   +
  - - - - + + + +
From : 
To : 
Subject
Date
{$MOD.LBL_FROM} 
{$MOD.LBL_TO} 
{$MOD.LBL_SUBJECT}
{$MOD.LBL_DATE}
 
 
+
@@ -61,119 +83,85 @@
- -{**} -
Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Tue May 9 12:38:58 2006 @@ -1236,11 +1236,11 @@ var colthree = row.insertCell(2); - colone.innerHTML=""; - - coltwo.innerHTML=" "; - - colthree.innerHTML=""; + colone.innerHTML=""; + + coltwo.innerHTML=" "; + + colthree.innerHTML=""; } Modified: vtigercrm/trunk/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/SearchUtils.php (original) +++ vtigercrm/trunk/include/utils/SearchUtils.php Tue May 9 12:38:58 2006 @@ -495,7 +495,7 @@ $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,$tab_col)." ".$matchtype; } } - $where=$adv_string."#@@#".$url_string."&searchtype=advance&search_cnt=".$tot_no_criteria."&matchtype=".$_REQUEST['matchtype']; + $where="(".$adv_string.")#@@#".$url_string."&searchtype=advance&search_cnt=".$tot_no_criteria."&matchtype=".$_REQUEST['matchtype']; } else { From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:03:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:03:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23421=3A_?= =?utf-8?q?edit_tab_profile_takes_to_edit_global_privileges?= In-Reply-To: <076.02cb3b9ee9dbafa0f278149d4e7c2f6d@vtiger.fosslabs.com> References: <076.02cb3b9ee9dbafa0f278149d4e7c2f6d@vtiger.fosslabs.com> Message-ID: <085.309e6aea09428bc6d509bf11a6aa4b72@vtiger.fosslabs.com> #421: edit tab profile takes to edit global privileges ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profile ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:04:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:04:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23423=3A_?= =?utf-8?q?edit_standard_privileges_takes_to_edit_global_privileges?= In-Reply-To: <076.d183d57825e0f2e4471317a7770a629d@vtiger.fosslabs.com> References: <076.d183d57825e0f2e4471317a7770a629d@vtiger.fosslabs.com> Message-ID: <085.5dfc60e5af7a4c9442d7aa502cd4673e@vtiger.fosslabs.com> #423: edit standard privileges takes to edit global privileges ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profile ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:05:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:05:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23424=3A_?= =?utf-8?q?even_without_tab_privileges_standard_privileges_can_be_given?= In-Reply-To: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com> References: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com> Message-ID: <085.00c4ffe72415348037f160bfd105e203@vtiger.fosslabs.com> #424: even without tab privileges standard privileges can be given ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profile ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:07:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:07:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23446=3A_?= =?utf-8?q?Issue_in_Contact_without_Accounts?= In-Reply-To: <076.2a6a37d12f81515b920b13fc242c0611@vtiger.fosslabs.com> References: <076.2a6a37d12f81515b920b13fc242c0611@vtiger.fosslabs.com> Message-ID: <085.4b51af3d2ea92f3d24501b69b6df5e4a@vtiger.fosslabs.com> #446: Issue in Contact without Accounts ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:08:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:08:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23448=3A_?= =?utf-8?q?Issue_in_the_display_of_Overdue_Activities?= In-Reply-To: <076.e4c41107075472cbaa297ea1f5a0d8f9@vtiger.fosslabs.com> References: <076.e4c41107075472cbaa297ea1f5a0d8f9@vtiger.fosslabs.com> Message-ID: <085.07b140a1392d5c26828be96b138eef02@vtiger.fosslabs.com> #448: Issue in the display of Overdue Activities ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:08:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:08:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23450=3A_?= =?utf-8?q?Pagination_is_not_supported_for_related_list?= In-Reply-To: <076.4ae1ba069297a58cd7b967357dfd775b@vtiger.fosslabs.com> References: <076.4ae1ba069297a58cd7b967357dfd775b@vtiger.fosslabs.com> Message-ID: <085.10cb1792f03c10b369ae55ae20084002@vtiger.fosslabs.com> #450: Pagination is not supported for related list ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:09:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:09:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23451=3A_?= =?utf-8?q?Sorting_is_not_available_in_related_lists?= In-Reply-To: <076.654fca5baaa382ddaa3e380e3b4026db@vtiger.fosslabs.com> References: <076.654fca5baaa382ddaa3e380e3b4026db@vtiger.fosslabs.com> Message-ID: <085.fe22c8fe4721ab62531e73e703d49af8@vtiger.fosslabs.com> #451: Sorting is not available in related lists ------------------------+--------------------------------------------------- Reporter: don | Owner: saraj Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saraj -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:10:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:10:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23457=3A_?= =?utf-8?q?Inconsistency_in_List_Views?= In-Reply-To: <076.62f80fd69dd6508b4f16ec9faaf586f8@vtiger.fosslabs.com> References: <076.62f80fd69dd6508b4f16ec9faaf586f8@vtiger.fosslabs.com> Message-ID: <085.948420a785aef3bccd9ea39bdb1fa768@vtiger.fosslabs.com> #457: Inconsistency in List Views ------------------------+--------------------------------------------------- Reporter: don | Owner: saraj Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saraj -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:11:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:11:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23486=3A_?= =?utf-8?q?table_indexing_is_not_proper_in_some_tables?= In-Reply-To: <076.54bbc5aa9fb5a6e3cd2310cbda7781d8@vtiger.fosslabs.com> References: <076.54bbc5aa9fb5a6e3cd2310cbda7781d8@vtiger.fosslabs.com> Message-ID: <085.ef80dbc38c53bb79de928d411b9081bd@vtiger.fosslabs.com> #486: table indexing is not proper in some tables ------------------------+--------------------------------------------------- Reporter: don | Owner: don Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:13:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:13:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23519=3A_?= =?utf-8?q?validation_for_notes_quickreate?= In-Reply-To: <076.a1e19f784ca3cb33edb5fa2c87c26e5a@vtiger.fosslabs.com> References: <076.a1e19f784ca3cb33edb5fa2c87c26e5a@vtiger.fosslabs.com> Message-ID: <085.0033047102635960b7ea838a0a3266f0@vtiger.fosslabs.com> #519: validation for notes quickreate --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: --------------------------------+------------------------------------------- Changes (by don): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:14:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:14:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23580=3A_?= =?utf-8?q?Attachment_is_not_duplicated_while_duplicating_Notes?= In-Reply-To: <076.4d406ad81ce5ad272e3113cf23423cdb@vtiger.fosslabs.com> References: <076.4d406ad81ce5ad272e3113cf23423cdb@vtiger.fosslabs.com> Message-ID: <085.778e67a7a7d6dc8e881e21f6eab4ac15@vtiger.fosslabs.com> #580: Attachment is not duplicated while duplicating Notes ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Attachments ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:15:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:15:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23599=3A_?= =?utf-8?q?Profile_Issue?= In-Reply-To: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com> References: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com> Message-ID: <085.cacfc01705228f87f4338a74c1fc5ec1@vtiger.fosslabs.com> #599: Profile Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:16:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:16:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23606=3A_?= =?utf-8?q?issue_in_create_activity_button?= In-Reply-To: <076.585aa73b113c683f3987066758d376a5@vtiger.fosslabs.com> References: <076.585aa73b113c683f3987066758d376a5@vtiger.fosslabs.com> Message-ID: <085.b0c634d312189f4a8286afc13bbd5b91@vtiger.fosslabs.com> #606: issue in create activity button ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:16:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:16:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23609=3A_?= =?utf-8?q?Issue_in_Create_Task?= In-Reply-To: <076.130338c36c34b8ecb011f0bdad013ee6@vtiger.fosslabs.com> References: <076.130338c36c34b8ecb011f0bdad013ee6@vtiger.fosslabs.com> Message-ID: <085.7026c392afef9c8986fd6a118b93f113@vtiger.fosslabs.com> #609: Issue in Create Task ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:18:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:18:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23613=3A_?= =?utf-8?q?Default_Lead_VIew_=2C_Activity_View_in_users_is_of_no_use?= In-Reply-To: <076.2d12500d7d95303f1affcf69a5cf635c@vtiger.fosslabs.com> References: <076.2d12500d7d95303f1affcf69a5cf635c@vtiger.fosslabs.com> Message-ID: <085.d2a092756df632cfd99dde9733a96d66@vtiger.fosslabs.com> #613: Default Lead VIew , Activity View in users is of no use ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Users ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:19:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:19:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23623=3A_?= =?utf-8?q?Issue_in_Activity_Quick_Edit?= In-Reply-To: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com> References: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com> Message-ID: <085.805f2e8d860267f012156a5a24a644bf@vtiger.fosslabs.com> #623: Issue in Activity Quick Edit ------------------------+--------------------------------------------------- Reporter: don | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:20:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:20:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23678=3A_?= =?utf-8?q?Home_Page_Security_Support_is_not_proper?= In-Reply-To: <076.0108077923a68a13c0fb45ff815a79d5@vtiger.fosslabs.com> References: <076.0108077923a68a13c0fb45ff815a79d5@vtiger.fosslabs.com> Message-ID: <085.acf29ce1c462f4ed7ae29e379867c9c5@vtiger.fosslabs.com> #678: Home Page Security Support is not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: saraj Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: ahmed => saraj -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:20:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:20:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23680=3A_?= =?utf-8?q?Send_Remainder_in_Events_not_working?= In-Reply-To: <076.25e02cfec13997af4baaacbb0fc391fb@vtiger.fosslabs.com> References: <076.25e02cfec13997af4baaacbb0fc391fb@vtiger.fosslabs.com> Message-ID: <085.03a2f70d8e2b40a2751abd9f99cca56d@vtiger.fosslabs.com> #680: Send Remainder in Events not working ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:21:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:21:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23688=3A_?= =?utf-8?q?Issue_in_Event_User_Related_List?= In-Reply-To: <076.815f18cf3ceaadb29c37d84a50c176c6@vtiger.fosslabs.com> References: <076.815f18cf3ceaadb29c37d84a50c176c6@vtiger.fosslabs.com> Message-ID: <085.ecd92a9e159d4388f787fa5a4b7b8e68@vtiger.fosslabs.com> #688: Issue in Event User Related List ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:25:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:25:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2374=3A_I?= =?utf-8?q?nstallation_Pb_step_4?= In-Reply-To: <076.348c601258368d89f9a0a19c3d89c524@vtiger.fosslabs.com> References: <076.348c601258368d89f9a0a19c3d89c524@vtiger.fosslabs.com> Message-ID: <085.db750e43dccdd0967809df8012897f35@vtiger.fosslabs.com> #74: Installation Pb step 4 ------------------------+--------------------------------------------------- Reporter: oitsuki | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:26:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:26:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2377=3A_A?= =?utf-8?q?dd_accounts_doesn=27t_work_in_detail_view?= In-Reply-To: <076.d541c69836d3e93fc412dae2f6fd0dd8@vtiger.fosslabs.com> References: <076.d541c69836d3e93fc412dae2f6fd0dd8@vtiger.fosslabs.com> Message-ID: <085.1d64fbce75749b10931fe4b422799827@vtiger.fosslabs.com> #77: Add accounts doesn't work in detail view -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------+-------------------------------------------- Changes (by don): * status: assigned => new * owner: richie => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:26:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:26:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2378=3A_I?= =?utf-8?q?nput_tab_field_order_for_contacts?= In-Reply-To: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> References: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> Message-ID: <085.79211502112ccda369279f13945be51b@vtiger.fosslabs.com> #78: Input tab field order for contacts ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:29:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:29:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2380=3A_B?= =?utf-8?q?lock_=27Custom_information=27_for_accounts?= In-Reply-To: <076.a9588a24eea5812b218bd55fd917354f@vtiger.fosslabs.com> References: <076.a9588a24eea5812b218bd55fd917354f@vtiger.fosslabs.com> Message-ID: <085.a0e46c777826f98ee9a2bcf94f92945a@vtiger.fosslabs.com> #80: Block 'Custom information' for accounts -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: -------------------------------+-------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:29:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:29:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2381=3A_?= =?utf-8?q?=22Available_Merge_Fields=22_does_not_work_in_the_email_templat?= =?utf-8?q?es_=28adding_a_merge_field_to_a_template_does_not_result_in_tha?= =?utf-8?q?t_field_being_merged=29?= In-Reply-To: <076.247dfccd0d5a7f69c4c5016ef5f5c24b@vtiger.fosslabs.com> References: <076.247dfccd0d5a7f69c4c5016ef5f5c24b@vtiger.fosslabs.com> Message-ID: <085.59b87836d129459f8a9a7a5fe7936559@vtiger.fosslabs.com> #81: "Available Merge Fields" does not work in the email templates (adding a merge field to a template does not result in that field being merged) ------------------------------------+--------------------------------------- Reporter: scott at crazycolour.com | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: merge fields not available in email template ------------------------------------+--------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:30:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:30:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2398=3A_C?= =?utf-8?q?annot_add_a_new_product?= In-Reply-To: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> References: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> Message-ID: <085.f82b9738e30204a6c83f900b6e1704c4@vtiger.fosslabs.com> #98: Cannot add a new product --------------------------------+------------------------------------------- Reporter: Robgsem at yahoo.com | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:31:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:31:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2399=3A_v?= =?utf-8?q?alidation_is_not_working_for_Notes_module?= In-Reply-To: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> References: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> Message-ID: <085.ce317561703a5da1fe00dca74c6fd08f@vtiger.fosslabs.com> #99: validation is not working for Notes module ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:32:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:32:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2398=3A_C?= =?utf-8?q?annot_add_a_new_product?= In-Reply-To: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> References: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> Message-ID: <085.e12435264eb4cd9166a453445cdae805@vtiger.fosslabs.com> #98: Cannot add a new product --------------------------------+------------------------------------------- Reporter: Robgsem at yahoo.com | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:33:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:33:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23103=3A_?= =?utf-8?q?can_not_add_more_than_one_user_in_email_Related_list?= In-Reply-To: <076.ed4dabd5b24748c2fb1fded49054925e@vtiger.fosslabs.com> References: <076.ed4dabd5b24748c2fb1fded49054925e@vtiger.fosslabs.com> Message-ID: <085.111ca42953491fc036e8f4b800f86058@vtiger.fosslabs.com> #103: can not add more than one user in email Related list --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: more than one user --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:34:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:34:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23105=3A_?= =?utf-8?q?can_not_add_contact_to_email_from_its_related_list?= In-Reply-To: <076.db585632c9a7d390b1cb92cb9ba47588@vtiger.fosslabs.com> References: <076.db585632c9a7d390b1cb92cb9ba47588@vtiger.fosslabs.com> Message-ID: <085.417b503551295c4ceaaeda5a13c15a58@vtiger.fosslabs.com> #105: can not add contact to email from its related list --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: add contact to email --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:34:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:34:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23104=3A_?= =?utf-8?q?Issue_in_Sorting_in_List_View?= In-Reply-To: <076.513762e4d30ae169b1cf83fd27c6741a@vtiger.fosslabs.com> References: <076.513762e4d30ae169b1cf83fd27c6741a@vtiger.fosslabs.com> Message-ID: <085.5ee11b4615631700f6fc0163a74bd52a@vtiger.fosslabs.com> #104: Issue in Sorting in List View ------------------------------+--------------------------------------------- Reporter: jeri at vtiger.com | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------------+--------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:36:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:36:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23107=3A_?= =?utf-8?q?Not_able_to_sort_the_website_field_in_Leads_list_view?= In-Reply-To: <076.dde3052d0273fcdae95df35eccddf5b3@vtiger.fosslabs.com> References: <076.dde3052d0273fcdae95df35eccddf5b3@vtiger.fosslabs.com> Message-ID: <085.2b1ccf278fd926a18d3f820ab135c7ec@vtiger.fosslabs.com> #107: Not able to sort the website field in Leads list view ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:36:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:36:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23108=3A_?= =?utf-8?q?can_not_add_note_to_email?= In-Reply-To: <076.1c4a7f4e3a8840da54efba22fa0a520e@vtiger.fosslabs.com> References: <076.1c4a7f4e3a8840da54efba22fa0a520e@vtiger.fosslabs.com> Message-ID: <085.2ffe0178dd4fafe4157226743e776cc6@vtiger.fosslabs.com> #108: can not add note to email --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: note from email RL --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:38:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:38:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23111=3A_?= =?utf-8?q?Issue_in_Custom_View?= In-Reply-To: <076.8a38ba8d8b8c6591ed04e5404e2b8606@vtiger.fosslabs.com> References: <076.8a38ba8d8b8c6591ed04e5404e2b8606@vtiger.fosslabs.com> Message-ID: <085.37210e5cbe4d798e85cee7bdf3624767@vtiger.fosslabs.com> #111: Issue in Custom View ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:38:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:38:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23115=3A_?= =?utf-8?q?check_mail_link_is_not_working?= In-Reply-To: <076.b5686ee083b27123b84b47398780e288@vtiger.fosslabs.com> References: <076.b5686ee083b27123b84b47398780e288@vtiger.fosslabs.com> Message-ID: <085.3c18aefb9d9b332d5662d897570ea996@vtiger.fosslabs.com> #115: check mail link is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: checkmail link --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:40:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:40:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23117=3A_?= =?utf-8?q?issue_in_Page_navigation?= In-Reply-To: <076.6c2b56e976313ee3444368c0830c47ae@vtiger.fosslabs.com> References: <076.6c2b56e976313ee3444368c0830c47ae@vtiger.fosslabs.com> Message-ID: <085.5c47ac45baf3c13c359a059df6f5f79f@vtiger.fosslabs.com> #117: issue in Page navigation ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: pagination ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:40:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:40:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23120=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.52335e78ac6b04c98e0c3aae3b5564f0@vtiger.fosslabs.com> References: <076.52335e78ac6b04c98e0c3aae3b5564f0@vtiger.fosslabs.com> Message-ID: <085.f3540b59a56cb932d0703e30e8b639f9@vtiger.fosslabs.com> #120: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: massdelete ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: richie => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:42:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:42:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23126=3A_?= =?utf-8?q?Issui_in_Seach_in_Leads_icon?= In-Reply-To: <076.90d521f3fe426b094d6cacdd659d381d@vtiger.fosslabs.com> References: <076.90d521f3fe426b094d6cacdd659d381d@vtiger.fosslabs.com> Message-ID: <085.7ab9f55d509857de429ccf3727bae696@vtiger.fosslabs.com> #126: Issui in Seach in Leads icon ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:43:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:43:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23127=3A_?= =?utf-8?q?Users_icon_not_proper?= In-Reply-To: <076.f1cfd246af878366c8bf7616bc1b62d8@vtiger.fosslabs.com> References: <076.f1cfd246af878366c8bf7616bc1b62d8@vtiger.fosslabs.com> Message-ID: <085.c4fe3e83709facf52780f7df60b593b6@vtiger.fosslabs.com> #127: Users icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: user icon ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:44:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:44:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23128=3A_?= =?utf-8?q?roles_icon_not_proper?= In-Reply-To: <076.0a01f2f437d64401b3cff20dd56372cd@vtiger.fosslabs.com> References: <076.0a01f2f437d64401b3cff20dd56372cd@vtiger.fosslabs.com> Message-ID: <085.a745c1b4f792592883fcaa05d68266cc@vtiger.fosslabs.com> #128: roles icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: roles icon ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:44:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:44:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23130=3A_?= =?utf-8?q?Calendar_in_Accounts_ListView_not_working?= In-Reply-To: <076.b1750d48d39ce294079c7219d43d4c59@vtiger.fosslabs.com> References: <076.b1750d48d39ce294079c7219d43d4c59@vtiger.fosslabs.com> Message-ID: <085.2e918e468fe10aef425a77957d32eeb8@vtiger.fosslabs.com> #130: Calendar in Accounts ListView not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: calendar ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: philip => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:44:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:44:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23129=3A_?= =?utf-8?q?profiles_icon_not_proper?= In-Reply-To: <076.022a98eb29d6a79f15851112170e2a06@vtiger.fosslabs.com> References: <076.022a98eb29d6a79f15851112170e2a06@vtiger.fosslabs.com> Message-ID: <085.3642e062d8b43d3577ecfeb0ea33937c@vtiger.fosslabs.com> #129: profiles icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profiles icon ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:45:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:45:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23132=3A_?= =?utf-8?q?groups=2C_default_organization=2Cassign_module_owners_icon_not_?= =?utf-8?q?proper?= In-Reply-To: <076.e71334eb43ddc9fb65b8db70042e99cb@vtiger.fosslabs.com> References: <076.e71334eb43ddc9fb65b8db70042e99cb@vtiger.fosslabs.com> Message-ID: <085.6f25fa1c2953e19f6278e701869328bb@vtiger.fosslabs.com> #132: groups, default organization,assign module owners icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: icons ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:48:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:48:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23133=3A_?= =?utf-8?q?Settings_icon_not_proper?= In-Reply-To: <076.f8f9273f78f9179ab6e89a6779e07153@vtiger.fosslabs.com> References: <076.f8f9273f78f9179ab6e89a6779e07153@vtiger.fosslabs.com> Message-ID: <085.c2f4a1fb4622951c62ebb8b9952f598a@vtiger.fosslabs.com> #133: Settings icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: icons ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:49:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:49:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23147=3A_?= =?utf-8?q?qualify_button_is_not_working?= In-Reply-To: <076.c9b0e6926fdcd3584a62a35ae69aa260@vtiger.fosslabs.com> References: <076.c9b0e6926fdcd3584a62a35ae69aa260@vtiger.fosslabs.com> Message-ID: <085.91aaf59c02c622c0eded1a40a6d515c1@vtiger.fosslabs.com> #147: qualify button is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: qualify button in email --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:50:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:50:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23148=3A_?= =?utf-8?q?Improper_Values_after_Saving_Events_thru_Calendar?= In-Reply-To: <076.fece241f99eca80394e606738c23177f@vtiger.fosslabs.com> References: <076.fece241f99eca80394e606738c23177f@vtiger.fosslabs.com> Message-ID: <085.3d03e1d0d8a358e405c3204c13862604@vtiger.fosslabs.com> #148: Improper Values after Saving Events thru Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:51:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:51:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23150=3A_?= =?utf-8?q?search_is_not_working_in_email?= In-Reply-To: <076.6a257a14c69d067f58d0d5a606d8252f@vtiger.fosslabs.com> References: <076.6a257a14c69d067f58d0d5a606d8252f@vtiger.fosslabs.com> Message-ID: <085.c6519db51acde4722b90f77fd43ce2a2@vtiger.fosslabs.com> #150: search is not working in email --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: email search --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:52:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:52:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23151=3A_?= =?utf-8?q?sorting_in_Users_List_View_missing?= In-Reply-To: <076.7d526c19e2861849c72df4c050cd4462@vtiger.fosslabs.com> References: <076.7d526c19e2861849c72df4c050cd4462@vtiger.fosslabs.com> Message-ID: <085.fddf3222e17c6b94a357457948ad6320@vtiger.fosslabs.com> #151: sorting in Users List View missing ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: user sort ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:52:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:52:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23152=3A_?= =?utf-8?q?Time_Filter_Combo_Box_non_functional_in_Calendar_-_Week_Tab?= In-Reply-To: <076.f746c9f29152fef0cd48e6c12a634dac@vtiger.fosslabs.com> References: <076.f746c9f29152fef0cd48e6c12a634dac@vtiger.fosslabs.com> Message-ID: <085.5e1e8deddc6057d924ba90e355527aae@vtiger.fosslabs.com> #152: Time Filter Combo Box non functional in Calendar - Week Tab ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Time Filter - Week Tab ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:52:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:52:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23154=3A_?= =?utf-8?q?Cannot_Create_Task_from_Calendar_Module?= In-Reply-To: <076.ea1c68f9f29d7dafb9a1eec31db3fabc@vtiger.fosslabs.com> References: <076.ea1c68f9f29d7dafb9a1eec31db3fabc@vtiger.fosslabs.com> Message-ID: <085.2e053f0a24f6a9b2cf687e1301e9a992@vtiger.fosslabs.com> #154: Cannot Create Task from Calendar Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:57:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:57:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23155=3A_?= =?utf-8?q?no_validation_for_Accounts_Quick_Create?= In-Reply-To: <076.8d3fbbc033e3711a67b80f6cb00ee0c0@vtiger.fosslabs.com> References: <076.8d3fbbc033e3711a67b80f6cb00ee0c0@vtiger.fosslabs.com> Message-ID: <085.1ca4013ae1f30679ef51d387562bf62e@vtiger.fosslabs.com> #155: no validation for Accounts Quick Create ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: validation,quick create ---------------------------+------------------------------------------------ Changes (by don): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 12:59:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:59:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23156=3A_?= =?utf-8?q?Word_Plugin_not_available_for_5=2E0?= In-Reply-To: <076.319fa46e4b9e06a8a7ab980c4a9d4947@vtiger.fosslabs.com> References: <076.319fa46e4b9e06a8a7ab980c4a9d4947@vtiger.fosslabs.com> Message-ID: <085.3a87b67073bd1cd1b325e9e44f9c977f@vtiger.fosslabs.com> #156: Word Plugin not available for 5.0 ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: word plugin ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:00:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:00:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23157=3A_?= =?utf-8?q?Qualify_button_is_not_working?= In-Reply-To: <076.e4d330136528d5f1fc841090b09b56ae@vtiger.fosslabs.com> References: <076.e4d330136528d5f1fc841090b09b56ae@vtiger.fosslabs.com> Message-ID: <085.0cb44928ae1d3fdf86df584d099d7b53@vtiger.fosslabs.com> #157: Qualify button is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: qualify button in email --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:01:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:01:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23165=3A_?= =?utf-8?q?no_validation_for__import?= In-Reply-To: <076.58df247bb99d03c05c53b66b68302b68@vtiger.fosslabs.com> References: <076.58df247bb99d03c05c53b66b68302b68@vtiger.fosslabs.com> Message-ID: <085.c3272073a5c3cfe9276ee9aac776d1e5@vtiger.fosslabs.com> #165: no validation for import ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: assigned Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: import,validation ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:01:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:01:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23168=3A_?= =?utf-8?q?Multiple_Events_Not_Displayed_for_Particular_Day_in_Calendar_-_?= =?utf-8?q?Month_Tab?= In-Reply-To: <076.e1ee923196db4883b67e00116c5e092c@vtiger.fosslabs.com> References: <076.e1ee923196db4883b67e00116c5e092c@vtiger.fosslabs.com> Message-ID: <085.bdfb93bf9185d0067d418502575ad41a@vtiger.fosslabs.com> #168: Multiple Events Not Displayed for Particular Day in Calendar - Month Tab ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:01:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:01:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23173=3A_?= =?utf-8?q?forward_button_is_not_working_in_Emails?= In-Reply-To: <076.947bbfcb4222c4072df4f7b58bc601e4@vtiger.fosslabs.com> References: <076.947bbfcb4222c4072df4f7b58bc601e4@vtiger.fosslabs.com> Message-ID: <085.d81113a0225a9a9fb46362e2ee7bb01d@vtiger.fosslabs.com> #173: forward button is not working in Emails --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: forward mail --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:03:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:03:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23175=3A_?= =?utf-8?q?reply_button_is_not_working_in_email?= In-Reply-To: <076.b3d758cb82e127f01bb7a64dd690ea36@vtiger.fosslabs.com> References: <076.b3d758cb82e127f01bb7a64dd690ea36@vtiger.fosslabs.com> Message-ID: <085.ad23c69ce724d54afd423ee7c6de27b9@vtiger.fosslabs.com> #175: reply button is not working in email --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: reply mail --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:03:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:03:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23178=3A_?= =?utf-8?q?download_attachment_is_not_working?= In-Reply-To: <076.338642f7a7c28ade353b3ad60a69ca5d@vtiger.fosslabs.com> References: <076.338642f7a7c28ade353b3ad60a69ca5d@vtiger.fosslabs.com> Message-ID: <085.272b03c41494ed986d248f5a566e8f64@vtiger.fosslabs.com> #178: download attachment is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: mickie Type: defect | Status: assigned Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: download attachments --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:03:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:03:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23198=3A_?= =?utf-8?q?calculator_UI_not_good?= In-Reply-To: <076.ca470107fa9ea27c72e141dd762f111b@vtiger.fosslabs.com> References: <076.ca470107fa9ea27c72e141dd762f111b@vtiger.fosslabs.com> Message-ID: <085.1bc797ba311602647590735eaeba8ed8@vtiger.fosslabs.com> #198: calculator UI not good ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:03:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:03:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23179=3A_?= =?utf-8?q?Custom_Field_Settings?= In-Reply-To: <076.a2c3435196291816734e4b849887c36b@vtiger.fosslabs.com> References: <076.a2c3435196291816734e4b849887c36b@vtiger.fosslabs.com> Message-ID: <085.9f2f59a06e08cd545ac46cc53e4720ed@vtiger.fosslabs.com> #179: Custom Field Settings ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field Settings ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:05:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:05:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23204=3A_?= =?utf-8?q?Inviting_Users=2C_Recurring_Events_=26_Reminder_Non_Functional_?= =?utf-8?q?-__Calendar?= In-Reply-To: <076.59442eec4e6153f731214192b8585aa8@vtiger.fosslabs.com> References: <076.59442eec4e6153f731214192b8585aa8@vtiger.fosslabs.com> Message-ID: <085.bcf6468edc55b75eb6371f5b37fd02e5@vtiger.fosslabs.com> #204: Inviting Users, Recurring Events & Reminder Non Functional - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:05:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:05:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23207=3A_?= =?utf-8?q?Quick_Create_Not_working?= In-Reply-To: <076.8a8a9547957df99d71fe7ce3ec4d5b2b@vtiger.fosslabs.com> References: <076.8a8a9547957df99d71fe7ce3ec4d5b2b@vtiger.fosslabs.com> Message-ID: <085.b2a83f8c59dd2e943fcde1f341bd78b1@vtiger.fosslabs.com> #207: Quick Create Not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: QuickCreate ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:06:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:06:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23209=3A_?= =?utf-8?q?Date_and_Time_Buttons_in_Add_Event_Non_Functional_-_Calendar?= In-Reply-To: <076.f869a371012c25e18f2dca1fd3fae5ec@vtiger.fosslabs.com> References: <076.f869a371012c25e18f2dca1fd3fae5ec@vtiger.fosslabs.com> Message-ID: <085.c640b7a473cc2a413ce14fe58e88ef06@vtiger.fosslabs.com> #209: Date and Time Buttons in Add Event Non Functional - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:07:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:07:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23210=3A_?= =?utf-8?q?Mail_Merge_Not_available_in_Detail_View?= In-Reply-To: <076.17121deb1c6eed5b8e670ddebc5b4719@vtiger.fosslabs.com> References: <076.17121deb1c6eed5b8e670ddebc5b4719@vtiger.fosslabs.com> Message-ID: <085.f90df9f19a7c554299791ad759919af3@vtiger.fosslabs.com> #210: Mail Merge Not available in Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mailmerge ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:07:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:07:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23214=3A_?= =?utf-8?q?Detail_View_UI_not_proper?= In-Reply-To: <076.781e9f6b2539201b781f0ba926b26dcd@vtiger.fosslabs.com> References: <076.781e9f6b2539201b781f0ba926b26dcd@vtiger.fosslabs.com> Message-ID: <085.d11467801b45b84c920269339c09818d@vtiger.fosslabs.com> #214: Detail View UI not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:08:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:08:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23216=3A_?= =?utf-8?q?backup_edit_showing_previous_value?= In-Reply-To: <076.79c7faeb56f57dd761581121742ae2df@vtiger.fosslabs.com> References: <076.79c7faeb56f57dd761581121742ae2df@vtiger.fosslabs.com> Message-ID: <085.602786ea2dca209f6c61887924e61c27@vtiger.fosslabs.com> #216: backup edit showing previous value ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: backup ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:10:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:10:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23223=3A_?= =?utf-8?q?Issue_Entering_ticker_symbol?= In-Reply-To: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com> References: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com> Message-ID: <085.18e9d8d357e8ff335a839fd9ebacbd93@vtiger.fosslabs.com> #223: Issue Entering ticker symbol ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ticker symbol ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:10:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:10:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23220=3A_?= =?utf-8?q?Events_Scheduled_after_more_than_1_hour_gets_displayed_only_at_?= =?utf-8?q?the_start_of_the_Hour_-_Calendar?= In-Reply-To: <076.106fba7ba90fc32941161e0f200a0e12@vtiger.fosslabs.com> References: <076.106fba7ba90fc32941161e0f200a0e12@vtiger.fosslabs.com> Message-ID: <085.419046448a503557e1d76546fe92d776@vtiger.fosslabs.com> #220: Events Scheduled after more than 1 hour gets displayed only at the start of the Hour - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:11:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:11:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23217=3A_?= =?utf-8?q?Validation_check_not_evailable_for_ajax_edit?= In-Reply-To: <076.6de19a3609cbfe64214bee620fe01442@vtiger.fosslabs.com> References: <076.6de19a3609cbfe64214bee620fe01442@vtiger.fosslabs.com> Message-ID: <085.a16c90c2a74456613d84c8991383b6de@vtiger.fosslabs.com> #217: Validation check not evailable for ajax edit ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ajax ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:11:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:11:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23224=3A_?= =?utf-8?q?Validation_not_proper?= In-Reply-To: <076.8342f02ae6134b90ef70026e212bd85e@vtiger.fosslabs.com> References: <076.8342f02ae6134b90ef70026e212bd85e@vtiger.fosslabs.com> Message-ID: <085.864fe040f6acb9282bc786882dfff4af@vtiger.fosslabs.com> #224: Validation not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: validation ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:14:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:14:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23227=3A_?= =?utf-8?q?Validation_not_proper?= In-Reply-To: <076.4d0af3665d7fb13a9e1f2ab8cf2d2a62@vtiger.fosslabs.com> References: <076.4d0af3665d7fb13a9e1f2ab8cf2d2a62@vtiger.fosslabs.com> Message-ID: <085.bf75188f30eff52ec19ff0173cce8512@vtiger.fosslabs.com> #227: Validation not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: validation ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:15:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:15:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23233=3A_?= =?utf-8?q?can_not_short_emails_by_RelatedTo_field?= In-Reply-To: <076.cbb939ab7d11690d947ba79539ce8104@vtiger.fosslabs.com> References: <076.cbb939ab7d11690d947ba79539ce8104@vtiger.fosslabs.com> Message-ID: <085.85cf57b1dccf52ef086712257e691be1@vtiger.fosslabs.com> #233: can not short emails by RelatedTo field --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: shorting email by relatedto --------------------------------+------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:16:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:16:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23234=3A_?= =?utf-8?q?Users_list_view_-_Navigation_breaking?= In-Reply-To: <076.31d197d3c870774eea2af708fa57615f@vtiger.fosslabs.com> References: <076.31d197d3c870774eea2af708fa57615f@vtiger.fosslabs.com> Message-ID: <085.ddf38872f8c7b04072d77db589d4033e@vtiger.fosslabs.com> #234: Users list view - Navigation breaking ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:16:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:16:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23231=3A_?= =?utf-8?q?assigned_to_field_are_not_editable?= In-Reply-To: <076.fe422d819681890c2567841813edea3f@vtiger.fosslabs.com> References: <076.fe422d819681890c2567841813edea3f@vtiger.fosslabs.com> Message-ID: <085.fef16c829636ccf7cbff066ce9f24281@vtiger.fosslabs.com> #231: assigned to field are not editable ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ajax ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:16:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:16:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23230=3A_?= =?utf-8?q?check_boxes_not_editable?= In-Reply-To: <076.5e23f28d0f16149532b6b827f8fbccfe@vtiger.fosslabs.com> References: <076.5e23f28d0f16149532b6b827f8fbccfe@vtiger.fosslabs.com> Message-ID: <085.8ca2018892b055d873b6e7c1549576d5@vtiger.fosslabs.com> #230: check boxes not editable ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ajax ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:17:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:17:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23236=3A_?= =?utf-8?q?Scalability_Isse_in_All_link_in_list_view?= In-Reply-To: <076.51adff6f3414f5a553ed4c62a54f0d49@vtiger.fosslabs.com> References: <076.51adff6f3414f5a553ed4c62a54f0d49@vtiger.fosslabs.com> Message-ID: <085.de0518acf9d1d87f6fb70cb23d7c96ce@vtiger.fosslabs.com> #236: Scalability Isse in All link in list view ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:18:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:18:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23243=3A_?= =?utf-8?q?can_not_short_emails_list_by_=27Date_Sent=27_field?= In-Reply-To: <076.7334a2c4f71ac3987f31d336154c2e22@vtiger.fosslabs.com> References: <076.7334a2c4f71ac3987f31d336154c2e22@vtiger.fosslabs.com> Message-ID: <085.d76fc829858c12a00cf45c297b16a04a@vtiger.fosslabs.com> #243: can not short emails list by 'Date Sent' field --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: shorting emails by date sent --------------------------------+------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:19:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:19:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23247=3A_?= =?utf-8?q?can_not_short_emails_by_=27Assigned_To=27_field?= In-Reply-To: <076.d261ef45e04de01dd23abed25421c306@vtiger.fosslabs.com> References: <076.d261ef45e04de01dd23abed25421c306@vtiger.fosslabs.com> Message-ID: <085.40ce0c7f48891c214448570eb98ef5a1@vtiger.fosslabs.com> #247: can not short emails by 'Assigned To' field --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: shorting emails by assigned to --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:19:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:19:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23254=3A_?= =?utf-8?q?Related_List_Error?= In-Reply-To: <076.ca758b2c5ad3758eb71992dfea7b9b77@vtiger.fosslabs.com> References: <076.ca758b2c5ad3758eb71992dfea7b9b77@vtiger.fosslabs.com> Message-ID: <085.818c32bd234fdcca1f32222f3d54ec72@vtiger.fosslabs.com> #254: Related List Error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Related lists ---------------------------+------------------------------------------------ Changes (by don): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:20:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:20:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23268=3A_?= =?utf-8?q?Selection_in_multiple_pages_from_list_view_is_not_supported?= In-Reply-To: <076.30c1b9af33fc83b78b78088399b52250@vtiger.fosslabs.com> References: <076.30c1b9af33fc83b78b78088399b52250@vtiger.fosslabs.com> Message-ID: <085.3e2708cfab50d2fe7d668b55ae9a89e9@vtiger.fosslabs.com> #268: Selection in multiple pages from list view is not supported ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:21:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:21:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23272=3A_?= =?utf-8?q?User_name_duplicated_in_popup?= In-Reply-To: <076.bcf5f8a6d18be7a4229ae7d427ac1f31@vtiger.fosslabs.com> References: <076.bcf5f8a6d18be7a4229ae7d427ac1f31@vtiger.fosslabs.com> Message-ID: <085.cd4f058f88874c70b37b893b5e0adc9e@vtiger.fosslabs.com> #272: User name duplicated in popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Popup ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:21:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:21:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23267=3A_?= =?utf-8?q?Calendar_-_Day_View_-_Time_starts_at_12_am_and_ends_at_11_pm?= In-Reply-To: <076.5fc2bcbd09d62e4d3a7b4407afe21821@vtiger.fosslabs.com> References: <076.5fc2bcbd09d62e4d3a7b4407afe21821@vtiger.fosslabs.com> Message-ID: <085.fbfae2d65091270f50a539a02c891288@vtiger.fosslabs.com> #267: Calendar - Day View - Time starts at 12 am and ends at 11 pm ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:21:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:21:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23258=3A_?= =?utf-8?q?Issue_in_recuring_type_is_not_saved_through_ajax_edit?= In-Reply-To: <076.c60e226ccb4078a30325f57db1263754@vtiger.fosslabs.com> References: <076.c60e226ccb4078a30325f57db1263754@vtiger.fosslabs.com> Message-ID: <085.30e64145cfc4640d0ffb03e22b0e2662@vtiger.fosslabs.com> #258: Issue in recuring type is not saved through ajax edit ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: recurring type ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:24:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:24:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23315=3A_?= =?utf-8?q?Check_if_user_already_exists=2C_in_the_same_page=2E?= In-Reply-To: <076.2e1aaf74031a03bfe756a227e3d670ca@vtiger.fosslabs.com> References: <076.2e1aaf74031a03bfe756a227e3d670ca@vtiger.fosslabs.com> Message-ID: <085.7393607807aa48f57b61f665c3989585@vtiger.fosslabs.com> #315: Check if user already exists, in the same page. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Create View Duplicate user ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:24:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:24:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23308=3A_?= =?utf-8?q?Drilldown_for_leads_by_industry_shows_no_data?= In-Reply-To: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com> References: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com> Message-ID: <085.06d79df30b88049aa692d3f9263f7c18@vtiger.fosslabs.com> #308: Drilldown for leads by industry shows no data ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:25:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:25:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23317=3A_?= =?utf-8?q?Custom_View_List_in_Metrics_function_does_not_work?= In-Reply-To: <076.6fab6bba9535dd754c98600a440c932a@vtiger.fosslabs.com> References: <076.6fab6bba9535dd754c98600a440c932a@vtiger.fosslabs.com> Message-ID: <085.3321ce885a8f8a3e4c9a2da71fc0fc9b@vtiger.fosslabs.com> #317: Custom View List in Metrics function does not work ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:26:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:26:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23322=3A_?= =?utf-8?q?quick_edit_of_Description_field_is_not_working?= In-Reply-To: <076.cbc407907f556cdd833010ab07611ffc@vtiger.fosslabs.com> References: <076.cbc407907f556cdd833010ab07611ffc@vtiger.fosslabs.com> Message-ID: <085.13c9b136f71a6f1c744636f7ceaee1f8@vtiger.fosslabs.com> #322: quick edit of Description field is not working ------------------------+--------------------------------------------------- Reporter: don | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: richie => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:26:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:26:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23324=3A_?= =?utf-8?q?Improper_Population_of_Data_while_Adding_New_Note_-_HelpDesk?= In-Reply-To: <076.4ddb7dae4b348b3aa3d0c47a16a5b636@vtiger.fosslabs.com> References: <076.4ddb7dae4b348b3aa3d0c47a16a5b636@vtiger.fosslabs.com> Message-ID: <085.97e9bd255ffa3ca1db7888b016a2d893@vtiger.fosslabs.com> #324: Improper Population of Data while Adding New Note - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:28:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:28:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23338=3A_?= =?utf-8?q?Testing_Ajaxification_in_Emails_DetailView?= In-Reply-To: <076.4b1a77e43b8ec303cb90faffc44cd522@vtiger.fosslabs.com> References: <076.4b1a77e43b8ec303cb90faffc44cd522@vtiger.fosslabs.com> Message-ID: <085.0ec7acce3f2d37d8e711cd31d3262bbb@vtiger.fosslabs.com> #338: Testing Ajaxification in Emails DetailView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ajaxification in email detailview --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:29:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:29:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23351=3A_?= =?utf-8?q?Convert_Lead_totally_not_working?= In-Reply-To: <076.8540ec7d330280bead061290a97f5042@vtiger.fosslabs.com> References: <076.8540ec7d330280bead061290a97f5042@vtiger.fosslabs.com> Message-ID: <085.daeba59ab6ac0ad3597fdde63bcfafeb@vtiger.fosslabs.com> #351: Convert Lead totally not working ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => blocker * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:29:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:29:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23343=3A_?= =?utf-8?q?Enter_button_click_in_tag_is_improper?= In-Reply-To: <076.c91dd8f875d266e8146594637ea2e15b@vtiger.fosslabs.com> References: <076.c91dd8f875d266e8146594637ea2e15b@vtiger.fosslabs.com> Message-ID: <085.5239d4b720fae5954563442549a2c66a@vtiger.fosslabs.com> #343: Enter button click in tag is improper ------------------------+--------------------------------------------------- Reporter: don | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:29:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:29:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23355=3A_?= =?utf-8?q?Option_can_be_provided_to_convert_a_lead_from_leads_list_view_i?= =?utf-8?q?tself?= In-Reply-To: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com> References: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com> Message-ID: <085.172c287d9752fd1e6fbd174c1e241da0@vtiger.fosslabs.com> #355: Option can be provided to convert a lead from leads list view itself ------------------------+--------------------------------------------------- Reporter: don | Owner: saint Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:31:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:31:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23360=3A_?= =?utf-8?q?Getting_Hacking_Attempt_Error_for_Merge_-_HelpDesk?= In-Reply-To: <076.d2c150001298d217e957e3e96f1ac691@vtiger.fosslabs.com> References: <076.d2c150001298d217e957e3e96f1ac691@vtiger.fosslabs.com> Message-ID: <085.feef6b5e544be3d281cb01b311b1a5d6@vtiger.fosslabs.com> #360: Getting Hacking Attempt Error for Merge - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:31:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:31:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23381=3A_?= =?utf-8?q?delete_link_present_only_for_Notes_and_Attachments_in_Related_L?= =?utf-8?q?ist?= In-Reply-To: <076.b2c1498f3d67dc4ddf90b7a1f51c03e4@vtiger.fosslabs.com> References: <076.b2c1498f3d67dc4ddf90b7a1f51c03e4@vtiger.fosslabs.com> Message-ID: <085.daa960af853403db1cf5d736bbde5f83@vtiger.fosslabs.com> #381: delete link present only for Notes and Attachments in Related List ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:31:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:31:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23373=3A_?= =?utf-8?q?no_css/smartification_for_user_popup?= In-Reply-To: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> References: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> Message-ID: <085.07852678b93629946142bb4b100208dc@vtiger.fosslabs.com> #373: no css/smartification for user popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Popup ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: jerrydgeorge => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:33:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:33:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23384=3A_?= =?utf-8?q?Email_not_send_to_selected_Contact?= In-Reply-To: <076.d5ca1911c6e37f4b21552d5e2508e0ff@vtiger.fosslabs.com> References: <076.d5ca1911c6e37f4b21552d5e2508e0ff@vtiger.fosslabs.com> Message-ID: <085.c71798ff6962bb64a68bc51a321a4c04@vtiger.fosslabs.com> #384: Email not send to selected Contact --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: mickie Type: defect | Status: assigned Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:34:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:34:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23386=3A_?= =?utf-8?q?contact_name_is_not_displayed_in_emails_detailview?= In-Reply-To: <076.0ab47da7faec98ebf101f5025443bdb2@vtiger.fosslabs.com> References: <076.0ab47da7faec98ebf101f5025443bdb2@vtiger.fosslabs.com> Message-ID: <085.5b35afeb1e2ba271032fe91f1a6b33da@vtiger.fosslabs.com> #386: contact name is not displayed in emails detailview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:34:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:34:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23387=3A_?= =?utf-8?q?eamil_template_selection_issue?= In-Reply-To: <076.d26218bd6499657af0736ab373779b21@vtiger.fosslabs.com> References: <076.d26218bd6499657af0736ab373779b21@vtiger.fosslabs.com> Message-ID: <085.15a53936ed2cc100402449342c7fe469@vtiger.fosslabs.com> #387: eamil template selection issue --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:35:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:35:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23390=3A_?= =?utf-8?q?bulk_mail_is_not_working?= In-Reply-To: <076.640f2fa60008715207f0ce4950299833@vtiger.fosslabs.com> References: <076.640f2fa60008715207f0ce4950299833@vtiger.fosslabs.com> Message-ID: <085.a420ae581b1f0f74d49741187feced41@vtiger.fosslabs.com> #390: bulk mail is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:37:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:37:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23396=3A_?= =?utf-8?q?Unable_to_sort_accounts_in_Contacts_List_View?= In-Reply-To: <076.458c7d1acc4332636d7a3ab839407613@vtiger.fosslabs.com> References: <076.458c7d1acc4332636d7a3ab839407613@vtiger.fosslabs.com> Message-ID: <085.9fabcc93edfd4142bebce67a436528ac@vtiger.fosslabs.com> #396: Unable to sort accounts in Contacts List View ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:37:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:37:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23406=3A_?= =?utf-8?q?Campaigns_module_missing?= In-Reply-To: <076.69533f198515fd391ea1fa6897389004@vtiger.fosslabs.com> References: <076.69533f198515fd391ea1fa6897389004@vtiger.fosslabs.com> Message-ID: <085.ec40e0fcabcc98eca537cc4dd7e8e5d7@vtiger.fosslabs.com> #406: Campaigns module missing ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Setting Assign Module Owners ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:39:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:39:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23412=3A_?= =?utf-8?q?can_not_search_email_from_email_listview?= In-Reply-To: <076.49644acad9635b623215f2ca3c0e299b@vtiger.fosslabs.com> References: <076.49644acad9635b623215f2ca3c0e299b@vtiger.fosslabs.com> Message-ID: <085.2e663f8cd4783c8fc659a2f36064e5f3@vtiger.fosslabs.com> #412: can not search email from email listview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:39:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:39:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23413=3A_?= =?utf-8?q?notes_can_not_shorted_by_Contact_name=2CRelated_to_and_File?= In-Reply-To: <076.b0a80bc08839a88be787f3bb4694d7e2@vtiger.fosslabs.com> References: <076.b0a80bc08839a88be787f3bb4694d7e2@vtiger.fosslabs.com> Message-ID: <085.41aed395c106557346324ccb4d6b681a@vtiger.fosslabs.com> #413: notes can not shorted by Contact name,Related to and File --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:39:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:39:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23408=3A_?= =?utf-8?q?Export_Emails_link_is_not_given_in_emails_listview?= In-Reply-To: <076.2ed7e14b8b9460c61f69e99dd212d1c7@vtiger.fosslabs.com> References: <076.2ed7e14b8b9460c61f69e99dd212d1c7@vtiger.fosslabs.com> Message-ID: <085.7305b64c159091e80704eb1ea4685ec4@vtiger.fosslabs.com> #408: Export Emails link is not given in emails listview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:40:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:40:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23420=3A_?= =?utf-8?q?unwanted_cancel_button?= In-Reply-To: <076.3f56b68cc035d15ef64600a2ec193115@vtiger.fosslabs.com> References: <076.3f56b68cc035d15ef64600a2ec193115@vtiger.fosslabs.com> Message-ID: <085.319a78a6feb03fc86aee7a0335883ea7@vtiger.fosslabs.com> #420: unwanted cancel button ------------------------+--------------------------------------------------- Reporter: richie | Owner: don Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profile ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 18:07:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 01:07:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23752=3A_?= =?utf-8?q?Add_postgresql_support_to_trunk?= In-Reply-To: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> References: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> Message-ID: <085.09f240ff6a2c70dc48168b6a0f15ddde@vtiger.fosslabs.com> #752: Add postgresql support to trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: adodb postgresql database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5806]) refs #752. Create a branch of vtigercrm/trunk named vtigercrm/branches/5.0_postgresql_integration. Development on this branch should be merged back to vtigercrm/trunk as soon as complete, to be included in vtigercrm/tags/vtigercrm-5.0.0beta series of releases -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 18:07:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 01:07:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5806 - /vtigercrm/branches/5.0_postgresql_integration/ Message-ID: <20060510010711.0BBAF718198@vtiger.fosslabs.com> Author: allanbush Date: Tue May 9 19:07:05 2006 New Revision: 5806 Log: refs #752. Create a branch of vtigercrm/trunk named vtigercrm/branches/5.0_postgresql_integration. Development on this branch should be merged back to vtigercrm/trunk as soon as complete, to be included in vtigercrm/tags/vtigercrm-5.0.0beta series of releases Added: vtigercrm/branches/5.0_postgresql_integration/ - copied from r5805, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 18:18:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 01:18:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5807 - in /vtigercrm/branches/5.0_postgresql_integration: data/ include/ include/utils/ install/ modules/Reports/ modules/Users/ schema/ Message-ID: <20060510011843.D81D7717B97@vtiger.fosslabs.com> Author: allanbush Date: Tue May 9 19:18:27 2006 New Revision: 5807 Log: Ref #752. Table creation and nearly all the demo data population is working (one issue with the creation of helpdesk tickets still). Modified: vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php vtigercrm/branches/5.0_postgresql_integration/include/PopulateComboValues.php vtigercrm/branches/5.0_postgresql_integration/include/utils/CommonUtils.php vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php vtigercrm/branches/5.0_postgresql_integration/install/5createTables.inc.php vtigercrm/branches/5.0_postgresql_integration/install/populateSeedData.php vtigercrm/branches/5.0_postgresql_integration/modules/Reports/PopulateReports.php vtigercrm/branches/5.0_postgresql_integration/modules/Users/LoginHistory.php vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml Modified: vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php Tue May 9 19:18:27 2006 @@ -89,6 +89,9 @@ if($_REQUEST['module'] != 'Emails') { + if(!$parentid) { + $parentid = $adb->getUniqueID('seactivityrel'); + } $mysql='insert into seactivityrel values('.$parentid.','.$actid.')'; $adb->query($mysql); } @@ -382,7 +385,7 @@ else { $description_val = from_html($adb->formatString("crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false); - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",'".$date_var."','".$date_var."')"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",".$adb->formatDate($date_var).",".$adb->formatDate($date_var).")"; $adb->query($sql); $this->id = $current_id; } Modified: vtigercrm/branches/5.0_postgresql_integration/include/PopulateComboValues.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/include/PopulateComboValues.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/include/PopulateComboValues.php Tue May 9 19:18:27 2006 @@ -26,13 +26,14 @@ $i=0; foreach ($values as $val => $cal) { + $id = $adb->getUniqueID($tableName); if($val != '') { - $adb->query("insert into ".$tableName. " values(null,'".$val."',".$i.",1)"); + $adb->query("insert into ".$tableName. " values(".$id.",'".$val."',".$i.",1)"); } else { - $adb->query("insert into ".$tableName. " values(null,'--None--',".$i.",1)"); + $adb->query("insert into ".$tableName. " values(".$id.",'--None--',".$i.",1)"); } $i++; } Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/include/utils/CommonUtils.php Tue May 9 19:18:27 2006 @@ -1681,7 +1681,7 @@ 'Contacts'=>'LNK_NEW_CONTACT', 'Vendors'=>'LNK_NEW_VENDOR'); -$qc_query = "select distinct tablabel,tab.name from field inner join tab on tab.tabid = field.tabid where quickcreate=0 order by tab.tablabel"; +$qc_query = "select distinct tab.tablabel,tab.name from field inner join tab on tab.tabid = field.tabid where quickcreate=0 order by tab.tablabel"; $result = $adb->query($qc_query); $noofrows = $adb->num_rows($result); $qcmodule_array = Array(); Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php Tue May 9 19:18:27 2006 @@ -1198,7 +1198,11 @@ list($y,$m,$d) = split('-',$value); } - $insert_date=$y.'-'.$m.'-'.$d; + if(!$y && !$m && !$d) { + $insert_date = ''; + } else { + $insert_date=$y.'-'.$m.'-'.$d; + } $log->debug("Exiting getDBInsertDateValue method ..."); return $insert_date; } Modified: vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php Tue May 9 19:18:27 2006 @@ -138,6 +138,15 @@ !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']; + } + + // determine database options + $db_options = array(); + if(function_exists('mysql_connect')) { + $db_options['mysql'] = 'MySQL'; + } + if(function_exists('pg_connect')) { + $db_options['pgsql'] = 'Postgres'; } ?> @@ -293,9 +302,19 @@
Database Configuration
Database Type * + + + No Database Support Deteched + + + + + +
- - - - REFERENCES salesorder(salesorderid) ON DELETE CASCADE - - - REFERENCES groups(groupname) ON DELETE CASCADE - - - - groupname - - Type=InnoDB -
- - - - - REFERENCES invoice(invoiceid) ON DELETE CASCADE - - - REFERENCES groups(groupname) ON DELETE CASCADE - - - - groupname - invoiceid - - Type=InnoDB -
- - - - - REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE - - - REFERENCES groups(groupname) ON DELETE CASCADE - - - - groupname - purchaseorderid - - Type=InnoDB -
- @@ -2738,6 +2690,115 @@
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + purpose + + + Type=InnoDB +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
+ + + + + + + + + + + + Type=InnoDB +
+ @@ -2752,115 +2813,6 @@ profileidglobalactionid - Type=InnoDB -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - purpose - - - Type=InnoDB -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
- - - - - - - - - - - Type=InnoDB
@@ -2940,9 +2892,7 @@ - - - + Type=InnoDB
@@ -3067,6 +3017,21 @@ Type=InnoDB
+ + + + REFERENCES salesorder(salesorderid) ON DELETE CASCADE + + + REFERENCES groups(groupname) ON DELETE CASCADE + + + + groupname + + Type=InnoDB +
+ @@ -3471,6 +3436,22 @@ contactid + + Type=InnoDB +
+ + + + + REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE + + + REFERENCES groups(groupname) ON DELETE CASCADE + + + + groupname + purchaseorderidType=InnoDB
@@ -3574,6 +3555,22 @@ Type=InnoDB
+ + + + REFERENCES invoice(invoiceid) ON DELETE CASCADE + + + REFERENCES groups(groupname) ON DELETE CASCADE + + + + groupname + invoiceid + + Type=InnoDB +
+ From vtiger-tickets at vtiger.fosslabs.com Tue May 9 18:55:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 01:55:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23752=3A_?= =?utf-8?q?Add_postgresql_support_to_trunk?= In-Reply-To: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> References: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> Message-ID: <085.57ba3ed610249b6dd4f0c93a6c79a908@vtiger.fosslabs.com> #752: Add postgresql support to trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: adodb postgresql database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5808]) Home tab loads without query errors after a freash install. Refs #752. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 18:55:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 01:55:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5808 - in /vtigercrm/branches/5.0_postgresql_integration/modules: Accounts/ListViewTop.php Activities/OpenListView.php CustomView/CustomView.php Message-ID: <20060510015522.DABF471879A@vtiger.fosslabs.com> Author: allanbush Date: Tue May 9 19:55:12 2006 New Revision: 5808 Log: Home tab loads without query errors after a freash install. Refs #752. Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php vtigercrm/branches/5.0_postgresql_integration/modules/Activities/OpenListView.php vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php Tue May 9 19:55:12 2006 @@ -33,7 +33,7 @@ global $current_user; $current_module_strings = return_module_language($current_language, "Accounts"); - $list_query = 'select account.accountid, account.accountname, account.tickersymbol, sum(potential.amount) as amount from potential inner join crmentity on (potential.potentialid=crmentity.crmid) inner join account on (potential.accountid=account.accountid) where crmentity.deleted=0 AND crmentity.smownerid="'.$current_user->id.'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_WON'].'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_LOST'].'" group by account.accountname order by 3 desc;'; + $list_query = "select account.accountid, account.accountname, account.tickersymbol, sum(potential.amount) as amount from potential inner join crmentity on (potential.potentialid=crmentity.crmid) inner join account on (potential.accountid=account.accountid) where crmentity.deleted=0 AND crmentity.smownerid='".$current_user->id."' and potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' and potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' group by account.accountid, account.accountname, account.tickersymbol order by amount desc;"; $list_result=$adb->query($list_query); $open_accounts_list = array(); $noofrows = min($adb->num_rows($list_result),7); Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Activities/OpenListView.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/Activities/OpenListView.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/Activities/OpenListView.php Tue May 9 19:55:12 2006 @@ -77,11 +77,11 @@ if($activity_view != 'OverDue') { - $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.status is NULL || activity.status != 'Deferred') and ( activity.eventstatus is NULL || activity.eventstatus != 'Held') and (activity.eventstatus is NULL || activity.eventstatus != 'Not Held' ) AND (((date_start >= '$today' AND date_start < '$later') OR (date_start < '$today')) OR (recurringevents.recurringdate between '$today' and '$later') ) AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; + $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (((date_start >= '$today' AND date_start < '$later') OR (date_start < '$today')) OR (recurringevents.recurringdate between '$today' and '$later') ) AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; } else { - $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.status is NULL || activity.status != 'Deferred') and ( activity.eventstatus is NULL || activity.eventstatus != 'Held') and (activity.eventstatus is NULL || activity.eventstatus != 'Not Held' ) AND (due_date < '$today') OR (recurringevents.recurringdate < '$today') AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; + $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (due_date < '$today') OR (recurringevents.recurringdate < '$today') AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; } $list_result = $adb->limitQuery($list_query,0,5); $open_activity_list = array(); Modified: vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php Tue May 9 19:55:12 2006 @@ -1203,7 +1203,7 @@ { $listviewquery = substr($listquery, strpos($listquery,'from'),strlen($listquery)); - $query = "select count(*) count ".$listviewquery; + $query = "select count(*) AS count ".$listviewquery; $stdfiltersql = $this->getCVStdFilterSQL($viewid); $advfiltersql = $this->getCVAdvFilterSQL($viewid); From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 20:52:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 03:52:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5809 - /vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Message-ID: <20060510035259.6579E717BF2@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 21:52:46 2006 New Revision: 5809 Log: changes made to fix the issue id:328 Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Tue May 9 21:52:46 2006 @@ -38,7 +38,7 @@ - + @@ -76,7 +76,7 @@ - + From vtiger-tickets at vtiger.fosslabs.com Tue May 9 20:54:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 03:54:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23328=3A_?= =?utf-8?q?Duplicate_of_Leads_not_working?= In-Reply-To: <076.0d6a38a1ab29e288c9243566e326d0a4@vtiger.fosslabs.com> References: <076.0d6a38a1ab29e288c9243566e326d0a4@vtiger.fosslabs.com> Message-ID: <085.970084dd62dda335772f469cb4c34be6@vtiger.fosslabs.com> #328: Duplicate of Leads not working ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: This has been fixed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 00:33:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 07:33:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23758=3A_?= =?utf-8?q?Announcements_bug?= Message-ID: <076.d9e5d4115ac45944ff8a461e3f93316d@vtiger.fosslabs.com> #758: Announcements bug -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- When a user post an announcement it can be seen at the top of the page. When you delete the user the announcement made by this user remains at the top of the page for ever and there is no way to remove it. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 00:41:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 07:41:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5810 - /vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Message-ID: <20060510074100.E1D3C71AB6C@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 01:40:48 2006 New Revision: 5810 Log: i18n done for createprofile template file - ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Wed May 10 01:40:48 2006 @@ -39,8 +39,9 @@
- Basic details of Profile
- Step 1 Of 3 + {$CMOD.LBL_BASIC_PROFILE_DETAILS}
+ {$CMOD.LBL_STEP_1_3} +
@@ -48,7 +49,7 @@
 
- * {$CMOD.LBL_NEW_PROFILE_NAME} :
 
-    -    - +    +    +
- Select Base Profile
- Step 2 Of 3 + {$CMOD.LBL_SELECT_BASE_PROFILE}
+ {$CMOD.LBL_STEP_2_3}
@@ -56,11 +56,11 @@ {/if}
I would like to setup a base profile and edit privileges (Recommened){$CMOD.LBL_BASE_PROFILE_MESG}
 Base Profile: + {$CMOD.LBL_BASE_PROFILE}
 
( OR )
( {$CMOD.LBL_OR} )
 
@@ -83,14 +83,14 @@ {/if} I will choose the privileges from scratch (Advanced Users){$CMOD.LBL_BASE_PROFILE_MESG_ADV}
 
-    -    - +    +    +
From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 00:43:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 07:43:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5812 - /vtigercrm/trunk/Smarty/templates/EditProfile.tpl Message-ID: <20060510074351.E7C5C71AB56@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 01:43:42 2006 New Revision: 5812 Log: i18n done for editprofile template file - ahmed Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Wed May 10 01:43:42 2006 @@ -34,8 +34,8 @@
- Profile Privileges
- Step 3 Of 3 + {$CMOD.LBL_PROFILE_PRIVILEGES}
+ {$CMOD.LBL_STEP_3_3}
- Profile Privileges
+ {$CMOD.LBL_PROFILE_PRIVILEGES}
{$PROFILE_NAME}
- - - - - + + + + +
Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities{$CMOD.LBL_GLOBAL_PRIVILEGES}{$CMOD.LBL_TAB_PRIVILEGES}{$CMOD.LBL_STANDARD_PRIVILEGES}{$CMOD.LBL_FIELD_PRIVILEGES}{$CMOD.LBL_UTILITIES}
@@ -99,8 +99,8 @@ - +
Global Privileges for "{$PROFILE_NAME}"
- Select the options below to change global privileges
{$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
+ {$CMOD.LBL_GLOBAL_MESG_OPTION}
@@ -124,22 +124,22 @@ - + - + - + - +
{$GLOBAL_PRIV.0}View all {$CMOD.LBL_VIEW_ALL}
Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}
 
{$GLOBAL_PRIV.1}Edit all {$CMOD.LBL_EDIT_ALL}
Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}
@@ -165,8 +165,8 @@ - Standard Privileges for "{$PROFILE_NAME}"
-Select the standard actions to be permitted + {$CMOD.LBL_STANDARD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
+{$CMOD.LBL_STD_MESG_OPTION} @@ -192,10 +192,10 @@ - - - - + + + + {foreach item=value from=$STANDARD_PRIV} @@ -232,8 +232,8 @@
EntityCreate/EditDeleteView{$CMOD.LBL_ENTITY}{$CMOD.LBL_CREATE_EDIT}{$CMOD.LBL_DELETE}{$CMOD.LBL_VIEW}
- Tab Privileges for "{$PROFILE_NAME}"
-Select the tabs/modules to be permitted + {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
+{$CMOD.LBL_TAB_MESG_OPTION}
@@ -295,8 +295,8 @@ - Utility Privileges for "{$PROFILE_NAME}"
-Select the utility actions to be permitted + {$CMOD.LBL_UTILITY_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
+{$CMOD.LBL_UTILITY_MESG_OPTION} @@ -361,8 +361,8 @@ - Field Privileges for "{$PROFILE_NAME}"
-Select the fields to be permitted + {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
+{$CMOD.LBL_FIELD_MESG_OPTION} @@ -439,14 +439,14 @@ {if $MODE neq "edit"} -    +    {/if} {if $ACTION eq 'SaveProfile'} -    +    {else} -    +    {/if} - + From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 00:45:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 07:45:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5813 - /vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Message-ID: <20060510074553.F284E71AB56@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 01:45:43 2006 New Revision: 5813 Log: i18n done for ProfileDetailView template file - ahmed Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Wed May 10 01:45:43 2006 @@ -32,7 +32,7 @@ - Detail View of Profile
+ {$CMOD.LBL_PROFILE_DETAIL_VIEW}
{$PROFILE_NAME} @@ -59,11 +59,11 @@ - - - - - + + + + +
Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities{$CMOD.LBL_GLOBAL_PRIVILEGES}{$CMOD.LBL_TAB_PRIVILEGES}{$CMOD.LBL_STANDARD_PRIVILEGES}{$CMOD.LBL_FIELD_PRIVILEGES}{$CMOD.LBL_UTILITIES}
@@ -78,8 +78,8 @@ - Global Privileges for "{$PROFILE_NAME}"
- Select the options below to change global privileges + {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
+ {$CMOD.LBL_GLOBAL_MESG_OPTION} @@ -103,22 +103,22 @@ - + - + - + - +
{$GLOBAL_PRIV.0}View all {$CMOD.LBL_VIEW_ALL}
Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}
 
{$GLOBAL_PRIV.1}Edit all {$CMOD.LBL_EDIT_ALL}
Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}
@@ -144,8 +144,8 @@ - Standard Action Privileges for "{$PROFILE_NAME}"
- Select the standard actions to be permitted + {$CMOD.LBL_STANDARD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
+ {$CMOD.LBL_STD_MESG_OPTION} @@ -171,10 +171,10 @@ - - - - + + + + {foreach item=value from=$STANDARD_PRIV} @@ -211,8 +211,8 @@
EntityCreate/EditDeleteView{$CMOD.LBL_ENTITY}{$CMOD.LBL_CREATE_EDIT}{$CMOD.LBL_DELETE}{$CMOD.LBL_VIEW}
- Tab Privileges for "{$PROFILE_NAME}"
- Select the tabs/modules to be permitted + {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
+ {$CMOD.LBL_TAB_MESG_OPTION}
@@ -275,8 +275,8 @@ - Utility Action Privileges for "{$PROFILE_NAME}"
- Select the utility actions to be permitted + {$CMOD.LBL_UTILITY_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
+ {$CMOD.LBL_UTILITY_MESG_OPTION} @@ -341,8 +341,8 @@ - Field Privileges for "{$PROFILE_NAME}"
- Select the fields to be permitted + {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
+ {$CMOD.LBL_FIELD_MESG_OPTION} @@ -419,8 +419,8 @@   -    - +    + From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 00:51:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 07:51:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5814 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060510075118.D0B6771ABBE@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 01:51:05 2006 New Revision: 5814 Log: language file for users module updated - ahmed Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Wed May 10 01:51:05 2006 @@ -130,7 +130,7 @@ 'LBL_ENTITY'=>'Entity', 'LBL_CREATE_EDIT'=>'Create/Edit', 'LBL_DELETE'=>'Delete', -'LBL_ALLOW'=>'Allow', +'LBL_VIEW'=>'View', 'LBL_LEADS'=>'Leads', 'LBL_ACCOUNTS'=>'Accounts', 'LBL_CONTACTS'=>'Contacts', @@ -226,6 +226,36 @@ 'LBL_NEW_PROFILE'=>'New Profile', 'LBL_NEW_PROFILE_NAME'=>'Profile Name', 'LBL_PARENT_PROFILE'=>'Parent Profile', +'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile', +'LBL_STEP_1_3'=>'Step 1 of 3', +'LBL_STEP_2_3'=>'Step 2 of 3', +'LBL_STEP_3_3'=>'Step 3 of 3', +'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile', +'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges', +'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges', +'LBL_TAB_PRIVILEGES'=>'Tab Privileges', +'LBL_FIELD_PRIVILEGES'=>'Field Privileges', +'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges', +'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges', +'LBL_UTILITIES'=>'Utilities', +'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges (Recommended)', +'LBL_BASE_PROFILE'=>'Base Profile:', +'LBL_OR'=>'OR', +'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch (Advanced Users)', +'LBL_FOR'=>'for', +'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges', +'LBL_VIEW_ALL'=>'View all', +'LBL_EDIT_ALL'=>'Edit all', +'LBL_ALLOW'=>'Allows', +'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM', +'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM', +'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted', +'LBL_TAB_MESG_OPTION'=>'Select the tabs/modules to be permitted', +'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted', +'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted', +'LBL_FINISH_BUTTON'=>'Finish', +'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile', + //Added fields in createrole.php 'LBL_HDR_ROLE_NAME'=>'Create New Role:', From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 02:22:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 09:22:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5815 - /vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Message-ID: <20060510092238.9591071AE04@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 03:22:34 2006 New Revision: 5815 Log: * Removed the hidden value for contact_id because the same potential id has been assigned to the hidden values for potential and contact ids. Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Wed May 10 03:22:34 2006 @@ -40,7 +40,6 @@ {$HIDDEN_PARENTS_LIST} {elseif $MODULE eq 'Potentials'} - {elseif $MODULE eq 'Quotes'} {elseif $MODULE eq 'SalesOrder'} From vtiger-tickets at vtiger.fosslabs.com Wed May 10 02:23:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:23:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23541=3A_?= =?utf-8?q?quotes_not_adding_to_potentials_related_lists?= In-Reply-To: <076.1b48c23ce877ca31ac00797fc0803bc5@vtiger.fosslabs.com> References: <076.1b48c23ce877ca31ac00797fc0803bc5@vtiger.fosslabs.com> Message-ID: <085.2bfc89f058837991981fa338330a51d4@vtiger.fosslabs.com> #541: quotes not adding to potentials related lists ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Related Lists ---------------------------+------------------------------------------------ Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue has been fixed and checkedin in svn -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 02:26:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:26:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23309=3A_?= =?utf-8?q?Quotes_by_Accounts_on_drill_down_shows_List_View?= In-Reply-To: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> References: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> Message-ID: <085.c0e9b02803cd0167b778043ce8e5b478@vtiger.fosslabs.com> #309: Quotes by Accounts on drill down shows List View ------------------------+--------------------------------------------------- Reporter: richie | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ------------------------+--------------------------------------------------- Changes (by mickie): * owner: mickie => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 02:27:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:27:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23311=3A_?= =?utf-8?q?SalesOrder_by_Accounts_on_drilldown_shows_list_view?= In-Reply-To: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com> References: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com> Message-ID: <085.d14685bb3564ee508aa389558035da2f@vtiger.fosslabs.com> #311: SalesOrder by Accounts on drilldown shows list view ------------------------+--------------------------------------------------- Reporter: richie | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dashboard ------------------------+--------------------------------------------------- Changes (by mickie): * owner: mickie => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 02:36:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:36:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23309=3A_?= =?utf-8?q?Quotes_by_Accounts_on_drill_down_shows_List_View?= In-Reply-To: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> References: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> Message-ID: <085.3f9940865553c42c8823cfc482815d29@vtiger.fosslabs.com> #309: Quotes by Accounts on drill down shows List View ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ------------------------+--------------------------------------------------- Changes (by don): * owner: philip => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 02:36:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:36:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23309=3A_?= =?utf-8?q?Quotes_by_Accounts_on_drill_down_shows_List_View?= In-Reply-To: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> References: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> Message-ID: <085.3d9adca1a43c9543e25524ca6c40460c@vtiger.fosslabs.com> #309: Quotes by Accounts on drill down shows List View ------------------------+--------------------------------------------------- Reporter: richie | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ------------------------+--------------------------------------------------- Changes (by don): * owner: jerrydgeorge => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 02:50:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:50:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2398=3A_C?= =?utf-8?q?annot_add_a_new_product?= In-Reply-To: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> References: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> Message-ID: <085.8421efe495ef27a186468e631fc77af3@vtiger.fosslabs.com> #98: Cannot add a new product --------------------------------+------------------------------------------- Reporter: Robgsem at yahoo.com | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: worksforme | Keywords: --------------------------------+------------------------------------------- Changes (by mickie): * resolution: => worksforme * status: new => closed Comment: This issue could not be reproduced now (in may 03rd files from svn) -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 04:16:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:16:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5816 - in /vtigercrm/trunk/Smarty/templates: CreateEmailTemplate.tpl DetailViewEmailTemplate.tpl ListEmailTemplates.tpl Message-ID: <20060510111634.34015718E8F@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 05:16:27 2006 New Revision: 5816 Log: i18n done for Email Template - ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Wed May 10 05:16:27 2006 @@ -121,10 +121,10 @@
{if $EMODE eq 'edit'} {$MOD.LBL_SETTINGS} - > Communication Templates > Editing Email Templates > {$TEMPLATENAME} + > {$MOD.LBL_COMMUNICATION_TEMPLATES} > {$MOD.LBL_EDIT} {$MOD.EMAILTEMPLATES} > {$TEMPLATENAME} {else} {$MOD.LBL_SETTINGS} - > Communication Templates > Creating Email Templates > New + > {$MOD.LBL_COMMUNICATION_TEMPLATES} > {$MOD.LBL_CREATE_EMAIL_TEMPLATES} > {$MOD.NEW} {/if}
@@ -145,9 +145,9 @@ *{$UMOD.LBL_TEMPLATE_NAME}

- Description:
+ {$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_COLON}


- *Folder: + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_FOLDER}{$UMOD.LBL_COLON} @@ -162,9 +162,9 @@ {if $FOLDERNAME == 'Public'} - + {else} - + {/if} {/foreach} @@ -197,12 +197,12 @@ - + - + @@ -250,11 +250,11 @@ Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Wed May 10 05:16:27 2006 @@ -42,9 +42,9 @@ - +
{$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}
Available Merge Fields
{$UMOD.LBL_AVAILABLE_MERGE_FIELDS}
 
{$UMOD.LBL_SELECT_FIELD_TYPE}
 
{$UMOD.LBL_SELECT_FIELD}
 
{$UMOD.LBL_MERGE_FIELD_VALUE}
-    +    {if $EMODE eq 'edit'} - + {else} - + {/if}  
{$TEMPLATENAME}
- {$TEMPLATENAME} Template + {$TEMPLATENAME} {$UMOD.LBL_TEMPLATE_HEADER}
Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Wed May 10 05:16:27 2006 @@ -89,11 +89,11 @@   - +   -
+
{* *} @@ -117,7 +117,7 @@ {/if}  {$template.templatename} {$template.description} - View Sample Email + {$UMOD.LNK_SAMPLE_EMAIL} {/foreach} @@ -133,7 +133,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 04:17:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:17:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5817 - in /vtigercrm/trunk/Smarty/templates: CreateWordTemplate.tpl ListWordTemplates.tpl Message-ID: <20060510111751.C21377188A9@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 05:17:46 2006 New Revision: 5817 Log: i18n done for mail merge Template - ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Wed May 10 05:17:46 2006 @@ -62,7 +62,7 @@ {$UMOD.LBL_SELECT_MODULE}
- Select a module to assign this Template + {$UMOD.LBL_MERGE_MSG} @@ -83,7 +83,7 @@ - {$UMOD.LBL_MERGE_FILE} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_MERGE_FILE}
(Eg - .doc, .rtf files) Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Wed May 10 05:17:46 2006 @@ -90,11 +90,11 @@   - +   -
+
{* *} From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 04:20:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:20:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5818 - in /vtigercrm/trunk/Smarty/templates: SettingsMenu.tpl UserDetailView.tpl UserEditView.tpl UserListView.tpl Message-ID: <20060510112030.3E396718E8F@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 05:20:23 2006 New Revision: 5818 Log: i18n done for Users - ahmed Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/Smarty/templates/UserDetailView.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Wed May 10 05:20:23 2006 @@ -83,4 +83,4 @@
-Expand/Close Menu +{$MOD.LBL_EXPAND_CLOSE_MENU} Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Wed May 10 05:20:23 2006 @@ -46,14 +46,14 @@ {$MOD.LBL_SETTINGS} - > {$MOD.LBL_USER_MANAGEMENT} + > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}
{$USER_NAME}
- Detail View of {$FIRST_NAME} {$LAST_NAME} + {$UMOD.LBL_DETAIL_VIEW} {$FIRST_NAME} {$LAST_NAME} @@ -100,34 +100,34 @@ {$UMOD.LBL_USER_INFORMATION} - *{$UMOD.LBL_USER_NAME} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_USER_NAME} {$USER_NAME}  {$UMOD.LBL_ADMIN} {if $MODE eq 'edit'} - *{$UMOD.LBL_PASSWORD} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_PASSWORD} - *{$UMOD.LBL_CONFIRM_PASSWORD} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_CONFIRM_PASSWORD} {/if} {$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}  - *{$UMOD.LBL_LAST_NAME} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_LAST_NAME} {$LAST_NAME}  - *{$UMOD.LBL_USER_ROLE} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_USER_ROLE} {$ROLEASSIGNED}  {$UMOD.LBL_GROUP_NAME} {$GROUPASSIGNED}  - *{$UMOD.LBL_EMAIL} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_EMAIL} {$EMAIL1}  - *{$UMOD.LBL_STATUS} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_STATUS} {$STATUS}  @@ -139,7 +139,7 @@ {$LEAD_VIEW}  - *{$UMOD.LBL_COLOR} + {$UMOD.LBL_COLOR} {$COLORASSIGNED}  {$UMOD.LBL_CURRENCY_NAME} {$CURRENCY_NAME}  Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Wed May 10 05:20:23 2006 @@ -35,15 +35,22 @@ {$MOD.LBL_SETTINGS} - > {$MOD.LBL_USER_MANAGEMENT} > User + > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}
- {$USER_NAME}
- Edit View of {$FIRST_NAME} {$LAST_NAME} + {if $MODE eq 'edit'} + {$USER_NAME}
+ {$UMOD.LBL_EDIT_VIEW} {$FIRST_NAME} {$LAST_NAME} + {else} + {$UMOD.LBL_NEW_USER_BUTTON_LABEL}
+ {$UMOD.LBL_CREATE_NEW_USER} + + {/if} + @@ -91,39 +98,43 @@ + {if $MODE eq 'edit'} + + {else} + {/if} - + {if $MODE neq 'edit'} - + - + {/if} - + - + - + - + {$USER_STATUS_OPTIONS} @@ -135,7 +146,7 @@ - + @@ -151,7 +162,11 @@ - -
{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}{$UMOD.LBL_NEW_FORM_TITLE}
*{$UMOD.LBL_USER_NAME} {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_USER_NAME} {$UMOD.LBL_ADMIN}
*{$UMOD.LBL_PASSWORD} {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD} {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_CONFIRM_PASSWORD}
{$UMOD.LBL_FIRST_NAME} *{$UMOD.LBL_LAST_NAME}{$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_LAST_NAME}
*{$UMOD.LBL_USER_ROLE}{$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_USER_ROLE} {$USER_ROLE}*{$UMOD.LBL_EMAIL}{$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_EMAIL}
*{$UMOD.LBL_STATUS}{$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_STATUS} 
{$LEAD_VIEW}
*{$UMOD.LBL_COLOR}{$UMOD.LBL_COLOR}   {$CAL_COLOR} {$UMOD.LBL_CURRENCY_NAME} {$CURRENCY_NAME}
- + {if $MODE eq 'edit'} + + {else} + + {/if} @@ -218,7 +233,11 @@ @@ -36,7 +36,7 @@ @@ -55,7 +55,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 04:39:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:39:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5819 - /vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Message-ID: <20060510113909.2F9C57185C9@vtiger.fosslabs.com> Author: richie Date: Wed May 10 05:39:02 2006 New Revision: 5819 Log: Control-M characters removed Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Wed May 10 05:39:02 2006 @@ -1,140 +1,140 @@ -{**} - - -
{$UMOD.LBL_NEW_FORM_TITLE}{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}{$UMOD.LBL_NEW_FORM_TITLE}
{$UMOD.LBL_TITLE}
- + {if $MODE eq 'edit'} + + {else} + + {/if} @@ -262,8 +281,8 @@
{$UMOD.LBL_NEW_FORM_TITLE}{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}{$UMOD.LBL_NEW_FORM_TITLE}
{$UMOD.LBL_ADDRESS}
 
- - + +
Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Wed May 10 05:20:23 2006 @@ -26,7 +26,7 @@
{$MOD.LBL_SETTINGS} - > {$MOD.LBL_USER_MANAGEMENT} > Users + > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}
 {$MOD.LBL_USER_MANAGEMENT} - +
 
{$CMOD.LBL_TOTAL} {$USER_COUNT.user} {$CMOD.LBL_USERS}
{$CMOD.LBL_ADMIN} :
{$CMOD.LBL_ADMIN} {$CMOD.LBL_COLON} {$USER_COUNT.admin} {$CMOD.LBL_USERS}
{$CMOD.LBL_OTHERS}
- - {include file='SettingsMenu.tpl'} - - -
- - - - - - - - -

-{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} -
-
- -
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$ORGANIZATIONNAME}

-
{$MOD.LBL_ORGANIZATION_NAME} : {$ORGANIZATIONNAME}
{$MOD.LBL_ORGANIZATION_ADDRESS} : {$ORGANIZATIONADDRESS}
{$MOD.LBL_ORGANIZATION_CITY} : {$ORGANIZATIONCITY}
{$MOD.LBL_ORGANIZATION_STATE} : {$ORGANIZATIONSTATE}
{$MOD.LBL_ORGANIZATION_CODE} : {$ORGANIZATIONCODE}
{$MOD.LBL_ORGANIZATION_COUNTRY} : {$ORGANIZATIONCOUNTRY}

- - - - - - - - - - - - - - - -
{$MOD.LBL_ORGANIZATION_PHONE} : {$ORGANIZATIONPHONE}{$MOD.LBL_ORGANIZATION_WEBSITE} : {$ORGANIZATIONWEBSITE}
{$MOD.LBL_ORGANIZATION_FAX} : {$ORGANIZATIONFAX}{$MOD.LBL_ORGANIZATION_LOGO} : {$ORGANIZATIONLOGONAME}

- -    -
-
-
- -
 
-
-
- {include file='SettingsSubMenu.tpl'} -{literal} - -{/literal} +{**} + + + + + {include file='SettingsMenu.tpl'} + + +
+ + + + + + + + +

+{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 {$ORGANIZATIONNAME}

+
{$MOD.LBL_ORGANIZATION_NAME} : {$ORGANIZATIONNAME}
{$MOD.LBL_ORGANIZATION_ADDRESS} : {$ORGANIZATIONADDRESS}
{$MOD.LBL_ORGANIZATION_CITY} : {$ORGANIZATIONCITY}
{$MOD.LBL_ORGANIZATION_STATE} : {$ORGANIZATIONSTATE}
{$MOD.LBL_ORGANIZATION_CODE} : {$ORGANIZATIONCODE}
{$MOD.LBL_ORGANIZATION_COUNTRY} : {$ORGANIZATIONCOUNTRY}

+ + + + + + + + + + + + + + + +
{$MOD.LBL_ORGANIZATION_PHONE} : {$ORGANIZATIONPHONE}{$MOD.LBL_ORGANIZATION_WEBSITE} : {$ORGANIZATIONWEBSITE}
{$MOD.LBL_ORGANIZATION_FAX} : {$ORGANIZATIONFAX}{$MOD.LBL_ORGANIZATION_LOGO} : {$ORGANIZATIONLOGONAME}

+ +    +
+
+
+ +
 
+
+ + + + {include file='SettingsSubMenu.tpl'} +{literal} + +{/literal} From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 04:41:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:41:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5820 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060510114113.761FE718347@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 05:41:09 2006 New Revision: 5820 Log: i18n done for Users - ahmed Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Wed May 10 05:41:09 2006 @@ -36,7 +36,7 @@   {$MOD.LBL_PROFILES} - +   From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 04:48:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:48:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5821 - in /vtigercrm/trunk/Smarty/templates/Settings: ModuleOwnersContents.tpl PickList.tpl PickListContents.tpl Message-ID: <20060510114853.9680471AF94@vtiger.fosslabs.com> Author: richie Date: Wed May 10 05:48:47 2006 New Revision: 5821 Log: Hardcoded strings removed Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl Wed May 10 05:48:47 2006 @@ -32,8 +32,8 @@ # - Module - Owned By + {$MOD.LBL_MODULE} + {$MOD.LBL_OWNER} {if $MODULE_MODE neq 'edit'} {foreach name=modulelists item=modules from=$USER_LIST} Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Wed May 10 05:48:47 2006 @@ -118,13 +118,13 @@   - Select Module + {$MOD.LBL_SELECT_MODULE}   - Select the CRM module : + {$MOD.LBL_SELECT_CRM_MODULE} : {foreach key=report_in_fld_id item=report_in_fld_name from=$REPINFOLDER} {if $report_in_fld_id neq $REPORTID} @@ -70,8 +70,8 @@ - - + + Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Wed May 10 06:42:07 2006 @@ -63,7 +63,7 @@ - +
 
Select Column : Select Time : {$MOD.LBL_SELECT_COLUMN} : {$MOD.LBL_SELECT_TIME} :  {$MOD.LBL_SF_STARTDATE} :  {$MOD.LBL_SF_ENDDATE} : 
Modified: vtigercrm/trunk/Smarty/templates/Reports.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Reports.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Reports.tpl Wed May 10 06:42:07 2006 @@ -85,13 +85,13 @@
- Folder Name : + {$MOD.LBL_REP_FOLDER_NAME} : - Folder Description : + {$MOD.LBL_REP_FOLDER_DESC} :   Modified: vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl Wed May 10 06:42:07 2006 @@ -58,7 +58,7 @@
{foreachelse}
- Click Here to Add New Group + {$MOD.LBL_CLICK_HERE} {$MOD.LBL_TO_ADD_NEW_GROUP}
{/foreach} @@ -66,7 +66,7 @@ @@ -67,7 +67,7 @@ @@ -75,7 +75,7 @@
 {$keyval}
@@ -83,7 +83,7 @@
 {$keyval}
@@ -92,7 +92,7 @@ @@ -104,7 +104,7 @@ {else} {/if} -
or +
or Cancel
@@ -112,7 +112,7 @@ @@ -120,7 +120,7 @@ @@ -129,7 +129,7 @@ @@ -137,7 +137,7 @@ @@ -145,7 +145,7 @@ @@ -156,7 +156,7 @@ From vtiger-tickets at vtiger.fosslabs.com Mon May 29 02:40:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 09:40:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2399=3A_v?= =?utf-8?q?alidation_is_not_working_for_Notes_module?= In-Reply-To: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> References: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> Message-ID: <085.911caeeb016a586fa675fd1f03d9a87c@vtiger.fosslabs.com> #99: validation is not working for Notes module ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: ahmed Type: defect | Status: reopened Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: duplicate => * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 02:40:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 09:40:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2399=3A_v?= =?utf-8?q?alidation_is_not_working_for_Notes_module?= In-Reply-To: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> References: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> Message-ID: <085.aac340ae367db6203bfc5318f221fcca@vtiger.fosslabs.com> #99: validation is not working for Notes module ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: ahmed Type: defect | Status: reopened Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 02:49:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 09:49:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23916=3A_?= =?utf-8?q?Home_=3E_Emails_=3E_Compose_Button?= In-Reply-To: <076.8124c19b04836834bb5c81db02e35c7c@vtiger.fosslabs.com> References: <076.8124c19b04836834bb5c81db02e35c7c@vtiger.fosslabs.com> Message-ID: <085.4898cda3f5092a73257de1178c8be339@vtiger.fosslabs.com> #916: Home > Emails > Compose Button ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 02:59:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 09:59:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23787=3A_?= =?utf-8?q?Metrics?= In-Reply-To: <076.fe7a5aebcea4828624aec5838b299765@vtiger.fosslabs.com> References: <076.fe7a5aebcea4828624aec5838b299765@vtiger.fosslabs.com> Message-ID: <085.6196c6e96e3ce5e32e377fbed689cd3d@vtiger.fosslabs.com> #787: Metrics ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => invalid * status: new => closed Comment: invalid as the feature has been removed from the home page -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 03:09:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:09:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231062=3A?= =?utf-8?q?_Role_View?= In-Reply-To: <076.c7af2565b9df95bcead67d86eb2f3e39@vtiger.fosslabs.com> References: <076.c7af2565b9df95bcead67d86eb2f3e39@vtiger.fosslabs.com> Message-ID: <085.621b2bdfa12e4a90b58d6d6d6edf4661@vtiger.fosslabs.com> #1062: Role View ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: trivial | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [6663]) Fixes #1062 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 03:09:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:09:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6663 - /vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Message-ID: <20060529100946.0A6B77C9A33@vtiger.fosslabs.com> Author: richie Date: Mon May 29 04:09:40 2006 New Revision: 6663 Log: Fixes #1062 Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Mon May 29 04:09:40 2006 @@ -45,7 +45,7 @@ - + From vtiger-tickets at vtiger.fosslabs.com Mon May 29 03:11:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:11:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231061=3A?= =?utf-8?q?_user_having_read_only_permission_can_able_to_change_owner?= In-Reply-To: <076.412eec6f43e386c14515e32d3e43c609@vtiger.fosslabs.com> References: <076.412eec6f43e386c14515e32d3e43c609@vtiger.fosslabs.com> Message-ID: <085.77504fede7d102192883d13974e3a2aa@vtiger.fosslabs.com> #1061: user having read only permission can able to change owner ------------------------+--------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 03:27:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:27:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6664 - in /vtigercrm/trunk: include/js/general.js modules/Emails/Email.js Message-ID: <20060529102701.7A64E7C9A36@vtiger.fosslabs.com> Author: don Date: Mon May 29 04:26:55 2006 New Revision: 6664 Log: opencompose function moved to general.js file from email.js Modified: vtigercrm/trunk/include/js/general.js vtigercrm/trunk/modules/Emails/Email.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Mon May 29 04:26:55 2006 @@ -1595,3 +1595,21 @@ function fnHide_Event(obj){ document.getElementById(obj).style.display = 'none'; } + +function OpenCompose(id,mode) +{ + switch(mode) + { + case 'edit': + url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id; + break; + case 'create': + url = 'index.php?module=Emails&action=EmailsAjax&file=EditView'; + break; + case 'forward': + url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id+'&forward=true'; + break; + } + openPopUp('xComposeEmail',this,url,'createemailWin',820,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no'); +} + Modified: vtigercrm/trunk/modules/Emails/Email.js ============================================================================== --- vtigercrm/trunk/modules/Emails/Email.js (original) +++ vtigercrm/trunk/modules/Emails/Email.js Mon May 29 04:26:55 2006 @@ -103,20 +103,3 @@ ajaxObj.process("index.php?",urlstring); } -function OpenCompose(id,mode) -{ - switch(mode) - { - case 'edit': - url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id; - break; - case 'create': - url = 'index.php?module=Emails&action=EmailsAjax&file=EditView'; - break; - case 'forward': - url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id+'&forward=true'; - break; - } - openPopUp('xComposeEmail',this,url,'createemailWin',820,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no'); -} - From vtiger-tickets at vtiger.fosslabs.com Mon May 29 03:29:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:29:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23891=3A_?= =?utf-8?q?cannot_go_to_email_detailview_from_lleads_relatedlist?= In-Reply-To: <076.73cdbeb2e9ad587c3e01791f964332fd@vtiger.fosslabs.com> References: <076.73cdbeb2e9ad587c3e01791f964332fd@vtiger.fosslabs.com> Message-ID: <085.05af79eb00cd4176a05c6439c98fb962@vtiger.fosslabs.com> #891: cannot go to email detailview from lleads relatedlist ------------------------+--------------------------------------------------- Reporter: mickie | Owner: jeri Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed Comment: (In [6665]) Fixes #891 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 03:29:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:29:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6665 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060529102928.F19717C9A36@vtiger.fosslabs.com> Author: don Date: Mon May 29 04:29:24 2006 New Revision: 6665 Log: Fixes #891 Modified: vtigercrm/trunk/include/utils/ListViewUtils.php Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon May 29 04:29:24 2006 @@ -693,6 +693,13 @@ elseif($owner_id == 0 && $name == 'Assigned To') { $value=$adb->query_result($list_result,$i-1,"groupname"); + } + elseif($module =='Emails' && $relatedlist != '' && $name=='Subject') + { + $list_result_count = $i-1; + $tmp_value = getValue($ui_col_array,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset,$oCv->setdefaultviewid); + $value = ''.$tmp_value.''; + } else { From vtiger-tickets at vtiger.fosslabs.com Mon May 29 03:31:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:31:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231038=3A?= =?utf-8?q?_in_ajax_edit=2C_it_is_difficult_to_edit_the_field_which_has_no?= =?utf-8?q?_values?= In-Reply-To: <076.c5e40f51dbad87ab0eba4afdc71f65ad@vtiger.fosslabs.com> References: <076.c5e40f51dbad87ab0eba4afdc71f65ad@vtiger.fosslabs.com> Message-ID: <085.0d0219910ecc4e05ab17483cb80e5011@vtiger.fosslabs.com> #1038: in ajax edit, it is difficult to edit the field which has no values ------------------------+--------------------------------------------------- Reporter: mickie | Owner: jeri Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 03:35:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:35:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23909=3A_?= =?utf-8?q?Detail_Views?= In-Reply-To: <076.b06792568ed3810a23a5cebcc01b6223@vtiger.fosslabs.com> References: <076.b06792568ed3810a23a5cebcc01b6223@vtiger.fosslabs.com> Message-ID: <085.d8babaf24833c954757585f432ea0d22@vtiger.fosslabs.com> #909: Detail Views ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 03:35:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:35:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23894=3A_?= =?utf-8?q?the_pagination_buttons_are_not_good?= In-Reply-To: <076.4bcf6422cb869cfdd12131614ac7c6d2@vtiger.fosslabs.com> References: <076.4bcf6422cb869cfdd12131614ac7c6d2@vtiger.fosslabs.com> Message-ID: <085.9465a2931cb64587b1eb06e7aab9cb7e@vtiger.fosslabs.com> #894: the pagination buttons are not good ------------------------+--------------------------------------------------- Reporter: don | Owner: saint Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * priority: critical => major -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 03:46:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:46:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6666 - /vtigercrm/trunk/include/images/install/ Message-ID: <20060529104615.BFC237CA402@vtiger.fosslabs.com> Author: richie Date: Mon May 29 04:45:53 2006 New Revision: 6666 Log: mistakenly deleted. added back again Added: vtigercrm/trunk/include/images/install/ vtigercrm/trunk/include/images/install/cwBtnChange.gif (with props) vtigercrm/trunk/include/images/install/cwBtnFinish.gif (with props) vtigercrm/trunk/include/images/install/cwBtnNext.gif (with props) vtigercrm/trunk/include/images/install/cwBtnStart.gif (with props) vtigercrm/trunk/include/images/install/cwHdrCnfSysConf.gif (with props) vtigercrm/trunk/include/images/install/cwHdrCrConfFile.gif (with props) vtigercrm/trunk/include/images/install/cwHdrCrDbTables.gif (with props) vtigercrm/trunk/include/images/install/cwHdrSysCheck.gif (with props) vtigercrm/trunk/include/images/install/cwHdrSysConf.gif (with props) vtigercrm/trunk/include/images/install/cwHdrVtConfWiz.gif (with props) vtigercrm/trunk/include/images/install/cwIcoConfFile.gif (with props) vtigercrm/trunk/include/images/install/cwIcoDB.gif (with props) vtigercrm/trunk/include/images/install/cwIcoSystem.gif (with props) vtigercrm/trunk/include/images/install/cwRegVCRM.gif (with props) vtigercrm/trunk/include/images/install/cwShadeBg.gif (with props) vtigercrm/trunk/include/images/install/cwShadeLeft.gif (with props) vtigercrm/trunk/include/images/install/cwShadeRight.gif (with props) vtigercrm/trunk/include/images/install/cwStep1of5.gif (with props) vtigercrm/trunk/include/images/install/cwStep2of5.gif (with props) vtigercrm/trunk/include/images/install/cwStep3of5.gif (with props) vtigercrm/trunk/include/images/install/cwStep4of5.gif (with props) vtigercrm/trunk/include/images/install/cwStep5of5.gif (with props) vtigercrm/trunk/include/images/install/cwTitle.gif (with props) vtigercrm/trunk/include/images/install/cwTopBg.gif (with props) vtigercrm/trunk/include/images/install/cwTopLeft.gif (with props) vtigercrm/trunk/include/images/install/cwTopRight.gif (with props) vtigercrm/trunk/include/images/install/cwURL.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 03:47:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:47:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6667 - /vtigercrm/trunk/install/images/ Message-ID: <20060529104745.716187CA413@vtiger.fosslabs.com> Author: richie Date: Mon May 29 04:47:41 2006 New Revision: 6667 Log: removed image files as they have been relocated Removed: vtigercrm/trunk/install/images/ From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 03:52:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:52:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6668 - in /vtigercrm/trunk/modules: Invoice/EditView.php SalesOrder/EditView.php Message-ID: <20060529105203.2E70C7CA42A@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 04:51:57 2006 New Revision: 6668 Log: * Modified to set the tax and adjustment values as 0 if the column_field value of the object is empty Modified: vtigercrm/trunk/modules/Invoice/EditView.php vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/EditView.php (original) +++ vtigercrm/trunk/modules/Invoice/EditView.php Mon May 29 04:51:57 2006 @@ -49,10 +49,13 @@ //Added to display the Quote's associated products -- when we create invoice from Quotes DetailView $associated_prod = getAssociatedProducts("Quotes",$quote_focus); + $txtTax = (($quote_focus->column_fields['txtTax'] != '')?$quote_focus->column_fields['txtTax']:'0.000'); + $txtAdj = (($quote_focus->column_fields['txtAdjustment'] != '')?$quote_focus->column_fields['txtAdjustment']:'0.000'); + $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); $smarty->assign("MODE", $quote_focus->mode); - $smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $quote_focus->column_fields['txtAdjustment']); + $smarty->assign("TAXVALUE", $txtTax); + $smarty->assign("ADJUSTMENTVALUE", $txtAdj); $smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']); $smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']); $smarty->assign("AVAILABLE_PRODUCTS", 'true'); @@ -67,10 +70,13 @@ //Added to display the SalesOrder's associated products -- when we create invoice from SO DetailView $associated_prod = getAssociatedProducts("SalesOrder",$so_focus); + $txtTax = (($so_focus->column_fields['txtTax'] != '')?$so_focus->column_fields['txtTax']:'0.000'); + $txtAdj = (($so_focus->column_fields['txtAdjustment'] != '')?$so_focus->column_fields['txtAdjustment']:'0.000'); + $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); $smarty->assign("MODE", $so_focus->mode); - $smarty->assign("TAXVALUE", $so_focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $so_focus->column_fields['txtAdjustment']); + $smarty->assign("TAXVALUE", $txtTax); + $smarty->assign("ADJUSTMENTVALUE", $txtAdj); $smarty->assign("SUBTOTAL", $so_focus->column_fields['hdnSubTotal']); $smarty->assign("GRANDTOTAL", $so_focus->column_fields['hdnGrandTotal']); $smarty->assign("AVAILABLE_PRODUCTS", 'true'); Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Mon May 29 04:51:57 2006 @@ -226,12 +226,15 @@ if(isset($_REQUEST['convertmode']) && ($_REQUEST['convertmode'] == 'quotetoso' || $_REQUEST['convertmode'] == 'update_quote_val')) { $num_of_products = getNoOfAssocProducts("Quotes",$quote_focus); + $txtTax = (($quote_focus->column_fields['txtTax'] != '')?$quote_focus->column_fields['txtTax']:'0.000'); + $txtAdj = (($quote_focus->column_fields['txtAdjustment'] != '')?$quote_focus->column_fields['txtAdjustment']:'0.000'); + $smarty->assign("ROWCOUNT", $num_of_products); $associated_prod = getAssociatedProducts("Quotes",$quote_focus); $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); $smarty->assign("MODE", $focus->mode); - $smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $quote_focus->column_fields['txtAdjustment']); + $smarty->assign("TAXVALUE", $txtTax); + $smarty->assign("ADJUSTMENTVALUE", $txtAdj); $smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']); $smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 03:55:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:55:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6669 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060529105513.12E367CA42D@vtiger.fosslabs.com> Author: don Date: Mon May 29 04:55:03 2006 New Revision: 6669 Log: scrollbars removed from listview Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon May 29 04:55:03 2006 @@ -261,7 +261,7 @@
{$CMOD.LBL_GROUP_DETAILS}{$CMOD.LBL_ROLE_DETAILS}
 
-
+
From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 04:08:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 11:08:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6670 - /vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Message-ID: <20060529110838.5F5A57CA46A@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 05:08:32 2006 New Revision: 6670 Log: * Added hidden variables product_id for products, vendors and pricebooks and vendor_id for Vendors Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Mon May 29 05:08:32 2006 @@ -84,6 +84,12 @@ {$HIDDEN_PARENTS_LIST} {elseif $MODULE eq 'Products' || $MODULE eq 'Vendors' || $MODULE eq 'PriceBooks'} + {if $MODULE eq 'Products'} + + {elseif $MODULE eq 'Vendors'} + + {/if} + From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 04:09:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 11:09:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6671 - /vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Message-ID: <20060529110957.6598A7CA40B@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 05:09:53 2006 New Revision: 6671 Log: * Modified to give the proper links for module basis and commented some links which are not working and we will enable these links in feature Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Mon May 29 05:09:53 2006 @@ -21,9 +21,13 @@ + + + {if $MODULE neq 'PurchaseOrder' && $MODULE neq 'Invoice'} + {/if} @@ -33,21 +37,28 @@ - - - - - - - + Create Quote + + + + + + + + + + + + {elseif $MODULE eq 'Vendors'} @@ -73,25 +91,29 @@ - + Create PurchaseOrder + + + {elseif $MODULE eq 'PurchaseOrder'} + {elseif $MODULE eq 'SalesOrder'} @@ -99,6 +121,13 @@ + + {elseif $MODULE eq 'Quotes'} @@ -128,18 +158,14 @@ {elseif $MODULE eq 'Invoice'} + {/if} @@ -149,47 +175,41 @@ - + +{if $MODULE neq 'Products' && $MODULE neq 'Vendors'} - - - - +{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} + + {if $MODULE eq 'SalesOrder'} + {assign var=export_pdf_action value="CreateSOPDF"} + {else} + {assign var=export_pdf_action value="CreatePDF"} + {/if} + - - - - ---> - - - -{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} - - - {/if} + - + + +{/if} + + + + +
 
{$APP.LBL_ACTIONS}
- Create Quote -
- - Create Invoice -
- - Create SalesOrder -
+ + Create Invoice +
+ + Create SalesOrder +
+ + Create PurchaseOrder +
- Create PurchaseOrder -
+ Create Invoice +
- Other Functions
-
- Use Customer Name -
- - Use Shipping Address -
- - Export To PDF + Export To PDF
From vtiger-tickets at vtiger.fosslabs.com Mon May 29 04:12:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 11:12:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231098=3A?= =?utf-8?q?_Security_is_not_implemented_for_New_Emails?= Message-ID: <076.9338ecb11bbd664fc8df6eb42c9a07c1@vtiger.fosslabs.com> #1098: Security is not implemented for New Emails --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 04:18:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 11:18:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6672 - in /vtigercrm/trunk/modules: Accounts/ Activities/ Campaigns/ Contacts/ HelpDesk/ Invoice/ Potentials/ PurchaseOrder/ Quotes/ SalesOrder/ Message-ID: <20060529111843.C97A47CA469@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 05:18:30 2006 New Revision: 6672 Log: Updated module level security for change owner button - ahmed Modified: vtigercrm/trunk/modules/Accounts/ListView.php vtigercrm/trunk/modules/Activities/ListView.php vtigercrm/trunk/modules/Campaigns/ListView.php vtigercrm/trunk/modules/Contacts/ListView.php vtigercrm/trunk/modules/HelpDesk/ListView.php vtigercrm/trunk/modules/Invoice/ListView.php vtigercrm/trunk/modules/Potentials/ListView.php vtigercrm/trunk/modules/PurchaseOrder/ListView.php vtigercrm/trunk/modules/Quotes/ListView.php vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Mon May 29 05:18:30 2006 @@ -96,6 +96,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } +if(isPermitted('Accounts','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if(isPermitted('Emails','EditView','') == 'yes') { $other_text['s_mail'] = $app_strings[LBL_SEND_MAIL_BUTTON]; Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Mon May 29 05:18:30 2006 @@ -100,6 +100,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } +if(isPermitted('Activities','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} global $task_title; $title_display = $current_module_strings['LBL_LIST_FORM_TITLE']; if ($task_title) $title_display= $task_title; Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Mon May 29 05:18:30 2006 @@ -93,7 +93,10 @@ { $other_text ['del']=$app_strings[LBL_MASS_DELETE]; } - +if(isPermitted('Campaigns','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Mon May 29 05:18:30 2006 @@ -121,6 +121,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } +if(isPermitted('Contacts','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if(isPermitted('Emails','EditView','') == 'yes') $other_text['s_mail'] = $app_strings[LBL_SEND_MAIL_BUTTON]; Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Mon May 29 05:18:30 2006 @@ -93,7 +93,10 @@ // Buttons and View options if(isPermitted('HelpDesk','Delete','') == 'yes') $other_text['del'] = $app_strings[LBL_MASS_DELETE]; - +if(isPermitted('HelpDesk','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Mon May 29 05:18:30 2006 @@ -90,6 +90,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } +if(isPermitted('Invoice','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Mon May 29 05:18:30 2006 @@ -117,6 +117,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } +if(isPermitted('Potentials','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Mon May 29 05:18:30 2006 @@ -90,7 +90,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } - +if(isPermitted('PurchaseOrder','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Mon May 29 05:18:30 2006 @@ -91,7 +91,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } - +if(isPermitted('Quotes','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Mon May 29 05:18:30 2006 @@ -90,7 +90,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } - +if(isPermitted('SalesOrder','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 04:26:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 11:26:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6673 - in /vtigercrm/trunk/Smarty/templates: ListView.tpl ListViewEntries.tpl Message-ID: <20060529112641.3097F7CA40B@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 05:26:37 2006 New Revision: 6673 Log: Updated module level security for change owner button - ahmed Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon May 29 05:26:37 2006 @@ -224,12 +224,13 @@ {elseif $button_check eq 'c_status'} + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} {/if} {/foreach} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} {$RECORD_COUNTS} @@ -291,12 +292,13 @@ {elseif $button_check eq 'c_status'} + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} {/if} {/foreach} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} {$RECORD_COUNTS} Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Mon May 29 05:26:37 2006 @@ -32,12 +32,13 @@ {elseif $button_check eq 'c_status'} + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} {/if} {/foreach} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} {$RECORD_COUNTS} @@ -106,12 +107,13 @@ {elseif $button_check eq 'c_status'} + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} {/if} {/foreach} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} {$RECORD_COUNTS} From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 04:59:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 11:59:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6674 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060529115932.2C6237CA413@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 05:59:27 2006 New Revision: 6674 Log: default data for hour_format,start_time and end_time has been included Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Mon May 29 05:59:27 2006 @@ -56,9 +56,15 @@ - - - + + + + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 05:15:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 12:15:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6675 - /vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Message-ID: <20060529121555.C2B897CA483@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:15:52 2006 New Revision: 6675 Log: Added record level security for change owner/status for all modules - ahmed Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Mon May 29 06:15:52 2006 @@ -10,8 +10,8 @@ * ********************************************************************************/ - require_once('include/database/PearDatabase.php'); +require_once('include/utils/utils.php'); $idlist= $_REQUEST['idlist']; $leadstatusval = $_REQUEST['leadval']; @@ -22,14 +22,23 @@ global $adb; $storearray = explode(";",$idlist); +$ids_list = array(); + $date_var = date('YmdHis'); if(isset($_REQUEST['user_id']) && $_REQUEST['user_id']!='') { foreach($storearray as $id) { - if($id != '') { - $sql = "update crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid='" .$id."'"; - $result = $adb->query($sql); + if(isPermitted($return_module,'EditView',$id) == 'yes') + { + if($id != '') { + $sql = "update crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid='" .$id."'"; + $result = $adb->query($sql); + } + } + else + { + $ids_list[] = $id; } } } @@ -37,14 +46,30 @@ { foreach($storearray as $id) { - if($id != '') { - $sql = "update leaddetails set leadstatus='" .$leadstatusval ."' where leadid='" .$id."'"; - $result = $adb->query($sql); - $query = "update crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$id; - $result1 = $adb->query($query); + if(isPermitted($return_module,'EditView',$id) == 'yes') + { + if($id != '') { + $sql = "update leaddetails set leadstatus='" .$leadstatusval ."' where leadid='" .$id."'"; + $result = $adb->query($sql); + $query = "update crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$id; + $result1 = $adb->query($query); + } } + else + { + $ids_list[] = $id; + } + } } -header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid); +$ret_owner = getEntityName($return_module,$ids_list); +if(count($ret_owner) > 0) +{ + $errormsg = implode(',',$ret_owner); +}else +{ + $errormsg = ''; +} + +header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid."&errormsg=".$errormsg); ?> - From vtiger-tickets at vtiger.fosslabs.com Mon May 29 05:21:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 12:21:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231067=3A?= =?utf-8?q?_Tab_privileges_do_not_work?= In-Reply-To: <076.baa7b69c6ca44b0daa26fc51089e8b17@vtiger.fosslabs.com> References: <076.baa7b69c6ca44b0daa26fc51089e8b17@vtiger.fosslabs.com> Message-ID: <085.09fc20513e5cc67cc24b1578ad4a44f2@vtiger.fosslabs.com> #1067: Tab privileges do not work ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 05:50:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 12:50:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6676 - in /vtigercrm/trunk/modules: Accounts/ Activities/ Campaigns/ Contacts/ HelpDesk/ Invoice/ Leads/ Potentials/ PurchaseOrder/ Quotes/ SalesOrder/ Message-ID: <20060529125001.3DD067CA4B1@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:49:47 2006 New Revision: 6676 Log: Implemented record level security for change owner/status button - ahmed Modified: vtigercrm/trunk/modules/Accounts/ListView.php vtigercrm/trunk/modules/Activities/ListView.php vtigercrm/trunk/modules/Campaigns/ListView.php vtigercrm/trunk/modules/Contacts/ListView.php vtigercrm/trunk/modules/HelpDesk/ListView.php vtigercrm/trunk/modules/Invoice/ListView.php vtigercrm/trunk/modules/Leads/ListView.php vtigercrm/trunk/modules/Potentials/ListView.php vtigercrm/trunk/modules/PurchaseOrder/ListView.php vtigercrm/trunk/modules/Quotes/ListView.php vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Mon May 29 06:49:47 2006 @@ -57,7 +57,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Mon May 29 06:49:47 2006 @@ -55,7 +55,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Mon May 29 06:49:47 2006 @@ -44,7 +44,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Mon May 29 06:49:47 2006 @@ -53,7 +53,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Mon May 29 06:49:47 2006 @@ -45,7 +45,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Mon May 29 06:49:47 2006 @@ -49,7 +49,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Mon May 29 06:49:47 2006 @@ -62,7 +62,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Mon May 29 06:49:47 2006 @@ -51,7 +51,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Mon May 29 06:49:47 2006 @@ -48,7 +48,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Mon May 29 06:49:47 2006 @@ -49,7 +49,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Mon May 29 06:49:47 2006 @@ -46,7 +46,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 05:56:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 12:56:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6677 - in /vtigercrm/trunk/modules/Calendar: Calendar.php addEventUI.php calendarLayout.php Message-ID: <20060529125619.573CF7CA4B5@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:56:14 2006 New Revision: 6677 Log: changes made for calendar actions Modified: vtigercrm/trunk/modules/Calendar/Calendar.php vtigercrm/trunk/modules/Calendar/addEventUI.php vtigercrm/trunk/modules/Calendar/calendarLayout.php Modified: vtigercrm/trunk/modules/Calendar/Calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/Calendar.php Mon May 29 06:56:14 2006 @@ -1,4 +1,14 @@ '; for($i=1;$i<=12;$i++) { - if($i == $selvalue) - $selected = 'selected'; - else - $selected = ''; if($i <= 9 && strlen(trim($i)) < 2) { $hrvalue= '0'.$i; } - elseif($i == 12) $hrvalue = '00'; + //elseif($i == 12) $hrvalue = '00'; else $hrvalue= $i; - $combo .= ''; + $combo .= ''; } $combo .= ' '; $combo .= ' '; $combo .= ''; @@ -132,33 +114,25 @@ $combo .= 'Hr '; $combo .= ' min'; } @@ -277,11 +251,11 @@ - + - + - +
       
@@ -477,7 +451,7 @@ - - - - + - @@ -491,10 +465,10 @@
Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Mon May 29 06:56:14 2006 @@ -1,4 +1,14 @@ view == 'day') @@ -426,6 +452,10 @@ } } +/*To get calendar layout for dayview + *@param $cal -- The calendar array :: Type Array + *@param $type -- The type :: Type string +*/ function getDayViewLayout(& $cal,$type) { global $current_user,$app_strings; @@ -500,6 +530,10 @@ echo $dayview_layout; } +/*To get calendar layout for week view + *@param $cal -- The calendar array :: Type Array + *@param $type -- The type :: Type string +*/ function getWeekViewLayout(& $cal,$type) { global $current_user,$app_strings; @@ -598,6 +632,10 @@ } +/*To get calendar layout for month view + *@param $cal -- The calendar array :: Type Array + *@param $type -- The type :: Type string +*/ function getMonthViewLayout(& $cal,$type) { global $current_user,$app_strings; @@ -668,6 +706,10 @@ } +/*To get calendar layout for year view + *@param $cal -- The calendar array :: Type Array + *@param $type -- The type :: Type string +*/ function getYearViewLayout(& $cal,$type) { global $mod_strings; @@ -772,7 +814,11 @@ } - +/*To display events in day view + *@param $cal -- The calendar array :: Type Array + *@param $slice -- The slice(date and time) :: Type string + *returns event in html div format +*/ function getdayEventLayer(& $cal,$slice) { global $mod_strings; @@ -810,7 +856,7 @@ @@ -821,6 +867,11 @@ } } +/*To display events in week view + *@param $cal -- The calendar array :: Type Array + *@param $slice -- The slice(date) :: Type string + *returns event in html div format +*/ function getweekEventLayer(& $cal,$slice) { global $mod_strings; @@ -853,6 +904,11 @@ } +/*To display events in month view + *@param $cal -- The calendar array :: Type Array + *@param $slice -- The slice(date) :: Type string + *returns event in html div format +*/ function getmonthEventLayer(& $cal,$slice) { global $mod_strings; @@ -904,7 +960,13 @@ } - +/*To get events list scheduled between specified dates + *@param $calendar -- The calendar array :: Type Array + *@param $start_date -- the start date :: Type string + *@param $end_date -- the end date :: Type string + *@param $info -- the info :: Type string + *returns $Entries :: Type Array +*/ function getEventList(& $calendar,$start_date,$end_date,$info='') { $Entries = Array(); @@ -971,13 +1033,21 @@ $image_tag = " ".$type; $element['eventtype'] = $image_tag; $element['eventdetail'] = $contact_data." ".$subject." ".$more_link; - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"event\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $element['status'] = $adb->query_result($result,$i,"eventstatus"); $Entries[] = $element; } return $Entries; } + +/*To get todos list scheduled between specified dates + *@param $calendar -- The calendar array :: Type Array + *@param $start_date -- the start date :: Type string + *@param $end_date -- the end date :: Type string + *@param $info -- the info :: Type string + *returns $Entries :: Type Array +*/ function getTodoList(& $calendar,$start_date,$end_date,$info='') { $Entries = Array(); @@ -1023,7 +1093,7 @@ $more_link = "".$subject.""; $element['tododetail'] = $more_link; $element['status'] = $adb->query_result($result,$i,"status"); - $element['action'] = ""; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"todo\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $Entries[] = $element; } return $Entries; From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 05:56:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 12:56:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6678 - /vtigercrm/trunk/modules/Calendar/calendar_share.php Message-ID: <20060529125659.3F0D87CA4B5@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:56:55 2006 New Revision: 6678 Log: changes made for calendar actions Modified: vtigercrm/trunk/modules/Calendar/calendar_share.php Modified: vtigercrm/trunk/modules/Calendar/calendar_share.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_share.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_share.php Mon May 29 06:56:55 2006 @@ -70,7 +70,7 @@ } ?>
-   + hour_format == '24'){?> checked value="24">  From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 05:57:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 12:57:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6679 - /vtigercrm/trunk/modules/Calendar/Date.php Message-ID: <20060529125736.7CD5E7CA4B5@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:57:33 2006 New Revision: 6679 Log: license added Modified: vtigercrm/trunk/modules/Calendar/Date.php Modified: vtigercrm/trunk/modules/Calendar/Date.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Date.php (original) +++ vtigercrm/trunk/modules/Calendar/Date.php Mon May 29 06:57:33 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Mon May 29 06:58:18 2006 New Revision: 6680 Log: license added Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/new_calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/new_calendar.php Mon May 29 06:58:18 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Mon May 29 06:59:05 2006 New Revision: 6681 Log: changes made for calendar actions Modified: vtigercrm/trunk/modules/Calendar/script.js vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Mon May 29 06:59:05 2006 @@ -1,3 +1,13 @@ +/********************************************************************************* + +** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + ********************************************************************************/ + function DisableSharing() { @@ -86,22 +96,28 @@ if (y.display=="none") { - document.getElementById("jscal_field_due_date").value = enddate; - document.getElementById("starthr").value = starthr; - document.getElementById("startmin").value = startmin; - document.getElementById("startfmt").value = startfmt; - document.getElementById("endhr").value = endhr; - document.getElementById("endmin").value = endmin; - document.getElementById("endfmt").value = endfmt; - if(type == 'call') - document.appSave.activitytype[0].checked = true; - if(type == 'meeting') - document.appSave.activitytype[1].checked = true; - if(type == 'todo') - document.getElementById("task_jscal_field_date_start").value = startdate; - else - document.getElementById("jscal_field_date_start").value = startdate; - + if(type == 'call' || type == 'meeting') + { + if(type == 'call') + document.appSave.activitytype[0].checked = true; + if(type == 'meeting') + document.appSave.activitytype[1].checked = true; + + document.appSave.date_start.value = startdate; + document.appSave.starthr.value = starthr; + document.appSave.startmin.value = startmin; + document.appSave.startfmt.value = startfmt; + document.appSave.endhr.value = endhr; + document.appSave.endmin.value = endmin; + document.appSave.endfmt.value = endfmt; + } + if(type == 'todo') + { + document.createTodo.task_date_start.value = startdate; + document.createTodo.starthr.value = starthr; + document.createTodo.startmin.value = startmin; + document.createTodo.startfmt.value = startfmt; + } y.display="block"; } } @@ -153,7 +169,6 @@ else document.SharingForm.start_hour.disabled = true; } - function check_form() { @@ -235,6 +250,26 @@ } } +function task_check_form() +{ + starthour = document.createTodo.starthr.value; + startmin = document.createTodo.startmin.value; + startformat = document.createTodo.startfmt.value; + if(startformat != '') + { + if(startformat == 'pm') + { + starthour = eval(starthour) + 12; + startmin = startmin; + } + else + { + starthour = starthour; + startmin = startmin; + } + } + document.createTodo.task_time_start.value = starthour+':'+startmin; +} var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj; @@ -410,7 +445,7 @@ document.getElementById("calSettings").innerHTML=response.responseText; } -function getcalAction(obj,Lay,id,view,hour,day,month,year){ +function getcalAction(obj,Lay,id,view,hour,day,month,year,type){ var tagName = document.getElementById(Lay); var leftSide = findPosX(obj); var topSide = findPosY(obj); @@ -426,10 +461,24 @@ tagName.style.top= topSide + 'px'; tagName.style.display = 'block'; tagName.style.visibility = "visible"; - document.getElementById("complete").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&eventstatus=Held&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; - document.getElementById("pending").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&eventstatus=Not Held&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; - document.getElementById("postpone").href="index.php?action=EditView&module=Activities&record="+id+"&activity_mode=Events"; - document.getElementById("actdelete").href="index.php?return_module=Calendar&return_action=index&action=Delete&module=Activities&record="+id+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + if(type == 'event') + { + var heldstatus = "eventstatus=Held"; + var notheldstatus = "eventstatus=Not Held"; + var activity_mode = "Events"; + } + if(type == 'todo') + { + var heldstatus = "status=Completed"; + var notheldstatus = "status=Deferred"; + var activity_mode = "Task"; + } + + document.getElementById("complete").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+heldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + document.getElementById("pending").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+notheldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + document.getElementById("postpone").href="index.php?action=EditView&module=Activities&record="+id+"&activity_mode="+activity_mode; + document.getElementById("actdelete").href="index.php?return_module=Calendar&return_action=index&action=massdelete&module=Users&idlist="+id+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; document.getElementById("changeowner").href="javascript:fnvshobj(this,'act_changeowner');"; -} - + +} + Modified: vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php (original) +++ vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php Mon May 29 06:59:05 2006 @@ -10,6 +10,13 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); global $adb; + +if(isset($_REQUEST['hour_format']) && $_REQUEST['hour_format'] != '') + $hour_format = $_REQUEST['hour_format']; +else + $hour_format = 'am/pm'; +$delquery = "delete from sharedcalendar where userid=".$_REQUEST["current_userid"]; +$adb->query($delquery); $sharedid = $_REQUEST['user']; if(isset($sharedid) && $sharedid != null) { @@ -28,11 +35,8 @@ $adb->query($sql); } -if(isset($_REQUEST['hour_format']) && $_REQUEST['hour_format'] != '') -{ - $sql = "update users set hour_format='".$_REQUEST['hour_format']."' where id=".$current_user->id; - $adb->query($sql); -} +$sql = "update users set hour_format='".$hour_format."' where id=".$current_user->id; +$adb->query($sql); header("Location: index.php?action=index&module=Calendar&parenttab=My Home Page"); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:00:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:00:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6682 - /vtigercrm/trunk/modules/Calendar/TodoSave.php Message-ID: <20060529130000.62D727CA4B5@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:59:56 2006 New Revision: 6682 Log: file added for todo save Added: vtigercrm/trunk/modules/Calendar/TodoSave.php From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:00:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:00:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23896=3A_?= =?utf-8?q?Pagination_not_working_in_Popup?= In-Reply-To: <076.9e25407318a009f0a78d7698ad4a8ab4@vtiger.fosslabs.com> References: <076.9e25407318a009f0a78d7698ad4a8ab4@vtiger.fosslabs.com> Message-ID: <085.671189316c49cfcdbe2fb2dcea5518c4@vtiger.fosslabs.com> #896: Pagination not working in Popup ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:01:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:01:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6683 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060529130136.AF3397CBAD1@vtiger.fosslabs.com> Author: don Date: Mon May 29 07:01:32 2006 New Revision: 6683 Log: inserted ajax entries into the actionmapping file Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Mon May 29 07:01:32 2006 @@ -2047,6 +2047,9 @@ $this->db->query("insert into actionmapping values(0,'SavePriceBook',0)"); $this->db->query("insert into actionmapping values(2,'DeletePriceBook',0)"); $this->db->query("insert into actionmapping values(9,'ConvertLead',0)"); + $this->db->query("insert into actionmapping values(1,'DetailViewAjax',0)"); + $this->db->query("insert into actionmapping values(4,'TagCloud',0)"); + $this->db->query("insert into actionmapping values(1,'QuickCreate',0)"); //Insert values for moduleowners table which contains the modules and their users. default user id admin - after 4.2 patch 2 $module_array = Array('Potentials','Contacts','Accounts','Leads','Notes','Activities','Emails','HelpDesk','Products','Faq','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Reports','Campaigns'); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:01:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:01:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6684 - /vtigercrm/trunk/index.php Message-ID: <20060529130157.792377CBAD1@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:01:54 2006 New Revision: 6684 Log: header escaped for TodoSave Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon May 29 07:01:54 2006 @@ -192,7 +192,7 @@ { $log->info("About to take action ".$action); $log->debug("in $action"); - if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action) || ereg("^RecalculateSharingRules",$action) || (ereg("^body",$action) && ereg("^Webmails",$module)) || (ereg("^DetailView",$action) && ereg("^Webmails",$module) )) + if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action) || ereg("^TodoSave",$action) || ereg("^RecalculateSharingRules",$action) || (ereg("^body",$action) && ereg("^Webmails",$module)) || (ereg("^DetailView",$action) && ereg("^Webmails",$module) )) { $skipHeaders=true; //skip headers for all these invocations as they are mostly popups From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:03:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:03:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6685 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060529130322.BF90D7CEE4D@vtiger.fosslabs.com> Author: don Date: Mon May 29 07:03:19 2006 New Revision: 6685 Log: We are and help link added to header Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon May 29 07:03:19 2006 @@ -44,7 +44,9 @@ - + + +
{$APP.LBL_MY_PREFERENCES} {$APP.LBL_LOGOUT} ({$CURRENT_USER}){$APP.LNK_HELP}{$APP.LNK_WEARE} {$APP.LBL_LOGOUT} ({$CURRENT_USER})
@@ -418,3 +420,10 @@ + + From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:04:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:04:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6686 - /vtigercrm/trunk/modules/Users/massdelete.php Message-ID: <20060529130446.BAED97CEE4D@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:04:43 2006 New Revision: 6686 Log: changes made to delete activities from calendar Modified: vtigercrm/trunk/modules/Users/massdelete.php Modified: vtigercrm/trunk/modules/Users/massdelete.php ============================================================================== --- vtigercrm/trunk/modules/Users/massdelete.php (original) +++ vtigercrm/trunk/modules/Users/massdelete.php Mon May 29 07:04:43 2006 @@ -63,6 +63,10 @@ { header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&ajax=delete&file=ListView&viewname=".$viewid."&errormsg=".$errormsg); } +elseif($returnmodule == 'Calendar') +{ + header("Location: index.php?module=".$returnmodule."&action=index&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&parenttab=My Home Page"); +} else { header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&ajax=delete&file=ListView&errormsg=".$errormsg); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:06:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:06:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6687 - /vtigercrm/trunk/index.php Message-ID: <20060529130640.653847C4382@vtiger.fosslabs.com> Author: don Date: Mon May 29 07:06:36 2006 New Revision: 6687 Log: added security check for ajax actions Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon May 29 07:06:36 2006 @@ -465,16 +465,29 @@ if(!$skipSecurityCheck) { + + require_once('include/utils/UserInfoUtil.php'); - if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') - { - $display = isPermitted($module,$action,$_REQUEST['record']); - } - else - { - $display = isPermitted($module,$action); - } + + if(ereg('Ajax',$action)) + { + $now_action=$_REQUEST['file']; + } + else + { + $now_action=$action; + } + + if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') + { + $display = isPermitted($module,$now_action,$_REQUEST['record']); + } + else + { + $display = isPermitted($module,$now_action); + } $seclog->debug('########### Pemitted ---> '.$display.' ##############'); + } else { From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:08:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:08:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6688 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060529130858.6EDFE766D1F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:08:54 2006 New Revision: 6688 Log: query updated for activities module Modified: vtigercrm/trunk/include/utils/ListViewUtils.php Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon May 29 07:08:54 2006 @@ -1752,7 +1752,7 @@ $query .= $sec_parameter; } - $query .=" group by activity.activityid "; + //$query .=" group by activity.activityid "; //included by Jaguar } if($module == "Emails") From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:10:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:10:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23857=3A_?= =?utf-8?q?Links_in_Communication_Templates_Headings?= In-Reply-To: <076.b701bab91b5663913e5b005347f8c28e@vtiger.fosslabs.com> References: <076.b701bab91b5663913e5b005347f8c28e@vtiger.fosslabs.com> Message-ID: <085.9aa9c64566ea610f060ca17a79a62a2c@vtiger.fosslabs.com> #857: Links in Communication Templates Headings --------------------------+------------------------------------------------- Reporter: mangai | Owner: ahmed Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------+------------------------------------------------- Changes (by jerrydgeorge): * owner: jeri => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:11:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:11:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231012=3A?= =?utf-8?q?_HelpDesk_-_Detail_View_UI_problem?= In-Reply-To: <076.b198b1e865f9e93c599c9d928fe197d4@vtiger.fosslabs.com> References: <076.b198b1e865f9e93c599c9d928fe197d4@vtiger.fosslabs.com> Message-ID: <085.cbd279ecd097c37a94c4b6fdc5a451a8@vtiger.fosslabs.com> #1012: HelpDesk - Detail View UI problem ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangay Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: helpdesk detailview ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * owner: jeridgeorge => mangay -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:11:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:11:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6689 - /vtigercrm/trunk/modules/Migration/Migration.php Message-ID: <20060529131137.790D5766D1F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:11:34 2006 New Revision: 6689 Log: * Added function call RecalculateSharingRules which will recalculate the sharing previleges and write it in the file Modified: vtigercrm/trunk/modules/Migration/Migration.php Modified: vtigercrm/trunk/modules/Migration/Migration.php ============================================================================== --- vtigercrm/trunk/modules/Migration/Migration.php (original) +++ vtigercrm/trunk/modules/Migration/Migration.php Mon May 29 07:11:34 2006 @@ -337,6 +337,9 @@ echo '
Dump could not be applied correctly. so your previous database restored.'; include("modules/Migration/MigrationStep1.php"); } + + //Now we should recalculate the user and sharing privileges + RecalculateSharingRules(); } } From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:12:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:12:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6690 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060529131207.BFBFD766D1F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:12:04 2006 New Revision: 6690 Log: style added for CurrencyDelete Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Mon May 29 07:12:04 2006 @@ -2246,6 +2246,16 @@ padding:5px; } +#CurrencyDeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; +} + /* For Report HTML Generation*/ .rptCellLabel { From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:15:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:15:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6691 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060529131514.9149F766D1F@vtiger.fosslabs.com> Author: don Date: Mon May 29 07:15:10 2006 New Revision: 6691 Log: label added for FOR Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Mon May 29 07:15:10 2006 @@ -873,7 +873,7 @@ 'COVERED_PERCENTAGE'=>'(%)', 'LBL_TAG_CLOUD'=>'Tag Cloud', - +'LBL_FOR'=>'for', ); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:15:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:15:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6692 - /tags/vtigercrm-5.0.0-val/ Message-ID: <20060529131520.B62757CF68F@vtiger.fosslabs.com> Author: richie Date: Mon May 29 07:15:15 2006 New Revision: 6692 Log: made a copy Added: tags/vtigercrm-5.0.0-val/ - copied from r6690, vtigercrm/trunk/ From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:17:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:17:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23766=3A_?= =?utf-8?q?Change_Owner_Button?= In-Reply-To: <076.f565da083c8fd4113733a3e15d4a4fad@vtiger.fosslabs.com> References: <076.f565da083c8fd4113733a3e15d4a4fad@vtiger.fosslabs.com> Message-ID: <085.f5c634b977389f3bddc6132979ce3488@vtiger.fosslabs.com> #766: Change Owner Button ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:23:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:23:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23788=3A_?= =?utf-8?q?detail_view_Leads?= In-Reply-To: <076.6da2531272f72eb12dc7914b4b93f169@vtiger.fosslabs.com> References: <076.6da2531272f72eb12dc7914b4b93f169@vtiger.fosslabs.com> Message-ID: <085.b5a0f2435fbcbd2e4fcdcd9c768f8964@vtiger.fosslabs.com> #788: detail view Leads ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed - Tag Cloud & Mail Merge blocks can be viewed separately now -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:26:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:26:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23838=3A_?= =?utf-8?q?Settings_=3E_CommunicationsTemplates_=3E_Mail_Merge_Template?= In-Reply-To: <076.e25ff08fdd1aa2a8f2e85835ca2ed712@vtiger.fosslabs.com> References: <076.e25ff08fdd1aa2a8f2e85835ca2ed712@vtiger.fosslabs.com> Message-ID: <085.a9ede45e3e71b1eca9f6f3937c1d981e@vtiger.fosslabs.com> #838: Settings > CommunicationsTemplates > Mail Merge Template ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:27:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:27:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6693 - /vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl Message-ID: <20060529132700.066B5766D1F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:26:55 2006 New Revision: 6693 Log: * Added multipart/form-data as ENCTYPE in form tag because in tickets we have attachments Modified: vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl Mon May 29 07:26:55 2006 @@ -52,7 +52,7 @@ {elseif $MODULE eq 'HelpDesk'} -
+ {elseif $MODULE eq 'Leads'} From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:28:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:28:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23398=3A_?= =?utf-8?q?Attachment_Issues_-_HelpDesk?= In-Reply-To: <076.7a510c5b49e89d51cb7e175be79d8b36@vtiger.fosslabs.com> References: <076.7a510c5b49e89d51cb7e175be79d8b36@vtiger.fosslabs.com> Message-ID: <085.1624b4740f4cd325ff6b8fa649955791@vtiger.fosslabs.com> #398: Attachment Issues - HelpDesk ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue is fixed. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:29:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:29:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23907=3A_?= =?utf-8?q?Campain_Detail_View?= In-Reply-To: <076.4a06e5f0535423280cd4351eba88e627@vtiger.fosslabs.com> References: <076.4a06e5f0535423280cd4351eba88e627@vtiger.fosslabs.com> Message-ID: <085.e0c05d44ea2f22c284a242c97932e1b4@vtiger.fosslabs.com> #907: Campain Detail View ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:29:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:29:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23908=3A_?= =?utf-8?q?Leads=2C_Detail_view?= In-Reply-To: <076.b26f1641789daff11acea1e418be60b2@vtiger.fosslabs.com> References: <076.b26f1641789daff11acea1e418be60b2@vtiger.fosslabs.com> Message-ID: <085.f8e91c00e83cb9f121cc5553a5dd20cc@vtiger.fosslabs.com> #908: Leads, Detail view ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:33:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:33:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23957=3A_?= =?utf-8?q?Plural_form_is_used_for_quick_create_function?= In-Reply-To: <076.9e6c95fdf872c50c6563ccb0b75787a7@vtiger.fosslabs.com> References: <076.9e6c95fdf872c50c6563ccb0b75787a7@vtiger.fosslabs.com> Message-ID: <085.f133f0f642c52c8dfa8e11c203b1aa3c@vtiger.fosslabs.com> #957: Plural form is used for quick create function ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed - Name changed to singular -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:36:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:36:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23915=3A_?= =?utf-8?q?Issues_in_Home_Page?= In-Reply-To: <076.c91d734dfe491bd408e8ae74e611ac1a@vtiger.fosslabs.com> References: <076.c91d734dfe491bd408e8ae74e611ac1a@vtiger.fosslabs.com> Message-ID: <085.c6cbc18b4f60f827cfee74a6dda19e75@vtiger.fosslabs.com> #915: Issues in Home Page ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: jeri Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed Comment: (In [6694]) Fixes #915 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:36:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:36:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6694 - in /vtigercrm/trunk: Smarty/templates/HomePage.tpl modules/Activities/OpenListView.php modules/Home/language/en_us.lang.php Message-ID: <20060529133637.C2D1E7CF888@vtiger.fosslabs.com> Author: don Date: Mon May 29 07:36:28 2006 New Revision: 6694 Log: Fixes #915 Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl vtigercrm/trunk/modules/Activities/OpenListView.php vtigercrm/trunk/modules/Home/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Mon May 29 07:36:28 2006 @@ -114,40 +114,11 @@
{/if} {/foreach} -
- - - - - - - - - - -
{$MOD.LBL_LEADS_BY_SOURCE}
- {$MOD.LBL_TOTAL}340 -
-
-
- - - - - - - - - - -
{$MOD.LBL_LEADS_BY_STATUS}
- {$MOD.LBL_TOTAL}340 -
-
+ {if $ACTIVITIES.0.Entries.noofactivities > 0} @@ -158,10 +129,9 @@ + +
- + - {foreach item=entries from=$ACTIVITIES.0.Entries} @@ -173,6 +143,9 @@
{$MOD.LBL_UPCOMING_EVENTS}
{$ACTIVITIES.0.Entries.noofactivities} {$MOD.LBL_TODAYEVENT}
{$MOD.LBL_UPCOMING_EVENTS}
{$ACTIVITIES.0.Entries.noofactivities} {$APP.Events} {$APP.LBL_FOR} {$ACTIVITIES.0.Title.0}
{$entries.IMAGE}

+ {/if} + + {if $ACTIVITIES.1.Entries.noofactivities > 0} @@ -201,6 +174,7 @@

+ {/if} {if $TAGCLOUD_JS ne ''}
Modified: vtigercrm/trunk/modules/Activities/OpenListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/OpenListView.php (original) +++ vtigercrm/trunk/modules/Activities/OpenListView.php Mon May 29 07:36:28 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -function getPendingActivities() +function getPendingActivities($mode) { global $log; $log->debug("Entering getPendingActivities() method ..."); @@ -74,14 +74,16 @@ { $later = date("Y-m-d", strtotime("$today +1 day")); } - - if($activity_view != 'OverDue') - { - $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (((date_start >= '$today' AND date_start < '$later') OR (date_start < '$today')) OR (recurringevents.recurringdate between '$today' and '$later') ) AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; + $last_tendays = date("Y-m-d",strtotime("$today - 10 days")); + if($mode != 1) + { + //for upcoming avtivities + $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (((date_start > '$today' AND date_start < '$later')) OR (recurringevents.recurringdate between '$today' and '$later') ) AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; } else { - $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (due_date < '$today') OR (recurringevents.recurringdate < '$today') AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; + //for pending activities for the last 10 days + $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (due_date > '$last_tendays' AND due_date <= '$today') OR (recurringevents.recurringdate > '$last_tendays' AND recurringevents.recurringdate <= '$today') AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; } $res = $adb->query($list_query); $noofrecords = $adb->num_rows($res); @@ -114,8 +116,8 @@ $later_day = getDisplayDate(date("Y-m-d", strtotime("$later -1 day "))); $title=array(); + $title[]=$activity_view; $title[]='myUpcoPendAct.gif'; - $title[]=$current_module_strings["LBL_UPCOMING"]; //.'('.$current_module_strings["LBL_TODAY"].' '.$later_day.')'; $title[]='home_myact'; $title[]=getActivityView($activity_view); @@ -262,10 +264,6 @@ { $selected4 = 'selected'; } - else if($activity_view == 'OverDue') - { - $selected5 = 'selected'; - } //constructing the combo values for activities $ACTIVITY_VIEW_SELECT_OPTION = ''; Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Home/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Home/language/en_us.lang.php Mon May 29 07:36:28 2006 @@ -45,7 +45,7 @@ 'LBL_UPCOMING_EVENTS'=>'Upcoming Events', 'LBL_PENDING_EVENTS'=>'Pending Events', -'LBL_TODAYEVENT'=>'Events for Today', +'LBL_TODAYEVENT'=>'Events for Last Ten days', ); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:37:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:37:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6695 - /vtigercrm/trunk/modules/Users/massdelete.php Message-ID: <20060529133758.343B5766D1F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:37:54 2006 New Revision: 6695 Log: code added for activity Delete from users Modified: vtigercrm/trunk/modules/Users/massdelete.php Modified: vtigercrm/trunk/modules/Users/massdelete.php ============================================================================== --- vtigercrm/trunk/modules/Users/massdelete.php (original) +++ vtigercrm/trunk/modules/Users/massdelete.php Mon May 29 07:37:54 2006 @@ -59,13 +59,14 @@ } header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&folderid=".$folderid."&ajax=delete&file=ListView&errormsg=".$errormsg); } +elseif($returnmodule == 'Calendar') +{ + header("Location: index.php?module=".$returnmodule."&action=index&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&parenttab=My Home Page"); +} + elseif($returnmodule!='Faq') { header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&ajax=delete&file=ListView&viewname=".$viewid."&errormsg=".$errormsg); -} -elseif($returnmodule == 'Calendar') -{ - header("Location: index.php?module=".$returnmodule."&action=index&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&parenttab=My Home Page"); } else { From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:40:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:40:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23775=3A_?= =?utf-8?q?Convert_lead_not_working?= In-Reply-To: <076.96742e746599375cfefc6f9ca387de68@vtiger.fosslabs.com> References: <076.96742e746599375cfefc6f9ca387de68@vtiger.fosslabs.com> Message-ID: <085.4a7120d6a82c5579b1db30b54f2b49c5@vtiger.fosslabs.com> #775: Convert lead not working ------------------------+--------------------------------------------------- Reporter: Nathan | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:41:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:41:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231076=3A?= =?utf-8?q?_no_create_new_activities?= In-Reply-To: <076.eaaa8cb928d1aa031a8dfd5536e82811@vtiger.fosslabs.com> References: <076.eaaa8cb928d1aa031a8dfd5536e82811@vtiger.fosslabs.com> Message-ID: <085.1b78f0f486303f48eb62162cb6c76f2c@vtiger.fosslabs.com> #1076: no create new activities ------------------------+--------------------------------------------------- Reporter: ftc | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Activities is segregated into New Task & Events. So you have to create either one of them to get the data in the Activities List view. Accounts is functional from Marketing tab -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:43:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:43:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231014=3A?= =?utf-8?q?_Conver_to_FAQ_-_string_is_appended_in_Answer_text_area?= In-Reply-To: <076.34563da44e84c9b36342cfa57486392a@vtiger.fosslabs.com> References: <076.34563da44e84c9b36342cfa57486392a@vtiger.fosslabs.com> Message-ID: <085.ccbdc2d73c9518828673b8d71bfbc7fa@vtiger.fosslabs.com> #1014: Conver to FAQ - string is appended in Answer text area ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => invalid * status: new => closed Comment: This string is reasonably added to show the comments and solutions seperately. This is expected bahaviour. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:44:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:44:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23801=3A_?= =?utf-8?q?calendar_settings_icon?= In-Reply-To: <076.c60abf35c03ea2802e25e5deb4509bae@vtiger.fosslabs.com> References: <076.c60abf35c03ea2802e25e5deb4509bae@vtiger.fosslabs.com> Message-ID: <085.3cff97f28c28cc354ad19c6a3479ca0a@vtiger.fosslabs.com> #801: calendar settings icon ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:45:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:45:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23906=3A_?= =?utf-8?q?Calendar_-_To_Do?= In-Reply-To: <076.eb017c5a70b5b97f512e27a68ca27cc5@vtiger.fosslabs.com> References: <076.eb017c5a70b5b97f512e27a68ca27cc5@vtiger.fosslabs.com> Message-ID: <085.b525888ec24cd2d775b9d2e022dd8ebc@vtiger.fosslabs.com> #906: Calendar - To Do ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:47:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:47:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23974=3A_?= =?utf-8?q?Sorting_is_not_working_in_Email_Listts_View?= In-Reply-To: <076.2c7b086732146900250e4894a2effdaa@vtiger.fosslabs.com> References: <076.2c7b086732146900250e4894a2effdaa@vtiger.fosslabs.com> Message-ID: <085.eb67db276430bf247bc354143332a7c0@vtiger.fosslabs.com> #974: Sorting is not working in Email Listts View ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:47:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:47:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231092=3A?= =?utf-8?q?_Calendar_=3E_ToDo_=3E_Actions_do_not_work?= In-Reply-To: <076.86166d768aa3521237bd3836bb3b3b28@vtiger.fosslabs.com> References: <076.86166d768aa3521237bd3836bb3b3b28@vtiger.fosslabs.com> Message-ID: <085.9b393e28a5d71af45dc3f2553a86a3ac@vtiger.fosslabs.com> #1092: Calendar > ToDo > Actions do not work ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:48:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:48:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231016=3A?= =?utf-8?q?_HelpDesk_-_Attached_file_name_is_missing_in_detail_view?= In-Reply-To: <076.5b39819938d72761fa4a92d4814d80ce@vtiger.fosslabs.com> References: <076.5b39819938d72761fa4a92d4814d80ce@vtiger.fosslabs.com> Message-ID: <085.7d20d3a1122e35906127e6dbc1d22762@vtiger.fosslabs.com> #1016: HelpDesk - Attached file name is missing in detail view ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => duplicate * status: new => closed Comment: This issue is fixed This is the duplication ticket of 398 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:48:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:48:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231086=3A?= =?utf-8?q?_Home_page_graphs_are_broken?= In-Reply-To: <076.e8c3d7abf047c083f365b76693799438@vtiger.fosslabs.com> References: <076.e8c3d7abf047c083f365b76693799438@vtiger.fosslabs.com> Message-ID: <085.e31c56df2d7c34f4ffec08aece6c8359@vtiger.fosslabs.com> #1086: Home page graphs are broken ------------------------+--------------------------------------------------- Reporter: gopal | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by jerrydgeorge): removed from Home Page temp work arround -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:50:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:50:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2345=3A_F?= =?utf-8?q?ix_for_=22Fatal_error=2E=2E=2E=22_by_reports_with_custom_field?= In-Reply-To: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> References: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> Message-ID: <085.1e945324b8dd9d65ff5e3fbc0981ece5@vtiger.fosslabs.com> #45: Fix for "Fatal error..." by reports with custom field ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * status: reopened => new * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:50:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:50:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2344=3A_F?= =?utf-8?q?ix_for_Error_by_custom_view_with_a_custom_fields?= In-Reply-To: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> References: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> Message-ID: <085.9c2ac52030a1141678eb62d02bd2df9d@vtiger.fosslabs.com> #44: Fix for Error by custom view with a custom fields ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * status: reopened => new * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:51:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:51:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23109=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> References: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> Message-ID: <085.7e6a0de1d995329541d661bb2ca98bfc@vtiger.fosslabs.com> #109: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Accounts,MassDelete ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * owner: philip => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:51:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:51:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23109=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> References: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> Message-ID: <085.66111a5d2fac7fe8e1b0dcfcd4a28ca2@vtiger.fosslabs.com> #109: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Accounts,MassDelete ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:53:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:53:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23281=3A_?= =?utf-8?q?ListView_of_Leads_must_color-differentiate_junk_leads?= In-Reply-To: <076.f37448842ef9b3b36384b24b610b9e83@vtiger.fosslabs.com> References: <076.f37448842ef9b3b36384b24b610b9e83@vtiger.fosslabs.com> Message-ID: <085.91273ade02b9446aa2918b5236a7e4e3@vtiger.fosslabs.com> #281: ListView of Leads must color-differentiate junk leads --------------------------+------------------------------------------------- Reporter: richie | Owner: philip Type: enhancement | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: leads --------------------------+------------------------------------------------- Changes (by jerrydgeorge): * type: defect => enhancement -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 07:19:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 14:19:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23713=3A_?= =?utf-8?q?Alphabetical_search_missing_in_campaign?= In-Reply-To: <076.cb538ed353558cca1414c6f4d7dd19a3@vtiger.fosslabs.com> References: <076.cb538ed353558cca1414c6f4d7dd19a3@vtiger.fosslabs.com> Message-ID: <085.2d7d0033992463b4a9d9340fc19b2788@vtiger.fosslabs.com> #713: Alphabetical search missing in campaign ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Campaign Alphabetical ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 07:24:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 14:24:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231099=3A?= =?utf-8?q?_images_not_coming_in_all_installation_pages?= Message-ID: <076.37294b1e8e1224f195b3fa8ffd3b77b5@vtiger.fosslabs.com> #1099: images not coming in all installation pages -----------------------+---------------------------------------------------- Reporter: mangai | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- images not coming in all installation pages -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 07:25:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 14:25:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231099=3A?= =?utf-8?q?_images_not_coming_in_all_installation_pages?= In-Reply-To: <076.37294b1e8e1224f195b3fa8ffd3b77b5@vtiger.fosslabs.com> References: <076.37294b1e8e1224f195b3fa8ffd3b77b5@vtiger.fosslabs.com> Message-ID: <085.6b3aea7395b64ed8dafee3bd4ab62777@vtiger.fosslabs.com> #1099: images not coming in all installation pages ------------------------+--------------------------------------------------- Reporter: mangai | Owner: jerry Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => jerry -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 07:38:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 14:38:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6696 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060529143801.0B3BE7CF897@vtiger.fosslabs.com> Author: don Date: Mon May 29 08:37:57 2006 New Revision: 6696 Log: image location changed Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== --- vtigercrm/trunk/install/0welcome.php (original) +++ vtigercrm/trunk/install/0welcome.php Mon May 29 08:37:57 2006 @@ -61,12 +61,12 @@

- +
- - + + - +
vtiger CRMv5 Betavtiger CRMv5 Beta

 vtiger CRM Configuration Wizard

 vtiger CRM Configuration Wizard

@@ -2568,24 +2568,24 @@
-
+
By clicking the Start button, you are agreeing to the licensing terms.
- +
- - + +
- +
Register vtiger CRM (Optional)Register vtiger CRM (Optional)
Please take a moment to register your copy of vtiger CRM. Though this is optional, we encourage you to register. Only your name and email address are required for registration. We do not sell, rent, share or otherwise, distribute your information to third parties.
From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 07:44:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 14:44:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6697 - /vtigercrm/trunk/modules/Users/Login.php Message-ID: <20060529144407.301FB7CF6A8@vtiger.fosslabs.com> Author: richie Date: Mon May 29 08:44:03 2006 New Revision: 6697 Log: changed the message Modified: vtigercrm/trunk/modules/Users/Login.php Modified: vtigercrm/trunk/modules/Users/Login.php ============================================================================== --- vtigercrm/trunk/modules/Users/Login.php (original) +++ vtigercrm/trunk/modules/Users/Login.php Mon May 29 08:44:03 2006 @@ -103,15 +103,14 @@
- Welcome to vtiger CRM 5.0.0

- vtigerCRM 5.0.0 is more user-friendly than ever before and sets the standard for all commercial-grade business applications, open-source or otherwise.

+ Welcome to vtiger CRM 5 Beta

New in Beta
-
  • Integrated Mail Client
  • -
  • API docs
  • -
  • Optimized Performance
  • +
  • Integrated webmail Client
  • +
  • Campaign Management
  • +
  • Better Performance
  • Sexier Dashboards,Reports,Calendar
  • Migration Support

  • - Your 'vtiger-xperience' is ...
    + How is 'vtiger-experience' ?
  • vtiger blogs
  • bloglines
  • technorati
  • From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 07:45:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 14:45:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6698 - /vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Message-ID: <20060529144539.0E3B67CF896@vtiger.fosslabs.com> Author: don Date: Mon May 29 08:45:35 2006 New Revision: 6698 Log: scrollbars removed from listview Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Mon May 29 08:45:35 2006 @@ -73,7 +73,7 @@
    -
    +
    {if $SHOW_MASS_SELECT neq 'false'} From vtiger-tickets at vtiger.fosslabs.com Mon May 29 07:48:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 14:48:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231100=3A?= =?utf-8?q?_Search_Issue?= Message-ID: <076.121568b45778e432f494a514491fb077@vtiger.fosslabs.com> #1100: Search Issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: philip Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- I clicked on Search under Campaigns and i clicked advanced search,then i clicked on Basic Search,then i clicked on Advanced search ,now i cant go back to Basic Search -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 07:59:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 14:59:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231101=3A?= =?utf-8?q?_UI_issue_View_Names_for_Calendar?= Message-ID: <076.b7a056cbb88a5a06ee49d953312cc2d3@vtiger.fosslabs.com> #1101: UI issue View Names for Calendar --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- the View Name for Calendar Week View and Month view is not understandable -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:01:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:01:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23149=3A_?= =?utf-8?q?Able_to_add_events_for_days_gone_by_without_any_check_in_Calend?= =?utf-8?q?ar?= In-Reply-To: <076.cf1907ebb39ce87940079993e8ae3424@vtiger.fosslabs.com> References: <076.cf1907ebb39ce87940079993e8ae3424@vtiger.fosslabs.com> Message-ID: <085.748d9516615a89612b76101313f10a80@vtiger.fosslabs.com> #149: Able to add events for days gone by without any check in Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:02:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:02:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23187=3A_?= =?utf-8?q?Cannot_Disable_Share_Calendar_Feature_for_Single_User?= In-Reply-To: <076.4a8338ece8b8361dd08d6153e6e829c1@vtiger.fosslabs.com> References: <076.4a8338ece8b8361dd08d6153e6e829c1@vtiger.fosslabs.com> Message-ID: <085.054f8acf6eb01ff5f2a80638c34c228b@vtiger.fosslabs.com> #187: Cannot Disable Share Calendar Feature for Single User ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:04:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:04:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23910=3A_?= =?utf-8?q?Calendar_-_Settings_Icon?= In-Reply-To: <076.8768051958f9fba0b00bf8e84c552efd@vtiger.fosslabs.com> References: <076.8768051958f9fba0b00bf8e84c552efd@vtiger.fosslabs.com> Message-ID: <085.58cb9ea3c803d87ae64c5987b41b8941@vtiger.fosslabs.com> #910: Calendar - Settings Icon ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:05:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:05:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231026=3A?= =?utf-8?q?_Calendar_-_Time_format_problem?= In-Reply-To: <076.5c969aa71b8ff64c4db327a2be7cce6c@vtiger.fosslabs.com> References: <076.5c969aa71b8ff64c4db327a2be7cce6c@vtiger.fosslabs.com> Message-ID: <085.97f136e781ac41170589d89625747cd3@vtiger.fosslabs.com> #1026: Calendar - Time format problem ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: calendar ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed in calendar setting UI -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:06:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:06:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231029=3A?= =?utf-8?q?_Calendar_-_No_quick_create_link_for_Todo/task?= In-Reply-To: <076.f88a93d596410fb17fcf0f1bccbc78de@vtiger.fosslabs.com> References: <076.f88a93d596410fb17fcf0f1bccbc78de@vtiger.fosslabs.com> Message-ID: <085.5bf3de9995ad8059ac060ee8a63662b1@vtiger.fosslabs.com> #1029: Calendar - No quick create link for Todo/task ------------------------+--------------------------------------------------- Reporter: saraj | Owner: managi Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: calendar ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:08:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:08:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231102=3A?= =?utf-8?q?_Calendar_Month_View_Issue?= Message-ID: <076.5adc91d14a1acc250e808369d6f5dadc@vtiger.fosslabs.com> #1102: Calendar Month View Issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- In Calendar Month View The Event comes out of the space alloted for a day -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:09:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:09:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231103=3A?= =?utf-8?q?_Change_Owner_not_working_for_Events_in_Calendar?= Message-ID: <076.456354da9a057d9c87ee8cd8dca6b107@vtiger.fosslabs.com> #1103: Change Owner not working for Events in Calendar --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:10:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:10:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23802=3A_?= =?utf-8?q?calendar_icon?= In-Reply-To: <076.4aa45f3db8ea735b9656aeaa4dd835de@vtiger.fosslabs.com> References: <076.4aa45f3db8ea735b9656aeaa4dd835de@vtiger.fosslabs.com> Message-ID: <085.ce561797bbfdc1c0d621345df867936c@vtiger.fosslabs.com> #802: calendar icon ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:10:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:10:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231104=3A?= =?utf-8?q?_Issue_in_notes_attachment?= Message-ID: <076.72db068eaf2b283598eb7f6d6eae55de@vtiger.fosslabs.com> #1104: Issue in notes attachment -----------------------+---------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In notes attachement upload a file named features.html. this file is getting saved as features.html.txt -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:14:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:14:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231105=3A?= =?utf-8?q?_Calendar_Issue?= Message-ID: <076.828097aad950dc3eaa698a08d3117831@vtiger.fosslabs.com> #1105: Calendar Issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- When I do any operations from ListView af a calendar it is going back to Hour View -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 08:18:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 15:18:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6699 - /vtigercrm/trunk/index.php Message-ID: <20060529151813.D66917CF8A0@vtiger.fosslabs.com> Author: allanbush Date: Mon May 29 09:18:11 2006 New Revision: 6699 Log: Cleaned up formatting. Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon May 29 09:18:11 2006 @@ -112,6 +112,7 @@ $_SERVER['REQUEST_URI'] = ''; } +$action = ''; if(isset($_REQUEST['action'])) { $action = $_REQUEST['action']; @@ -192,11 +193,97 @@ { $log->info("About to take action ".$action); $log->debug("in $action"); - if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action) || ereg("^TodoSave",$action) || ereg("^RecalculateSharingRules",$action) || (ereg("^body",$action) && ereg("^Webmails",$module)) || (ereg("^DetailView",$action) && ereg("^Webmails",$module) )) + if(ereg("^Save", $action) || + ereg("^Delete", $action) || + ereg("^Choose", $action) || + ereg("^Popup", $action) || + ereg("^ChangePassword", $action) || + ereg("^Authenticate", $action) || + ereg("^Logout", $action) || + ereg("^Export",$action) || + ereg("^add2db", $action) || + ereg("^result", $action) || + ereg("^LeadConvertToEntities", $action) || + ereg("^downloadfile", $action) || + ereg("^massdelete", $action) || + ereg("^updateLeadDBStatus",$action) || + ereg("^AddCustomFieldToDB", $action) || + ereg("^updateRole",$action) || + ereg("^UserInfoUtil",$action) || + ereg("^deleteRole",$action) || + ereg("^UpdateComboValues",$action) || + ereg("^fieldtypes",$action) || + ereg("^app_ins",$action) || + ereg("^minical",$action) || + ereg("^minitimer",$action) || + ereg("^app_del",$action) || + ereg("^send_mail",$action) || + ereg("^populatetemplate",$action) || + ereg("^TemplateMerge",$action) || + ereg("^testemailtemplateusage",$action) || + ereg("^saveemailtemplate",$action) || + ereg("^lookupemailtemplate",$action) || + ereg("^deletewordtemplate",$action) || + ereg("^deleteemailtemplate",$action) || + ereg("^CurrencyDelete",$action) || + ereg("^deleteattachments",$action) || + ereg("^MassDeleteUsers",$action) || + ereg("^UpdateFieldLevelAccess",$action) || + ereg("^UpdateDefaultFieldLevelAccess",$action) || + ereg("^UpdateProfile",$action) || + ereg("^updateRelations",$action) || + ereg("^updateNotificationSchedulers",$action) || + ereg("^Star",$action) || + ereg("^addPbProductRelToDB",$action) || + ereg("^UpdateListPrice",$action) || + ereg("^PriceListPopup",$action) || + ereg("^SalesOrderPopup",$action) || + ereg("^CreatePDF",$action) || + ereg("^CreateSOPDF",$action) || + ereg("^redirect",$action) || + ereg("^webmail",$action) || + ereg("^left_main",$action) || + ereg("^delete_message",$action) || + ereg("^mime",$action) || + ereg("^move_messages",$action) || + ereg("^folders_create",$action) || + ereg("^imap_general",$action) || + ereg("^mime",$action) || + ereg("^download",$action) || + ereg("^about_us",$action) || + ereg("^SendMailAction",$action) || + ereg("^CreateXL",$action) || + ereg("^savetermsandconditions",$action) || + ereg("^home_rss",$action) || + ereg("^ConvertAsFAQ",$action) || + ereg("^Tickerdetail",$action) || + ereg("^".$module."Ajax",$action) || + ereg("^chat",$action) || + ereg("^vtchat",$action) || + ereg("^updateCalendarSharing",$action) || + ereg("^disable_sharing",$action) || + ereg("^HeadLines",$action) || + ereg("^TodoSave",$action) || + ereg("^RecalculateSharingRules",$action) || + (ereg("^body",$action) && + ereg("^Webmails",$module)) || + (ereg("^DetailView",$action) && + ereg("^Webmails",$module) )) { $skipHeaders=true; //skip headers for all these invocations as they are mostly popups - if(ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Export", $action) || ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^lookupemailtemplate",$action) || ereg("^about_us",$action) || ereg("^home_rss",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action)|| ereg("^vtchat",$action) || ereg("^massdelete", $action)) + if(ereg("^Popup", $action) || + ereg("^ChangePassword", $action) || + ereg("^Export", $action) || + ereg("^downloadfile", $action) || + ereg("^fieldtypes",$action) || + ereg("^lookupemailtemplate",$action) || + ereg("^about_us",$action) || + ereg("^home_rss",$action) || + ereg("^".$module."Ajax",$action) || + ereg("^chat",$action) || + ereg("^vtchat",$action) || + ereg("^massdelete", $action)) $skipFooters=true; //skip footers for all these invocations as they are mostly popups if(ereg("^downloadfile", $action) || ereg("^fieldtypes",$action)) From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:30:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:30:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23921=3A_?= =?utf-8?q?issue_in_file_upload?= In-Reply-To: <076.bddce29e7351c94aa52dd807c034f953@vtiger.fosslabs.com> References: <076.bddce29e7351c94aa52dd807c034f953@vtiger.fosslabs.com> Message-ID: <085.7f1acff284801f6eb660f9e07e2cdfa3@vtiger.fosslabs.com> #921: issue in file upload ------------------------+--------------------------------------------------- Reporter: mangai | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:39:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:39:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231106=3A?= =?utf-8?q?_Issue_in_Calendar_Quick_Access_link?= Message-ID: <076.c6e100f8424625fa3cd82a6c919480dd@vtiger.fosslabs.com> #1106: Issue in Calendar Quick Access link --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- The Postpone link in Calendar QuickAcces do the same functionality of editing the calendar -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:40:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:40:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231107=3A?= =?utf-8?q?_Error_In_calendar?= Message-ID: <076.924adee6499b40eb86dddcd6dc28fd0e@vtiger.fosslabs.com> #1107: Error In calendar --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- type is not set when i delete an event i got this error -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:43:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:43:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231108=3A?= =?utf-8?q?_Issue_in_Week_hour_View?= Message-ID: <076.28a280a5e9b68de193a2ca12694caefc@vtiger.fosslabs.com> #1108: Issue in Week hour View --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- Week Hour View is not proper if i give a huge subject -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:51:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:51:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231109=3A?= =?utf-8?q?_total_cost_calculation_in_quote_not_clear?= Message-ID: <076.45e9bc14aab1f17446b516955f930775@vtiger.fosslabs.com> #1109: total cost calculation in quote not clear -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: quote | -----------------------+---------------------------------------------------- The Total value derived during quote creation is not intuitive. We have to assume that the total tax and the cost price are being added to get the Total Cost. The representation can be made more clearer. The product should be automatically related to the quote if the quote is being created from the related list of product or from a link in the product page -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:51:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:51:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231109=3A?= =?utf-8?q?_total_cost_calculation_in_quote_not_clear?= In-Reply-To: <076.45e9bc14aab1f17446b516955f930775@vtiger.fosslabs.com> References: <076.45e9bc14aab1f17446b516955f930775@vtiger.fosslabs.com> Message-ID: <085.57e5fb8cf5c2f6c11cfd591d2dba426b@vtiger.fosslabs.com> #1109: total cost calculation in quote not clear ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: quote ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:52:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:52:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231110=3A?= =?utf-8?q?_price_book_not_showing_any_entries?= Message-ID: <076.5b2bd510ab6218f7a668d3d6bf6f9aba@vtiger.fosslabs.com> #1110: price book not showing any entries -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: pricebook | -----------------------+---------------------------------------------------- when i click on the price book icon next to the list price while creation of a quote, the list view for the price book shows 0 entries. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:53:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:53:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231111=3A?= =?utf-8?q?_Unit_price_alignment?= Message-ID: <076.200736e54b6b9a89af6abc5d64dea244@vtiger.fosslabs.com> #1111: Unit price alignment ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: unit price | ------------------------+--------------------------------------------------- The Unit Price is not aligned in the same plane when there are more than one entries during quote creation -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:54:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:54:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231112=3A?= =?utf-8?q?_copy_shipping_to_billing_and_vice-versa_not_supported?= Message-ID: <076.7b8b2189052f43a7391dbcc8289cc21c@vtiger.fosslabs.com> #1112: copy shipping to billing and vice-versa not supported ---------------------------+------------------------------------------------ Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: product,quote | ---------------------------+------------------------------------------------ There is no facility to copy the shipping and billing addresses to each other if need be. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:56:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:56:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231113=3A?= =?utf-8?q?_export_to_pdf_fails_from_quotes?= Message-ID: <076.431db81bc7b29e1e6bec57b2346fde3b@vtiger.fosslabs.com> #1113: export to pdf fails from quotes -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: quote | -----------------------+---------------------------------------------------- Warning: getimagesize(test/logo/sale.jpeg) [function.getimagesize]: failed to open stream: No such file or directory in C:\mayval\vtigercrm-5.0.0-beta\apache\htdocs\vtigerCRM\include\fpdf\fpdf.php on line 1505 FPDF error: Missing or incorrect image file: test/logo/sale.jpeg -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:58:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:58:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231114=3A?= =?utf-8?q?_tax_split_up_shows_only_upon_clicking_on_button?= Message-ID: <076.e0fc7e9f8cb228797d775f33694000ad@vtiger.fosslabs.com> #1114: tax split up shows only upon clicking on button -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- tax split up gets listed only upon clicking the button. The sequence should have been the other way round. The button too is not intuitive. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:28:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 16:28:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231115=3A?= =?utf-8?q?_Report_Creator_=3E_Relative_Module_not_showing?= Message-ID: <076.bfc887d15993de2dff63a0499087006d@vtiger.fosslabs.com> #1115: Report Creator > Relative Module not showing -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- There are no entries at the relative module - step 2 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 10:20:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 17:20:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?= =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?= =?utf-8?q?leased?= Message-ID: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com> #1116: FCKeditor: document version used, merge new versions as released ---------------------------------------+------------------------------------ Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: editor packaging snapshot | ---------------------------------------+------------------------------------ It seems that the most recent FCKEditor snapshot was added in r1799, nearly 10 months ago. I don't know what version of FCKEditor this was, but I'd like to follow the same policy I advocated with adodb, specifically upgrading to the latest stable releases to take advantage of externally- developed feature additions and security and bug fixes. This is different packaging issue than adodb, because I think the client- side FCKEditor will always be used from its location in the vtigercrm source. However, with all the browser compatibilty work that goes into FCKEditor, we're foolish not to update to the most recent version as often as our release schedule permits. FCKEditor is under active development at http://www.fckeditor.net/ I propose the following: * Document the version of FCKEditor that is currently snapshotted per r1799 (or later). * I will merge (and give cursory testing to) the most recent stable FCKEditor: FCKeditor 2.2 released 2005-12-23 * In an easily-reversible changeset, I will merge (and give cursory testing to) the development version of FCKEditor: FCKeditor 2.3 Beta released 2006-05-16 As well as merging subsequent betas. By the time vtigercrm-5.0.0 nears release, FCKEditor-2.3 will be our documented snapshot. Please give feedback to this bug to help decide this course of action. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 11:12:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 18:12:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6700 - /vtigercrm/trunk/include/install/images/ Message-ID: <20060529181245.B58167D37E8@vtiger.fosslabs.com> Author: richie Date: Mon May 29 12:12:24 2006 New Revision: 6700 Log: install images moved to include/install/images Added: vtigercrm/trunk/include/install/images/ vtigercrm/trunk/include/install/images/cwBtnChange.gif (with props) vtigercrm/trunk/include/install/images/cwBtnFinish.gif (with props) vtigercrm/trunk/include/install/images/cwBtnNext.gif (with props) vtigercrm/trunk/include/install/images/cwBtnStart.gif (with props) vtigercrm/trunk/include/install/images/cwHdrCnfSysConf.gif (with props) vtigercrm/trunk/include/install/images/cwHdrCrConfFile.gif (with props) vtigercrm/trunk/include/install/images/cwHdrCrDbTables.gif (with props) vtigercrm/trunk/include/install/images/cwHdrSysCheck.gif (with props) vtigercrm/trunk/include/install/images/cwHdrSysConf.gif (with props) vtigercrm/trunk/include/install/images/cwHdrVtConfWiz.gif (with props) vtigercrm/trunk/include/install/images/cwIcoConfFile.gif (with props) vtigercrm/trunk/include/install/images/cwIcoDB.gif (with props) vtigercrm/trunk/include/install/images/cwIcoSystem.gif (with props) vtigercrm/trunk/include/install/images/cwRegVCRM.gif (with props) vtigercrm/trunk/include/install/images/cwShadeBg.gif (with props) vtigercrm/trunk/include/install/images/cwShadeLeft.gif (with props) vtigercrm/trunk/include/install/images/cwShadeRight.gif (with props) vtigercrm/trunk/include/install/images/cwStep1of5.gif (with props) vtigercrm/trunk/include/install/images/cwStep2of5.gif (with props) vtigercrm/trunk/include/install/images/cwStep3of5.gif (with props) vtigercrm/trunk/include/install/images/cwStep4of5.gif (with props) vtigercrm/trunk/include/install/images/cwStep5of5.gif (with props) vtigercrm/trunk/include/install/images/cwTitle.gif (with props) vtigercrm/trunk/include/install/images/cwTopBg.gif (with props) vtigercrm/trunk/include/install/images/cwTopLeft.gif (with props) vtigercrm/trunk/include/install/images/cwTopRight.gif (with props) vtigercrm/trunk/include/install/images/cwURL.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 11:13:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 18:13:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6701 - /vtigercrm/trunk/include/images/install/ Message-ID: <20060529181340.775F67D37F1@vtiger.fosslabs.com> Author: richie Date: Mon May 29 12:13:36 2006 New Revision: 6701 Log: install images deleted Removed: vtigercrm/trunk/include/images/install/ From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 11:46:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 18:46:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6702 - in /vtigercrm/trunk/include: images/install/ install/images/ Message-ID: <20060529184650.B7E787D37EA@vtiger.fosslabs.com> Author: jeffk Date: Mon May 29 12:46:37 2006 New Revision: 6702 Log: backing out r6700:6701. will do subversion-style history-aware move next Added: vtigercrm/trunk/include/images/install/ - copied from r6699, vtigercrm/trunk/include/images/install/ vtigercrm/trunk/include/images/install/cwBtnChange.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwBtnChange.gif vtigercrm/trunk/include/images/install/cwBtnFinish.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwBtnFinish.gif vtigercrm/trunk/include/images/install/cwBtnNext.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwBtnNext.gif vtigercrm/trunk/include/images/install/cwBtnStart.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwBtnStart.gif vtigercrm/trunk/include/images/install/cwHdrCnfSysConf.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrCnfSysConf.gif vtigercrm/trunk/include/images/install/cwHdrCrConfFile.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrCrConfFile.gif vtigercrm/trunk/include/images/install/cwHdrCrDbTables.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrCrDbTables.gif vtigercrm/trunk/include/images/install/cwHdrSysCheck.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrSysCheck.gif vtigercrm/trunk/include/images/install/cwHdrSysConf.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrSysConf.gif vtigercrm/trunk/include/images/install/cwHdrVtConfWiz.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrVtConfWiz.gif vtigercrm/trunk/include/images/install/cwIcoConfFile.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwIcoConfFile.gif vtigercrm/trunk/include/images/install/cwIcoDB.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwIcoDB.gif vtigercrm/trunk/include/images/install/cwIcoSystem.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwIcoSystem.gif vtigercrm/trunk/include/images/install/cwRegVCRM.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwRegVCRM.gif vtigercrm/trunk/include/images/install/cwShadeBg.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwShadeBg.gif vtigercrm/trunk/include/images/install/cwShadeLeft.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwShadeLeft.gif vtigercrm/trunk/include/images/install/cwShadeRight.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwShadeRight.gif vtigercrm/trunk/include/images/install/cwStep1of5.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwStep1of5.gif vtigercrm/trunk/include/images/install/cwStep2of5.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwStep2of5.gif vtigercrm/trunk/include/images/install/cwStep3of5.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwStep3of5.gif vtigercrm/trunk/include/images/install/cwStep4of5.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwStep4of5.gif vtigercrm/trunk/include/images/install/cwStep5of5.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwStep5of5.gif vtigercrm/trunk/include/images/install/cwTitle.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwTitle.gif vtigercrm/trunk/include/images/install/cwTopBg.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwTopBg.gif vtigercrm/trunk/include/images/install/cwTopLeft.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwTopLeft.gif vtigercrm/trunk/include/images/install/cwTopRight.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwTopRight.gif vtigercrm/trunk/include/images/install/cwURL.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwURL.gif Removed: vtigercrm/trunk/include/install/images/ From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 11:51:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 18:51:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6703 - in /vtigercrm/trunk/include: images/install/ install/images/ Message-ID: <20060529185130.78E257D37F7@vtiger.fosslabs.com> Author: jeffk Date: Mon May 29 12:51:28 2006 New Revision: 6703 Log: install images moved to include/install/images, history-aware replay of r6700:r6701 Added: vtigercrm/trunk/include/install/images/ - copied from r6702, vtigercrm/trunk/include/images/install/ Removed: vtigercrm/trunk/include/images/install/ From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 12:39:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 19:39:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6704 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060529193903.176E47D37FF@vtiger.fosslabs.com> Author: richie Date: Mon May 29 13:38:58 2006 New Revision: 6704 Log: status aligned Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon May 29 13:38:58 2006 @@ -419,7 +419,7 @@ - + +
    - + salesorderid @@ -3399,6 +3402,9 @@ + + + quoteid @@ -3521,6 +3527,9 @@ + + + quoteid @@ -3636,6 +3645,9 @@ + + + invoice From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 15:34:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 22:34:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6724 - /vtigercrm/trunk/index.php Message-ID: <20060529223409.D36484C4412@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 16:34:06 2006 New Revision: 6724 Log: * Modified to avoid the copyright statement in Popups Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon May 29 16:34:06 2006 @@ -650,7 +650,8 @@ "; - if($action != "about_us" && $action != "vtchat" && $action != "ChangePassword" && $action != "body" && $action != $module."Ajax") + if($action != "about_us" && $action != "vtchat" && $action != "ChangePassword" && $action != "body" && $action != $module."Ajax" && $action!='Popup') + { echo $copyrightstatement; echo ""; From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 15:35:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 22:35:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6725 - /vtigercrm/trunk/Smarty/templates/Popup.tpl Message-ID: <20060529223546.AE56A4C4412@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 16:35:43 2006 New Revision: 6725 Log: * Added class small in table to display the Alphabetical search letters as small Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Popup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Popup.tpl Mon May 29 16:35:43 2006 @@ -58,7 +58,7 @@ - + - - + + - - + + + - -
    {$APP.$CATEGORY} > {$APP.$MODULE}{$APP.$CATEGORY} > {$APP.$MODULE} @@ -22,7 +23,7 @@ - - - + + + '; $output .= ''; $output .= ''; - $output .= ''; + $output .= ''; $output .= ''; Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon May 29 16:25:34 2006 @@ -1209,11 +1209,16 @@ $productid=$adb->query_result($result,$i-1,'productid'); $qty=$adb->query_result($result,$i-1,'quantity'); $listprice=$adb->query_result($result,$i-1,'listprice'); + $vat=$adb->query_result($result,$i-1,'vattax'); + $sales=$adb->query_result($result,$i-1,'salestax'); + $service=$adb->query_result($result,$i-1,'servicetax'); + if($listprice == '') $listprice = $unitprice; if($qty =='') $qty = 1; $total = $qty*$listprice; + $total_with_tax = $total+($vat*$total/100)+($sales*$total/100)+($service*$total/100); $product_id_var = 'hdnProductId'.$i; $status_var = 'hdnRowStatus'.$i; @@ -1233,7 +1238,7 @@ $product_Detail[$i]['txtQty'.$i]=$qty; $product_Detail[$i]['unitPrice'.$i]=$unitprice; $product_Detail[$i]['txtListPrice'.$i]=$listprice; - $product_Detail[$i]['total'.$i]=$total; + $product_Detail[$i]['total'.$i]=$total_with_tax; if($i != 1) { @@ -1245,9 +1250,9 @@ $product_Detail[$i]['hdnTotal'.$i] = $total; //Added to pass the tax percentage values - $product_Detail[$i]['txtVATTax'.$i] = getProductTaxPercentage('VAT',$productid,'default'); - $product_Detail[$i]['txtSalesTax'.$i] = getProductTaxPercentage('Sales',$productid,'default'); - $product_Detail[$i]['txtServiceTax'.$i] = getProductTaxPercentage('Service',$productid,'default'); + $product_Detail[$i]['txtVATTax'.$i] = $vat;//getProductTaxPercentage('VAT',$productid,'default'); + $product_Detail[$i]['txtSalesTax'.$i] = $sales;//getProductTaxPercentage('Sales',$productid,'default'); + $product_Detail[$i]['txtServiceTax'.$i] = $service;//getProductTaxPercentage('Service',$productid,'default'); } $log->debug("Exiting getAssociatedProducts method ..."); Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Mon May 29 16:25:34 2006 @@ -69,14 +69,22 @@ $qty_var = 'txtQty'.$i; $list_price_var = 'txtListPrice'.$i; + $vat_var = 'txtVATTax'.$i; + $sales_var = 'txtSalesTax'.$i; + $service_var = 'txtServiceTax'.$i; + $prod_id = $_REQUEST[$product_id_var]; $prod_status = $_REQUEST[$status_var]; $qty = $_REQUEST[$qty_var]; $listprice = $_REQUEST[$list_price_var]; + $vat = $_REQUEST[$vat_var]; + $sales = $_REQUEST[$sales_var]; + $service = $_REQUEST[$service_var]; + if($prod_status != 'D') { - $query ="insert into invoiceproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; + $query ="insert into invoiceproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)"; $adb->query($query); //Updating the Quantity in Stock in the Product Table updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Invoice'); Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Mon May 29 16:25:34 2006 @@ -2756,7 +2756,27 @@ $update_query5 = "update field set quickcreate=1, quickcreatesequence=NULL where tabid in (10,14)"; Execute($update_query5); - +$alter_query_array18 = Array( + "alter table soproductrel add column vattax decimal(7,3) default NULL", + "alter table soproductrel add column salestax decimal(7,3) default NULL", + "alter table soproductrel add column servicetax decimal(7,3) default NULL", + + "alter table poproductrel add column vattax decimal(7,3) default NULL", + "alter table poproductrel add column salestax decimal(7,3) default NULL", + "alter table poproductrel add column servicetax decimal(7,3) default NULL", + + "alter table quotesproductrel add column vattax decimal(7,3) default NULL", + "alter table quotesproductrel add column salestax decimal(7,3) default NULL", + "alter table quotesproductrel add column servicetax decimal(7,3) default NULL", + + "alter table invoiceproductrel add column vattax decimal(7,3) default NULL", + "alter table invoiceproductrel add column salestax decimal(7,3) default NULL", + "alter table invoiceproductrel add column servicetax decimal(7,3) default NULL", + ); +foreach($alter_query_array18 as $query) +{ + Execute($query); +} Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Mon May 29 16:25:34 2006 @@ -59,14 +59,22 @@ $qty_var = 'txtQty'.$i; $list_price_var = 'txtListPrice'.$i; + $vat_var = 'txtVATTax'.$i; + $sales_var = 'txtSalesTax'.$i; + $service_var = 'txtServiceTax'.$i; + $prod_id = $_REQUEST[$product_id_var]; $prod_status = $_REQUEST[$status_var]; $qty = $_REQUEST[$qty_var]; $listprice = $_REQUEST[$list_price_var]; + $vat = $_REQUEST[$vat_var]; + $sales = $_REQUEST[$sales_var]; + $service = $_REQUEST[$service_var]; + if($prod_status != 'D') { - $query ="insert into poproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; + $query ="insert into poproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)"; $adb->query($query); if($update_prod_stock == 'true') { Modified: vtigercrm/trunk/modules/Quotes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Save.php (original) +++ vtigercrm/trunk/modules/Quotes/Save.php Mon May 29 16:25:34 2006 @@ -67,14 +67,22 @@ $qty_var = 'txtQty'.$i; $list_price_var = 'txtListPrice'.$i; + $vat_var = 'txtVATTax'.$i; + $sales_var = 'txtSalesTax'.$i; + $service_var = 'txtServiceTax'.$i; + $prod_id = $_REQUEST[$product_id_var]; $prod_status = $_REQUEST[$status_var]; $qty = $_REQUEST[$qty_var]; $listprice = $_REQUEST[$list_price_var]; + $vat = $_REQUEST[$vat_var]; + $sales = $_REQUEST[$sales_var]; + $service = $_REQUEST[$service_var]; + if($prod_status != 'D') { - $query ="insert into quotesproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; + $query ="insert into quotesproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)"; $adb->query($query); //Checking the re-order level and sending mail updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Quotes'); Modified: vtigercrm/trunk/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Save.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Save.php Mon May 29 16:25:34 2006 @@ -69,14 +69,22 @@ $qty_var = 'txtQty'.$i; $list_price_var = 'txtListPrice'.$i; + $vat_var = 'txtVATTax'.$i; + $sales_var = 'txtSalesTax'.$i; + $service_var = 'txtServiceTax'.$i; + $prod_id = $_REQUEST[$product_id_var]; $prod_status = $_REQUEST[$status_var]; $qty = $_REQUEST[$qty_var]; $listprice = $_REQUEST[$list_price_var]; + $vat = $_REQUEST[$vat_var]; + $sales = $_REQUEST[$sales_var]; + $service = $_REQUEST[$service_var]; + if($prod_status != 'D') { - $query ="insert into soproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; + $query ="insert into soproductrel values($focus->id, $prod_id , $qty, $listprice, $vat, $sales, $service)"; $adb->query($query); updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'SalesOrder'); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 15:31:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 22:31:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6722 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060529223121.3172E4C440F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 16:31:17 2006 New Revision: 6722 Log: * Modified the fnAddRow and fnAddRowForPO functions Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Mon May 29 16:31:17 2006 @@ -1445,10 +1445,10 @@ colfour.innerHTML=" 
    "; colfive.innerHTML="  "; //Added for tax calculation - colsix.innerHTML=" 
    - {if $CHECK.EditView eq 'yes'} + {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} {if $MODULE eq 'Activities'} {else} Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Mon May 29 14:15:51 2006 @@ -99,12 +99,11 @@ {rdelim} + {include file='Buttons_List.tpl'}
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...
    - @@ -152,7 +151,7 @@ {$MOD.LBL_QUAL_CONTACT} 
  •    - {$MOD.LBL_MY_MAILS}  + {$MOD.LBL_MY_MAILS} 

  •  {$MOD.LBL_SENT_MAILS} Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Mon May 29 14:15:51 2006 @@ -10,11 +10,10 @@ ********************************************************************************/ -->*} + {include file='Buttons_List.tpl'}

    - {$CATEGORY} > {$MODULE} -
    +
       
    - From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 13:17:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:17:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6712 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060529201733.8B4E47D2F9B@vtiger.fosslabs.com> Author: richie Date: Mon May 29 14:17:29 2006 New Revision: 6712 Log: appstrings added for wemails module Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Mon May 29 14:17:29 2006 @@ -727,6 +727,7 @@ 'Vendors'=>'Vendors', 'Rss'=>'RSS', 'Portal'=>'My Sites', +'Webmails'=>'Webmails', //Added language for Parent Tab From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 13:18:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:18:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6713 - in /vtigercrm/trunk/modules/Webmails: WebmailsAjax.php webmails.js Message-ID: <20060529201844.D12DC7D30A1@vtiger.fosslabs.com> Author: mmbrich Date: Mon May 29 14:18:43 2006 New Revision: 6713 Log: more fixes for mailbox tally Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/trunk/modules/Webmails/WebmailsAjax.php Mon May 29 14:18:43 2006 @@ -75,9 +75,9 @@ $boxes[$i]["name"] = $mailbox; if($val == sizeof($search)) $boxes[$i]["newmsgs"] = 0; - else { - $boxes[$i]["newmsgs"] = (sizeof($search)-$val); - $_SESSION["mailboxes"][$mailbox] = ($val+sizeof($search)); + elseif($val < sizeof($search)) { + $boxes[$i]["newmsgs"] = (sizeof($search) - $val); + $_SESSION["mailboxes"][$key] = (sizeof($search)); } $i++; } Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Mon May 29 14:18:43 2006 @@ -99,7 +99,7 @@ if(mbox != mymbox) { var mbox = data.msgs[i].msg.box; var numnew = parseInt(data.msgs[i].msg.newmsgs); - + var read = parseInt($(mbox+"_read").innerHTML); $(mbox+"_read").innerHTML = (read+numnew); var unread = parseInt($(mbox+"_unread").innerHTML); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 13:26:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:26:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6714 - /vtigercrm/trunk/modules/Webmails/ListView.php Message-ID: <20060529202652.26EB47D2D43@vtiger.fosslabs.com> Author: mmbrich Date: Mon May 29 14:26:50 2006 New Revision: 6714 Log: fixes for empty mailbox Modified: vtigercrm/trunk/modules/Webmails/ListView.php Modified: vtigercrm/trunk/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/ListView.php (original) +++ vtigercrm/trunk/modules/Webmails/ListView.php Mon May 29 14:26:50 2006 @@ -225,7 +225,8 @@ return $listview_entries[$num]; } - +$displayed_msgs=0; +$new_msgs=0; if($numEmails <= 0) $listview_entries[0][] = ''; else { @@ -245,8 +246,6 @@ // MAIN LOOP // Main loop to create listview entries -$displayed_msgs=0; -$new_msgs=0; $i=1; while ($i<$c) { if(is_array($searchlist)) { @@ -261,7 +260,7 @@ $i++; $start_message--; } - +} // Build folder list and move_to dropdown box $list = imap_getmailboxes($mbox, "{".$imapServerAddress."}", "*"); @@ -300,7 +299,6 @@ imap_close($mbox); global $current_user; -} $smarty = new vtigerCRM_Smarty; $smarty->assign("USERID", $current_user->id); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 13:47:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:47:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6715 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060529204741.02D067D2D22@vtiger.fosslabs.com> Author: richie Date: Mon May 29 14:47:37 2006 New Revision: 6715 Log: function fnhide added Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Mon May 29 14:47:37 2006 @@ -1133,6 +1133,13 @@ id.style.display = 'none'; } +function fnhide(divId) +{ + + var id = document.getElementById(divId); + + id.style.display = 'none'; +} function fnLoadValues(obj1,obj2,SelTab,unSelTab){ From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 13:48:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:48:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6716 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060529204811.923027D13AE@vtiger.fosslabs.com> Author: richie Date: Mon May 29 14:48:07 2006 New Revision: 6716 Log: cntct image restored Modified: vtigercrm/trunk/include/utils/ListViewUtils.php Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon May 29 14:48:07 2006 @@ -1410,11 +1410,14 @@ if($imagename != '') { $imgpath = "test/contact/".$imagename; - $contact_image='  '; + $contact_image=''; } - } + $value = '
    - {$CATEGORY} -> {$MODULE} -

    +
       
    No Emails In This Folder
    '.$temp_val.''.$contact_image.'
    '; + }else + { //Commented to give link even to the first name - Jaguar $value = $contact_image.''.$temp_val.''; + } } elseif($module == "Activities") { From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 13:49:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:49:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6717 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060529204901.139567D2D57@vtiger.fosslabs.com> Author: richie Date: Mon May 29 14:48:57 2006 New Revision: 6717 Log: cntct image restored Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon May 29 14:48:57 2006 @@ -17,7 +17,7 @@ {if $MODULE eq 'Contacts'} -
    +
    {/if} - - - - - - - - - - {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} - - {/if} - - - - - - - - - - - {foreach key=row_no item=data from=$ASSOCIATEDPRODUCTS} - {assign var="txtProduct" value="txtProduct"|cat:$row_no} - {assign var="qtyInStock" value="qtyInStock"|cat:$row_no} - {assign var="txtQty" value="txtQty"|cat:$row_no} - {assign var="unitPrice" value="unitPrice"|cat:$row_no} - {assign var="txtListPrice" value="txtListPrice"|cat:$row_no} - {assign var="total" value="total"|cat:$row_no} - {assign var="hdnProductId" value="hdnProductId"|cat:$row_no} - {assign var="hdnRowStatus" value="hdnRowStatus"|cat:$row_no} - {assign var="hdnTotal" value="hdnTotal"|cat:$row_no} - - {assign var="txtVATTax" value="txtVATTax"|cat:$row_no} - {assign var="txtSalesTax" value="txtSalesTax"|cat:$row_no} - {assign var="txtServiceTax" value="txtServiceTax"|cat:$row_no} - - - - - {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} - - {/if} - - - - - - - - - {/foreach} -
    - {$APP.LBL_PRODUCT_DETAILS} -
    *{$APP.LBL_PRODUCT}{$APP.LBL_QTY_IN_STOCK}*{$APP.LBL_QTY}{$APP.LBL_UNIT_PRICE}*{$APP.LBL_LIST_PRICE}{$APP.LBL_TAX_CALCULATION}{$APP.LBL_TOTAL} 
    -   -
    {$data.$qtyInStock}
     
    - - -
    {$data.$unitPrice}
      -
    -   - - - - -   - - - - - - - -
    {$data.$total}
      -
    - - -   -
    -
    - - - - {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - -  {$APP.LBL_SUB_TOTAL} - -  
      {$APP.LBL_TAX} 
      {$APP.LBL_ADJUSTMENT} 
      {$APP.LBL_GRAND_TOTAL} 
    - - - - - - - - +{**} + + + + + + + + + +
    + {$APP.LBL_PRODUCT_DETAILS} +
    + + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {/if} + + + + + + + + + + + {foreach key=row_no item=data from=$ASSOCIATEDPRODUCTS} + {assign var="txtProduct" value="txtProduct"|cat:$row_no} + {assign var="qtyInStock" value="qtyInStock"|cat:$row_no} + {assign var="txtQty" value="txtQty"|cat:$row_no} + {assign var="unitPrice" value="unitPrice"|cat:$row_no} + {assign var="txtListPrice" value="txtListPrice"|cat:$row_no} + {assign var="total" value="total"|cat:$row_no} + {assign var="hdnProductId" value="hdnProductId"|cat:$row_no} + {assign var="hdnRowStatus" value="hdnRowStatus"|cat:$row_no} + {assign var="hdnTotal" value="hdnTotal"|cat:$row_no} + + {assign var="txtVATTax" value="txtVATTax"|cat:$row_no} + {assign var="txtSalesTax" value="txtSalesTax"|cat:$row_no} + {assign var="txtServiceTax" value="txtServiceTax"|cat:$row_no} + + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {/if} + + + + + + + + + {/foreach} +
    *{$APP.LBL_PRODUCT}{$APP.LBL_QTY_IN_STOCK}*{$APP.LBL_QTY}{$APP.LBL_UNIT_PRICE}*{$APP.LBL_LIST_PRICE}{$APP.LBL_TAX_CALCULATION}{$APP.LBL_TOTAL} 
    +   + {$data.$qtyInStock}  + + + {$data.$unitPrice}  + +   + + + + +   + + + + + + + + + +
    {$data.$total}
      +
    + + +   +
    +
    + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {else} + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +  {$APP.LBL_SUB_TOTAL} + +  
      {$APP.LBL_TAX} 
      {$APP.LBL_ADJUSTMENT} 
      {$APP.LBL_GRAND_TOTAL} 
    + + + + + + + + Modified: vtigercrm/trunk/include/js/Inventory.js ============================================================================== --- vtigercrm/trunk/include/js/Inventory.js (original) +++ vtigercrm/trunk/include/js/Inventory.js Mon May 29 16:25:34 2006 @@ -79,7 +79,7 @@ return prodListBody; } -function delRow(rowId) { +/*function delRow(rowId) { var rowId=parseInt(rowId.substr(rowId.indexOf("w")+1,rowId.length)) //removing the corresponding row var prodListBody=getProdListBody() @@ -160,7 +160,111 @@ } calcGrandTotal() -} +}*/ + +/* New Delete Function */ + +// Don't take risk by changing this function + +function deleteRow(module,i) +{ + rowCnt--; + var tableName = document.getElementById('proTab'); + var prev = tableName.rows.length; + document.getElementById('proTab').deleteRow(i); + for(loop_count=i+1;loop_countquery_result($result,$i-1,'qtyinstock'); $qty=$adb->query_result($result,$i-1,'quantity'); $listprice=$adb->query_result($result,$i-1,'listprice'); + $vat=$adb->query_result($result,$i-1,'vattax'); + $sales=$adb->query_result($result,$i-1,'salestax'); + $service=$adb->query_result($result,$i-1,'servicetax'); $total = $qty*$listprice; + $total_with_tax = $total+($vat*$total/100)+($sales*$total/100)+($service*$total/100); if($i%2 == 0) { @@ -914,7 +918,7 @@ $output .= '
    '.$qty.''.$unitprice.''.$listprice.'
    '.$total.'
    '.$total_with_tax.'
     VAT
     Sales
     Service
    "; - - colseven.innerHTML=" 
    "; - coleight.innerHTML="Del"; + colsix.innerHTML=" "; + + colseven.innerHTML=" 
    "; + coleight.innerHTML="Del"; } function fnAddRowForPO(module){ @@ -1485,20 +1485,14 @@ colfour.innerHTML="  "; //Added for tax calculation - colfive.innerHTML=" "; - - colsix.innerHTML=" 
    "; - colseven.innerHTML="Del"; - -} + colfive.innerHTML=" "; + + colsix.innerHTML=" 
    "; + colseven.innerHTML="Del"; + +} + - -function deleteRow(i) -{ - rowCnt--; - document.getElementById('proTab').deleteRow(i); -} - function cancelForm(frm) { window.history.back(); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 15:32:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 22:32:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6723 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060529223218.3F7F04C440F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 16:32:13 2006 New Revision: 6723 Log: * Added vat, sales and service tax fields in po, so, quotes and invoice product related tables Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Mon May 29 16:32:13 2006 @@ -3095,6 +3095,9 @@ + + +
    - +
    {$ALPHABETICAL} From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 15:40:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 22:40:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6726 - in /vtigercrm/trunk/modules/Webmails: WebmailsAjax.php webmails.js Message-ID: <20060529224009.8E55A492E93@vtiger.fosslabs.com> Author: mmbrich Date: Mon May 29 16:40:08 2006 New Revision: 6726 Log: more speed improvements with imap_status Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/trunk/modules/Webmails/WebmailsAjax.php Mon May 29 16:40:08 2006 @@ -70,20 +70,19 @@ $mailbox=$key; $mbox = getImapMbox($mailbox,$temprow,"true"); - $search = imap_search($mbox, "NEW ALL"); - if($search != false) { - $boxes[$i]["name"] = $mailbox; - if($val == sizeof($search)) - $boxes[$i]["newmsgs"] = 0; - elseif($val < sizeof($search)) { - $boxes[$i]["newmsgs"] = (sizeof($search)-$val); - $_SESSION["mailboxes"][$key] = (sizeof($search)); - } else { - $boxes[$i]["newmsgs"] = 0; - $_SESSION["mailboxes"][$key] = 0; - } - $i++; + $box = imap_status($mbox, "{".$imapServerAddress."}".$mailbox, SA_ALL); + + $boxes[$i]["name"] = $mailbox; + if($val == $box->unseen) + $boxes[$i]["newmsgs"] = 0; + elseif($val < $box->unseen) { + $boxes[$i]["newmsgs"] = ($box->unseen-$val); + $_SESSION["mailboxes"][$mailbox] = $box->unseen; + } else { + $boxes[$i]["newmsgs"] = 0; + $_SESSION["mailboxes"][$mailbox] = $box->unseen; } + $i++; imap_close($mbox); } Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Mon May 29 16:40:08 2006 @@ -84,7 +84,6 @@ if(degraded_service == 'true') { return; } - $("status").style.display="block"; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, @@ -92,13 +91,13 @@ postBody: 'module=Webmails&action=WebmailsAjax&command=check_mbox_all&ajax=true', onComplete: function(t) { //alert(t.responseText); - try { if(t.responseText != "") { var data = eval('(' + t.responseText + ')'); for (var i=0;i Author: mmbrich Date: Mon May 29 16:41:36 2006 New Revision: 6727 Log: no need to degrade service for check_all but it won't be hit on a degraded client anyways \(refresh happens first) Modified: vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Mon May 29 16:41:36 2006 @@ -81,9 +81,6 @@ } } function check_in_all_boxes(mymbox) { - if(degraded_service == 'true') { - return; - } new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, From vtiger-tickets at vtiger.fosslabs.com Mon May 29 15:42:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 22:42:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23736=3A_?= =?utf-8?q?Changing_existing_quote_line_items_causes_improper_subtotal?= In-Reply-To: <076.1175e17764a34c299e4966098111d634@vtiger.fosslabs.com> References: <076.1175e17764a34c299e4966098111d634@vtiger.fosslabs.com> Message-ID: <085.f1fa6f4232963d45d152004c45dea62d@vtiger.fosslabs.com> #736: Changing existing quote line items causes improper subtotal ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: quote ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 16:01:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 23:01:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6728 - /vtigercrm/trunk/modules/Webmails/webmails.js Message-ID: <20060529230148.B17CD4C4A94@vtiger.fosslabs.com> Author: mmbrich Date: Mon May 29 17:01:47 2006 New Revision: 6728 Log: more mail check cleanups Modified: vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Mon May 29 17:01:47 2006 @@ -91,10 +91,9 @@ if(t.responseText != "") { var data = eval('(' + t.responseText + ')'); for (var i=0;i #1117: Ajax object naming collision --------------------------------------------------------+------------------- Reporter: mmbrich | Owner: developer Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: prototype, javascript, ajax, scriptaculous | --------------------------------------------------------+------------------- The vtiger Ajax object is named "Ajax" in ajax.js. This is causing a name collision with prototype since the prototype ajax object and it's constructors are named Ajax*. Please change the name of the vtiger Ajax object to something like VTAjax or VtigerAjax or something more geared towards vtiger and the environment that it's used in or prototype applications will not work well with vtiger. Matt -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 16:28:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 29 May 2006 23:28:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6729 - in /vtigercrm/trunk: Smarty/templates/ Smarty/templates/Inventory/ Smarty/templates/Settings/ include/js/ modules/Activities/ modules/Calendar/ modules/Contacts/js/ modules/Emails/ modules/Faq/ modules/Migration/ModifyDatabase/ modules/Portal/ modules/Users/ Message-ID: <20060529232825.3C1857D7D84@vtiger.fosslabs.com> Author: mmbrich Date: Mon May 29 17:28:17 2006 New Revision: 6729 Log: This renames function Ajax() to function VtigerAjax() and tries to find any files that had a call to Ajax and change appropriately. Since this is all done in one check-in it should be nice and easy to back out if I broke anything. Closes # 1117 Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/Emails.tpl vtigercrm/trunk/Smarty/templates/GroupEditView.tpl vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/Smarty/templates/ImportStep2.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl vtigercrm/trunk/Smarty/templates/ListRoles.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/trunk/Smarty/templates/Popup.tpl vtigercrm/trunk/Smarty/templates/ReportRun.tpl vtigercrm/trunk/Smarty/templates/Reports.tpl vtigercrm/trunk/Smarty/templates/RoleEditView.tpl vtigercrm/trunk/Smarty/templates/Rss.tpl vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/Smarty/templates/UserListView.tpl vtigercrm/trunk/Smarty/templates/UserProfile.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl vtigercrm/trunk/include/js/ListView.js vtigercrm/trunk/include/js/Mail.js vtigercrm/trunk/include/js/ajax.js vtigercrm/trunk/include/js/dtlviewajax.js vtigercrm/trunk/modules/Activities/Activity.js vtigercrm/trunk/modules/Calendar/script.js vtigercrm/trunk/modules/Contacts/js/chat.js vtigercrm/trunk/modules/Emails/Email.js vtigercrm/trunk/modules/Faq/Faq.js vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php vtigercrm/trunk/modules/Portal/Portal.js vtigercrm/trunk/modules/Users/listroles.html Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Mon May 29 17:28:17 2006 @@ -93,7 +93,7 @@ function dup_validation(profilename) {ldelim} - var ajaxObj = new Ajax(ajaxSaveResponse); + var ajaxObj = new VtigerAjax(ajaxSaveResponse); var urlstring ="module=Users&action=UsersAjax&file=CreateProfile1&ajax=true&dup_check=true&profile_name="+profilename; ajaxObj.process("index.php?",urlstring); Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Mon May 29 17:28:17 2006 @@ -35,7 +35,7 @@ if(Ticker!='') {ldelim} show('vtbusy_info'); - var ajaxObj = new Ajax(ajaxResponse); + var ajaxObj = new VtigerAjax(ajaxResponse); //var Ticker = document.getElementById('tickersymbol').value; var urlstring = "module={$MODULE}&action=Tickerdetail&tickersymbol="+Ticker; ajaxObj.process("index.php?",urlstring); Modified: vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Mon May 29 17:28:17 2006 @@ -16,7 +16,7 @@ function deleteCurrency(currid) { show("status"); - var ajaxObj = new Ajax(ajaxCurrencyDeleteResponse); + var ajaxObj = new VtigerAjax(ajaxCurrencyDeleteResponse); var urlstring = "action=SettingsAjax&file=CurrencyDeleteStep1&return_action=CurrencyListView&return_module=Settings&module=Settings&parenttab=Settings&id="+currid; ajaxObj.process("index.php?",urlstring); } @@ -31,7 +31,7 @@ { show("status"); hide("CurrencyDeleteLay"); - var ajaxObj = new Ajax(ajaxCurrencySaveResponse); + var ajaxObj = new VtigerAjax(ajaxCurrencySaveResponse); var trans_currencyid=document.getElementById('transfer_currency_id').options[document.getElementById('transfer_currency_id').options.selectedIndex].value; var urlstring ="module=Settings&action=SettingsAjax&file=CurrencyDelete&ajax=true&delete_currency_id="+del_currencyid+"&transfer_currency_id="+trans_currencyid; ajaxObj.process("index.php?",urlstring); Modified: vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Mon May 29 17:28:17 2006 @@ -16,7 +16,7 @@ {rdelim} function getCustomFieldList(customField) {ldelim} - var ajaxObj = new Ajax(ajaxSaveResponse); + var ajaxObj = new VtigerAjax(ajaxSaveResponse); var modulename = customField.options[customField.options.selectedIndex].value; var urlstring ="module=Settings&action=SettingsAjax&file=CustomFieldList&fld_module="+modulename+"&parenttab=Settings&ajax=true"; ajaxObj.process("index.php?",urlstring); @@ -37,7 +37,7 @@ {rdelim} function getCreateCustomFieldForm(customField,id,tabid,ui) {ldelim} - var ajaxObj = new Ajax(ajaxCFSaveResponse); + var ajaxObj = new VtigerAjax(ajaxCFSaveResponse); var modulename = customField; var urlstring ="module=Settings&action=SettingsAjax&file=CreateCustomField&fld_module="+modulename+"&parenttab=Settings&ajax=true&fieldid="+id+"&tabid="+tabid+"&uitype="+ui; ajaxObj.process("index.php?",urlstring); Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Mon May 29 17:28:17 2006 @@ -28,7 +28,7 @@ function callConvertLeadDiv(id) {ldelim} - var ajaxObj = new Ajax(ajaxSaveResponse); + var ajaxObj = new VtigerAjax(ajaxSaveResponse); var urlstring = "module=Leads&action=LeadsAjax&file=ConvertLead&record="+id; ajaxObj.process("index.php?",urlstring); {rdelim} @@ -313,7 +313,7 @@ "; echo $inputs; - //header("Location: index.php?action=$return_action&module=$return_module&parent_id=$parent_id&record=$return_id&filename=$filename&viewname=$return_viewname"); } ?> Modified: vtigercrm/trunk/modules/Emails/mail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mail.php (original) +++ vtigercrm/trunk/modules/Emails/mail.php Mon May 29 21:01:30 2006 @@ -138,7 +138,8 @@ * $contents -- body of the email you want to send * $from_email -- from email id which will be displayed in the mail * $from_name -- from name which will be displayed in the mail - * $to_email -- to email address + * $to_email -- to email address -- This can be an email in a single string, a comma separated + * list of emails or an array of email addresses * $attachment -- whether we want to attach the currently selected file or all files. [values = current,all] - optional * $emailid -- id of the email object which will be used to get the attachments - optional @@ -167,7 +168,16 @@ if($to_email != '') { - $mail->AddAddress($to_email); + if(is_array($to_email)) { + for($j=0,$num=count($to_email);$j<$num;$j++) { + $mail->addAddress($to_email[$j]); + } + } else { + $_tmp = explode(",",$to_email); + for($j=0,$num=count($_tmp);$j<$num;$j++) { + $mail->addAddress($_tmp[$j]); + } + } } $mail->AddReplyTo($from_email); From vtiger-tickets at vtiger.fosslabs.com Mon May 29 20:21:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 03:21:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23811=3A_?= =?utf-8?q?Recurring_Events_Functionality_Issue?= In-Reply-To: <076.8585fb4bdf941329df8632100a82d2cd@vtiger.fosslabs.com> References: <076.8585fb4bdf941329df8632100a82d2cd@vtiger.fosslabs.com> Message-ID: <085.10279c8fdfc3ff9905d28da969ee8dd0@vtiger.fosslabs.com> #811: Recurring Events Functionality Issue ----------------------------------+----------------------------------------- Reporter: sganendra at yahoo.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: recurring, events, tasks ----------------------------------+----------------------------------------- Comment (by anonymous): I can't program, so I don't know how to fix this. But i believe the problem is due to the fact a recurring task has only one taskID. there is no need for a recurringID in my opinion. the recurring function in vTiger should purely generate x amount of IDs for the x amount of recurrences. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 20:55:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 03:55:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231118=3A?= =?utf-8?q?_issue_in_custom_field?= Message-ID: <076.b7ca86dba4ffe927aca5a0856f25df73@vtiger.fosslabs.com> #1118: issue in custom field -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- While editing the customfield, the field length and type are mismatched -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 21:03:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 04:03:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231119=3A?= =?utf-8?q?_custom_field_UI_not_proper_in_IE?= Message-ID: <076.fd3163da175acd9436235ee85221b737@vtiger.fosslabs.com> #1119: custom field UI not proper in IE -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- custom field create PopUI is not proper in IE browser -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 21:09:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 04:09:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231120=3A?= =?utf-8?q?_alignment_not_proper_in_Customfield_listview?= Message-ID: <076.4b884f803d6e52a23bdf4c14044cef75@vtiger.fosslabs.com> #1120: alignment not proper in Customfield listview -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In customfield listview text alignment is not proper. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 21:16:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 04:16:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231121=3A?= =?utf-8?q?_Picklist_UI_is_broken?= Message-ID: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com> #1121: Picklist UI is broken -----------------------+---------------------------------------------------- Reporter: mangai | Owner: jeri Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Picklist ListViewUI is broken.Picklist image and label for module select is missing. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 21:25:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 04:25:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231121=3A?= =?utf-8?q?_Picklist_UI_is_broken?= In-Reply-To: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com> References: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com> Message-ID: <085.917b079c6cfcfe917d2566835d04de30@vtiger.fosslabs.com> #1121: Picklist UI is broken ------------------------+--------------------------------------------------- Reporter: mangai | Owner: jeri Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * priority: critical => major -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 21:37:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 04:37:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231122=3A?= =?utf-8?q?_required_symbol_in_currency_editview_is_missing?= Message-ID: <076.e304b32450477f1ef20d72ae1c371e6d@vtiger.fosslabs.com> #1122: required symbol in currency editview is missing -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 22:34:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 05:34:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231123=3A?= =?utf-8?q?_issue_in_role_drag_and_drop?= Message-ID: <076.c4a5b714c12cec3b392d5125f15097cc@vtiger.fosslabs.com> #1123: issue in role drag and drop -----------------------+---------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- I got the following message in roles drag and drop '''Warning: explode(): Empty delimiter. in /home/mangayarkarasi/Mangai/Alpha3/vtigerCRM5_beta/apache/htdocs/vtigerCRM/may29_1/vtiger_crm/modules/Users/RoleDragDrop.php on line 40''' '''Warning: Cannot modify header information - headers already sent by (output started at /home/mangayarkarasi/Mangai/Alpha3/vtigerCRM5_beta/apache/htdocs/vtigerCRM/may29_1/vtiger_crm/modules/Users/RoleDragDrop.php:40) in /home/mangayarkarasi/Mangai/Alpha3/vtigerCRM5_beta/apache/htdocs/vtigerCRM/may29_1/vtiger_crm/modules/Users/RoleDragDrop.php on line 52''' -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 22:56:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 05:56:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2382=3A_T?= =?utf-8?q?icket-Activity-Relation?= In-Reply-To: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> References: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> Message-ID: <085.60dba27fea4d7685cf805fbfe4f272e1@vtiger.fosslabs.com> #82: Ticket-Activity-Relation -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: minnie Type: enhancement | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------+-------------------------------------------- Changes (by anonymous): * type: defect => enhancement -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 22:57:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 05:57:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2382=3A_T?= =?utf-8?q?icket-Activity-Relation?= In-Reply-To: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> References: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> Message-ID: <085.29149a0b2aed54f50d6a77c2869b0b3c@vtiger.fosslabs.com> #82: Ticket-Activity-Relation -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: minnie Type: enhancement | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: -------------------------------+-------------------------------------------- Changes (by anonymous): * milestone: 5.0.0 => * version: 5.0.0 => 5.0.1 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:07:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:07:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231124=3A?= =?utf-8?q?_issue_in_attachments?= Message-ID: <076.eece6f4dd358282fca02037b81e9226c@vtiger.fosslabs.com> #1124: issue in attachments -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- First I've added a file and deleted that file. after that I've added 2 files and uploded. It is going to a blank page. I've done it from Accounts/Contacts relatedlists -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:10:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:10:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231125=3A?= =?utf-8?q?_attachment_missing_while_creating_ticket_from_product?= Message-ID: <076.478ea28a2c6031392264f0dfa9da56bd@vtiger.fosslabs.com> #1125: attachment missing while creating ticket from product ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: attachment | ------------------------+--------------------------------------------------- attachment missing while creating ticket from product -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:28:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:28:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231126=3A?= =?utf-8?q?_unwanted_field_Team_in_Quote_creation?= Message-ID: <076.11f2feb72adb5d0a18b85776bb31f1ab@vtiger.fosslabs.com> #1126: unwanted field Team in Quote creation -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: quote | -----------------------+---------------------------------------------------- unwanted field Team in Quote creation -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:29:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:29:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231127=3A?= =?utf-8?q?_Issue_in_Emaol?= Message-ID: <076.5f2796ef1febe6076fd5ba3545997e71@vtiger.fosslabs.com> #1127: Issue in Emaol -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In the Emails List, we the mouse cursor is moved over the subject, the mouse pointer should be changed to the hand pointer -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:31:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:31:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231128=3A?= =?utf-8?q?_too_high_reaction_time_in_using_inventory?= Message-ID: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com> #1128: too high reaction time in using inventory -------------------------+-------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: performance | -------------------------+-------------------------------------------------- Inventory queries need to be optimized. It takes a long time to load -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:32:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:32:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231129=3A?= =?utf-8?q?_SalesOrder_popup_gives_fatal_error?= Message-ID: <076.ed5850144fdfa69ed89800ea316794af@vtiger.fosslabs.com> #1129: SalesOrder popup gives fatal error ---------------------------+------------------------------------------------ Reporter: ahmed | Owner: Jeri Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: Pop Up Search | ---------------------------+------------------------------------------------ While creating a new invoice from Account related list & trying to add Salesorder from Pop up , I get a fatal error - Call to a member function Move() on a non-object in vtigerCRM/may29_1/include/database/PearDatabase.php on line 439 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:33:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:33:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231130=3A?= =?utf-8?q?_more_information_tab_ajaxified?= Message-ID: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com> #1130: more information tab ajaxified -------------------------+-------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: performance | -------------------------+-------------------------------------------------- more information tab ought to be ajaxified. takes too long a time to load -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:33:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:33:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231131=3A?= =?utf-8?q?_Copy_Merge_Field_Value_is_not__replaced_with_value?= Message-ID: <076.bef32b69825917dc34da8cbc8db15847@vtiger.fosslabs.com> #1131: Copy Merge Field Value is not replaced with value -----------------------+---------------------------------------------------- Reporter: mangai | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In email template,Copy Merge Field Value is not replaced with value -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:34:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:34:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231132=3A?= =?utf-8?q?_creation_of_related_entities_ought_to_be_ajaxified?= Message-ID: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com> #1132: creation of related entities ought to be ajaxified -------------------------+-------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: performance | -------------------------+-------------------------------------------------- Creation of related entities ought to be ajaxified. Currently, we unnecessarily take them to a different page. This gives a poor impression of the usability of the product -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:34:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:34:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231131=3A?= =?utf-8?q?_Copy_Merge_Field_Value_is_not__replaced_with_value_and_parentt?= =?utf-8?q?ab_not_parsed_for_edit_template?= In-Reply-To: <076.bef32b69825917dc34da8cbc8db15847@vtiger.fosslabs.com> References: <076.bef32b69825917dc34da8cbc8db15847@vtiger.fosslabs.com> Message-ID: <085.39ae9e2f00859fd133fd76ebdf7d6f06@vtiger.fosslabs.com> #1131: Copy Merge Field Value is not replaced with value and parenttab not parsed for edit template ------------------------+--------------------------------------------------- Reporter: mangai | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * summary: Copy Merge Field Value is not replaced with value => Copy Merge Field Value is not replaced with value and parenttab not parsed for edit template -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:36:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:36:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231133=3A?= =?utf-8?q?_in_related_list_note_can_be_shown_in_a_different_color?= Message-ID: <076.2f01c0cdb39b0c84bd3ed216997c2d77@vtiger.fosslabs.com> #1133: in related list note can be shown in a different color -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- in related list note can be shown in a different color to differentiate from attachments. In that case, we can do away with the Type column altogether. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:38:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:38:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231134=3A?= =?utf-8?q?_unable_to_change_state_of_purchase_order_using_ajax_feature?= Message-ID: <076.6b6e1bdd6d4cf54f7a2bce3761f03794@vtiger.fosslabs.com> #1134: unable to change state of purchase order using ajax feature -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- not able to change the state of a purchase order using the ajax feature. I am not able to save the state at all. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:38:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:38:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231135=3A?= =?utf-8?q?_The_History_of_the_Purchase_Order_not_getting_displayed?= Message-ID: <076.70a50c265764e891dd51a97dd8390af4@vtiger.fosslabs.com> #1135: The History of the Purchase Order not getting displayed -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- PO history is not getting updated at all. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:44:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:44:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231136=3A?= =?utf-8?q?_parenttab_not_parsed_for_backup_server_configuration_save?= Message-ID: <076.111cd820f71186cdd653f9d438341dd5@vtiger.fosslabs.com> #1136: parenttab not parsed for backup server configuration save -----------------------+---------------------------------------------------- Reporter: mangai | Owner: jeri Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:45:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:45:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231137=3A?= =?utf-8?q?_Issue_in_Emails?= Message-ID: <076.9cbd988fd3d7e2707b4d3292e1da421d@vtiger.fosslabs.com> #1137: Issue in Emails -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Bring up the Emails Settings Page and click on the Cancel button. It takes you to the User DetailView. this should not happen. this should take back to the emails page -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:47:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:47:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231138=3A?= =?utf-8?q?_could_be_made_more_usable?= Message-ID: <076.6260faca7a3dab8756ec45d2be226913@vtiger.fosslabs.com> #1138: could be made more usable -----------------------+---------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- When clicking on the tax field during product addition, the default value is shown. If I need to change this value, I need to go to Settings and then change the value. It will be much more usable if I have a direct facility to access and change the required field present in Settings from the PO creation page itself. The same case holds for addition of custom fields. Even there, if I need to add a custom field during creation of the PO, I need to go to Settings and then make the changes and then come back to the particular screen. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:49:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:49:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231139=3A?= =?utf-8?q?_could_be_made_more_usable2?= Message-ID: <076.1772ef737aedfed24ad81cc9ac0c4e0f@vtiger.fosslabs.com> #1139: could be made more usable2 -----------------------+---------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- while adding a product, when i click on the PriceBook, if the entry is not present, I should be given an option to add to the price book right there. There should be no need for me to run in circles to add a product to a price book. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:50:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:50:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231140=3A?= =?utf-8?q?_Issue_in_Emails?= Message-ID: <076.a35124f4112b6efc1ce3a64ae8820aed@vtiger.fosslabs.com> #1140: Issue in Emails -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- The to address field in email should be made non editable because we ge the email ids only from the db. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:53:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:53:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231141=3A?= =?utf-8?q?_mandatory_shown_but_not_so?= Message-ID: <076.02fcc522483405a938931a6090a37b4c@vtiger.fosslabs.com> #1141: mandatory shown but not so -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: PO | -----------------------+---------------------------------------------------- while creation of PO, the product, qty, billing add, shipping address, are shown as mandatory. But they are actually not. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:53:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:53:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231142=3A?= =?utf-8?q?_currency_conversion_is_not_applied_for_product_details?= Message-ID: <076.ed680d7929677a23842f476fd7e13220@vtiger.fosslabs.com> #1142: currency conversion is not applied for product details -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:00:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:00:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231143=3A?= =?utf-8?q?_Issue_in_Email_Search?= Message-ID: <076.602112a95e47edfea50fc9b4ff0606e7@vtiger.fosslabs.com> #1143: Issue in Email Search -----------------------+---------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Search in Emails is not working. Search with selecting 'in Subject or Sender' option. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:05:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:05:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231144=3A?= =?utf-8?q?_Ajax_Quick_Edit_Fields_Retains_value_in_the_text_box_even_if_w?= =?utf-8?q?e_cancel_it=2E?= Message-ID: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com> #1144: Ajax Quick Edit Fields Retains value in the text box even if we cancel it. -----------------------------+---------------------------------------------- Reporter: ahmed | Owner: Jeri Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: Quick Edit Ajax | -----------------------------+---------------------------------------------- While quick editing Account Detail View Fields, if we enter incorrect values it pops up error, but when we click cancel and move to editing other fields with values it gives the previous field error because the value is retained. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:10:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:10:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231145=3A?= =?utf-8?q?_in_edit_view_of_inventory=2C_the_right_hand_side_options_are_h?= =?utf-8?q?ardcoded?= Message-ID: <076.0e62778b6100dd068d2df9182121005c@vtiger.fosslabs.com> #1145: in edit view of inventory, the right hand side options are hardcoded -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- in edit view of inventory, the right hand side options are hardcoded. But the right hand side options work, only when one is in the Detail View screen. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:11:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:11:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231146=3A?= =?utf-8?q?_PriceBook_Popup_screen_too_big?= Message-ID: <076.30e2595c2b37b1575bee462504899f2f@vtiger.fosslabs.com> #1146: PriceBook Popup screen too big -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- PriceBook Popup screen too big -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:11:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:11:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231147=3A?= =?utf-8?q?_Vendor_Popup_screen_too_big?= Message-ID: <076.0794d0812b807cd905b48ff6aa59084a@vtiger.fosslabs.com> #1147: Vendor Popup screen too big -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Vendor Popup screen too big -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:12:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:12:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231148=3A?= =?utf-8?q?_category_not_drop_down_in_pricebook_creation?= Message-ID: <076.e7a68cf911647e37fc94092599e028b4@vtiger.fosslabs.com> #1148: category not drop down in pricebook creation -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Category field in pricebook should be a dropdown -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:17:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:17:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231149=3A?= =?utf-8?q?_could_not_enable_create/edit_option_in_standard_privileges?= Message-ID: <076.66092766998638d33820b88f8666d4b3@vtiger.fosslabs.com> #1149: could not enable create/edit option in standard privileges -----------------------+---------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In Profile standard profiles,I've given create/edit option only for contact module. But when I save it All modules create/edit option has been disabled.So could not create any records. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 00:27:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 07:27:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6732 - /vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Message-ID: <20060530072700.A8CFB7D4DBD@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 01:26:56 2006 New Revision: 6732 Log: Removed the calendar image from Quick create modules - Ahmed Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Tue May 30 01:26:56 2006 @@ -225,7 +225,6 @@ {assign var=time_val value="$time_value"} {/foreach} - {if $uitype eq 6} {/if} From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 00:36:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 07:36:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6733 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060530073613.A63367D5A89@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 01:36:09 2006 New Revision: 6733 Log: Moved the fields Ticker symbol & Member to Basic Infn for Accounts Module - ahmed Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue May 30 01:36:09 2006 @@ -158,9 +158,9 @@ $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'website','account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'fax','account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email1','account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email2','account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')"); From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:43:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:43:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231150=3A?= =?utf-8?q?_related_list_not_gettng_populated?= Message-ID: <076.4e1f98aeb67bc6258cc11f40272f4eef@vtiger.fosslabs.com> #1150: related list not gettng populated -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- while creating an inventory entity, i relate to contacts, leads, accounts, etc. In the respective entities, we should see the related list populated with these entries. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:45:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:45:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?= =?utf-8?q?_Error_message_in_Installer=2E=2E?= Message-ID: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com> #1151: Error message in Installer.. -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- If I specify wrong user name while creating a new DB: Warning: mysql_connect() [function.mysql-connect]: Access denied for user 'roo'@'gopals.vtiger.com' (using password: NO) in C:\wamp\www\vtcrm30m\adodb\drivers\adodb-mysql.inc.php on line 355 Warning: mysql_connect() [function.mysql-connect]: Access denied for user 'roo'@'gopals.vtiger.com' (using password: NO) in C:\wamp\www\vtcrm30m\adodb\drivers\adodb-mysql.inc.php on line 355 Convert this error message to easly understandable message. You have specified a wrong user name to create a new database. Please enter correct user name and password to create database for Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:47:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:47:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231152=3A?= =?utf-8?q?_cannot_go_to_different_months/years__from_popup_calendar?= Message-ID: <076.305f67d0510043ae0fbe7bd653f4aa48@vtiger.fosslabs.com> #1152: cannot go to different months/years from popup calendar -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- cannot go to different months/years from popup calendar -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:48:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:48:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231153=3A?= =?utf-8?q?_Source_Installer=3A_data_in_=22Path=22_field_disappears?= Message-ID: <076.a6308f317cdefba138949240f46f1aae@vtiger.fosslabs.com> #1153: Source Installer: data in "Path" field disappears -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- While refreshing the Step 2 of source installer, data in "Path" field is disappeared. Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:48:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:48:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231154=3A?= =?utf-8?q?_while_using_quick_create=2C_we_have_a_cheetah_running_instead_?= =?utf-8?q?of_a_tiger?= Message-ID: <076.77103b94050e4ea6ac8253b3e0ebffe5@vtiger.fosslabs.com> #1154: while using quick create, we have a cheetah running instead of a tiger -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- while using quick create, we have a cheetah running instead of a tiger -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:53:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:53:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231155=3A?= =?utf-8?q?_Home_page_-_not_much_informative?= Message-ID: <076.df32a5a4f009111920e73e95331da209@vtiger.fosslabs.com> #1155: Home page - not much informative -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Currently we have a lot boxes in Home page. It is better to have useful information. For example, Key Metrics box we can display: Prospect Accounts - 10 Open Tickets - 24 Hot Leads - 13 etc My Top Accounts ABC - $25000 XYZ - $20000 etc. Also there is no "More" link in each box.. Please get back to me if you need any clarifications. Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:54:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:54:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231156=3A?= =?utf-8?q?_can_create_invoice_without_specifying_product_quantity?= Message-ID: <076.92edb3c9cf4881a366e5a914f7e21365@vtiger.fosslabs.com> #1156: can create invoice without specifying product quantity -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- can create invoice without specifying product quantity -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:20:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:20:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231157=3A?= =?utf-8?q?_Wrong_display_of_Roles_in_Roles_Home?= Message-ID: <076.0042ce49f00228b56312a0bfc5ea57d9@vtiger.fosslabs.com> #1157: Wrong display of Roles in Roles Home -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- By default we are populating two different roles namely administrator and standard_user. standard_user is shown under administrator, but administrator role has to do nothing with standard_user. Both should be at same level. Please contact me for details. Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:22:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:22:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231158=3A?= =?utf-8?q?_JavaScript_errors_in_Roles_page?= Message-ID: <076.b08c0c9d886c70774389436fa08c82ca@vtiger.fosslabs.com> #1158: JavaScript errors in Roles page -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- While saving a role, JavaScript error displayed in IE6. Line: 709 Char: 3 Error: Object doesn't support this property or method Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:24:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:24:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231159=3A?= =?utf-8?q?_Roles_-_Expand_icon_is_not_intuitive?= Message-ID: <076.baaaff1e8853707e998ecfdccb70cd44@vtiger.fosslabs.com> #1159: Roles - Expand icon is not intuitive -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- For expand and collapse same icon is used. It is better to have + when roles are in collapsed mode and - when it is expand mode. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:27:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:27:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231160=3A?= =?utf-8?q?_Improper_Navigation_links?= Message-ID: <076.04585a3838305ae5eda12ac53ec9b7cd@vtiger.fosslabs.com> #1160: Improper Navigation links -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Settings > Users & Access Management > Create New Role. From Create New Role page you can't go to "Users & Access Management" You can directly access the Settings page. Either provide a separate page for each sub section or navigate back to Settings. Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:35:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:35:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231161=3A?= =?utf-8?q?_Roles_link_-_JavaScript_error_in_IE_6?= Message-ID: <076.1d3f81da3d97d1c4e9f35cf771595b2d@vtiger.fosslabs.com> #1161: Roles link - JavaScript error in IE 6 -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- While clicking Roles link under Users & Access Management JS error displayed: -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:44:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:44:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231162=3A?= =?utf-8?q?_navigation_issue_from_Calendar?= Message-ID: <076.be19fd30fd8c810bee45f8361c2c8b04@vtiger.fosslabs.com> #1162: navigation issue from Calendar -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- navigation issue from Calendar module. I cannot go/create anything. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 01:45:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 08:45:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6734 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060530084545.0EBAB7D77BC@vtiger.fosslabs.com> Author: don Date: Tue May 30 02:45:40 2006 New Revision: 6734 Log: Fixed the parent role issue in getRoleAndSubordinatesInfo() Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue May 30 02:45:40 2006 @@ -2542,7 +2542,7 @@ $roleid=$adb->query_result($result,$i,'roleid'); $rolename=$adb->query_result($result,$i,'rolename'); $roledepth=$adb->query_result($result,$i,'depth'); - $parentRoleSeq=$adb->query_result($result,$i,'parentrole'); + $parentrole=$adb->query_result($result,$i,'parentrole'); $roleDet=Array(); $roleDet[]=$rolename; $roleDet[]=$parentrole; From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:46:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:46:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231163=3A?= =?utf-8?q?_unable_to_save_Ajaxified_Terms_and_Conditions_field_in_Invoice?= Message-ID: <076.81406a0d124351606d1fccac357d6e5d@vtiger.fosslabs.com> #1163: unable to save Ajaxified Terms and Conditions field in Invoice -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- unable to save Ajaxified Terms and Conditions field in Invoice -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:47:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:47:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231164=3A?= =?utf-8?q?_unable_to_save_Ajaxified_Description_field_in_Invoice?= Message-ID: <076.b0bc283a60909e304007e4b26726e2ef@vtiger.fosslabs.com> #1164: unable to save Ajaxified Description field in Invoice -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- unable to save Ajaxified Description field in Invoice -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:48:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:48:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231165=3A?= =?utf-8?q?_Move_Role_is_not_working_in_IE=2E=2E?= Message-ID: <076.acbe4cea637c14b89f704105e9460ec2@vtiger.fosslabs.com> #1165: Move Role is not working in IE.. -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- After clciking the Move Role icon, role doesn't moved or there is no drag/drop option. There is -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:48:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:48:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231166=3A?= =?utf-8?q?_Move_Role_is_not_working_in_IE=2E=2E?= Message-ID: <076.a830516a48e8ac68dbcee16057ec5aab@vtiger.fosslabs.com> #1166: Move Role is not working in IE.. -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- After clciking the Move Role icon, role doesn't moved or there is no drag/drop option. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:49:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:49:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231166=3A?= =?utf-8?q?_Move_Role_is_not_working_in_IE=2E=2E?= In-Reply-To: <076.a830516a48e8ac68dbcee16057ec5aab@vtiger.fosslabs.com> References: <076.a830516a48e8ac68dbcee16057ec5aab@vtiger.fosslabs.com> Message-ID: <085.9439e47b796f69be6e658eeb10278e4a@vtiger.fosslabs.com> #1166: Move Role is not working in IE.. ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:50:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:50:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231167=3A?= =?utf-8?q?_able_to_store_negative_value_in_stock_while_creation_of_invoic?= =?utf-8?q?e?= Message-ID: <076.90681771b7b03afd5ee26a72d90bd95f@vtiger.fosslabs.com> #1167: able to store negative value in stock while creation of invoice -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- able to store negative value in stock while creation of invoice -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:52:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:52:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231168=3A?= =?utf-8?q?_Inconsistent_buttons?= Message-ID: <076.9785f194df3f213625826a4d8c4e3b59@vtiger.fosslabs.com> #1168: Inconsistent buttons -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- CSS applied to some of the buttons, where as some buttons take browser default buttons. Better to have consistent button layout across the modules. Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:56:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:56:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231169=3A?= =?utf-8?q?_unable_to_relate_Quote_to_SalesOrder?= Message-ID: <076.bec9bdcd41de51d9a21b66c7a45dbe9a@vtiger.fosslabs.com> #1169: unable to relate Quote to SalesOrder -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:08:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:08:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231170=3A?= =?utf-8?q?_PO_related_to_SO_does_not_have_assigned_to_value?= Message-ID: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com> #1170: PO related to SO does not have assigned to value -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In the related list of SO, the PO does not have the assigned to value populated. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:09:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:09:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231171=3A?= =?utf-8?q?_If_i_add_a_to_do_it_is_not_showing_the_to_do_list_instead_it_i?= =?utf-8?q?s_showing_the_Events?= Message-ID: <076.85fe0d91a01ebf4f15b08b9ce5e2c3a3@vtiger.fosslabs.com> #1171: If i add a to do it is not showing the to do list instead it is showing the Events --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:10:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:10:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231172=3A?= =?utf-8?q?_unable_to_store_any_Ajax_edited_value?= Message-ID: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com> #1172: unable to store any Ajax edited value -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Ajax editing fails most of the times. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:10:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:10:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231172=3A?= =?utf-8?q?_unable_to_store_any_Ajax_edited_value?= In-Reply-To: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com> References: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com> Message-ID: <085.7bcbea0328aa7ba5c5d6bf567ac9e61a@vtiger.fosslabs.com> #1172: unable to store any Ajax edited value ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by richie): Only upon storing the Contact Name does the Ajax editing work. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:12:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:12:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231173=3A?= =?utf-8?q?_unable_to_veiw_pdf?= Message-ID: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com> #1173: unable to veiw pdf -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- pdf viewer crashes. win xp -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:13:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:13:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231174=3A?= =?utf-8?q?_unable_to_change_months/years_from_mini-calendar?= Message-ID: <076.2ef668b0f99e11dc546be8a077110184@vtiger.fosslabs.com> #1174: unable to change months/years from mini-calendar -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- unable to change months/years from mini-calendar -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:14:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:14:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231175=3A?= =?utf-8?q?_add_products_to_pricebook_UI_is_old?= Message-ID: <076.88a213b6789fd810420b69633d85a7ad@vtiger.fosslabs.com> #1175: add products to pricebook UI is old -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- add products to pricebook UI is old -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:15:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:15:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231176=3A?= =?utf-8?q?_is_more_info_needed_for_Pricebook=3F?= Message-ID: <076.6eea86995041f78926851950a9662262@vtiger.fosslabs.com> #1176: is more info needed for Pricebook? -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Do we really need to show a More Information tab for pricebook? We could list out the products to be added in 1 page itself. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:16:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:16:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231177=3A?= =?utf-8?q?_Calendar_Meeting_issue?= Message-ID: <076.2e85dcc580c77c2f77a32db653da9aec@vtiger.fosslabs.com> #1177: Calendar Meeting issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- I created a meeting of 4 hours duration.In calendar Hour view it is showing only the hour for the start time -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:16:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:16:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231178=3A?= =?utf-8?q?_Calendar_Meeting_issue?= Message-ID: <076.c5360e299833dfecaae35d0b42a6203c@vtiger.fosslabs.com> #1178: Calendar Meeting issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- I created a meeting of 4 hours duration.In calendar Hour view it is showing only the hour for the start time -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:41:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:41:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231179=3A?= =?utf-8?q?_Activity_Delete_issue?= Message-ID: <076.a2c2c663ffa4fa41b8ffbe8acd39e028@vtiger.fosslabs.com> #1179: Activity Delete issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- Instead of a confirm message an alert is coming for delete event from calendar -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:51:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:51:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231180=3A?= =?utf-8?q?_pricebook_related_list_shows_products_which_cannot_be_deleted_?= =?utf-8?q?from_related_list?= Message-ID: <076.0271cde3695160584f02fe99d754d59c@vtiger.fosslabs.com> #1180: pricebook related list shows products which cannot be deleted from related list -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- On clicking on del link in pricebook related list of products, focus goes to different page but the product is not deleted. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:55:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:55:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231181=3A?= =?utf-8?q?_header_buttons_missing_from_Import_Products_screen?= Message-ID: <076.4f57062275dd6f6a01adeebb79425762@vtiger.fosslabs.com> #1181: header buttons missing from Import Products screen -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:57:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:57:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231182=3A?= =?utf-8?q?_Issue_in_email_templates?= Message-ID: <076.ac60ce16b49a2b500206812cfdc53853@vtiger.fosslabs.com> #1182: Issue in email templates -----------------------+---------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In the email compose page i have specified to,cc,bcc address and attachments. Now when i select an email template the page is reloded and the already specified email address and attachments are lost. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 02:59:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 09:59:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6735 - in /vtigercrm/trunk: Smarty/templates/Inventory/ProductDetails.tpl modules/Invoice/EditView.php modules/PurchaseOrder/EditView.php modules/Quotes/EditView.php modules/SalesOrder/EditView.php Message-ID: <20060530095912.EB6157D77FC@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 03:59:04 2006 New Revision: 6735 Log: * Modified to display the product details in new PO, SO, Quotes and Invoice when we create these entities from Product DetailView or Product Relatedlist Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl vtigercrm/trunk/modules/Invoice/EditView.php vtigercrm/trunk/modules/PurchaseOrder/EditView.php vtigercrm/trunk/modules/Quotes/EditView.php vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Tue May 30 03:59:04 2006 @@ -42,21 +42,21 @@ {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} - + {/if} - - {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } - - - - {else} - - {/if} - - -
    -   +        +   -   +   @@ -68,17 +68,17 @@ +{/if} + + + - + + +
    {$APP.$CATEGORY} > {$APP.$MODULE}{$APP.$CATEGORY} > {$APP.$MODULE} @@ -23,72 +39,76 @@ - - + + - - + + + - -
    - {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} - {if $MODULE eq 'Activities'} - - {else} - - {/if} + {if $CHECK.EditView eq 'yes'} + {if $MODULE eq 'Activities'} + + {else} + + {/if} {/if} {if $CHECK.index eq 'yes'} - + {/if} -
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_CHAT_ALT} -
    -
      + - - - - - + + + +
    {$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT} {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT} +
    -
    + + + + {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } + {if $CHECK.Import eq 'yes'} + + {else} + + {/if} + {if $CHECK.Export eq 'yes'} + + {else} + + {/if} + {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} + + + {else} + + + {/if} + {else} + + + {/if} + +
    {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE} + {if $CHECK.Export eq 'yes'} + {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}
    +
    - +
    {$APP.LBL_ALL_MENU_ALT}
    -
    +
    - {if $CHECK.Import eq 'yes' && $CHECK.Export eq 'yes'} - {$APP.LBL_IMPORT} {$APP.$MODULE} | - {$APP.LBL_EXPORT} {$APP.$MODULE} - {elseif $CHECK.Import eq 'yes' && $CHECK.Export eq 'no'} - {$APP.LBL_IMPORT} {$APP.$MODULE} - {elseif $CHECK.Import eq 'no' && $CHECK.Export eq 'yes' } - {$APP.LBL_EXPORT} {$APP.$MODULE} - {/if} - {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} - - {if $CHECK.Export eq 'yes'} - {$APP.LBL_EXPORT} {$APP.$MODULE} - {/if} -  
    Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 30 07:18:57 2006 @@ -31,7 +31,7 @@
    {$APP.$CATEGORY} > {$APP.$MODULE}{$APP.$CATEGORY} > {$APP.$MODULE} @@ -40,68 +40,73 @@
    {if $CHECK.EditView eq 'yes'} - {if $MODULE eq 'Activities'} - - {else} - - {/if} + {if $MODULE eq 'Activities'} + + {else} + + {/if} {/if} - +
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CHAT_ALT} -
    -
      + - - - - - + + + +
    {$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT} {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT} +
    -
    + + + + {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } + {if $CHECK.Import eq 'yes'} + + {else} + + {/if} + {if $CHECK.Export eq 'yes'} + + {else} + + {/if} + {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} + + + {else} + + + {/if} + {else} + + + {/if} + +
    {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE} + {if $CHECK.Export eq 'yes'} + {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}
    +
    - +
    {$APP.LBL_ALL_MENU_ALT}
    -
    +
    - {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } - - - {if $CHECK.Import eq 'yes' && $CHECK.Export eq 'yes'} - {$APP.LBL_IMPORT} {$APP.$MODULE} | - {$APP.LBL_EXPORT} {$APP.$MODULE} - {elseif $CHECK.Import eq 'yes' && $CHECK.Export eq 'no'} - {$APP.LBL_IMPORT} {$APP.$MODULE} - {elseif $CHECK.Import eq 'no' && $CHECK.Export eq 'yes' } - {$APP.LBL_EXPORT} {$APP.$MODULE} - {/if} - {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} - - - {if $CHECK.Export eq 'yes'} - {$APP.LBL_EXPORT} {$APP.$MODULE} - {/if} - - {else} -   - {/if} - - - Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Tue May 30 07:18:57 2006 @@ -147,7 +147,9 @@ $tabhtml = ""; $count = 1; include_once 'modules/Calendar/addEventUI.php'; - $div = "
    + include_once 'modules/Calendar/header.php'; + + $div = " "; echo $div; Modified: vtigercrm/trunk/modules/Home/index.php ============================================================================== --- vtigercrm/trunk/modules/Home/index.php (original) +++ vtigercrm/trunk/modules/Home/index.php Tue May 30 07:18:57 2006 @@ -160,6 +160,8 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("APP",$app_strings); $smarty->assign("MOD",$mod_strings); +$smarty->assign("MODULE",'Home'); +$smarty->assign("CATEGORY",getParenttab('Home')); $smarty->assign("HOMEDETAILS",$home_values); $smarty->assign("HOMEDEFAULTVIEW",DefHomeView()); $smarty->assign("ACTIVITIES",$activities); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 06:21:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:21:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6746 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060530132127.0ACE07D598E@vtiger.fosslabs.com> Author: don Date: Tue May 30 07:21:24 2006 New Revision: 6746 Log: icons in Home page has been changed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 30 07:21:24 2006 @@ -40,48 +40,65 @@ - - - - - - - - - + + + + + + + + + +
    {$MOD.LBL_MY_HOME} - - - - - - - -
    - - - - -
     
    -
      - - - - - - - - - - -
    {$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT} {$APP.LBL_ALL_MENU_ALT}
    -
    - - - -
    -
    -
     
    {$APP.$CATEGORY} > {$APP.$MODULE} + + + + + + + + + +
    + + + + + +
    +
    + + + + + + + + +
    {$APP.LBL_CALENDAR_ALT}{$APP.L
+BL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT} +
    +
    + + + + + +
    {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}
    +
    + + + + +
    {$APP.LBL_ALL_MENU_ALT}
    +
    +
    + + {* Main Contents Start Here *} From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 06:29:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:29:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6747 - in /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl Buttons_List1.tpl Message-ID: <20060530132941.BD9377D5BBD@vtiger.fosslabs.com> Author: don Date: Tue May 30 07:29:37 2006 New Revision: 6747 Log: fadded icons integrated Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue May 30 07:29:37 2006 @@ -40,16 +40,21 @@
    {if $CHECK.EditView eq 'yes'} - {if $MODULE eq 'Activities'} - - {else} - - {/if} + {if $MODULE eq 'Activities'} + + {else} + + {/if} + {else} + {/if} {if $CHECK.index eq 'yes'} - + + {else} + {/if} +
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...
    Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 30 07:29:37 2006 @@ -40,11 +40,15 @@ {if $CHECK.EditView eq 'yes'} - {if $MODULE eq 'Activities'} - - {else} - - {/if} + {if $MODULE eq 'Activities'} + + {else} + + {/if} + {else} + {/if} From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 06:30:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:30:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6748 - in /vtigercrm/trunk/modules/Settings: CreateCurrencyInfo.php CurrencyInfo.html CurrencyInfo.php customfield.html fieldtypes.php Message-ID: <20060530133009.6314D7D598E@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 07:30:04 2006 New Revision: 6748 Log: unwanted files removed Removed: vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php vtigercrm/trunk/modules/Settings/CurrencyInfo.html vtigercrm/trunk/modules/Settings/CurrencyInfo.php vtigercrm/trunk/modules/Settings/customfield.html vtigercrm/trunk/modules/Settings/fieldtypes.php From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 06:42:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:42:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6749 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060530134217.5A51F7D598E@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 07:42:13 2006 New Revision: 6749 Log: Updated History label as Activity History for Related List of all modules - Ahmed Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue May 30 07:42:13 2006 @@ -1600,7 +1600,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)"); $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)"); @@ -1620,7 +1620,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)"); $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)"); @@ -1645,7 +1645,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)"); $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)"); @@ -1657,7 +1657,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)"); $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)"); @@ -1667,7 +1667,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)"); //Inserting Product Related Lists @@ -1721,7 +1721,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)"); // Inserting Purchase order Related Lists @@ -1729,7 +1729,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)"); // Inserting Sales order Related Lists @@ -1739,7 +1739,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)"); // Inserting Invoice Related Lists @@ -1747,7 +1747,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)"); // Inserting Activities Related Lists From vtiger-tickets at vtiger.fosslabs.com Tue May 30 06:44:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 13:44:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231241=3A?= =?utf-8?q?_error_in_showing_the_activities_in_Product_related_list?= Message-ID: <076.2e657a67594262ade3f99d3cf68d91c4@vtiger.fosslabs.com> #1241: error in showing the activities in Product related list -----------------------+---------------------------------------------------- Reporter: mickie | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- when i add a task or event in the product related list some errors are shown in the page and the activities are not shown in the corresponding table. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 06:44:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:44:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6750 - in /vtigercrm/trunk: Smarty/templates/RelatedLists.tpl include/language/en_us.lang.php Message-ID: <20060530134458.A66227D5844@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 07:44:53 2006 New Revision: 6750 Log: Updated History label as Activity History for Related List of all modules - Ahmed Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Tue May 30 07:44:53 2006 @@ -146,7 +146,7 @@     {/if} - {elseif $header eq 'History'} + {elseif $header eq 'Activity History'}   {/if} Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Tue May 30 07:44:53 2006 @@ -460,7 +460,7 @@ 'LBL_OPEN_ACTIVITIES'=>'Open Activities', -'LBL_HISTORY'=>'History', +'LBL_HISTORY'=>'Activity History', 'LBL_ATTACHMENTS'=>'Attachments', From vtiger-tickets at vtiger.fosslabs.com Tue May 30 06:45:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 13:45:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231242=3A?= =?utf-8?q?_Activities_history_is_missing_in_Product_relatedlist?= Message-ID: <076.4b9590790acecb205e8103ff0f8ca3a2@vtiger.fosslabs.com> #1242: Activities history is missing in Product relatedlist -------------------------+-------------------------------------------------- Reporter: mickie | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -------------------------+-------------------------------------------------- In product relatedlist, activities are available and we can create new task and events. but there is no table for activity history. if there is a related list for activities then we should have history in that relatedlist. so we should list out the open activities in the activities table and the closed activities in the History table. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 06:57:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:57:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6751 - in /vtigercrm/trunk: Copyright.txt LICENSE_AGREEMENT.txt Message-ID: <20060530135725.C35D47D7848@vtiger.fosslabs.com> Author: richie Date: Tue May 30 07:57:19 2006 New Revision: 6751 Log: updated licence files Modified: vtigercrm/trunk/Copyright.txt vtigercrm/trunk/LICENSE_AGREEMENT.txt Modified: vtigercrm/trunk/Copyright.txt ============================================================================== --- vtigercrm/trunk/Copyright.txt (original) +++ vtigercrm/trunk/Copyright.txt Tue May 30 07:57:19 2006 @@ -1,1542 +1,1603 @@ - -This software is a collective work consisting of the following major Open Source components: -Apache software, MySQL server, PHP, SugarCRM, phpBB, TUTOS, phpSysinfo, PHPMailer, and lastRSS each licensed under a separate Open Source License. -vtiger.com is not affiliated with nor endorsed by any of the above providers. - -For Windows - -1. Apache web server software used under the Apache License available at /vtigerCRM/apache/LICENSE.txt -2. MySQL database software used under the GPL License available at /vtigerCRM/mysql/README.txt -3. PHP software used under the PHP License version 3.0 available at /vtigerCRM/php/license.txt -4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 available at /vtigerCRM/LICENSE_windows.txt -5. gdwin32 software used under the GNU GPL available at gdwin32 /vtigerCRM/gdwin32/gd-license.txt -6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap -7. phpBB software used under GNU GPL downloaded from http://www.phpbb.com/support/license.php -8. TUTOS software used under GNU GPL downloaded from http://www.tutos.org/html/copyright.html available at /vtigerCRM/modules/Calendar/TUTOS_Copyright.pdf -9. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt -10. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -11. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING -12. lastRSS software used under GNU GPL downloaded from http://lastrss.webdot.cz/ -13. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt -14. Squirrel Mail used under GNU GPL downloaded from http://www.squirrelmail.org/download.php available at http://www.squirrelmail.org/wiki/en_US/SquirrelMailGPL -15. Mailfeed used under GNU GPL downloaed from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright -16. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). - -For Linux - -1. Apache web server software used under the Apache License available at /vtigerCRM_linux/apache/LICENSE.txt -2. MySQL database software used under the GPL available at /vtigerCRM_linux/mysql/README.txt -3. PHP software used under the PHP License version 3.0 available at /vtigerCRM_linux/php/license.txt -4. SugarCRM software used under the SugarCRM Public License (SPL 1.1.2) available at /vtigerCRM/LICENSE_linux.txt -5. gd 2.0.28 software used "AS IS" available at /vtigerCRM_linux/gd-2.0.28/ -6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap -7. phpBB software used under GNU GPL downloaded from http://www.phpbb.com/support/license.php -8. TUTOS software used under GNU GPL downloaded from http://www.tutos.org/html/copyright.html available at /vtigerCRM/modules/Calendar/TUTOS_Copyright.pdf -9. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt -10. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -11. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING -12. lastRSS software used under GNU GPL downloaded from http://lastrss.webdot.cz/ -13. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt -14. Squirrel Mail used under GNU GPL downloaded from http://www.squirrelmail.org/download.php available at http://www.squirrelmail.org/wiki/en_US/SquirrelMailGPL -15. Mailfeed used under GNU GPL downloaed from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright -16. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). -The licenses of the Open Source components are reproduced in full below. - - -The licenses of the Open Source components are reproduced in full below. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - -APACHE HTTP SERVER SUBCOMPONENTS: - -The Apache HTTP Server includes a number of subcomponents with -separate copyright notices and license terms. Your use of the source -code for the these subcomponents is subject to the terms and -conditions of the following licenses. - -For the mod_mime_magic component: - -/* - * mod_mime_magic: MIME type lookup via file magic numbers - * Copyright (c) 1996-1997 Cisco Systems, Inc. - * - * This software was submitted by Cisco Systems to the Apache Group in July - * 1997. Future revisions and derivatives of this source code must - * acknowledge Cisco Systems as the original contributor of this module. - * All other licensing and usage conditions are those of the Apache Group. - * - * Some of this code is derived from the free version of the file command - * originally posted to comp.sources.unix. Copyright info for that program - * is included below as required. - * --------------------------------------------------------------------------- - * - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin. - * - * This software is not subject to any license of the American Telephone and - * Telegraph Company or of the Regents of the University of California. - * - * Permission is granted to anyone to use this software for any purpose on any - * computer system, and to alter it and redistribute it freely, subject to - * the following restrictions: - * - * 1. The author is not responsible for the consequences of use of this - * software, no matter how awful, even if they arise from flaws in it. - * - * 2. The origin of this software must not be misrepresented, either by - * explicit claim or by omission. Since few users ever read sources, credits - * must appear in the documentation. - * - * 3. Altered versions must be plainly marked as such, and must not be - * misrepresented as being the original software. Since few users ever read - * sources, credits must appear in the documentation. - * - * 4. This notice may not be removed or altered. - * ------------------------------------------------------------------------- - * - */ - - -For the modules\mappers\mod_imap.c component: - - "macmartinized" polygon code copyright 1992 by Eric Haines, erich at eye.com - -For the server\util_md5.c component: - -/************************************************************************ - * NCSA HTTPd Server - * Software Development Group - * National Center for Supercomputing Applications - * University of Illinois at Urbana-Champaign - * 605 E. Springfield, Champaign, IL 61820 - * httpd at ncsa.uiuc.edu - * - * Copyright (C) 1995, Board of Trustees of the University of Illinois - * - ************************************************************************ - * - * md5.c: NCSA HTTPd code which uses the md5c.c RSA Code - * - * Original Code Copyright (C) 1994, Jeff Hostetler, Spyglass, Inc. - * Portions of Content-MD5 code Copyright (C) 1993, 1994 by Carnegie Mellon - * University (see Copyright below). - * Portions of Content-MD5 code Copyright (C) 1991 Bell Communications - * Research, Inc. (Bellcore) (see Copyright below). - * Portions extracted from mpack, John G. Myers - jgm+ at cmu.edu - * Content-MD5 Code contributed by Martin Hamilton (martin at net.lut.ac.uk) - * - */ - - -/* these portions extracted from mpack, John G. Myers - jgm+ at cmu.edu */ -/* (C) Copyright 1993,1994 by Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without - * fee, provided that the above copyright notice appear in all copies - * and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of Carnegie - * Mellon University not be used in advertising or publicity - * pertaining to distribution of the software without specific, - * written prior permission. Carnegie Mellon University makes no - * representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied - * warranty. - * - * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE - * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN - * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -/* - * Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore) - * - * Permission to use, copy, modify, and distribute this material - * for any purpose and without fee is hereby granted, provided - * that the above copyright notice and this permission notice - * appear in all copies, and that the name of Bellcore not be - * used in advertising or publicity pertaining to this - * material without the specific, prior written permission - * of an authorized representative of Bellcore. BELLCORE - * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY - * OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS", - * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. - */ - -For the srclib\apr\include\apr_md5.h component: -/* - * This is work is derived from material Copyright RSA Data Security, Inc. - * - * The RSA copyright statement and Licence for that original material is - * included below. This is followed by the Apache copyright statement and - * licence for the modifications made to that material. - */ - -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - rights reserved. - - License to copy and use this software is granted provided that it - is identified as the "RSA Data Security, Inc. MD5 Message-Digest - Algorithm" in all material mentioning or referencing this software - or this function. - - License is also granted to make and use derivative works provided - that such works are identified as "derived from the RSA Data - Security, Inc. MD5 Message-Digest Algorithm" in all material - mentioning or referencing the derived work. - - RSA Data Security, Inc. makes no representations concerning either - the merchantability of this software or the suitability of this - software for any particular purpose. It is provided "as is" - without express or implied warranty of any kind. - - These notices must be retained in any copies of any part of this - documentation and/or software. - */ - -For the srclib\apr\passwd\apr_md5.c component: - -/* - * This is work is derived from material Copyright RSA Data Security, Inc. - * - * The RSA copyright statement and Licence for that original material is - * included below. This is followed by the Apache copyright statement and - * licence for the modifications made to that material. - */ - -/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - */ - -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - rights reserved. - - License to copy and use this software is granted provided that it - is identified as the "RSA Data Security, Inc. MD5 Message-Digest - Algorithm" in all material mentioning or referencing this software - or this function. - - License is also granted to make and use derivative works provided - that such works are identified as "derived from the RSA Data - Security, Inc. MD5 Message-Digest Algorithm" in all material - mentioning or referencing the derived work. - - RSA Data Security, Inc. makes no representations concerning either - the merchantability of this software or the suitability of this - software for any particular purpose. It is provided "as is" - without express or implied warranty of any kind. - - These notices must be retained in any copies of any part of this - documentation and/or software. - */ -/* - * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0 - * MD5 crypt() function, which is licenced as follows: - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp - * ---------------------------------------------------------------------------- - */ - -For the srclib\apr-util\crypto\apr_md4.c component: - - * This is derived from material copyright RSA Data Security, Inc. - * Their notice is reproduced below in its entirety. - * - * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - * rights reserved. - * - * License to copy and use this software is granted provided that it - * is identified as the "RSA Data Security, Inc. MD4 Message-Digest - * Algorithm" in all material mentioning or referencing this software - * or this function. - * - * License is also granted to make and use derivative works provided - * that such works are identified as "derived from the RSA Data - * Security, Inc. MD4 Message-Digest Algorithm" in all material - * mentioning or referencing the derived work. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - */ - -For the srclib\apr-util\include\apr_md4.h component: - - * - * This is derived from material copyright RSA Data Security, Inc. - * Their notice is reproduced below in its entirety. - * - * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - * rights reserved. - * - * License to copy and use this software is granted provided that it - * is identified as the "RSA Data Security, Inc. MD4 Message-Digest - * Algorithm" in all material mentioning or referencing this software - * or this function. - * - * License is also granted to make and use derivative works provided - * that such works are identified as "derived from the RSA Data - * Security, Inc. MD4 Message-Digest Algorithm" in all material - * mentioning or referencing the derived work. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - */ - - -For the srclib\apr-util\test\testdbm.c component: - -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000-2002 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache at apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - * This file came from the SDBM package (written by oz at nexus.yorku.ca). - * That package was under public domain. This file has been ported to - * APR, updated to ANSI C and other, newer idioms, and added to the Apache - * codebase under the above copyright and license. - */ - - -For the srclib\apr-util\test\testmd4.c component: - - * - * This is derived from material copyright RSA Data Security, Inc. - * Their notice is reproduced below in its entirety. - * - * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All - * rights reserved. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - */ - -For the srclib\apr-util\xml\expat\conftools\install-sh component: - -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# - -For the srclib\pcre\install-sh component: - -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. - -For the pcre component: - -PCRE LICENCE ------------- - -PCRE is a library of functions to support regular expressions whose syntax -and semantics are as close as possible to those of the Perl 5 language. - -Written by: Philip Hazel - -University of Cambridge Computing Service, -Cambridge, England. Phone: +44 1223 334714. - -Copyright (c) 1997-2001 University of Cambridge - -Permission is granted to anyone to use this software for any purpose on any -computer system, and to redistribute it freely, subject to the following -restrictions: - -1. This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. In practice, this means that if you use - PCRE in software which you distribute to others, commercially or - otherwise, you must put a sentence like this - - Regular expression support is provided by the PCRE library package, - which is open source software, written by Philip Hazel, and copyright - by the University of Cambridge, England. - - somewhere reasonably visible in your documentation and in any relevant - files or online help data or similar. A reference to the ftp site for - the source, that is, to - - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ - - should also be given in the documentation. - -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. - -4. If PCRE is embedded in any software that is released under the GNU - General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL), - then the terms of that licence shall supersede any condition above with - which it is incompatible. - -The documentation for PCRE, supplied in the "doc" directory, is distributed -under the same terms as the software itself. - -End PCRE LICENCE - - -For the test\zb.c component: - -/* ZeusBench V1.01 - =============== - -This program is Copyright (C) Zeus Technology Limited 1996. - -This program may be used and copied freely providing this copyright notice -is not removed. - -This software is provided "as is" and any express or implied waranties, -including but not limited to, the implied warranties of merchantability and -fitness for a particular purpose are disclaimed. In no event shall -Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, -exemplary, or consequential damaged (including, but not limited to, -procurement of substitute good or services; loss of use, data, or profits; -or business interruption) however caused and on theory of liability. Whether -in contract, strict liability or tort (including negligence or otherwise) -arising in any way out of the use of this software, even if advised of the -possibility of such damage. - - Written by Adam Twiss (adam at zeus.co.uk). March 1996 - -Thanks to the following people for their input: - Mike Belshe (mbelshe at netscape.com) - Michael Campanella (campanella at stevms.enet.dec.com) - -*/ - -For the expat xml parser component: - -Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - and Clark Cooper - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -==================================================================== - -For the mod_deflate zlib compression component: - - (C) 1995-2002 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup at gzip.org madler at alumni.caltech.edu - -------------------------------------------------------------------------------------- - -This is a release of MySQL, a GPL (free) SQL database server (more -licence information in the PUBLIC file and in the reference manual). - -Please read the "Upgrading from..." section in the manual first, if you are -migrating from older versions of MySQL! - -The latest information about MySQL can be found at: -http://www.mysql.com - -To see what it can do take a look at the features section in the -manual. - -For installation instructions see the Installation chapter in the -manual. - -For future plans see the TODO appendix in the manual. - -New features/bug fixes history is in the news appendix in the manual. - -For the currently known bugs/misfeatures (known errors) see the bugs -appendix in the manual. - -For examples of SQL and benchmarking information see the bench -directory. - -The manual mentioned above can be found in the Docs directory. The -manual is available in the following formats: as plain ASCII text in -Docs/manual.txt, in HTML format in Docs/manual_toc.html, as GNU Info in -Docs/mysql.info and as PostScript in Docs/manual.ps. - -MySQL is brought to you by the MySQL team at MySQL AB - -For a list of developers and other contributors, see the Credits appendix -in the manual. - -************************************************************ - -IMPORTANT: - -Send bug (error) reports, questions and comments to the mailing list -at mysql at lists.mysql.com - -Please use the 'mysqlbug' script when posting bug reports or questions -about MySQL. mysqlbug will gather some information about your system -and start your editor with a form in which you can describe your -problem. Bug reports might be silently ignored by the MySQL -maintainers if there is not a good reason included in the report as to -why mysqlbug has not been used. A report that says 'MySQL does not -work for me. Why?' is not considered a valid bug report. - -The mysqlbug script can be found in the 'scripts' directory of the -distribution, that is '/scripts'. - - --------------------------------------------------------------------------------- - --------------------------------------------------------------------- - The PHP License, version 3.0 -Copyright (c) 1999 - 2002 The PHP Group. All rights reserved. --------------------------------------------------------------------- - -Redistribution and use in source and binary forms, with or without -modification, is permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name "PHP" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact group at php.net. - - 4. Products derived from this software may not be called "PHP", nor - may "PHP" appear in their name, without prior written permission - from group at php.net. You may indicate that your software works in - conjunction with PHP by saying "Foo for PHP" instead of calling - it "PHP Foo" or "phpfoo" - - 5. The PHP Group may publish revised and/or new versions of the - license from time to time. Each version will be given a - distinguishing version number. - Once covered code has been published under a particular version - of the license, you may always continue to use it under the terms - of that version. You may also choose to use such covered code - under the terms of any subsequent version of the license - published by the PHP Group. No one other than the PHP Group has - the right to modify the terms applicable to covered code created - under this License. - - 6. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes PHP, freely available from - ". - -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND -ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - --------------------------------------------------------------------- - -This software consists of voluntary contributions made by many -individuals on behalf of the PHP Group. - -The PHP Group can be contacted via Email at group at php.net. - -For more information on the PHP Group and the PHP project, -please see . - -This product includes the Zend Engine, freely available at -. - ------------------------------------------------------------------------ - - -SUGARCRM PUBLIC LICENSE -Version 1.1.2 - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party. - - 1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications. - - 1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. - - 1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. - - 1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data. - - 1.5. ''Executable'' means Covered Code in any form other than Source Code. - - 1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. - - 1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. - - 1.8. ''License'' means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. - - 1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: - A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or previous Modifications. - - 1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. - - 1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. - - 1.12. "You'' (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: - (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). - (c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor. - - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. - - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - SugarCRM Inc. (''SugarCRM'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by SugarCRM. No one other than SugarCRM has the right to modify the terms applicable to Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''SugarCRM'', ''SPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the SugarCRM Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. - - 8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as ?Multiple-Licensed?. ?Multiple-Licensed? means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the SPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. - -SugarCRM Public License 1.1.2 - Exhibit A - -The contents of this file are subject to the SugarCRM Public License Version 1.1.2 -("License"); You may not use this file except in compliance with the -License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -the specific language governing rights and limitations under the License. - -The Original Code is: SugarCRM Open Source - -The Initial Developer of the Original Code is SugarCRM, Inc. -Portions created by SugarCRM are Copyright (C) 2004 SugarCRM, Inc.; -All Rights Reserved. -Contributor(s): ______________________________________. - -[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - -SugarCRM Public License 1.1.2 - Exihibit B - -Additional Terms applicable to the SugarCRM Public License. - -I. Effect. -These additional terms described in this SugarCRM Public License ? Additional Terms shall apply to the Covered Code under this License. - -II. SugarCRM and logo. -This License does not grant any rights to use the trademarks "SugarCRM" and the "SugarCRM" logos even if such marks are included in the Original Code or Modifications. - - - -The modifications made to the code of SugarCRM are available under SPL and the new additions made by vtiger are available under Mozilla Public License (MPL) and GNU Public License (GPL). - - --------------------------------------------------------------------------------------------------------------- - -GNU Lesser General Public License - -Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, -Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and -distribute verbatim copies of this license document, but changing it is not -allowed. - - [This is the first released version of the Lesser GPL. It also counts as -the successor of the GNU Library Public License, version 2, hence the version -number 2.1.] - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public Licenses are intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. - -This license, the Lesser General Public License, applies to some specially -designated software packages--typically libraries--of the Free Software -Foundation and other authors who decide to use it. You can use it too, but we -suggest you first think carefully about whether this license or the ordinary -General Public License is the better strategy to use in any particular case, -based on the explanations below. - -When we speak of free software, we are referring to freedom of use, not price. -Our General Public Licenses are designed to make sure that you have the -freedom to distribute copies of free software (and charge for this service if -you wish); that you receive source code or can get it if you want it; that you -can change the software and use pieces of it in new free programs; and that -you are informed that you can do these things. - -To protect your rights, we need to make restrictions that forbid distributors -to deny you these rights or to ask you to surrender these rights. These -restrictions translate to certain responsibilities for you if you distribute -copies of the library or if you modify it. - -For example, if you distribute copies of the library, whether gratis or for a -fee, you must give the recipients all the rights that we gave you. You must -make sure that they, too, receive or can get the source code. If you link -other code with the library, you must provide complete object files to the -recipients, so that they can relink them with the library after making changes -to the library and recompiling it. And you must show them these terms so they -know their rights. - -We protect your rights with a two-step method: (1) we copyright the library, -and (2) we offer you this license, which gives you legal permission to copy, -distribute and/or modify the library. - -To protect each distributor, we want to make it very clear that there is no -warranty for the free library. Also, if the library is modified by someone -else and passed on, the recipients should know that what they have is not the -original version, so that the original author's reputation will not be -affected by problems that might be introduced by others. - -Finally, software patents pose a constant threat to the existence of any free -program. We wish to make sure that a company cannot effectively restrict the -users of a free program by obtaining a restrictive license from a patent -holder. Therefore, we insist that any patent license obtained for a version of -the library must be consistent with the full freedom of use specified in this -license. - -Most GNU software, including some libraries, is covered by the ordinary GNU -General Public License. This license, the GNU Lesser General Public License, -applies to certain designated libraries, and is quite different from the -ordinary General Public License. We use this license for certain libraries in -order to permit linking those libraries into non-free programs. - -When a program is linked with a library, whether statically or using a shared -library, the combination of the two is legally speaking a combined work, a -derivative of the original library. The ordinary General Public License -therefore permits such linking only if the entire combination fits its -criteria of freedom. The Lesser General Public License permits more lax -criteria for linking other code with the library. - -We call this license the "Lesser" General Public License because it does Less -to protect the user's freedom than the ordinary General Public License. It -also provides other free software developers Less of an advantage over -competing non-free programs. These disadvantages are the reason we use the -ordinary General Public License for many libraries. However, the Lesser -license provides advantages in certain special circumstances. - -For example, on rare occasions, there may be a special need to encourage the -widest possible use of a certain library, so that it becomes a de-facto -standard. To achieve this, non-free programs must be allowed to use the -library. A more frequent case is that a free library does the same job as -widely used non-free libraries. In this case, there is little to gain by -limiting the free library to free software only, so we use the Lesser General -Public License. - -In other cases, permission to use a particular library in non-free programs -enables a greater number of people to use a large body of free software. For -example, permission to use the GNU C Library in non-free programs enables many -more people to use the whole GNU operating system, as well as its variant, the -GNU/Linux operating system. - -Although the Lesser General Public License is Less protective of the users' -freedom, it does ensure that the user of a program that is linked with the -Library has the freedom and the wherewithal to run that program using a -modified version of the Library. - -The precise terms and conditions for copying, distribution and modification -follow. Pay close attention to the difference between a "work based on the -library" and a "work that uses the library". The former contains code derived -from the library, whereas the latter must be combined with the library in -order to run. -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License Agreement applies to any software library or other program -which contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Lesser General -Public License (also called "this License"). Each licensee is addressed as -"you". - -A "library" means a collection of software functions and/or data prepared so -as to be conveniently linked with application programs (which use some of -those functions and data) to form executables. - -The "Library", below, refers to any such software library or work which has -been distributed under these terms. A "work based on the Library" means either -the Library or any derivative work under copyright law: that is to say, a work -containing the Library or a portion of it, either verbatim or with -modifications and/or translated straightforwardly into another language. -(Hereinafter, translation is included without limitation in the term -"modification".) - -"Source code" for a work means the preferred form of the work for making -modifications to it. For a library, complete source code means all the source -code for all modules it contains, plus any associated interface definition -files, plus the scripts used to control compilation and installation of the -library. - -Activities other than copying, distribution and modification are not covered -by this License; they are outside its scope. The act of running a program -using the Library is not restricted, and output from such a program is covered -only if its contents constitute a work based on the Library (independent of -the use of the Library in a tool for writing it). Whether that is true depends -on what the Library does and what the program that uses the Library does. - -1. You may copy and distribute verbatim copies of the Library's complete -source code as you receive it, in any medium, provided that you conspicuously -and appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and distribute a copy of this License -along with the Library. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Library or any portion of it, -thus forming a work based on the Library, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you -also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices stating -that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no charge to all -third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a table -of data to be supplied by an application program that uses the facility, other -than as an argument passed when the facility is invoked, then you must make a -good faith effort to ensure that, in the event an application does not supply -such function or table, the facility still operates, and performs whatever -part of its purpose remains meaningful. - - (For example, a function in a library to compute square roots has a -purpose that is entirely well-defined independent of the application. -Therefore, Subsection 2d requires that any application-supplied function or -table used by this function must be optional: if the application does not -supply it, the square root function must still compute square roots.) - - These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Library, and can be reasonably -considered independent and separate works in themselves, then this License, -and its terms, do not apply to those sections when you distribute them as -separate works. But when you distribute the same sections as part of a whole -which is a work based on the Library, the distribution of the whole must be on -the terms of this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Library. - - In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of a -storage or distribution medium does not bring the other work under the scope -of this License. - -3. You may opt to apply the terms of the ordinary GNU General Public License -instead of this License to a given copy of the Library. To do this, you must -alter all the notices that refer to this License, so that they refer to the -ordinary GNU General Public License, version 2, instead of to this License. -(If a newer version than version 2 of the ordinary GNU General Public License -has appeared, then you can specify that version instead if you wish.) Do not -make any other change in these notices. - -Once this change is made in a given copy, it is irreversible for that copy, so -the ordinary GNU General Public License applies to all subsequent copies and -derivative works made from that copy. - -This option is useful when you wish to copy part of the code of the Library -into a program that is not a library. - -4. You may copy and distribute the Library (or a portion or derivative of it, -under Section 2) in object code or executable form under the terms of Sections -1 and 2 above provided that you accompany it with the complete corresponding -machine-readable source code, which must be distributed under the terms of -Sections 1 and 2 above on a medium customarily used for software interchange. - -If distribution of object code is made by offering access to copy from a -designated place, then offering equivalent access to copy the source code from -the same place satisfies the requirement to distribute the source code, even -though third parties are not compelled to copy the source along with the -object code. - -5. A program that contains no derivative of any portion of the Library, but is -designed to work with the Library by being compiled or linked with it, is -called a "work that uses the Library". Such a work, in isolation, is not a -derivative work of the Library, and therefore falls outside the scope of this -License. - -However, linking a "work that uses the Library" with the Library creates an -executable that is a derivative of the Library (because it contains portions -of the Library), rather than a "work that uses the library". The executable is -therefore covered by this License. Section 6 states terms for distribution of -such executables. - -When a "work that uses the Library" uses material from a header file that is -part of the Library, the object code for the work may be a derivative work of -the Library even though the source code is not. Whether this is true is -especially significant if the work can be linked without the Library, or if -the work is itself a library. The threshold for this to be true is not -precisely defined by law. - -If such an object file uses only numerical parameters, data structure layouts -and accessors, and small macros and small inline functions (ten lines or less -in length), then the use of the object file is unrestricted, regardless of -whether it is legally a derivative work. (Executables containing this object -code plus portions of the Library will still fall under Section 6.) - -Otherwise, if the work is a derivative of the Library, you may distribute the -object code for the work under the terms of Section 6. Any executables -containing that work also fall under Section 6, whether or not they are linked -directly with the Library itself. - -6. As an exception to the Sections above, you may also combine or link a "work -that uses the Library" with the Library to produce a work containing portions -of the Library, and distribute that work under terms of your choice, provided -that the terms permit modification of the work for the customer's own use and -reverse engineering for debugging such modifications. - -You must give prominent notice with each copy of the work that the Library is -used in it and that the Library and its use are covered by this License. You -must supply a copy of this License. If the work during execution displays -copyright notices, you must include the copyright notice for the Library among -them, as well as a reference directing the user to the copy of this License. -Also, you must do one of these things: - - a) Accompany the work with the complete corresponding machine-readable -source code for the Library including whatever changes were used in the work -(which must be distributed under Sections 1 and 2 above); and, if the work is -an executable linked with the Library, with the complete machine-readable -"work that uses the Library", as object code and/or source code, so that the -user can modify the Library and then relink to produce a modified executable -containing the modified Library. (It is understood that the user who changes -the contents of definitions files in the Library will not necessarily be able -to recompile the application to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the Library. A -suitable mechanism is one that (1) uses at run time a copy of the library -already present on the user's computer system, rather than copying library -functions into the executable, and (2) will operate properly with a modified -version of the library, if the user installs one, as long as the modified -version is interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at least three -years, to give the same user the materials specified in Subsection 6a, above, -for a charge no more than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy from a -designated place, offer equivalent access to copy the above specified -materials from the same place. - - e) Verify that the user has already received a copy of these materials or -that you have already sent this user a copy. - -For an executable, the required form of the "work that uses the Library" must -include any data and utility programs needed for reproducing the executable -from it. However, as a special exception, the materials to be distributed need -not include anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the operating -system on which the executable runs, unless that component itself accompanies -the executable. - -It may happen that this requirement contradicts the license restrictions of -other proprietary libraries that do not normally accompany the operating -system. Such a contradiction means you cannot use both them and the Library -together in an executable that you distribute. - -7. You may place library facilities that are a work based on the Library -side-by-side in a single library together with other library facilities not -covered by this License, and distribute such a combined library, provided that -the separate distribution of the work based on the Library and of the other -library facilities is otherwise permitted, and provided that you do these two -things: - - a) Accompany the combined library with a copy of the same work based on -the Library, uncombined with any other library facilities. This must be -distributed under the terms of the Sections above. - - b) Give prominent notice with the combined library of the fact that part -of it is a work based on the Library, and explaining where to find the -accompanying uncombined form of the same work. - -8. You may not copy, modify, sublicense, link with, or distribute the Library -except as expressly provided under this License. Any attempt otherwise to -copy, modify, sublicense, link with, or distribute the Library is void, and -will automatically terminate your rights under this License. However, parties -who have received copies, or rights, from you under this License will not have -their licenses terminated so long as such parties remain in full compliance. - -9. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the -Library or its derivative works. These actions are prohibited by law if you do -not accept this License. Therefore, by modifying or distributing the Library -(or any work based on the Library), you indicate your acceptance of this -License to do so, and all its terms and conditions for copying, distributing -or modifying the Library or works based on it. - -10. Each time you redistribute the Library (or any work based on the Library), -the recipient automatically receives a license from the original licensor to -copy, distribute, link with or modify the Library subject to these terms and -conditions. You may not impose any further restrictions on the recipients' -exercise of the rights granted herein. You are not responsible for enforcing -compliance by third parties with this License. - -11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or otherwise) -that contradict the conditions of this License, they do not excuse you from -the conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Library at all. -For example, if a patent license would not permit royalty-free redistribution -of the Library by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -12. If the distribution and/or use of the Library is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Library under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -13. The Free Software Foundation may publish revised and/or new versions of -the Lesser General Public License from time to time. Such new versions will be -similar in spirit to the present version, but may differ in detail to address -new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software -Foundation. If the Library does not specify a license version number, you may -choose any version ever published by the Free Software Foundation. - -14. If you wish to incorporate parts of the Library into other free programs -whose distribution conditions are incompatible with these, write to the author -to ask for permission. For software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we sometimes make -exceptions for this. Our decision will be guided by the two goals of -preserving the free status of all derivatives of our free software and of -promoting the sharing and reuse of software generally. - -NO WARRANTY - -15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE -THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE -OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR -DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR -A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH -HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -END OF TERMS AND CONDITIONS -How to Apply These Terms to Your New Libraries -If you develop a new library, and you want it to be of the greatest possible -use to the public, we recommend making it free software that everyone can -redistribute and change. You can do so by permitting redistribution under -these terms (or, alternatively, under the terms of the ordinary General Public -License). - -To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - - This library is free software; you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as published by the -Free Software Foundation; either version 2.1 of the License, or (at your -option) any later version. - - This library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License -for more details. - - You should have received a copy of the GNU Lesser General Public License -along with this library; if not, write to the Free Software Foundation, Inc., -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the library -`Frob' (a library for tweaking knobs) written by James Random Hacker. - - signature of Ty Coon, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - -Acknowledgements: - -We have used the following software: - -1. ExcelReader package to read the xls files. We have taken the utility from the following Web site : - http://freshmeat.net/projects/phpexcelreader/ - The product is available as GNU General Public License (GPL). - -2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the following Web site: -http://www.linuxscope.net/articles/mailAttachmentsPHP.html - -3. FPDF package to create PDF reports and documents. We have taken the utility from the following Web site: -http://www.fpdf.org/ - -We are grateful to the creators of the respective products for providing such a beautiful utilities. + +This software is a collective work consisting of the following major Open Source components: +Apache software, MySQL server, PHP, SugarCRM, ADOdb, Smarty, PHPMailer, phpSysinfo, MagpieRSS and others, each licensed under a separate Open Source License. +vtiger.com is not affiliated with nor endorsed by any of the above providers. + +For Windows + +1. Apache Web server software used under the Apache License available at /vtigerCRM/apache/LICENSE.txt + +2. MySQL database software used under the GPL License available at /vtigerCRM/mysql/README.txt + +3. PHP software used under the PHP License version 3.0 available at /vtigerCRM/php/license.txt + +4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 available at /vtigerCRM/LICENSE.txt + +5. gdwin32 software used under the GNU GPL available at gdwin32 /vtigerCRM/gdwin32/gd-license.txt + +6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap + +7. PHPMailer software used under the GNU LGPL downloaded from http://adodb.sourceforge.net available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt + +8. ADOdb software used under BSD license downloaded from http://adodb.sourceforge.net available at /vtigerCRM/adodb/license.txt + +9. phpSysinfo software used under GNU GPL downloaded from http://phpsysinfo.sourceforge.net/ available at /vtigerCRM/modules/System/COPYING + +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at + +11. FCKeditor software used under GNU LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt + +12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright + +13. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib + +14. freetag is used under dual license BSD and GNU LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt + +15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html + +16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt + +17. Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html + +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at + +19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html + +20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE + +21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# +22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). + +For Linux + +1. Apache Web server software used under the Apache License available at /vtigerCRM_linux/apache/LICENSE.txt + +2. MySQL database software used under the GPL available at /vtigerCRM_linux/mysql/README.txt + +3. PHP software used under the PHP License version 3.0 available at /vtigerCRM_linux/php/license.txt + +4. SugarCRM software used under the SugarCRM Public License (SPL 1.1.2) available at /vtigerCRM/LICENSE_linux.txt + +5. gd 2.0.28 software used "AS IS" available at /vtigerCRM_linux/gd-2.0.28/ + +6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap + +8. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt + +9. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt + +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ + +10. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING + +11. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt + +12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright + +13. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib + +14. freetag is used under dual license BSD and LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt + +15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html + +16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt + +17. Image_Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html + +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at + +19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html + +20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE + +21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# +22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL) + +The licenses of the Open Source components are reproduced in full below. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 06:57:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:57:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6752 - in /vtigercrm/trunk/pkg/license: License_linux.txt License_windows.txt Message-ID: <20060530135735.A0CB87D7848@vtiger.fosslabs.com> Author: richie Date: Tue May 30 07:57:30 2006 New Revision: 6752 Log: updated licence files Modified: vtigercrm/trunk/pkg/license/License_linux.txt vtigercrm/trunk/pkg/license/License_windows.txt Modified: vtigercrm/trunk/pkg/license/License_linux.txt ============================================================================== --- vtigercrm/trunk/pkg/license/License_linux.txt (original) +++ vtigercrm/trunk/pkg/license/License_linux.txt Tue May 30 07:57:30 2006 @@ -1,24 +1,51 @@ - This software is a collective work consisting of the following major Open Source components: -Apache software, MySQL server, PHP, SugarCRM, phpBB, phpSysinfo, Magpie and PHPMailer each licensed under a separate Open Source License. -vtiger.com is not affiliated with nor endorsed by any of the above providers. - +Apache software, MySQL server, PHP, SugarCRM, ADOdb, Smarty, PHPMailer, phpSysinfo, MagpieRSS and others, each licensed under a separate Open Source License. +vtiger.com is not affiliated with nor endorsed by any of the above providers. For Linux -1. Apache web server software used under the Apache License available at /vtigerCRM_linux/apache/LICENSE.txt +1. Apache Web server software used under the Apache License available at /vtigerCRM_linux/apache/LICENSE.txt + 2. MySQL database software used under the GPL available at /vtigerCRM_linux/mysql/README.txt + 3. PHP software used under the PHP License version 3.0 available at /vtigerCRM_linux/php/license.txt + 4. SugarCRM software used under the SugarCRM Public License (SPL 1.1.2) available at /vtigerCRM/LICENSE_linux.txt + 5. gd 2.0.28 software used "AS IS" available at /vtigerCRM_linux/gd-2.0.28/ + 6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap -7. phpBB software used under GNU GPL downloaded from http://www.phpbb.com/support/license.php -9. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt -10. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -11. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING -13. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt -15. Mailfeed used under GNU GPL downloaed from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright -16. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). + +8. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt + +9. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt + +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ + +10. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING + +11. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt + +12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright + +13. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib + +14. freetag is used under dual license BSD and LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt + +15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html + +16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt + +17. Image_Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html + +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at + +19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html + +20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE + +21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# +22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL) The licenses of the Open Source components are reproduced in full below. @@ -485,7 +512,6 @@ * * Copyright (c) 2000-2002 The Apache Software Foundation. All rights * reserved. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1193,7 +1219,6 @@ modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating @@ -1502,18 +1527,27 @@ That's all there is to it! -Acknowledgements: - We have used the following software: 1. ExcelReader package to read the xls files. We have taken the utility from the following Web site : http://freshmeat.net/projects/phpexcelreader/ The product is available as GNU General Public License (GPL). -2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the following Web site: +2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the http://www.linuxscope.net/articles/mailAttachmentsPHP.html -3. FPDF package to create PDF reports and documents. We have taken the utility from the following Web site: -http://www.fpdf.org/ - -We are grateful to the creators of the respective products for providing such beautiful utilities. +3. FPDF package to create PDF reports and documents. We have downloaded package from http://www.fpdf.org + +4. Prototype (Object-Oriented JavaScript framework) package to ease development of dynamic web applications. We have downloaded package from http://prototype.conio.net + +5. class_http to cache scraped content. We have downloaded package from http://www.troywolf.com/articles/php/class_http/ + +6.Carousel Slideshow package to display large images as thumbnails. We have downloaded package from http://www.dynamicdrive.com/dynamicindex14/carousel2.htm + +7. Ajax Popup Chat for enabling instant messaging for vtiger CRM users. We have downloaded package from http://www.os-solution.com/demo/ajaxcsspopupchat/index.php + +8. Image Crossfade Redux for enabling fade effect to images. We have downloaded package from http://slayeroffice.com/code/imageCrossFade/xfade2.html + +9. Calculator for enabling calculations in vtiger CRM. We have downloaded package from http://www.hmhd.com/steve + +We are grateful to the creators of the respective products for providing such a beautiful utilities. Modified: vtigercrm/trunk/pkg/license/License_windows.txt ============================================================================== --- vtigercrm/trunk/pkg/license/License_windows.txt (original) +++ vtigercrm/trunk/pkg/license/License_windows.txt Tue May 30 07:57:30 2006 @@ -1,23 +1,52 @@ This software is a collective work consisting of the following major Open Source components: -Apache software, MySQL server, PHP, SugarCRM, phpBB, phpSysinfo, Magpie and PHPMailer each licensed under a separate Open Source License. -vtiger.com is not affiliated with nor endorsed by any of the above providers. +Apache software, MySQL server, PHP, SugarCRM, ADOdb, Smarty, PHPMailer, phpSysinfo, MagpieRSS and others, each licensed under a separate Open Source License. +vtiger.com is not affiliated with nor endorsed by any of the above providers. For Windows -1. Apache web server software used under the Apache License available at /vtigerCRM/apache/LICENSE.txt +1. Apache Web server software used under the Apache License available at /vtigerCRM/apache/LICENSE.txt + 2. MySQL database software used under the GPL License available at /vtigerCRM/mysql/README.txt + 3. PHP software used under the PHP License version 3.0 available at /vtigerCRM/php/license.txt -4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 available at /vtigerCRM/LICENSE_windows.txt + +4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 available at /vtigerCRM/LICENSE.txt + 5. gdwin32 software used under the GNU GPL available at gdwin32 /vtigerCRM/gdwin32/gd-license.txt + 6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap -7. phpBB software used under GNU GPL downloaded from http://www.phpbb.com/support/license.php -9. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt -10. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -11. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING -13. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt -15. Mailfeed used under GNU GPL downloaed from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright -16. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). + +7. PHPMailer software used under the GNU LGPL downloaded from http://adodb.sourceforge.net available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt + +8. ADOdb software used under BSD license downloaded from http://adodb.sourceforge.net available at /vtigerCRM/adodb/license.txt + +9. phpSysinfo software used under GNU GPL downloaded from http://phpsysinfo.sourceforge.net/ available at /vtigerCRM/modules/System/COPYING + +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at + +11. FCKeditor software used under GNU LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt + +12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright + +13. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib + +14. freetag is used under dual license BSD and GNU LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt + +15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html + +16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt + +17. Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html + +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at + +19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html + +20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE + +21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# +22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). The licenses of the Open Source components are reproduced in full below. @@ -1501,7 +1530,7 @@ That's all there is to it! -Acknowledgements: +Acknowledgments: We have used the following software: @@ -1509,11 +1538,21 @@ http://freshmeat.net/projects/phpexcelreader/ The product is available as GNU General Public License (GPL). -2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the following Web site: +2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the http://www.linuxscope.net/articles/mailAttachmentsPHP.html -3. FPDF package to create PDF reports and documents. We have taken the utility from the following Web site: -http://www.fpdf.org/ - -We are grateful to the creators of the respective products for providing such beautiful utilities. - +3. FPDF package to create PDF reports and documents. We have downloaded package from http://www.fpdf.org + +4. Prototype (Object-Oriented JavaScript framework) package to ease development of dynamic web applications. We have downloaded package from http://prototype.conio.net + +5. class_http to cache scraped content. We have downloaded package from http://www.troywolf.com/articles/php/class_http/ + +6.Carousel Slideshow package to display large images as thumbnails. We have downloaded package from http://www.dynamicdrive.com/dynamicindex14/carousel2.htm + +7. Ajax Popup Chat for enabling instant messaging for vtiger CRM users. We have downloaded package from http://www.os-solution.com/demo/ajaxcsspopupchat/index.php + +8. Image Crossfade Redux for enabling fade effect to images. We have downloaded package from http://slayeroffice.com/code/imageCrossFade/xfade2.html + +9. Calculator for enabling calculations in vtiger CRM. We have downloaded package from http://www.hmhd.com/steve + +We are grateful to the creators of the respective products for providing such a beautiful utilities. From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:11:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:11:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6753 - in /vtigercrm/trunk: Copyright.txt LICENSE.txt Message-ID: <20060530141134.D73317D7808@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:11:29 2006 New Revision: 6753 Log: updated licence files Modified: vtigercrm/trunk/Copyright.txt vtigercrm/trunk/LICENSE.txt Modified: vtigercrm/trunk/Copyright.txt ============================================================================== --- vtigercrm/trunk/Copyright.txt (original) +++ vtigercrm/trunk/Copyright.txt Tue May 30 08:11:29 2006 @@ -23,7 +23,7 @@ 9. phpSysinfo software used under GNU GPL downloaded from http://phpsysinfo.sourceforge.net/ available at /vtigerCRM/modules/System/COPYING -10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at http://magpierss.sourceforge.net 11. FCKeditor software used under GNU LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt @@ -39,7 +39,7 @@ 17. Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html -18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at http://www.vxr.it/log4php/ 19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html @@ -66,7 +66,7 @@ 9. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at http://magpierss.sourceforge.net/ 10. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING @@ -84,7 +84,7 @@ 17. Image_Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html -18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at http://www.vxr.it/log4php/ 19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html Modified: vtigercrm/trunk/LICENSE.txt ============================================================================== --- vtigercrm/trunk/LICENSE.txt (original) +++ vtigercrm/trunk/LICENSE.txt Tue May 30 08:11:29 2006 @@ -1,406 +1,406 @@ -The Sugar Public License Version 1.1.2 ("SPL") consists of the Mozilla Public -License Version 1.1, modified to be specific to SugarCRM, with the Additional -Terms in Exhibit B. The original Mozilla Public License 1.1 can be found at: -http://www.mozilla.org/MPL/MPL-1.1.html - -SUGARCRM PUBLIC LICENSE -Version 1.1.2 - - --------------------------------------------------------------------------------- - -1. Definitions. - -1.0.1. "Commercial Use" means distribution or otherwise making the Covered -Code available to a third party. -1.1. ''Contributor'' means each entity that creates or contributes to the -creation of Modifications. - -1.2. ''Contributor Version'' means the combination of the Original Code, prior -Modifications used by a Contributor, and the Modifications made by that -particular Contributor. - -1.3. ''Covered Code'' means the Original Code or Modifications or the -combination of the Original Code and Modifications, in each case including -portions thereof. - -1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted -in the software development community for the electronic transfer of data. - -1.5. ''Executable'' means Covered Code in any form other than Source Code. - -1.6. ''Initial Developer'' means the individual or entity identified as the -Initial Developer in the Source Code notice required by Exhibit A. - -1.7. ''Larger Work'' means a work which combines Covered Code or portions -thereof with code not governed by the terms of this License. - -1.8. ''License'' means this document. - -1.8.1. "Licensable" means having the right to grant, to the maximum extent -possible, whether at the time of the initial grant or subsequently acquired, -any and all of the rights conveyed herein. - -1.9. ''Modifications'' means any addition to or deletion from the substance -or structure of either the Original Code or any previous Modifications. When -Covered Code is released as a series of files, a Modification is: - -A. Any addition to or deletion from the contents of a file containing Original -Code or previous Modifications. -B. Any new file that contains any part of the Original Code or previous -Modifications. - - -1.10. ''Original Code'' means Source Code of computer software code which is -described in the Source Code notice required by Exhibit A as Original Code, -and which, at the time of its release under this License is not already Covered -Code governed by this License. -1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter -acquired, including without limitation, method, process, and apparatus claims, -in any patent Licensable by grantor. - -1.11. ''Source Code'' means the preferred form of the Covered Code for making -modifications to it, including all modules it contains, plus any associated -interface definition files, scripts used to control compilation and installation -of an Executable, or source code differential comparisons against either the -Original Code or another well known, available Covered Code of the Contributor's -choice. The Source Code can be in a compressed or archival form, provided the -appropriate decompression or de-archiving software is widely available for no -charge. - -1.12. "You'' (or "Your") means an individual or a legal entity exercising -rights under, and complying with all of the terms of, this License or a future -version of this License issued under Section 6.1. For legal entities, "You'' -includes any entity which controls, is controlled by, or is under common -control with You. For purposes of this definition, "control'' means (a) the -power, direct or indirect, to cause the direction or management of such entity, -whether by contract or otherwise, or (b) ownership of more than fifty percent -(50%) of the outstanding shares or beneficial ownership of such entity. - -2. Source Code License. -2.1. The Initial Developer Grant. -The Initial Developer hereby grants You a world-wide, royalty-free, -non-exclusive license, subject to third party intellectual property claims: -(a) under intellectual property rights (other than patent or trademark) -Licensable by Initial Developer to use, reproduce, modify, display, perform, -sublicense and distribute the Original Code (or portions thereof) with or -without Modifications, and/or as part of a Larger Work; and -(b) under Patents Claims infringed by the making, using or selling of Original -Code, to make, have made, use, practice, sell, and offer for sale, and/or -otherwise dispose of the Original Code (or portions thereof). - - -(c) the licenses granted in this Section 2.1(a) and (b) are effective on -the date Initial Developer first distributes Original Code under the terms -of this License. -(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for -code that You delete from the Original Code; 2) separate from the Original Code; -or 3) for infringements caused by: i) the modification of the Original Code or -ii) the combination of the Original Code with other software or devices. - - -2.2. Contributor Grant. -Subject to third party intellectual property claims, each Contributor hereby -grants You a world-wide, royalty-free, non-exclusive license - -(a) under intellectual property rights (other than patent or trademark) -Licensable by Contributor, to use, reproduce, modify, display, perform, -sublicense and distribute the Modifications created by such Contributor -(or portions thereof) either on an unmodified basis, with other Modifications, -as Covered Code and/or as part of a Larger Work; and -(b) under Patent Claims infringed by the making, using, or selling of -Modifications made by that Contributor either alone and/or in combination with -its Contributor Version (or portions of such combination), to make, use, sell, -offer for sale, have made, and/or otherwise dispose of: 1) Modifications made -by that Contributor (or portions thereof); and 2) the combination of -Modifications made by that Contributor with its Contributor Version (or portions -of such combination). - -(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date -Contributor first makes Commercial Use of the Covered Code. - -(d) Notwithstanding Section 2.2(b) above, no patent license is granted: -1) for any code that Contributor has deleted from the Contributor Version; -2) separate from the Contributor Version; 3) for infringements caused -by: i) third party modifications of Contributor Version or ii) the -combination of Modifications made by that Contributor with other software -(except as part of the Contributor Version) or other devices; or 4) under -Patent Claims infringed by Covered Code in the absence of Modifications -made by that Contributor. - - -3. Distribution Obligations. - -3.1. Application of License. -The Modifications which You create or to which You contribute are -governed by the terms of this License, including without limitation -Section 2.2. The Source Code version of Covered Code may be distributed -only under the terms of this License or a future version of this License -released under Section 6.1, and You must include a copy of this License -with every copy of the Source Code You distribute. You may not offer or -impose any terms on any Source Code version that alters or restricts the -applicable version of this License or the recipients' rights hereunder. -However, You may include an additional document offering the additional -rights described in Section 3.5. -3.2. Availability of Source Code. -Any Modification which You create or to which You contribute must be made -available in Source Code form under the terms of this License either on -the same media as an Executable version or via an accepted Electronic -Distribution Mechanism to anyone to whom you made an Executable version -available; and if made available via Electronic Distribution Mechanism, -must remain available for at least twelve (12) months after the date it -initially became available, or at least six (6) months after a subsequent -version of that particular Modification has been made available to such -recipients. You are responsible for ensuring that the Source Code version -remains available even if the Electronic Distribution Mechanism is -maintained by a third party. - -3.3. Description of Modifications. -You must cause all Covered Code to which You contribute to contain a file -documenting the changes You made to create that Covered Code and the date of -any change. You must include a prominent statement that the Modification is -derived, directly or indirectly, from Original Code provided by the Initial -Developer and including the name of the Initial Developer in (a) the Source -Code, and (b) in any notice in an Executable version or related documentation -in which You describe the origin or ownership of the Covered Code. - -3.4. Intellectual Property Matters - -(a) Third Party Claims. -If Contributor has knowledge that a license under a third party's intellectual -property rights is required to exercise the rights granted by such Contributor -under Sections 2.1 or 2.2, Contributor must include a text file with the Source -Code distribution titled "LEGAL'' which describes the claim and the party making -the claim in sufficient detail that a recipient will know whom to contact. If -Contributor obtains such knowledge after the Modification is made available as -described in Section 3.2, Contributor shall promptly modify the LEGAL file in -all copies Contributor makes available thereafter and shall take other steps -(such as notifying appropriate mailing lists or newsgroups) reasonably calculated -to inform those who received the Covered Code that new knowledge has been obtained. -(b) Contributor APIs. -If Contributor's Modifications include an application programming interface and -Contributor has knowledge of patent licenses which are reasonably necessary to -implement that API, Contributor must also include this information in the LEGAL -file. - - - (c) Representations. -Contributor represents that, except as disclosed pursuant to Section 3.4(a) -above, Contributor believes that Contributor's Modifications are Contributor's -original creation(s) and/or Contributor has sufficient rights to grant the -rights conveyed by this License. - -3.5. Required Notices. -You must duplicate the notice in Exhibit A in each file of the Source Code. -If it is not possible to put such notice in a particular Source Code file -due to its structure, then You must include such notice in a location (such -as a relevant directory) where a user would be likely to look for such a -notice. If You created one or more Modification(s) You may add your name as -a Contributor to the notice described in Exhibit A. You must also duplicate -this License in any documentation for the Source Code where You describe -recipients' rights or ownership rights relating to Covered Code. You may -choose to offer, and to charge a fee for, warranty, support, indemnity or -liability obligations to one or more recipients of Covered Code. However, You -may do so only on Your own behalf, and not on behalf of the Initial Developer -or any Contributor. You must make it absolutely clear than any such warranty, -support, indemnity or liability obligation is offered by You alone, and You -hereby agree to indemnify the Initial Developer and every Contributor for any -liability incurred by the Initial Developer or such Contributor as a result of -warranty, support, indemnity or liability terms You offer. - -3.6. Distribution of Executable Versions. -You may distribute Covered Code in Executable form only if the requirements -of Section 3.1-3.5 have been met for that Covered Code, and if You include -a notice stating that the Source Code version of the Covered Code is available -under the terms of this License, including a description of how and where -You have fulfilled the obligations of Section 3.2. The notice must be -conspicuously included in any notice in an Executable version, related -documentation or collateral in which You describe recipients' rights relating -to the Covered Code. You may distribute the Executable version of Covered -Code or ownership rights under a license of Your choice, which may contain -terms different from this License, provided that You are in compliance with -the terms of this License and that the license for the Executable version -does not attempt to limit or alter the recipient's rights in the Source Code -version from the rights set forth in this License. If You distribute the -Executable version under a different license You must make it absolutely -clear that any terms which differ from this License are offered by You alone, -not by the Initial Developer or any Contributor. You hereby agree to indemnify -the Initial Developer and every Contributor for any liability incurred by the -Initial Developer or such Contributor as a result of any such terms You offer. - -3.7. Larger Works. -You may create a Larger Work by combining Covered Code with other code not -governed by the terms of this License and distribute the Larger Work as a -single product. In such a case, You must make sure the requirements of this -License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. -If it is impossible for You to comply with any of the terms of this License -with respect to some or all of the Covered Code due to statute, judicial order, -or regulation then You must: (a) comply with the terms of this License to the -maximum extent possible; and (b) describe the limitations and the code they -affect. Such description must be included in the LEGAL file described in -Section 3.4 and must be included with all distributions of the Source Code. -Except to the extent prohibited by statute or regulation, such description -must be sufficiently detailed for a recipient of ordinary skill to be able -to understand it. -5. Application of this License. -This License applies to code to which the Initial Developer has attached the -notice in Exhibit A and to related Covered Code. -6. Versions of the License. -6.1. New Versions. -SugarCRM Inc. (''SugarCRM'') may publish revised and/or new versions of the -License from time to time. Each version will be given a distinguishing version -number. -6.2. Effect of New Versions. -Once Covered Code has been published under a particular version of the License, -You may always continue to use it under the terms of that version. You may also -choose to use such Covered Code under the terms of any subsequent version of the -License published by SugarCRM. No one other than SugarCRM has the right to modify -the terms applicable to Covered Code created under this License. - -6.3. Derivative Works. -If You create or use a modified version of this License (which you may only do -in order to apply it to code which is not already Covered Code governed by this -License), You must (a) rename Your license so that the phrases ''SugarCRM'', -''SPL'' or any confusingly similar phrase do not appear in your license (except -to note that your license differs from this License) and (b) otherwise make it -clear that Your version of the license contains terms which differ from the -SugarCRM Public License. (Filling in the name of the Initial Developer, Original -Code or Contributor in the notice described in Exhibit A shall not of themselves -be deemed to be modifications of this License.) - -7. DISCLAIMER OF WARRANTY. -COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES -THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE -OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED -CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT -THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY -SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL -PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT -UNDER THIS DISCLAIMER. - -8. TERMINATION. -8.1. This License and the rights granted hereunder will terminate automatically if -You fail to comply with terms herein and fail to cure such breach within 30 days of -becoming aware of the breach. All sublicenses to the Covered Code which are properly -granted shall survive any termination of this License. Provisions which, by their -nature, must remain in effect beyond the termination of this License shall survive. - -8.2. If You initiate litigation by asserting a patent infringement claim (excluding -declatory judgment actions) against Initial Developer or a Contributor (the Initial -Developer or Contributor against whom You file such action is referred to as -"Participant") alleging that: - -(a) such Participant's Contributor Version directly or indirectly infringes any patent, -then any and all rights granted by such Participant to You under Sections 2.1 and/or -2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, -unless if within 60 days after receipt of notice You either: (i) agree in writing to -pay Participant a mutually agreeable reasonable royalty for Your past and future use -of Modifications made by such Participant, or (ii) withdraw Your litigation claim -with respect to the Contributor Version against such Participant. If within 60 days -of notice, a reasonable royalty and payment arrangement are not mutually agreed upon -in writing by the parties or the litigation claim is not withdrawn, the rights granted -by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the -expiration of the 60 day notice period specified above. - -(b) any software, hardware, or device, other than such Participant's Contributor Version, -directly or indirectly infringes any patent, then any rights granted to You by such -Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You -first made, used, sold, distributed, or had made, Modifications made by that Participant. - -8.3. If You assert a patent infringement claim against Participant alleging that such -Participant's Contributor Version directly or indirectly infringes any patent where such -claim is resolved (such as by license or settlement) prior to the initiation of patent -infringement litigation, then the reasonable value of the licenses granted by such -Participant under Sections 2.1 or 2.2 shall be taken into account in determining the -amount or value of any payment or license. - -8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license -agreements (excluding distributors and resellers) which have been validly granted by You -or any distributor hereunder prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. -UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), -CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY -DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY -PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER -INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER -FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH -PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF -LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH -PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME -JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL -DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. -The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 -(Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer -software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). -Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), -all U.S. Government End Users acquire Covered Code with only those rights set forth herein. - -11. MISCELLANEOUS. -This License represents the complete agreement concerning subject matter hereof. If -any provision of this License is held to be unenforceable, such provision shall be -reformed only to the extent necessary to make it enforceable. This License shall be -governed by California law provisions (except to the extent applicable law, if any, -provides otherwise), excluding its conflict-of-law provisions. With respect to disputes -in which at least one party is a citizen of, or an entity chartered or registered to do -business in the United States of America, any litigation relating to this License shall -be subject to the jurisdiction of the Federal Courts of the Northern District of California, -with venue lying in Santa Clara County, California, with the losing party responsible for -costs, including without limitation, court costs and reasonable attorneys' fees and expenses. -The application of the United Nations Convention on Contracts for the International Sale of -Goods is expressly excluded. Any law or regulation which provides that the language of a -contract shall be construed against the drafter shall not apply to this License. - -12. RESPONSIBILITY FOR CLAIMS. -As between Initial Developer and the Contributors, each party is responsible for claims -and damages arising, directly or indirectly, out of its utilization of rights under this -License and You agree to work with Initial Developer and Contributors to distribute such -responsibility on an equitable basis. Nothing herein is intended or shall be deemed to -constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. -Initial Developer may designate portions of the Covered Code as ?Multiple-Licensed?. -?Multiple-Licensed? means that the Initial Developer permits you to utilize portions of -the Covered Code under Your choice of the SPL or the alternative licenses, if any, specified -by the Initial Developer in the file described in Exhibit A. - - -SugarCRM Public License 1.1.2 - Exhibit A -The contents of this file are subject to the SugarCRM Public License Version 1.1.2 -("License"); You may not use this file except in compliance with the -License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -the specific language governing rights and limitations under the License. - -The Original Code is: SugarCRM Open Source - -The Initial Developer of the Original Code is SugarCRM, Inc. -Portions created by SugarCRM are Copyright (C) 2004 SugarCRM, Inc.; -All Rights Reserved. -Contributor(s): ______________________________________. - - -[NOTE: The text of this Exhibit A may differ slightly from the text of the notices -in the Source Code files of the Original Code. You should use the text of this -Exhibit A rather than the text found in the Original Code Source Code for Your -Modifications.] - - - -SugarCRM Public License 1.1.2 - Exhibit B - -Additional Terms applicable to the SugarCRM Public License. - -I. Effect. -These additional terms described in this SugarCRM Public License - Additional -Terms shall apply to the Covered Code under this License. - -II. SugarCRM and logo. -This License does not grant any rights to use the trademarks "SugarCRM" and the "SugarCRM" +The Sugar Public License Version 1.1.2 ("SPL") consists of the Mozilla Public +License Version 1.1, modified to be specific to SugarCRM, with the Additional +Terms in Exhibit B. The original Mozilla Public License 1.1 can be found at: +http://www.mozilla.org/MPL/MPL-1.1.html + +SUGARCRM PUBLIC LICENSE +Version 1.1.2 + + +-------------------------------------------------------------------------------- + +1. Definitions. + +1.0.1. "Commercial Use" means distribution or otherwise making the Covered +Code available to a third party. +1.1. ''Contributor'' means each entity that creates or contributes to the +creation of Modifications. + +1.2. ''Contributor Version'' means the combination of the Original Code, prior +Modifications used by a Contributor, and the Modifications made by that +particular Contributor. + +1.3. ''Covered Code'' means the Original Code or Modifications or the +combination of the Original Code and Modifications, in each case including +portions thereof. + +1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted +in the software development community for the electronic transfer of data. + +1.5. ''Executable'' means Covered Code in any form other than Source Code. + +1.6. ''Initial Developer'' means the individual or entity identified as the +Initial Developer in the Source Code notice required by Exhibit A. + +1.7. ''Larger Work'' means a work which combines Covered Code or portions +thereof with code not governed by the terms of this License. + +1.8. ''License'' means this document. + +1.8.1. "Licensable" means having the right to grant, to the maximum extent +possible, whether at the time of the initial grant or subsequently acquired, +any and all of the rights conveyed herein. + +1.9. ''Modifications'' means any addition to or deletion from the substance +or structure of either the Original Code or any previous Modifications. When +Covered Code is released as a series of files, a Modification is: + +A. Any addition to or deletion from the contents of a file containing Original +Code or previous Modifications. +B. Any new file that contains any part of the Original Code or previous +Modifications. + + +1.10. ''Original Code'' means Source Code of computer software code which is +described in the Source Code notice required by Exhibit A as Original Code, +and which, at the time of its release under this License is not already Covered +Code governed by this License. +1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter +acquired, including without limitation, method, process, and apparatus claims, +in any patent Licensable by grantor. + +1.11. ''Source Code'' means the preferred form of the Covered Code for making +modifications to it, including all modules it contains, plus any associated +interface definition files, scripts used to control compilation and installation +of an Executable, or source code differential comparisons against either the +Original Code or another well known, available Covered Code of the Contributor's +choice. The Source Code can be in a compressed or archival form, provided the +appropriate decompression or de-archiving software is widely available for no +charge. + +1.12. "You'' (or "Your") means an individual or a legal entity exercising +rights under, and complying with all of the terms of, this License or a future +version of this License issued under Section 6.1. For legal entities, "You'' +includes any entity which controls, is controlled by, or is under common +control with You. For purposes of this definition, "control'' means (a) the +power, direct or indirect, to cause the direction or management of such entity, +whether by contract or otherwise, or (b) ownership of more than fifty percent +(50%) of the outstanding shares or beneficial ownership of such entity. + +2. Source Code License. +2.1. The Initial Developer Grant. +The Initial Developer hereby grants You a world-wide, royalty-free, +non-exclusive license, subject to third party intellectual property claims: +(a) under intellectual property rights (other than patent or trademark) +Licensable by Initial Developer to use, reproduce, modify, display, perform, +sublicense and distribute the Original Code (or portions thereof) with or +without Modifications, and/or as part of a Larger Work; and +(b) under Patents Claims infringed by the making, using or selling of Original +Code, to make, have made, use, practice, sell, and offer for sale, and/or +otherwise dispose of the Original Code (or portions thereof). + + +(c) the licenses granted in this Section 2.1(a) and (b) are effective on +the date Initial Developer first distributes Original Code under the terms +of this License. +(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for +code that You delete from the Original Code; 2) separate from the Original Code; +or 3) for infringements caused by: i) the modification of the Original Code or +ii) the combination of the Original Code with other software or devices. + + +2.2. Contributor Grant. +Subject to third party intellectual property claims, each Contributor hereby +grants You a world-wide, royalty-free, non-exclusive license + +(a) under intellectual property rights (other than patent or trademark) +Licensable by Contributor, to use, reproduce, modify, display, perform, +sublicense and distribute the Modifications created by such Contributor +(or portions thereof) either on an unmodified basis, with other Modifications, +as Covered Code and/or as part of a Larger Work; and +(b) under Patent Claims infringed by the making, using, or selling of +Modifications made by that Contributor either alone and/or in combination with +its Contributor Version (or portions of such combination), to make, use, sell, +offer for sale, have made, and/or otherwise dispose of: 1) Modifications made +by that Contributor (or portions thereof); and 2) the combination of +Modifications made by that Contributor with its Contributor Version (or portions +of such combination). + +(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date +Contributor first makes Commercial Use of the Covered Code. + +(d) Notwithstanding Section 2.2(b) above, no patent license is granted: +1) for any code that Contributor has deleted from the Contributor Version; +2) separate from the Contributor Version; 3) for infringements caused +by: i) third party modifications of Contributor Version or ii) the +combination of Modifications made by that Contributor with other software +(except as part of the Contributor Version) or other devices; or 4) under +Patent Claims infringed by Covered Code in the absence of Modifications +made by that Contributor. + + +3. Distribution Obligations. + +3.1. Application of License. +The Modifications which You create or to which You contribute are +governed by the terms of this License, including without limitation +Section 2.2. The Source Code version of Covered Code may be distributed +only under the terms of this License or a future version of this License +released under Section 6.1, and You must include a copy of this License +with every copy of the Source Code You distribute. You may not offer or +impose any terms on any Source Code version that alters or restricts the +applicable version of this License or the recipients' rights hereunder. +However, You may include an additional document offering the additional +rights described in Section 3.5. +3.2. Availability of Source Code. +Any Modification which You create or to which You contribute must be made +available in Source Code form under the terms of this License either on +the same media as an Executable version or via an accepted Electronic +Distribution Mechanism to anyone to whom you made an Executable version +available; and if made available via Electronic Distribution Mechanism, +must remain available for at least twelve (12) months after the date it +initially became available, or at least six (6) months after a subsequent +version of that particular Modification has been made available to such +recipients. You are responsible for ensuring that the Source Code version +remains available even if the Electronic Distribution Mechanism is +maintained by a third party. + +3.3. Description of Modifications. +You must cause all Covered Code to which You contribute to contain a file +documenting the changes You made to create that Covered Code and the date of +any change. You must include a prominent statement that the Modification is +derived, directly or indirectly, from Original Code provided by the Initial +Developer and including the name of the Initial Developer in (a) the Source +Code, and (b) in any notice in an Executable version or related documentation +in which You describe the origin or ownership of the Covered Code. + +3.4. Intellectual Property Matters + +(a) Third Party Claims. +If Contributor has knowledge that a license under a third party's intellectual +property rights is required to exercise the rights granted by such Contributor +under Sections 2.1 or 2.2, Contributor must include a text file with the Source +Code distribution titled "LEGAL'' which describes the claim and the party making +the claim in sufficient detail that a recipient will know whom to contact. If +Contributor obtains such knowledge after the Modification is made available as +described in Section 3.2, Contributor shall promptly modify the LEGAL file in +all copies Contributor makes available thereafter and shall take other steps +(such as notifying appropriate mailing lists or newsgroups) reasonably calculated +to inform those who received the Covered Code that new knowledge has been obtained. +(b) Contributor APIs. +If Contributor's Modifications include an application programming interface and +Contributor has knowledge of patent licenses which are reasonably necessary to +implement that API, Contributor must also include this information in the LEGAL +file. + + + (c) Representations. +Contributor represents that, except as disclosed pursuant to Section 3.4(a) +above, Contributor believes that Contributor's Modifications are Contributor's +original creation(s) and/or Contributor has sufficient rights to grant the +rights conveyed by this License. + +3.5. Required Notices. +You must duplicate the notice in Exhibit A in each file of the Source Code. +If it is not possible to put such notice in a particular Source Code file +due to its structure, then You must include such notice in a location (such +as a relevant directory) where a user would be likely to look for such a +notice. If You created one or more Modification(s) You may add your name as +a Contributor to the notice described in Exhibit A. You must also duplicate +this License in any documentation for the Source Code where You describe +recipients' rights or ownership rights relating to Covered Code. You may +choose to offer, and to charge a fee for, warranty, support, indemnity or +liability obligations to one or more recipients of Covered Code. However, You +may do so only on Your own behalf, and not on behalf of the Initial Developer +or any Contributor. You must make it absolutely clear than any such warranty, +support, indemnity or liability obligation is offered by You alone, and You +hereby agree to indemnify the Initial Developer and every Contributor for any +liability incurred by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +3.6. Distribution of Executable Versions. +You may distribute Covered Code in Executable form only if the requirements +of Section 3.1-3.5 have been met for that Covered Code, and if You include +a notice stating that the Source Code version of the Covered Code is available +under the terms of this License, including a description of how and where +You have fulfilled the obligations of Section 3.2. The notice must be +conspicuously included in any notice in an Executable version, related +documentation or collateral in which You describe recipients' rights relating +to the Covered Code. You may distribute the Executable version of Covered +Code or ownership rights under a license of Your choice, which may contain +terms different from this License, provided that You are in compliance with +the terms of this License and that the license for the Executable version +does not attempt to limit or alter the recipient's rights in the Source Code +version from the rights set forth in this License. If You distribute the +Executable version under a different license You must make it absolutely +clear that any terms which differ from this License are offered by You alone, +not by the Initial Developer or any Contributor. You hereby agree to indemnify +the Initial Developer and every Contributor for any liability incurred by the +Initial Developer or such Contributor as a result of any such terms You offer. + +3.7. Larger Works. +You may create a Larger Work by combining Covered Code with other code not +governed by the terms of this License and distribute the Larger Work as a +single product. In such a case, You must make sure the requirements of this +License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. +If it is impossible for You to comply with any of the terms of this License +with respect to some or all of the Covered Code due to statute, judicial order, +or regulation then You must: (a) comply with the terms of this License to the +maximum extent possible; and (b) describe the limitations and the code they +affect. Such description must be included in the LEGAL file described in +Section 3.4 and must be included with all distributions of the Source Code. +Except to the extent prohibited by statute or regulation, such description +must be sufficiently detailed for a recipient of ordinary skill to be able +to understand it. +5. Application of this License. +This License applies to code to which the Initial Developer has attached the +notice in Exhibit A and to related Covered Code. +6. Versions of the License. +6.1. New Versions. +SugarCRM Inc. (''SugarCRM'') may publish revised and/or new versions of the +License from time to time. Each version will be given a distinguishing version +number. +6.2. Effect of New Versions. +Once Covered Code has been published under a particular version of the License, +You may always continue to use it under the terms of that version. You may also +choose to use such Covered Code under the terms of any subsequent version of the +License published by SugarCRM. No one other than SugarCRM has the right to modify +the terms applicable to Covered Code created under this License. + +6.3. Derivative Works. +If You create or use a modified version of this License (which you may only do +in order to apply it to code which is not already Covered Code governed by this +License), You must (a) rename Your license so that the phrases ''SugarCRM'', +''SPL'' or any confusingly similar phrase do not appear in your license (except +to note that your license differs from this License) and (b) otherwise make it +clear that Your version of the license contains terms which differ from the +SugarCRM Public License. (Filling in the name of the Initial Developer, Original +Code or Contributor in the notice described in Exhibit A shall not of themselves +be deemed to be modifications of this License.) + +7. DISCLAIMER OF WARRANTY. +COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES +THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE +OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED +CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT +THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY +SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL +PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT +UNDER THIS DISCLAIMER. + +8. TERMINATION. +8.1. This License and the rights granted hereunder will terminate automatically if +You fail to comply with terms herein and fail to cure such breach within 30 days of +becoming aware of the breach. All sublicenses to the Covered Code which are properly +granted shall survive any termination of this License. Provisions which, by their +nature, must remain in effect beyond the termination of this License shall survive. + +8.2. If You initiate litigation by asserting a patent infringement claim (excluding +declatory judgment actions) against Initial Developer or a Contributor (the Initial +Developer or Contributor against whom You file such action is referred to as +"Participant") alleging that: + +(a) such Participant's Contributor Version directly or indirectly infringes any patent, +then any and all rights granted by such Participant to You under Sections 2.1 and/or +2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, +unless if within 60 days after receipt of notice You either: (i) agree in writing to +pay Participant a mutually agreeable reasonable royalty for Your past and future use +of Modifications made by such Participant, or (ii) withdraw Your litigation claim +with respect to the Contributor Version against such Participant. If within 60 days +of notice, a reasonable royalty and payment arrangement are not mutually agreed upon +in writing by the parties or the litigation claim is not withdrawn, the rights granted +by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the +expiration of the 60 day notice period specified above. + +(b) any software, hardware, or device, other than such Participant's Contributor Version, +directly or indirectly infringes any patent, then any rights granted to You by such +Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You +first made, used, sold, distributed, or had made, Modifications made by that Participant. + +8.3. If You assert a patent infringement claim against Participant alleging that such +Participant's Contributor Version directly or indirectly infringes any patent where such +claim is resolved (such as by license or settlement) prior to the initiation of patent +infringement litigation, then the reasonable value of the licenses granted by such +Participant under Sections 2.1 or 2.2 shall be taken into account in determining the +amount or value of any payment or license. + +8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license +agreements (excluding distributors and resellers) which have been validly granted by You +or any distributor hereunder prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), +CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY +DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY +PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER +INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER +FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH +PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH +PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME +JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL +DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. +The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 +(Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer +software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). +Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), +all U.S. Government End Users acquire Covered Code with only those rights set forth herein. + +11. MISCELLANEOUS. +This License represents the complete agreement concerning subject matter hereof. If +any provision of this License is held to be unenforceable, such provision shall be +reformed only to the extent necessary to make it enforceable. This License shall be +governed by California law provisions (except to the extent applicable law, if any, +provides otherwise), excluding its conflict-of-law provisions. With respect to disputes +in which at least one party is a citizen of, or an entity chartered or registered to do +business in the United States of America, any litigation relating to this License shall +be subject to the jurisdiction of the Federal Courts of the Northern District of California, +with venue lying in Santa Clara County, California, with the losing party responsible for +costs, including without limitation, court costs and reasonable attorneys' fees and expenses. +The application of the United Nations Convention on Contracts for the International Sale of +Goods is expressly excluded. Any law or regulation which provides that the language of a +contract shall be construed against the drafter shall not apply to this License. + +12. RESPONSIBILITY FOR CLAIMS. +As between Initial Developer and the Contributors, each party is responsible for claims +and damages arising, directly or indirectly, out of its utilization of rights under this +License and You agree to work with Initial Developer and Contributors to distribute such +responsibility on an equitable basis. Nothing herein is intended or shall be deemed to +constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. +Initial Developer may designate portions of the Covered Code as ?Multiple-Licensed?. +?Multiple-Licensed? means that the Initial Developer permits you to utilize portions of +the Covered Code under Your choice of the SPL or the alternative licenses, if any, specified +by the Initial Developer in the file described in Exhibit A. + + +SugarCRM Public License 1.1.2 - Exhibit A +The contents of this file are subject to the SugarCRM Public License Version 1.1.2 +("License"); You may not use this file except in compliance with the +License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for +the specific language governing rights and limitations under the License. + +The Original Code is: SugarCRM Open Source + +The Initial Developer of the Original Code is SugarCRM, Inc. +Portions created by SugarCRM are Copyright (C) 2004 SugarCRM, Inc.; +All Rights Reserved. +Contributor(s): ______________________________________. + + +[NOTE: The text of this Exhibit A may differ slightly from the text of the notices +in the Source Code files of the Original Code. You should use the text of this +Exhibit A rather than the text found in the Original Code Source Code for Your +Modifications.] + + + +SugarCRM Public License 1.1.2 - Exhibit B + +Additional Terms applicable to the SugarCRM Public License. + +I. Effect. +These additional terms described in this SugarCRM Public License - Additional +Terms shall apply to the Covered Code under this License. + +II. SugarCRM and logo. +This License does not grant any rights to use the trademarks "SugarCRM" and the "SugarCRM" logos even if such marks are included in the Original Code or Modifications. From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:11:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:11:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6754 - in /vtigercrm/trunk/pkg/license: License_linux.txt License_windows.txt Message-ID: <20060530141152.6A55F5CE170@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:11:46 2006 New Revision: 6754 Log: updated licence files Modified: vtigercrm/trunk/pkg/license/License_linux.txt vtigercrm/trunk/pkg/license/License_windows.txt Modified: vtigercrm/trunk/pkg/license/License_linux.txt ============================================================================== --- vtigercrm/trunk/pkg/license/License_linux.txt (original) +++ vtigercrm/trunk/pkg/license/License_linux.txt Tue May 30 08:11:46 2006 @@ -20,31 +20,31 @@ 9. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ - -10. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING - -11. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt - -12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright - -13. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib - -14. freetag is used under dual license BSD and LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt - -15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html - -16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt - -17. Image_Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html - -18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at - -19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html - -20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE - -21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at http://magpierss.sourceforge.net + +11. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING + +12. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt + +13. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright + +14. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib + +15. freetag is used under dual license BSD and LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt + +16. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html + +17. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt + +18. Image_Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html + +19. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at http://www.vxr.it/log4php/ + +20. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html + +21. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE + +22. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# 22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL) The licenses of the Open Source components are reproduced in full below. Modified: vtigercrm/trunk/pkg/license/License_windows.txt ============================================================================== --- vtigercrm/trunk/pkg/license/License_windows.txt (original) +++ vtigercrm/trunk/pkg/license/License_windows.txt Tue May 30 08:11:46 2006 @@ -23,7 +23,7 @@ 9. phpSysinfo software used under GNU GPL downloaded from http://phpsysinfo.sourceforge.net/ available at /vtigerCRM/modules/System/COPYING -10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at http://magpierss.sourceforge.net/ 11. FCKeditor software used under GNU LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt @@ -39,7 +39,7 @@ 17. Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html -18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at http://www.vxr.it/log4php/ 19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:13:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:13:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6755 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060530141301.CC0417D78A4@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:12:57 2006 New Revision: 6755 Log: updated licence data at the top Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== --- vtigercrm/trunk/install/0welcome.php (original) +++ vtigercrm/trunk/install/0welcome.php Tue May 30 08:12:57 2006 @@ -108,47 +108,32 @@
    License Agreement
    - This software is a collective work consisting of the following major Open Source components:
    Apache software, MySQL server, PHP, SugarCRM, Smarty, phpSysinfo and PHPMailer each licensed under a separate Open Source License. vtiger.com is not affiliated with nor endorsed by any of the above - providers.                  -
    -
    - 1. Apache Web server software used under the Apache License available - at <vtiger CRM Home>/vtigerCRM/apache/LICENSE.txt
    - 2. MySQL database software used under the GPL License available at - <vtiger CRM Home>/vtigerCRM/mysql/README.txt
    - 3. PHP software used under the PHP License version 3.0 available at - <vtiger CRM Home>/vtigerCRM/php/license.txt 
    - 4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 - available at <vtiger CRM Home>/vtigerCRM/LICENSE_windows.txt
    - 5. gdwin32 software used under the GNU GPL available at gdwin32 - <vtiger CRM Home>/vtigerCRM/gdwin32/gd-license.txt
    - 6. nusoap software used under GNU LGPL from - http://sourceforge.net/projects/nusoap
    - 7. phpBB software used under GNU GPL downloaded from - http://www.phpbb.com/support/license.php
    - 8. TUTOS software used under GNU GPL downloaded from - http://www.tutos.org/html/copyright.html available at <vtiger CRM - Home>/vtigerCRM/modules/Calendar/TUTOS_Copyright.pdf
    - 9. PHPMailer software used under the GNU LGPL available at <vtiger - CRM Home>/vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt
    - 10. ADOdb software used under BSD license available at <vtiger CRM - Home>/vtigerCRM/adodb/license.txt
    - 11. phpSysinfo software used under GNU GPL available at <vtiger CRM - Home>/vtigerCRM/modules/System/COPYING
    - 12. feedParser software used under GNU GPL downloaded from - http://revjim.net/code/feedParser/
    - 13. FCKeditor software used under LGPL downloaded from - http://www.fckeditor.net/download/default.html available at <vtiger - CRM Home>/vtigerCRM/includes/FCKeditor/license.txt
    - 14. SquirrelMail used under GNU GPL downloaded from - http://www.squirrelmail.org/download.php available at - http://www.squirrelmail.org/wiki/en_US/SquirrelMailGPL
    - 15. Mailfeed used under GNU GPL downloaed from - http://wiki.wonko.com/software/mailfeed/ available at - http://wiki.wonko.com/software/mailfeed/#copyright
    - 16. In addition to the above mentioned Open Source components, vtiger - provides additional functionality, which is dual-licensed under Mozilla - Public License (MPL 1.1) as well as the GNU Public License (GPL).
    + This software is a collective work consisting of the following major Open Source components:
    Apache software, MySQL server, PHP, SugarCRM, ADOdb, Smarty, PHPMailer, phpSysinfo, MagpieRSS and others, each licensed under a separate Open Source License. vtiger.com is not affiliated with nor endorsed by any of the above providers.                   +
    +
    + 1. Apache Web server software used under the Apache License available at <vtiger CRM Home>/vtigerCRM/apache/LICENSE.txt
    + 2. MySQL database software used under the GPL License available at <vtiger CRM Home>/vtigerCRM/mysql/README.txt
    + 3. PHP software used under the PHP License version 3.0 available at <vtiger CRM Home>/vtigerCRM/php/license.txt
    + 4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 available at <vtiger CRM Home>/vtigerCRM/LICENSE.txt
    + 5. gdwin32 software used under the GNU GPL available at gdwin32 <vtiger CRM Home>/vtigerCRM/gdwin32/gd-license.txt
    + 6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap
    + 7. PHPMailer software used under the GNU LGPL downloaded from http://adodb.sourceforge.net available at <vtiger CRM Home>/vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt
    + 8. ADOdb software used under BSD license downloaded from http://adodb.sourceforge.net available at <vtiger CRM Home>/vtigerCRM/adodb/license.txt
    + 9. phpSysinfo software used under GNU GPL downloaded from http://phpsysinfo.sourceforge.net/ available at <vtiger CRM Home>/vtigerCRM/modules/System/COPYING
    + 10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at http://magpierss.sourceforge.net/
    + 11. FCKeditor software used under GNU LGPL downloaded from http://www.fckeditor.net/download/default.html available at <vtiger CRM Home>/vtigerCRM/includes/FCKeditor/license.txt
    + 12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright
    + 13. Smarty Template Engine for PHP used under the GNU LGPL available at available at <vtiger CRM Home>/vtigerCRM/Smarty/COPYING.lib
    + 14. freetag is used under dual license BSD and GNU LGPL downloaded from http://www.getluky.net available at <vtiger CRM Home>/vtigerCRM/include/freetag/license.txt
    + 15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html
    + 16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt
    + 17. Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html
    + 18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at http://www.vxr.it/log4php/
    + 19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html
    + 20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at <vtiger CRM Home>/vtigerCRM/XTemplate/LICENSE
    + 21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/#
    + 22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL).
    +
    The licenses of the Open Source components are reproduced in full below.

    @@ -2541,23 +2526,20 @@ Acknowledgements:

    We have used the following software:
    -
    - 1. ExcelReader package to read the xls files. We have taken the utility - from the following Web site :
    -  http://freshmeat.net/projects/phpexcelreader/
    -  The product is available as GNU General Public License (GPL).
    -
    - 2. E-mail Client to handle attachments with PHP. We have taken the - ideas from the article by Kevin Steffer available at the following Web - site:
    - http://www.linuxscope.net/articles/mailAttachmentsPHP.html
    -
    - 3. FPDF package to create PDF reports and documents. We have taken the - utility from the following Web site:
    - http://www.fpdf.org/
    -
    - We are grateful to the creators of the respective products for - providing such a beautiful utilities.
    +
    1. ExcelReader package to read the xls files. We have taken the utility from the following Web site :
    + http://freshmeat.net/projects/phpexcelreader/
    + The product is available as GNU General Public License (GPL).
    + 2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the
    + http://www.linuxscope.net/articles/mailAttachmentsPHP.html
    + 3. FPDF package to create PDF reports and documents. We have downloaded package from http://www.fpdf.org
    + 4. Prototype (Object-Oriented JavaScript framework) package to ease development of dynamic web applications. We have downloaded package from http://prototype.conio.net
    + 5. class_http to cache scraped content. We have downloaded package from http://www.troywolf.com/articles/php/class_http/
    + 6.Carousel Slideshow package to display large images as thumbnails. We have downloaded package from http://www.dynamicdrive.com/dynamicindex14/carousel2.htm
    + 7. Ajax Popup Chat for enabling instant messaging for vtiger CRM users. We have downloaded package from http://www.os-solution.com/demo/ajaxcsspopupchat/index.php
    + 8. Image Crossfade Redux for enabling fade effect to images. We have downloaded package from http://slayeroffice.com/code/imageCrossFade/xfade2.html
    + 9. Calculator for enabling calculations in vtiger CRM. We have downloaded package from http://www.hmhd.com/steve
    +We are grateful to the creators of the respective products for providing such a beautiful utilities.
    +  

    From vtiger-tickets at vtiger.fosslabs.com Tue May 30 07:13:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:13:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231086=3A?= =?utf-8?q?_Home_page_graphs_are_broken?= In-Reply-To: <076.e8c3d7abf047c083f365b76693799438@vtiger.fosslabs.com> References: <076.e8c3d7abf047c083f365b76693799438@vtiger.fosslabs.com> Message-ID: <085.02cded8d57361df229fec5662cf79e1f@vtiger.fosslabs.com> #1086: Home page graphs are broken ------------------------+--------------------------------------------------- Reporter: gopal | Owner: philip Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: the broken graphs have been removed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:14:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:14:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6756 - /vtigercrm/trunk/copyright.html Message-ID: <20060530141414.45D4C7D78A4@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:14:10 2006 New Revision: 6756 Log: updated licence files Modified: vtigercrm/trunk/copyright.html Modified: vtigercrm/trunk/copyright.html ============================================================================== --- vtigercrm/trunk/copyright.html (original) +++ vtigercrm/trunk/copyright.html Tue May 30 08:14:10 2006 @@ -5,11 +5,9 @@ -
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...
    +
    - (This software is a collective work consisting of the following major Open Source components: Apache software, MySQL server, PHP, SugarCRM, phpBB, TUTOS, phpSysinfo,SquirrelMail,Smarty,Dynamic Drive and PHPMailer each licensed under a separate Open Source License. vtiger.com is not affiliated with nor endorsed by any of the above providers. - See Copyrights for details.); -
    This software is a collective work consisting of the following major Open Source components:
    +Apache software, MySQL server, PHP, SugarCRM, ADOdb, Smarty, PHPMailer, phpSysinfo, MagpieRSS and others, each licensed under a separate Open Source License. +vtiger.com is not affiliated with nor endorsed by any of the above providers. See Copyrights for details.);
    From vtiger-tickets at vtiger.fosslabs.com Tue May 30 07:15:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:15:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231110=3A?= =?utf-8?q?_price_book_not_showing_any_entries?= In-Reply-To: <076.5b2bd510ab6218f7a668d3d6bf6f9aba@vtiger.fosslabs.com> References: <076.5b2bd510ab6218f7a668d3d6bf6f9aba@vtiger.fosslabs.com> Message-ID: <085.d559de6a97192d793e62e1fea7945702@vtiger.fosslabs.com> #1110: price book not showing any entries ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: pricebook ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 07:15:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:15:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231099=3A?= =?utf-8?q?_images_not_coming_in_all_installation_pages?= In-Reply-To: <076.37294b1e8e1224f195b3fa8ffd3b77b5@vtiger.fosslabs.com> References: <076.37294b1e8e1224f195b3fa8ffd3b77b5@vtiger.fosslabs.com> Message-ID: <085.9f6e49ac67b35fcaae2bd0c19d09959a@vtiger.fosslabs.com> #1099: images not coming in all installation pages ------------------------+--------------------------------------------------- Reporter: mangai | Owner: jerry Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 07:15:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:15:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231165=3A?= =?utf-8?q?_Move_Role_is_not_working_in_IE=2E=2E?= In-Reply-To: <076.acbe4cea637c14b89f704105e9460ec2@vtiger.fosslabs.com> References: <076.acbe4cea637c14b89f704105e9460ec2@vtiger.fosslabs.com> Message-ID: <085.335338174b5135b9a0566e657c208577@vtiger.fosslabs.com> #1165: Move Role is not working in IE.. ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Comment: 1165 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:22:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:22:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6757 - in /vtigercrm/trunk/Smarty/templates: DetailView.tpl DetailViewUI.tpl Inventory/InventoryDetailView.tpl Message-ID: <20060530142224.7F74D7D78A4@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 08:22:19 2006 New Revision: 6757 Log: * Modified to display the $ symbol with the label instead of display with the text value for the fields leads,accounts-annualrevenue, potential-amount and unit_price-product Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue May 30 08:22:19 2006 @@ -214,11 +214,13 @@ {if $label ne ''} - {if $keycntimage ne ''} - {$keycntimage} - {else} - {$label} - {/if} + {if $keycntimage ne ''} + {$keycntimage} + {elseif $keyid eq '71' || $keyid eq '72'} + {$label} ({$keycursymb}) + {else} + {$label} + {/if} {include file="DetailViewUI.tpl"} {else} Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Tue May 30 08:22:19 2006 @@ -1,18 +1,33 @@ - {if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} - - {if $keyid eq '55'} - {$keysalut} - {elseif $keyid eq '71' || $keyid eq '72'} - {$keycursymb} - {/if} -
    {$keyval} 
    - - - {elseif $keyid eq '13'} +{**} + + +{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} + + {if $keyid eq '55'} + {$keysalut} + {/if} + +
    {$keyval} 
    + + +{elseif $keyid eq '13'}
    {if $INT_MAILER eq 'true'}  {$keyval}
    Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Tue May 30 08:22:19 2006 @@ -174,7 +174,11 @@ {if $keycntimage ne ''} {$keycntimage} {elseif $label neq 'Tax Class'} - {$label} + {if $keyid eq '71' || $keyid eq '72'} + {$label} ({$keycursymb}) + {else} + {$label} + {/if} {/if} {include file="DetailViewUI.tpl"} {else} From vtiger-tickets at vtiger.fosslabs.com Tue May 30 07:23:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:23:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231006=3A?= =?utf-8?q?_Issue_in_Product_Detail_view?= In-Reply-To: <076.41c2aac4bc6126a11db4a86f2b52b346@vtiger.fosslabs.com> References: <076.41c2aac4bc6126a11db4a86f2b52b346@vtiger.fosslabs.com> Message-ID: <085.3f9350f5d3424c76e35fc642be4c6447@vtiger.fosslabs.com> #1006: Issue in Product Detail view ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue has been fixed as the $ symbol will be display with the field label. This will be applied for leads,account-annualrevenue and amount-potential and unit_price-product -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 07:27:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:27:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231125=3A?= =?utf-8?q?_attachment_missing_while_creating_ticket_from_product?= In-Reply-To: <076.478ea28a2c6031392264f0dfa9da56bd@vtiger.fosslabs.com> References: <076.478ea28a2c6031392264f0dfa9da56bd@vtiger.fosslabs.com> Message-ID: <085.18a636739005b492e141102b1ceb70d7@vtiger.fosslabs.com> #1125: attachment missing while creating ticket from product ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: attachment ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:32:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:32:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6758 - /vtigercrm/trunk/modules/Users/ListView.php Message-ID: <20060530143226.2561C7D78CC@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:32:21 2006 New Revision: 6758 Log: issue in users listview has been fixed Modified: vtigercrm/trunk/modules/Users/ListView.php Modified: vtigercrm/trunk/modules/Users/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Users/ListView.php (original) +++ vtigercrm/trunk/modules/Users/ListView.php Tue May 30 08:32:21 2006 @@ -21,10 +21,13 @@ { $start = $_REQUEST['start']; } -else +elseif($_SESSION['user_pagestart'] != '') { $start = $_SESSION['user_pagestart']; } +else + $start=1; + $_SESSION['user_pagestart'] = $start; if($_REQUEST['sorder'] !='') $sortorder = $_REQUEST['sorder']; From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:34:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:34:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6759 - /vtigercrm/trunk/modules/Settings/AddMailAccount.html Message-ID: <20060530143414.9FCD17D78CC@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:34:11 2006 New Revision: 6759 Log: file removed as add mailaccount page has been smatified Removed: vtigercrm/trunk/modules/Settings/AddMailAccount.html From vtiger-tickets at vtiger.fosslabs.com Tue May 30 07:37:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:37:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231137=3A?= =?utf-8?q?_Issue_in_Emails?= In-Reply-To: <076.9cbd988fd3d7e2707b4d3292e1da421d@vtiger.fosslabs.com> References: <076.9cbd988fd3d7e2707b4d3292e1da421d@vtiger.fosslabs.com> Message-ID: <085.9743bfc63fcc26738be2f48b25f0b759@vtiger.fosslabs.com> #1137: Issue in Emails ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [6760]) Fixes #1137 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:37:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:37:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6760 - /vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Message-ID: <20060530143702.D1E317D78F0@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:36:58 2006 New Revision: 6760 Log: Fixes #1137 Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Tue May 30 08:36:58 2006 @@ -156,7 +156,7 @@    - +   From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:41:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:41:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6761 - in /vtigercrm/trunk/modules/Reports: AdvancedFilter.html ListView.html NewReport0.html NewReportFolder.html ReportColumns.html ReportColumnsTotal.html ReportGrouping.html ReportType.html SaveReport.html StandardFilter.html Message-ID: <20060530144147.68B327D78A4@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:41:38 2006 New Revision: 6761 Log: html files removed as reports smartified Removed: vtigercrm/trunk/modules/Reports/AdvancedFilter.html vtigercrm/trunk/modules/Reports/ListView.html vtigercrm/trunk/modules/Reports/NewReport0.html vtigercrm/trunk/modules/Reports/NewReportFolder.html vtigercrm/trunk/modules/Reports/ReportColumns.html vtigercrm/trunk/modules/Reports/ReportColumnsTotal.html vtigercrm/trunk/modules/Reports/ReportGrouping.html vtigercrm/trunk/modules/Reports/ReportType.html vtigercrm/trunk/modules/Reports/SaveReport.html vtigercrm/trunk/modules/Reports/StandardFilter.html From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:47:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:47:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6762 - in /vtigercrm/trunk/modules/Users: ShowHistory.html ShowHistory.php Message-ID: <20060530144730.332FF7D78F8@vtiger.fosslabs.com> Author: don Date: Tue May 30 08:47:25 2006 New Revision: 6762 Log: new ui integrated for login history Modified: vtigercrm/trunk/modules/Users/ShowHistory.html vtigercrm/trunk/modules/Users/ShowHistory.php Modified: vtigercrm/trunk/modules/Users/ShowHistory.html ============================================================================== --- vtigercrm/trunk/modules/Users/ShowHistory.html (original) +++ vtigercrm/trunk/modules/Users/ShowHistory.html Tue May 30 08:47:25 2006 @@ -10,50 +10,44 @@ ********************************************************************************/ --> - +
    + + + - +

    + + {MOD.LBL_LOGIN_HISTORY_BUTTON_LABEL} +

    -
    + + + + + + - - - - - - - - - - - - + - - - - - - - -
     {APP.LBL_LIST_USER_NAME}{user_name_arrow} {APP.LBL_LIST_USERIP}{user_ip_arrow} {APP.LBL_LIST_SIGNIN}{login_time_arrow} {APP.LBL_LIST_SIGNOUT}{logout_time_arrow} {APP.LBL_LIST_STATUS}
    -  {APP.LBL_LIST_USER_NAME}{user_name_arrow} -  {APP.LBL_LIST_USERIP}{user_ip_arrow} -  {APP.LBL_LIST_SIGNIN}{login_time_arrow} -  {APP.LBL_LIST_SIGNOUT}{logout_time_arrow} -  {APP.LBL_LIST_STATUS} -
    {LOGIN.USER_NAME} {LOGIN.USER_IP} {LOGIN.LOGIN_TIME} {LOGIN.LOGOUT_TIME} {LOGIN.STATUS}
    +
    + + + + + + +
    Modified: vtigercrm/trunk/modules/Users/ShowHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/ShowHistory.php (original) +++ vtigercrm/trunk/modules/Users/ShowHistory.php Tue May 30 08:47:25 2006 @@ -44,27 +44,12 @@ $focus->id = ""; } -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $current_module_strings['LBL_LOGIN_HISTORY_TITLE'], true); -echo "\n
    \n"; - // focus_list is the means of passing data to a ListView. global $focus_list; if (!isset($where)) $where = ""; $seedLogin = new LoginHistory(); - -$button = "\n"; - -$button .= ""; - -$button .= "
    \n"; -$button .= "\n"; -$button .= "\n"; -$button .= "\n"; -$button .= "\n"; -$button .= "\n"; -$button .= "
    "; $ListView = new ListView(); $ListView->initNewXTemplate('modules/Users/ShowHistory.html',$current_module_strings); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:54:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:54:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6763 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060530145417.D3A3F7D7908@vtiger.fosslabs.com> Author: don Date: Tue May 30 08:54:13 2006 New Revision: 6763 Log: removed AddBusiness in actionmapping Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue May 30 08:54:13 2006 @@ -2036,7 +2036,7 @@ $this->db->query("insert into actionmapping values(4,'DetailView',0)"); $this->db->query("insert into actionmapping values(5,'Import',0)"); $this->db->query("insert into actionmapping values(6,'Export',0)"); - $this->db->query("insert into actionmapping values(7,'AddBusinessCard',0)"); + //$this->db->query("insert into actionmapping values(7,'AddBusinessCard',0)"); $this->db->query("insert into actionmapping values(8,'Merge',0)"); $this->db->query("insert into actionmapping values(1,'VendorEditView',1)"); $this->db->query("insert into actionmapping values(4,'VendorDetailView',1)"); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 07:59:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:59:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6764 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060530145941.663DE7D7908@vtiger.fosslabs.com> Author: don Date: Tue May 30 08:59:37 2006 New Revision: 6764 Log: emails modules added in marketing and Support tab Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue May 30 08:59:37 2006 @@ -2102,6 +2102,8 @@ $this->db->query("insert into parenttabrel values (2,26,1)"); $this->db->query("insert into parenttabrel values (2,6,2)"); $this->db->query("insert into parenttabrel values (2,4,3)"); + $this->db->query("insert into parenttabrel values (2,10,4)"); + $this->db->query("insert into parenttabrel values (4,10,7)"); //Added to populate the default inventory tax informations $this->db->query("insert into inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')"); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 08:01:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 15:01:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6765 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060530150113.715127D7918@vtiger.fosslabs.com> Author: don Date: Tue May 30 09:01:06 2006 New Revision: 6765 Log: Modified entries into action mapping table Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 09:01:06 2006 @@ -132,21 +132,23 @@ "insert into actionmapping values(4,'DetailView',0)", "insert into actionmapping values(5,'Import',0)", "insert into actionmapping values(6,'Export',0)", - "insert into actionmapping values(7,'AddBusinessCard',0)", "insert into actionmapping values(8,'Merge',0)", - "insert into actionmapping values(1,'VendorEditView',0)", - "insert into actionmapping values(4,'VendorDetailView',0)", - "insert into actionmapping values(0,'SaveVendor',0)", - "insert into actionmapping values(2,'DeleteVendor',0)", - "insert into actionmapping values(1,'PriceBookEditView',0)", - "insert into actionmapping values(4,'PriceBookDetailView',0)", - "insert into actionmapping values(0,'SavePriceBook',0)", - "insert into actionmapping values(2,'DeletePriceBook',0)", - "insert into actionmapping values(1,'SalesOrderEditView',0)", - "insert into actionmapping values(4,'SalesOrderDetailView',0)", - "insert into actionmapping values(0,'SaveSalesOrder',0)", - "insert into actionmapping values(2,'DeleteSalesOrder',0)", + "insert into actionmapping values(1,'VendorEditView',1)", + "insert into actionmapping values(4,'VendorDetailView',1)", + "insert into actionmapping values(0,'SaveVendor',1)", + "insert into actionmapping values(2,'DeleteVendor',1)", + "insert into actionmapping values(1,'PriceBookEditView',1)", + "insert into actionmapping values(4,'PriceBookDetailView',1)", + "insert into actionmapping values(0,'SavePriceBook',1)", + "insert into actionmapping values(2,'DeletePriceBook',1)", + "insert into actionmapping values(1,'SalesOrderEditView',1)", + "insert into actionmapping values(4,'SalesOrderDetailView',1)", + "insert into actionmapping values(0,'SaveSalesOrder',1)", + "insert into actionmapping values(2,'DeleteSalesOrder',1)", "insert into actionmapping values(9,'ConvertLead',0)", + "insert into actionmapping values(1,'DetailViewAjax',1)", + "insert into actionmapping values(1,'QuickCreate',1)", + "insert into actionmapping values(4,'TagCloud',1)" ); foreach($actionmapping_array as $query) { From vtiger-tickets at vtiger.fosslabs.com Tue May 30 08:01:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:01:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231126=3A?= =?utf-8?q?_unwanted_field_Team_in_Quote_creation?= In-Reply-To: <076.11f2feb72adb5d0a18b85776bb31f1ab@vtiger.fosslabs.com> References: <076.11f2feb72adb5d0a18b85776bb31f1ab@vtiger.fosslabs.com> Message-ID: <085.67b458fea164141b9fd0b68cc13eef35@vtiger.fosslabs.com> #1126: unwanted field Team in Quote creation ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: quote ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 08:01:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:01:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231195=3A?= =?utf-8?q?_delete_webmail_does_not_work?= In-Reply-To: <076.b0ee4c3376a24e643a7a772804ec61b7@vtiger.fosslabs.com> References: <076.b0ee4c3376a24e643a7a772804ec61b7@vtiger.fosslabs.com> Message-ID: <085.bccf3b68749349a9ab7476f5e5f244ea@vtiger.fosslabs.com> #1195: delete webmail does not work ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 08:05:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:05:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231192=3A?= =?utf-8?q?_qualify_webmail_does_not_work?= In-Reply-To: <076.4e6af6fe6fc394f083bb6d1b73412aba@vtiger.fosslabs.com> References: <076.4e6af6fe6fc394f083bb6d1b73412aba@vtiger.fosslabs.com> Message-ID: <085.2e6eb74b6a1ed6146be33a5afdd6ca2c@vtiger.fosslabs.com> #1192: qualify webmail does not work ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 08:05:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:05:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231190=3A?= =?utf-8?q?_webmail_attachment_not_working?= In-Reply-To: <076.fc4283f5e72f7e31d90cc2f09f58e678@vtiger.fosslabs.com> References: <076.fc4283f5e72f7e31d90cc2f09f58e678@vtiger.fosslabs.com> Message-ID: <085.cff2624f434209e86bee139ed0f45f8d@vtiger.fosslabs.com> #1190: webmail attachment not working ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 08:05:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:05:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231189=3A?= =?utf-8?q?_check_mail_doest_not_fetch_any_new_mails?= In-Reply-To: <076.fd91883f0c96d6a7d31d035ebb7d884c@vtiger.fosslabs.com> References: <076.fd91883f0c96d6a7d31d035ebb7d884c@vtiger.fosslabs.com> Message-ID: <085.58a9655cabdf1dd87a4a65b4c8de6656@vtiger.fosslabs.com> #1189: check mail doest not fetch any new mails ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 08:20:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:20:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23809=3A_?= =?utf-8?q?Export_Contacts_SQL_Error?= In-Reply-To: <076.d3bef4ab96867550217aa5fdd66d20e3@vtiger.fosslabs.com> References: <076.d3bef4ab96867550217aa5fdd66d20e3@vtiger.fosslabs.com> Message-ID: <085.243baa17ed154c95133cae562482019e@vtiger.fosslabs.com> #809: Export Contacts SQL Error -------------------------------------------+-------------------------------- Reporter: Ken Lyle | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: export, contacts, SQL -------------------------------------------+-------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 08:21:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:21:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231022=3A?= =?utf-8?q?_Calendar_-_Home_page_warning?= In-Reply-To: <076.6e7a4250ac68538c03759d34d8848817@vtiger.fosslabs.com> References: <076.6e7a4250ac68538c03759d34d8848817@vtiger.fosslabs.com> Message-ID: <085.fce958a1b77a98c7b3ff437014d9a4f7@vtiger.fosslabs.com> #1022: Calendar - Home page warning ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: calendar ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 08:22:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:22:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231060=3A?= =?utf-8?q?_Inactive_icons_in_home_page?= In-Reply-To: <076.f941f6d15831c087b1f6f266884b9cd8@vtiger.fosslabs.com> References: <076.f941f6d15831c087b1f6f266884b9cd8@vtiger.fosslabs.com> Message-ID: <085.9428432046a6fdcbecf0d1e3883cf704@vtiger.fosslabs.com> #1060: Inactive icons in home page ------------------------+--------------------------------------------------- Reporter: saraj | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 08:35:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 15:35:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6766 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060530153520.849987D7968@vtiger.fosslabs.com> Author: don Date: Tue May 30 09:35:13 2006 New Revision: 6766 Log: Added migration support for profile2utility table Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 09:35:13 2006 @@ -2782,8 +2782,20 @@ - - +//Inserting into profile2utility table + $sql_sec="select profileid from profile"; + $result_sec=$conn->query($sql_sec); + $num_rows=$conn->num_rows($result_sec); + for($i=0;$i<$num_row;$i++) + { + $prof_id=$conn->query_result($result_sec,$i,'profileid'); + $sql1_sec="insert into profile2utility values(".$prof_id.",13,8,0)"; + Execute($sql1_sec); + + $sql2_sec="insert into profile2utility values(".$prof_id.",7,9,0)"; + Execute($sql2_sec); + + } From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:00:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:00:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6767 - /vtigercrm/trunk/vtigerservice.php Message-ID: <20060530160039.B9CD07D796C@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:00:35 2006 New Revision: 6767 Log: added word plugin Modified: vtigercrm/trunk/vtigerservice.php Modified: vtigercrm/trunk/vtigerservice.php ============================================================================== --- vtigercrm/trunk/vtigerservice.php (original) +++ vtigercrm/trunk/vtigerservice.php Tue May 30 10:00:35 2006 @@ -27,6 +27,10 @@ { include("soap/contactserialize.php"); } + elseif($_REQUEST['service'] == "wordplugin") + { + include("soap/contactserialize.php"); + } elseif($_REQUEST['service'] == "thunderbird") { include("soap/contactserialize.php"); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:21:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:21:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6768 - in /vtigercrm/trunk/modules/Calendar: Appointment.php addEventUI.php Message-ID: <20060530162103.B6D1A3DAA5C@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:20:56 2006 New Revision: 6768 Log: changes made to fix the issue Modified: vtigercrm/trunk/modules/Calendar/Appointment.php vtigercrm/trunk/modules/Calendar/addEventUI.php Modified: vtigercrm/trunk/modules/Calendar/Appointment.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Appointment.php (original) +++ vtigercrm/trunk/modules/Calendar/Appointment.php Tue May 30 10:20:56 2006 @@ -58,7 +58,7 @@ $q.=" ((activity.date_start < '". $to_datetime->get_formatted_date() ."' AND activity.date_start >= '". $from_datetime->get_formatted_date()."')"; if(!is_admin($current_user)) { - $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in ($shared_ids) and salesmanactivityrel.smid in ($shared_ids) and activity.visibility='Public'))"; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.") and activity.visibility='Public'))"; } $q .= " AND crmentity.deleted = 0) AND recurringevents.activityid is NULL "; $q .= " ORDER by activity.date_start,activity.time_start"; @@ -86,7 +86,7 @@ $q .= " (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') "; if(!is_admin($current_user)) { - $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in ($shared_ids) and salesmanactivityrel.smid in ($shared_ids) and activity.visibility='Public'))"; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.") and activity.visibility='Public'))"; } $q .= " AND crmentity.deleted = 0 )" ; Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Tue May 30 10:20:56 2006 @@ -442,16 +442,16 @@ -
    +
    - - - - + - + - - - - - - - + - + - + -
    @@ -616,7 +616,14 @@
    -
    +
    +
    + + + + + + @@ -639,10 +646,27 @@
    Change Owner
       - +
    +
    + +
    + + + + +
    + - + - + + - + - + - +
    +
    + From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:21:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:21:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6769 - /vtigercrm/trunk/modules/Calendar/calendarLayout.php Message-ID: <20060530162158.331853DAA5C@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:21:54 2006 New Revision: 6769 Log: changes made to fix the issue Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Tue May 30 10:21:54 2006 @@ -11,6 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/CommonUtils.php'); +require_once('modules/Calendar/CalendarCommon.php'); /** To construct calendar subtabs * @param $param_arr -- The calendar object:: Type class Calendar @@ -858,7 +859,7 @@ @@ -973,7 +974,7 @@ { $Entries = Array(); global $adb,$current_user,$mod_strings; - + $shared_ids = getSharedCalendarId($current_user->id); $query = "SELECT cntactivityrel.contactid, activity.* FROM activity INNER JOIN crmentity @@ -994,8 +995,10 @@ $res = $adb->query($pending_query); $pending_rows = $adb->num_rows($res); } - $query .= " AND crmentity.smownerid = ".$current_user->id." - ORDER BY activity.date_start,activity.time_start ASC"; + if(!is_admin($current_user)) + $query .= " AND crmentity.smownerid in (".$shared_ids.")"; + + $query .= "ORDER BY activity.date_start,activity.time_start ASC"; $result = $adb->query($query); $rows = $adb->num_rows($result); @@ -1035,7 +1038,7 @@ $image_tag = " ".$type; $element['eventtype'] = $image_tag; $element['eventdetail'] = $contact_data." ".$subject." ".$more_link; - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"event\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"event\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $element['status'] = $adb->query_result($result,$i,"eventstatus"); $Entries[] = $element; } @@ -1054,7 +1057,7 @@ { $Entries = Array(); global $adb,$current_user,$mod_strings; - + $shared_ids = getSharedCalendarId($current_user->id); $query = "SELECT cntactivityrel.contactid, activity.* FROM activity INNER JOIN crmentity @@ -1072,8 +1075,10 @@ $res = $adb->query($pending_query); $pending_rows = $adb->num_rows($res); } - $query .= " AND crmentity.smownerid = ".$current_user->id." - ORDER BY activity.date_start,activity.time_start ASC"; + + if(!is_admin($current_user)) + $query .= " AND crmentity.smownerid in (".$shared_ids.")"; + $query .= " ORDER BY activity.date_start,activity.time_start ASC"; $result = $adb->query($query); $rows = $adb->num_rows($result); @@ -1095,12 +1100,17 @@ $more_link = "".$subject.""; $element['tododetail'] = $more_link; $element['status'] = $adb->query_result($result,$i,"status"); - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"todo\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"todo\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $Entries[] = $element; } return $Entries; } +/*To get number of events and todos + *@param $cal -- The calendar array :: Type Array + *@param $mode -- The mode :: Type string + *return number of events and todos in Array format +*/ function getEventTodoInfo(& $cal, $mode) { global $mod_strings; @@ -1119,6 +1129,10 @@ return $event_todo_info; } +/*To construct event listview + *@param $entry_list -- The event entries array :: Type Array + *constructs event listview in HTML format +*/ function constructEventListView($entry_list) { global $mod_strings; @@ -1170,6 +1184,11 @@ echo $list_view; } +/*To construct todo listview + *@param $todo_list -- The todo entries array :: Type Array + *@param $cal -- The calendar array :: Type Array + *constructs todo listview in HTML format +*/ function constructTodoListView($todo_list,$cal) { global $mod_strings; From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:22:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:22:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6770 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060530162259.523F94E6AB8@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:22:55 2006 New Revision: 6770 Log: changes made to fix the issue Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Tue May 30 10:22:55 2006 @@ -466,19 +466,42 @@ var heldstatus = "eventstatus=Held"; var notheldstatus = "eventstatus=Not Held"; var activity_mode = "Events"; + var complete = document.getElementById("complete"); + var pending = document.getElementById("pending"); + var postpone = document.getElementById("postpone"); + var actdelete = document.getElementById("actdelete"); + var changeowner = document.getElementById("changeowner"); + } if(type == 'todo') { var heldstatus = "status=Completed"; var notheldstatus = "status=Deferred"; var activity_mode = "Task"; + var complete = document.getElementById("taskcomplete"); + var pending = document.getElementById("taskpending"); + var postpone = document.getElementById("taskpostpone"); + var actdelete = document.getElementById("taskactdelete"); + var changeowner = document.getElementById("taskchangeowner"); } - - document.getElementById("complete").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+heldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; - document.getElementById("pending").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+notheldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; - document.getElementById("postpone").href="index.php?action=EditView&module=Activities&record="+id+"&activity_mode="+activity_mode; - document.getElementById("actdelete").href="index.php?return_module=Calendar&return_action=index&action=massdelete&module=Users&idlist="+id+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; - document.getElementById("changeowner").href="javascript:fnvshobj(this,'act_changeowner');"; - -} - + document.getElementById("idlist").value = id; + complete.href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+heldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + pending.href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+notheldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + postpone.href="index.php?action=EditView&module=Activities&record="+id+"&activity_mode="+activity_mode; + actdelete.href="index.php?return_module=Calendar&return_action=index&action=massdelete&module=Users&idlist="+id+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + changeowner.href="javascript:fnvshNrm('act_changeowner');"; + +} + +function calendarChangeOwner() +{ + document.change_owner.action.value = "updateLeadDBStatus"; + document.change_owner.module.value = "Users"; + document.change_owner.return_module.value = "Calendar"; + document.change_owner.return_action.value = "index"; + document.change_owner.user_id.value = document.getElementById('activity_owner').options[document.getElementById('activity_owner').options.selectedIndex].value; + fninvsh('act_changeowner'); + window.document.change_owner.submit(); +} + + From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:25:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:25:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6771 - /vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Message-ID: <20060530162502.39F564E6AB8@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:24:58 2006 New Revision: 6771 Log: changes made to fix the issue Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Tue May 30 10:24:58 2006 @@ -236,7 +236,9 @@ 'db_email1' => 'LBL_LIST_EMAIL_ADDRESS', 'db_email2' => 'LBL_LIST_EMAIL_ADDRESS', 'LBL_COMPLETED'=>'Mark Completed', -'LBL_EPENDING'=>'Mark Not Held', +'LBL_DEFERRED'=>'Mark Deferred', +'LBL_HELD'=>'Mark Held', +'LBL_NOTHELD'=>'Mark Not Held', 'LBL_POSTPONE'=>'Postpone', 'LBL_CHANGEOWNER'=>'Change Owner', 'LBL_DEL'=>'Delete', From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:27:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:27:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6772 - /vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Message-ID: <20060530162739.C11FA4E5477@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:27:36 2006 New Revision: 6772 Log: changes made to fix the issue Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Tue May 30 10:27:36 2006 @@ -71,5 +71,14 @@ $errormsg = ''; } -header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid."&errormsg=".$errormsg); +if($return_module == 'Calendar') +{ + header("Location: index.php?module=$return_module&action=index"); +} +else +{ + header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid."&errormsg=".$errormsg); +} + + ?> From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:29:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:29:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6773 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060530162908.B3F114E5420@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:29:03 2006 New Revision: 6773 Log: style has been modified Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Tue May 30 10:29:03 2006 @@ -2158,7 +2158,7 @@ z-index:5000; } -#calAction{ +.calAction{ width:175px; background-color:#CCCCCC; border:1px solid #DDDDDD; From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:45:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:45:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6774 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060530164527.0B41E789889@vtiger.fosslabs.com> Author: don Date: Tue May 30 10:45:24 2006 New Revision: 6774 Log: border for calendar icon removed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 30 10:45:24 2006 @@ -62,9 +62,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:54:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:54:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6775 - in /vtigercrm/trunk/Smarty/templates: Emails.tpl Webmails.tpl Message-ID: <20060530165407.DF9D17D37F2@vtiger.fosslabs.com> Author: don Date: Tue May 30 10:54:03 2006 New Revision: 6775 Log: include file changed to Button_List.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl vtigercrm/trunk/Smarty/templates/Webmails.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Tue May 30 10:54:03 2006 @@ -99,7 +99,7 @@ {rdelim} - {include file='Buttons_List.tpl'} + {include file='Buttons_List1.tpl'}
    {$APP.LBL_CALENDAR_ALT}{$APP.LBL_CALENDAR_ALT} {$APP.L
 BL_CLOCK_ALT} {$APP.LBL_CALCULATOR_ALT}
    Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Tue May 30 10:54:03 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ -->*} - {include file='Buttons_List.tpl'} + {include file='Buttons_List1.tpl'}
    - + Modified: vtigercrm/trunk/modules/Reports/Report.js ============================================================================== --- vtigercrm/trunk/modules/Reports/Report.js (original) +++ vtigercrm/trunk/modules/Reports/Report.js Tue May 30 19:24:55 2006 @@ -500,9 +500,9 @@ { if(getObj('step1').style.display != 'none') { - if (trim(NewRep.reportname.value) == "") + if (trim(document.NewRep.reportname.value) == "") { - alert("Missing Folder Name"); + alert("Missing Report Name"); }else { hide('step1'); Modified: vtigercrm/trunk/modules/Reports/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Reports/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Reports/language/en_us.lang.php Tue May 30 19:24:55 2006 @@ -113,6 +113,7 @@ 'LBL_TABULAR_FORMAT'=>'Tabular Format', 'LBL_TABULAR_REPORTS_ARE_SIMPLEST'=>'Tabular Reports are the simplest and fastest way of getting your data', 'LBL_SUMMARY_REPORT_VIEW_DATA_WITH_SUBTOTALS'=>'Summary reports allow you to view your data along with subtotals and other summary information', +'LBL_FILTERS'=>'Filters', ) From vtiger-tickets at vtiger.fosslabs.com Tue May 30 19:44:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 02:44:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?= =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?= =?utf-8?q?leased?= In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com> References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com> Message-ID: <085.28633a93e133123dd429c5a25a031814@vtiger.fosslabs.com> #1116: FCKeditor: document version used, merge new versions as released ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: editor packaging snapshot ------------------------+--------------------------------------------------- Comment (by gopal): Hi Jeff, In v5 Beta, we are bundling FCKEditor 2.2. We are bundling only the needed files to reduce the size. FYI, I am maintaining all the list of third- party packages here locally. Please get back to me if you need any further clarifications. Gopal -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:46:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 03:46:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6813 - /vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Message-ID: <20060531034635.62E9E7D7DB3@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 21:46:31 2006 New Revision: 6813 Log: edit field block link has been disabled Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Tue May 30 21:46:31 2006 @@ -27,7 +27,7 @@
      From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:56:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:56:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6776 - /vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Message-ID: <20060530165642.D90477D4DD4@vtiger.fosslabs.com> Author: don Date: Tue May 30 10:56:39 2006 New Revision: 6776 Log: chk added for emails and webmails modules to fade the create icom Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 30 10:56:39 2006 @@ -39,7 +39,7 @@ - {if $CHECK.EditView eq 'yes'} + {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} {if $MODULE eq 'Activities'} {else} From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:16:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 17:16:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6777 - in /vtigercrm/trunk/modules/Dashboard: display_charts.php index.php Message-ID: <20060530171611.9675C7D598D@vtiger.fosslabs.com> Author: don Date: Tue May 30 11:16:07 2006 New Revision: 6777 Log: access menu added for dashboard Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/index.php Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue May 30 11:16:07 2006 @@ -268,22 +268,63 @@ } ?> -
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...
    - - - - - - - - - - - - - - -
    Analytics > Dashboard  
    + + + + + + + + + + + + +
    > + + + + + + + + + +
    + + + + + +
    <? echo $app_strings['LBL_CREATE_BUTTON_LABEL']; ?> <? echo $app_strings['Dashboard']; ?>...
    +
    + + + + + + + + +
    <? echo $app_strings['LBL_CALENDAR_ALT']; ?><? echo $app_strings['LBL_CLOCK_ALT']; ?><? echo $app_strings['LBL_CALCULATOR_ALT']; ?><? echo $app_strings['LBL_CHAT_ALT']; ?> +
    +
    + + + + + +
    <? echo $app_strings['LBL_IMPORT']; ?> <? echo $app_strings['Dashboard']; ?><? echo $app_strings['LBL_EXPORT']; ?> <? echo $app_strings['Dashboard']; ?>
    +
    + + + + +
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    +
    +
    + + Modified: vtigercrm/trunk/modules/Dashboard/index.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/index.php (original) +++ vtigercrm/trunk/modules/Dashboard/index.php Tue May 30 11:16:07 2006 @@ -52,22 +52,59 @@ $log = LoggerManager::getLogger('dashboard'); ?> -
    - - - - - - - - - - - - - - -
    >  
    + + + + + + + + + + +
    > + + + + + + + + + +
    + + + + + +
    <? echo $app_strings['LBL_CREATE_BUTTON_LABEL']; ?> <? echo $app_strings['Dashboard']; ?>...
    +
    + + + + + + + + +
    <? echo $app_strings['LBL_CALENDAR_ALT']; ?><? echo $app_strings['LBL_CLOCK_ALT']; ?><? echo $app_strings['LBL_CALCULATOR_ALT']; ?><? echo $app_strings['LBL_CHAT_ALT']; ?> +
    +
    + + + + + +
    <? echo $app_strings['LBL_IMPORT']; ?> <? echo $app_strings['Dashboard']; ?><? echo $app_strings['LBL_EXPORT']; ?> <? echo $app_strings['Dashboard']; ?>
    +
    + + + + +
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    +
    +
    From vtiger-tickets at vtiger.fosslabs.com Tue May 30 10:27:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 17:27:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23821=3A_?= =?utf-8?q?Login_History?= In-Reply-To: <076.67783c370aef9f19733e3b5753407726@vtiger.fosslabs.com> References: <076.67783c370aef9f19733e3b5753407726@vtiger.fosslabs.com> Message-ID: <085.0ce40f0a9f75b7dc88b5fe47a5b3516e@vtiger.fosslabs.com> #821: Login History ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 10:58:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 17:58:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231123=3A?= =?utf-8?q?_issue_in_role_drag_and_drop?= In-Reply-To: <076.c4a5b714c12cec3b392d5125f15097cc@vtiger.fosslabs.com> References: <076.c4a5b714c12cec3b392d5125f15097cc@vtiger.fosslabs.com> Message-ID: <085.3e28f9fa66e915a8bf41be317a494048@vtiger.fosslabs.com> #1123: issue in role drag and drop ------------------------+--------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:01:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:01:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231149=3A?= =?utf-8?q?_could_not_enable_create/edit_option_in_standard_privileges?= In-Reply-To: <076.66092766998638d33820b88f8666d4b3@vtiger.fosslabs.com> References: <076.66092766998638d33820b88f8666d4b3@vtiger.fosslabs.com> Message-ID: <085.525f6d4f0983a72fb027eeaba0a63fd0@vtiger.fosslabs.com> #1149: could not enable create/edit option in standard privileges ------------------------+--------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:04:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:04:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231089=3A?= =?utf-8?q?_Security_support_not_done_for_detail_view_ajaxification?= In-Reply-To: <076.85bf505f267544ac8fa5162a6126fa33@vtiger.fosslabs.com> References: <076.85bf505f267544ac8fa5162a6126fa33@vtiger.fosslabs.com> Message-ID: <085.878ff2376a40d7bbc915b5164311280d@vtiger.fosslabs.com> #1089: Security support not done for detail view ajaxification ------------------------+--------------------------------------------------- Reporter: don | Owner: don Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:06:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:06:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231090=3A?= =?utf-8?q?_Security_implementation_not_working_for_ajax_actions?= In-Reply-To: <076.ec9800314dfe32c924106e87835f8225@vtiger.fosslabs.com> References: <076.ec9800314dfe32c924106e87835f8225@vtiger.fosslabs.com> Message-ID: <085.c5cb2394cbe17a3b69aae50fa75e59f0@vtiger.fosslabs.com> #1090: Security implementation not working for ajax actions ------------------------+--------------------------------------------------- Reporter: don | Owner: don Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 11:26:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:26:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6779 - /vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Message-ID: <20060530182636.05CBE7D7990@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 12:26:32 2006 New Revision: 6779 Log: * Modified to add the Ticket History in related list Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue May 30 12:26:32 2006 @@ -106,20 +106,36 @@ $query = "SELECT activity.*, crmentity.crmid, contactdetails.contactid, contactdetails.lastname, contactdetails.firstname, recurringevents.recurringtype, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left outer join recurringevents on recurringevents.activityid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting')"; $log->debug("Exiting get_activities method ..."); + return GetRelatedList('HelpDesk','Activities',$focus,$query,$button,$returnset); } - /** Function to display the History of the Ticket which just includes a file which contains the TicketHistory informations + /** Function to get the Ticket History information as in array format + * @param int $ticketid - ticket id + * return array with title and the ticket history informations in the following format + array( + header=>array('0'=>'title'), + entries=>array('0'=>'info1','1'=>'info2',etc.,) + ) */ - function Get_Ticket_History() - { - global $log; - $log->debug("Entering Get_Ticket_History() method ..."); - global $mod_strings; - echo '

    '; - echo get_form_header($mod_strings['LBL_TICKET_HISTORY'],"", false); - include("modules/HelpDesk/TicketHistory.php"); - $log->debug("Exiting Get_Ticket_History method ..."); + function get_ticket_history($ticketid) + { + global $log, $adb; + $log->debug("Entering into get_ticket_history($ticketid) method ..."); + + $query="select title,update_log from troubletickets where ticketid=".$ticketid; + $result=$adb->query($query); + $update_log = $adb->query_result($result,0,"update_log"); + + $splitval = split('--//--',trim($update_log,'--//--')); + + $header[] = $adb->query_result($result,0,"title"); + + $return_value = Array('header'=>$header,'entries'=>$splitval); + + $log->debug("Exiting from get_ticket_history($ticketid) method ..."); + + return $return_value; } /** Function to form the query to get the list of attachments and notes From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 11:28:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:28:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6780 - in /vtigercrm/trunk/modules/HelpDesk: TicketHistory.html TicketHistory.php Message-ID: <20060530182807.B73727D7998@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 12:28:04 2006 New Revision: 6780 Log: * Removed the files which were used to display the Ticket History informations in the relatedlist. now this history informations will be formed as array and passed to the get related list function call. Removed: vtigercrm/trunk/modules/HelpDesk/TicketHistory.html vtigercrm/trunk/modules/HelpDesk/TicketHistory.php From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 11:31:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:31:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6781 - /vtigercrm/trunk/modules/Products/Product.php Message-ID: <20060530183157.950F27D7998@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 12:31:53 2006 New Revision: 6781 Log: * Commented the if condition which has restrict the activity object create which caused error in the product related list and the activities are not shown in the list. Modified: vtigercrm/trunk/modules/Products/Product.php Modified: vtigercrm/trunk/modules/Products/Product.php ============================================================================== --- vtigercrm/trunk/modules/Products/Product.php (original) +++ vtigercrm/trunk/modules/Products/Product.php Tue May 30 12:31:53 2006 @@ -213,8 +213,9 @@ $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; - require_once('modules/Activities/Activity.php'); - if($this->column_fields['contact_id']!=0 && $this->column_fields['contact_id']!='') + require_once('modules/Activities/Activity.php'); + + //if($this->column_fields['contact_id']!=0 && $this->column_fields['contact_id']!='') $focus = new Activity(); $button = ''; From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:32:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:32:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231232=3A?= =?utf-8?q?_Global_Search_shows_Contacts_by_default=2C_must_show_All?= In-Reply-To: <076.5c332f8e820b8bdd6c537fa60f24845c@vtiger.fosslabs.com> References: <076.5c332f8e820b8bdd6c537fa60f24845c@vtiger.fosslabs.com> Message-ID: <085.811c1e856b05b282a2799b5458e2ed85@vtiger.fosslabs.com> #1232: Global Search shows Contacts by default, must show All ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Comment: 953 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:32:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:32:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23947=3A_?= =?utf-8?q?Close_option_is_missing_for_Search_function?= In-Reply-To: <076.9449a290acf00d17c2120ba787bc473f@vtiger.fosslabs.com> References: <076.9449a290acf00d17c2120ba787bc473f@vtiger.fosslabs.com> Message-ID: <085.09ed631d011cd225d904355662fb4a67@vtiger.fosslabs.com> #947: Close option is missing for Search function ------------------------+--------------------------------------------------- Reporter: gopal | Owner: anonymous Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: assigned => closed Comment: 877 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 11:32:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:32:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6782 - /vtigercrm/trunk/include/RelatedListView.php Message-ID: <20060530183251.730E27D79AF@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 12:32:47 2006 New Revision: 6782 Log: * Added license Modified: vtigercrm/trunk/include/RelatedListView.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== --- vtigercrm/trunk/include/RelatedListView.php (original) +++ vtigercrm/trunk/include/RelatedListView.php Tue May 30 12:32:47 2006 @@ -1,4 +1,15 @@ Author: don Date: Tue May 30 12:34:23 2006 New Revision: 6783 Log: fixed sec query inner join issue Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Tue May 30 12:34:23 2006 @@ -305,7 +305,7 @@ else { $profileList = getCurrentUserProfileList(); - $sql = "select * from field inner join tab on tab.tabid = field.tabid innerjoin profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid "; + $sql = "select * from field inner join tab on tab.tabid = field.tabid inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid "; $sql.= " where field.tabid=".$tabid." and field.block in (".$blockids.") and (field.uitype =5 or field.displaytype=2)"; $sql.= " and profile2field.visible=0"; $sql.= " and def_org_field.visible=0 and profile2field.profileid in ".$profileList." order by field.sequence"; From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:35:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:35:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231032=3A?= =?utf-8?q?_can_not_create_New_Contact_or_New_Leads_when_having_permission?= =?utf-8?q?_for_create/edit?= In-Reply-To: <076.affb8cb4c352ba6ca316af085c1f0e41@vtiger.fosslabs.com> References: <076.affb8cb4c352ba6ca316af085c1f0e41@vtiger.fosslabs.com> Message-ID: <085.c8a6efd019da2bd317c644a974ae52d3@vtiger.fosslabs.com> #1032: can not create New Contact or New Leads when having permission for create/edit ------------------------+--------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:39:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:39:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231082=3A?= =?utf-8?q?_vtiger_Logo_missing?= In-Reply-To: <076.b25d8abf5fc3e3a8fa5169b5af5452f1@vtiger.fosslabs.com> References: <076.b25d8abf5fc3e3a8fa5169b5af5452f1@vtiger.fosslabs.com> Message-ID: <085.fb3e7f21b6142efdf5edb85fb42ca87b@vtiger.fosslabs.com> #1082: vtiger Logo missing ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:39:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:39:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231129=3A?= =?utf-8?q?_SalesOrder_popup_gives_fatal_error?= In-Reply-To: <076.ed5850144fdfa69ed89800ea316794af@vtiger.fosslabs.com> References: <076.ed5850144fdfa69ed89800ea316794af@vtiger.fosslabs.com> Message-ID: <085.4c70f00dbd9adcf23a5009cdd9b650d9@vtiger.fosslabs.com> #1129: SalesOrder popup gives fatal error ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: Jeri Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Pop Up Search ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:46:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:46:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23825=3A_?= =?utf-8?q?Selecting_multiple_contacts_or_accounts_to_email_doesn=27t_work?= In-Reply-To: <076.683cae006e1fdd273b3c9d1c8840ad6b@vtiger.fosslabs.com> References: <076.683cae006e1fdd273b3c9d1c8840ad6b@vtiger.fosslabs.com> Message-ID: <085.cbb65184cb31f76fbcffb1c399a27f0b@vtiger.fosslabs.com> #825: Selecting multiple contacts or accounts to email doesn't work -----------------------------------+---------------------------------------- Reporter: jay at forecasttech.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: -----------------------------------+---------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 11:49:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:49:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6784 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060530184947.0BB1C7D79D3@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 12:49:43 2006 New Revision: 6784 Log: * Added get_ticket_history entry for Ticket in related lists table Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue May 30 12:49:43 2006 @@ -1703,9 +1703,11 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)"); + + //Inserting PriceBook Related Lists $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)"); // Inserting Vendor Related Lists From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:54:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:54:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231019=3A?= =?utf-8?q?_Help_desk_-_Ticket_history_missing?= In-Reply-To: <076.9c5107e627c0574d829eb9fdf2b44421@vtiger.fosslabs.com> References: <076.9c5107e627c0574d829eb9fdf2b44421@vtiger.fosslabs.com> Message-ID: <085.069dfa69fad89070c321e55eb6c491fa@vtiger.fosslabs.com> #1019: Help desk - Ticket history missing ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Ticket history ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed as the Ticket History is added in the Ticket related list. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 11:58:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:58:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6785 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060530185800.B6B247D79DB@vtiger.fosslabs.com> Author: don Date: Tue May 30 12:57:56 2006 New Revision: 6785 Log: Fixed issue in isPermitted() if the actionname is not listed in actionmapping table Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue May 30 12:57:56 2006 @@ -1405,12 +1405,12 @@ { $permission = "yes"; $log->debug("Exiting isPermitted method ..."); - return $permission; } else { $permission ="no"; } + return $permission; } From vtiger-tickets at vtiger.fosslabs.com Tue May 30 12:00:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 19:00:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231204=3A?= =?utf-8?b?IGxlYWQgaGlzdG9yeT8/Pz8/Pz8=?= In-Reply-To: <076.bbbe8e270b4c7d1759f1f5202c6ad934@vtiger.fosslabs.com> References: <076.bbbe8e270b4c7d1759f1f5202c6ad934@vtiger.fosslabs.com> Message-ID: <085.d7dcf4d305c1c1fba4241c5f83e7a53b@vtiger.fosslabs.com> #1204: lead history??????? ------------------------+--------------------------------------------------- Reporter: richie | Owner: don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 12:01:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 19:01:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231209=3A?= =?utf-8?b?IGNvbnRhY3RzIGhpc3Rvcnk/Pz8/Pz8=?= In-Reply-To: <076.42cb83c6d048c893bb0ffcf27ba6f9e1@vtiger.fosslabs.com> References: <076.42cb83c6d048c893bb0ffcf27ba6f9e1@vtiger.fosslabs.com> Message-ID: <085.b14e4bb25d6818c19765f89cc0571002@vtiger.fosslabs.com> #1209: contacts history?????? ------------------------+--------------------------------------------------- Reporter: richie | Owner: don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 13:49:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 20:49:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6786 - /vtigercrm/trunk/Smarty/templates/ListRoles.tpl Message-ID: <20060530204934.334657D7A3F@vtiger.fosslabs.com> Author: don Date: Tue May 30 14:49:29 2006 New Revision: 6786 Log: Fixed the drag and drop issue in IE 6 Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListRoles.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListRoles.tpl Tue May 30 14:49:29 2006 @@ -50,15 +50,23 @@ {rdelim} -
    +
    {include file='SettingsMenu.tpl'} + + + + + + {if $header eq 'Comments' || $header eq 'Comment Information'} + + + + + + + + {/if} + + + + + {strip} {elseif $keyid eq '19' || $keyid eq '20'} + + {if $label eq 'Add Comment'} + {assign var=keyval value=""} + {/if} {/if} {elseif $uitype eq 19 || $uitype eq 20} + + {if $fldlabel eq 'Add Comment'} + {assign var=fldvalue value=""} + {/if} + + + + + {if $header eq 'Comments' || $header eq 'Comment Information'} + + + + + + + + + {/if} + + + + Modified: vtigercrm/trunk/modules/Faq/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/DetailView.php (original) +++ vtigercrm/trunk/modules/Faq/DetailView.php Tue May 30 14:57:57 2006 @@ -90,6 +90,9 @@ $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - + +//Added to display the Faq comments information +$smarty->assign("COMMENT_BLOCK",$focus->getFAQComments($_REQUEST['record'])); + $smarty->display("DetailView.tpl"); ?> Modified: vtigercrm/trunk/modules/Faq/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/EditView.php (original) +++ vtigercrm/trunk/modules/Faq/EditView.php Tue May 30 14:57:57 2006 @@ -106,7 +106,13 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); - + +if($_REQUEST['record'] != '') +{ + //Added to display the Faq comments information + $smarty->assign("COMMENT_BLOCK",$focus->getFAQComments($_REQUEST['record'])); +} + if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); else Modified: vtigercrm/trunk/modules/Faq/Faq.php ============================================================================== --- vtigercrm/trunk/modules/Faq/Faq.php (original) +++ vtigercrm/trunk/modules/Faq/Faq.php Tue May 30 14:57:57 2006 @@ -110,16 +110,19 @@ return ''; } - $list .= '
    '; + $list .= '
    '; for($i=0;$i<$noofrows;$i++) { $comment = $this->db->query_result($result,$i,'comments'); $createdtime = $this->db->query_result($result,$i,'createdtime'); if($comment != '') { - $list .= '
      '.$comment.'
    '; - $list .= '
    '.$mod_strings['Created Time']; - $list .= ' : '.$createdtime.'
    '; + //this div is to display the comment + $list .= '
    '.make_clickable(nl2br($comment)).'
    '; + + //this div is to display the created time + $list .= '
    '.$mod_strings['Created Time']; + $list .= ' : '.$createdtime.'
    '; } } $list .= '
    '; Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/DetailView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/DetailView.php Tue May 30 14:57:57 2006 @@ -99,6 +99,9 @@ $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); +//Added to display the ticket comments information +$smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record'])); + $smarty->assign("MODULE",$currentModule); $smarty->display("DetailView.tpl"); $focus->id = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/HelpDesk/EditView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/EditView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/EditView.php Tue May 30 14:57:57 2006 @@ -102,6 +102,12 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +if($_REQUEST['record'] != '') +{ + //Added to display the ticket comments information + $smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record'])); +} + if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); else Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue May 30 14:57:57 2006 @@ -358,16 +358,21 @@ return ''; } - $list .= '
    '; + $list .= '
    '; for($i=0;$i<$noofrows;$i++) { if($adb->query_result($result,$i,'comments') != '') { - $list .= '
    '; + //this div is to display the comment + $list .= '
    '; $list .= make_clickable(nl2br($adb->query_result($result,$i,'comments'))); - $list .= '
    '; + $list .= '
    '; + + //this div is to display the author and time + $list .= '
    '; $list .= $mod_strings['LBL_AUTHOR'].' : '; + if($adb->query_result($result,$i,'ownertype') == 'user') $list .= getUserName($adb->query_result($result,$i,'ownerid')); else @@ -388,7 +393,7 @@ * @param int $id - Ticket id * @return string $customername - The contact name **/ -function getCustomerName($id) + function getCustomerName($id) { global $log; $log->debug("Entering getCustomerName(".$id.") method ..."); Modified: vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php Tue May 30 14:57:57 2006 @@ -157,6 +157,7 @@ 'LBL_CONVERT_AS_FAQ_BUTTON_KEY'=>'C', 'LBL_CONVERT_AS_FAQ_BUTTON_LABEL'=>'Convert As FAQ', 'Attachment'=>'Attachment', +'LBL_COMMENT_INFORMATION'=>'Comment Information', ); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 14:48:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 21:48:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6789 - in /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl EmailContents.tpl EmailDetails.tpl Emails.tpl Header.tpl HomePage.tpl Message-ID: <20060530214821.37DCF7D7D56@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 15:48:13 2006 New Revision: 6789 Log: updated the UI changes given by saint - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/EmailContents.tpl vtigercrm/trunk/Smarty/templates/EmailDetails.tpl vtigercrm/trunk/Smarty/templates/Emails.tpl vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue May 30 15:48:13 2006 @@ -28,14 +28,18 @@
    @@ -167,7 +175,7 @@ {ldelim} childId = childId.replace(/user_/gi,''); parentId = parentId.replace(/user_/gi,''); - var ajaxObj = new VtigerAjax(ajaxSaveResponse); + var ajaxObj = new Ajax(ajaxSaveResponse); var urlstring ="module=Users&action=UsersAjax&file=RoleDragDrop&ajax=true&parentId="+parentId+"&childId="+childId; ajaxObj.process("index.php?",urlstring); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 13:51:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 20:51:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6787 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060530205128.288817D7A3F@vtiger.fosslabs.com> Author: don Date: Tue May 30 14:51:24 2006 New Revision: 6787 Log: Handled migration in security tables Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 14:51:24 2006 @@ -2794,6 +2794,33 @@ $sql2_sec="insert into profile2utility values(".$prof_id.",7,9,0)"; Execute($sql2_sec); + + $sql3_sec="insert into profile2tab values(".$prof_id.",26,0)"; + Execute($sql3_sec); + + $sql4_sec="insert into profile2tab values(".$prof_id.",27,0)"; + Execute($sql4_sec); + + $sql5_sec="delete from profile2standardpermissions where tabid=1 and profileid=".$prof_id; + Execute($sql5_sec); + + $sql6_sec="delete from profile2standardpermissions where tabid=3 and profileid=".$prof_id; + Execute($sql6_sec); + + $sql7_sec="insert into profile2standardpermissions values(".$prof_id.",26,0,0)"; + Execute($sql7_sec); + + $sql8_sec="insert into profile2standardpermissions values(".$prof_id.",26,1,0)"; + Execute($sql8_sec); + + $sql9_sec="insert into profile2standardpermissions values(".$prof_id.",26,2,0)"; + Execute($sql9_sec); + + $sql10_sec="insert into profile2standardpermissions values(".$prof_id.",26,3,0)"; + Execute($sql10_sec); + + $sql11_sec="insert into profile2standardpermissions values(".$prof_id.",26,4,0)"; + Execute($sql11_sec); } From vtiger-tickets at vtiger.fosslabs.com Tue May 30 13:51:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 20:51:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23810=3A_?= =?utf-8?q?Creating_New_Potential?= In-Reply-To: <076.b82f5ddc46ef8a0cb2806330580b0dba@vtiger.fosslabs.com> References: <076.b82f5ddc46ef8a0cb2806330580b0dba@vtiger.fosslabs.com> Message-ID: <085.0611a8bc904dda3806a2d1dd22edfca2@vtiger.fosslabs.com> #810: Creating New Potential ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * priority: critical => major * status: new => assigned * owner: developer => richie Comment: Could you please elaborate on which module you are facing this situation? A little more info will go a long way in helping us. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 13:58:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 20:58:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6788 - in /vtigercrm/trunk: Smarty/templates/ modules/Faq/ modules/HelpDesk/ modules/HelpDesk/language/ Message-ID: <20060530205810.715187D7A3B@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 14:57:57 2006 New Revision: 6788 Log: * Modified to display the comment details in Edit and DetailView and in the EditView page, in the comment text area already comment will not be shown now. it will be shown as empty Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl vtigercrm/trunk/Smarty/templates/DisplayFields.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl vtigercrm/trunk/modules/Faq/DetailView.php vtigercrm/trunk/modules/Faq/EditView.php vtigercrm/trunk/modules/Faq/Faq.php vtigercrm/trunk/modules/HelpDesk/DetailView.php vtigercrm/trunk/modules/HelpDesk/EditView.php vtigercrm/trunk/modules/HelpDesk/HelpDesk.php vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue May 30 14:57:57 2006 @@ -189,6 +189,27 @@ {/if}
    + {$MOD.LBL_COMMENT_INFORMATION} +
    {$COMMENT_BLOCK}
     
    Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Tue May 30 14:57:57 2006 @@ -87,6 +87,10 @@
     {$keyval}
    {if $uitype eq 20} * Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Tue May 30 14:57:57 2006 @@ -122,7 +122,26 @@ {foreach key=header item=data from=$BLOCKS} -
     
    + {$MOD.LBL_COMMENT_INFORMATION} +
    {$COMMENT_BLOCK}
     
    {$header}
    - - - - - -
    {$APP.$CATEGORY} > {$APP.$MODULE} - + + + +
    {$APP.$CATEGORY} > {$APP.$MODULE} + + + + + + - - + - -
    + + + - - + +
    @@ -57,11 +61,14 @@
    -
    +
    +
      + - @@ -70,10 +77,11 @@
    {$APP.LBL_CALENDAR_ALT} {$APP.LBL_CLOCK_ALT}
    -
    - + + + -
      + + {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } {if $CHECK.Import eq 'yes'} @@ -87,7 +95,7 @@ {/if} {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} - @@ -100,20 +108,19 @@ {/if} -
    {$APP.LBL_EXPORT} {$APP.$MODULE} + {if $CHECK.Export eq 'yes'} {$APP.LBL_IMPORT} {$APP.$MODULE} {$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}
    -
    +
    +
      +
    {$APP.LBL_ALL_MENU_ALT}
    -
    +
    Modified: vtigercrm/trunk/Smarty/templates/EmailContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EmailContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EmailContents.tpl Tue May 30 15:48:13 2006 @@ -1,38 +1,38 @@ -{**} -
    - - - - - - - - {foreach key=id item=row from=$LISTENTITY} - - - - - - - {/foreach} -
    {$LISTHEADER.0}{$LISTHEADER.1}{$LISTHEADER.2}
    - -{$row.0}{$row.1}{$row.2}
    -
    - +{**} +
    + + + + + + + + {foreach key=id item=row from=$LISTENTITY} + + + + + + + {/foreach} +
    {$LISTHEADER.0}{$LISTHEADER.1}{$LISTHEADER.2}
    + +{$row.0}{$row.1}{$row.2}
    +
    + Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Tue May 30 15:48:13 2006 @@ -15,7 +15,7 @@ {if $BLOCKS neq ''} - - Modified: vtigercrm/trunk/modules/Calendar/header.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/header.php (original) +++ vtigercrm/trunk/modules/Calendar/header.php Tue May 30 18:38:31 2006 @@ -62,7 +62,7 @@ Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue May 30 18:38:31 2006 @@ -315,7 +315,7 @@ Modified: vtigercrm/trunk/modules/Dashboard/index.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/index.php (original) +++ vtigercrm/trunk/modules/Dashboard/index.php Tue May 30 18:38:31 2006 @@ -99,7 +99,7 @@ From vtiger-tickets at vtiger.fosslabs.com Tue May 30 18:09:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 01:09:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231196=3A?= =?utf-8?q?_Reports_-_Next_Button_non_functional_in_Mozilla_Browser_=28Bin?= =?utf-8?q?_Installation=29?= In-Reply-To: <076.d539b2e8d861c4293c89750188d77963@vtiger.fosslabs.com> References: <076.d539b2e8d861c4293c89750188d77963@vtiger.fosslabs.com> Message-ID: <085.bee3db99d2d2b1e4f296400dc7ebcbab@vtiger.fosslabs.com> #1196: Reports - Next Button non functional in Mozilla Browser (Bin Installation) ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: Jeri Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 18:10:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 01:10:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231198=3A?= =?utf-8?q?_Reports_-_Cancel_Button_Non_function_in_Create_Report?= In-Reply-To: <076.8e9d3facea1ac93ec4ce77bef5d8633e@vtiger.fosslabs.com> References: <076.8e9d3facea1ac93ec4ce77bef5d8633e@vtiger.fosslabs.com> Message-ID: <085.f8b1e0709648e2b01cb4074fd35cca72@vtiger.fosslabs.com> #1198: Reports - Cancel Button Non function in Create Report ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: Jeri Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 18:12:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 01:12:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231197=3A?= =?utf-8?q?_Reports_-_Incorrect_Alert_Message?= In-Reply-To: <076.a565900329edc9f32752c9b71a73baa9@vtiger.fosslabs.com> References: <076.a565900329edc9f32752c9b71a73baa9@vtiger.fosslabs.com> Message-ID: <085.0d74410e19edf6fb03340a089bdd172a@vtiger.fosslabs.com> #1197: Reports - Incorrect Alert Message ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: jerrydgeorge Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * owner: Jeri => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 18:13:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 01:13:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6810 - in /vtigercrm/branches/4.2.4: changelog.txt modules/Users/about_us.php themes/Aqua/header.html themes/blue/header.html themes/nature/header.html themes/orange/header.html vtigerversion.php Message-ID: <20060531011333.9D1307D7D95@vtiger.fosslabs.com> Author: allanbush Date: Tue May 30 19:13:27 2006 New Revision: 6810 Log: Changes for 4.2.4 release as per #52. Added a few extra changes to the changelog that occured since that ticket was made. Closes #52. Modified: vtigercrm/branches/4.2.4/changelog.txt vtigercrm/branches/4.2.4/modules/Users/about_us.php vtigercrm/branches/4.2.4/themes/Aqua/header.html vtigercrm/branches/4.2.4/themes/blue/header.html vtigercrm/branches/4.2.4/themes/nature/header.html vtigercrm/branches/4.2.4/themes/orange/header.html vtigercrm/branches/4.2.4/vtigerversion.php Modified: vtigercrm/branches/4.2.4/changelog.txt ============================================================================== --- vtigercrm/branches/4.2.4/changelog.txt (original) +++ vtigercrm/branches/4.2.4/changelog.txt Tue May 30 19:13:27 2006 @@ -1,7 +1,92 @@ +vtigerCRM v4.2.4 (Jun 1, 2006) +------------------------------- + +NOTE: first time vtigerCRM users can directly install the source in their vtiger supported version of LAMP / WAMP. + +bug fixes +--------- + +r3606: Issue in Pop-up New link which caused elements to disappear when hovering over ">>" +r3607: Display currency symbol in listview header +r3608: Added dash after Potential Name when converting from Lead +r3609: Start/End date options in Custom View +r3614: utils.php call time pass reference error +r3615: fix for totals in reports not showing up +r3616: PearDatabase.php call time pass reference +r3617: Signatures are double-spaced in e-mails +r3618: vendor search has a field "company" .but vendor form does not have company field +r3619: "Email" mapping added for new search field +r3773: Search leads by Fax in advanced search +r3775: Order pending activities by date and time +r3776: Allow more lead columns to be sorted +r3777: Import CSV files with CR as line ending +r3779: Set memory limit higher than 8mb +r3783: removing schtasks.exe from source cron directory +r3784: move DatabaseSchema.xml out of adodb/ into new schema/ directory +r3787: Emails that contain HTML characters cause bad display in the Reply, Reply to All buttons area +r3789: My Group Allocation on the Home page does not have a border on the right edge +r3790: When switching from Email to Webmails and back to Emails, the tabs are drawn incorrectly +r3792: Products listed in the Help Desk custom views display the record ID instead of the Product Name +r3794: Missing border on Home module with more than 5 tickets open +r3795: Remove readonly attribs from installer db form fields +r3796: when we display fieldlabels, the label will not be displayed if there is a special character(like &) +r3803: copyright / license cleanup +r3809: install cleanup +r3811: unified naming scheme to vtigerCRM files +r3824: split README with Changelog +r3831: fix extraneous colon character appearing in installer stage 3 next to database name +r3833: add template for config file and 4.2.3 sql file +r3834: add config file for FHS system +r3868: update to jpgraph-1.20.3 +r3869: rename db_host_name and db_user_name to db_hostname and db_username +r3871: move columns for sunday and week number to the right +r3872: Fix Home Ticket List is Colored Opposite of Other Sections +r3873: Fix html emails sent with tags viewable +r3874: fixed time shift occuring if the calendar view spans a time change (daylight saving switch) +r3875: removed magic quotes check on input sanitization as magic quotes are removed on all input in the index.php file +r3876: Apostrophe in description of Lead means that the lead is lost upon converting +r3877: Don't die 'Couldn't get the group listing' +r3878: fix direct calls to mysql functions +r3879: Fix activities relatedlist won't display well if translated +r3891: Fix missing "break" in OpenListView.php CASE statement +r3892: Show rendered html instead of tags in notes editor +r3911: update to adodb-4.72 +r3912: Fix Quotes/Invoices/Orders Do Not Support Negative Adjustments +r3914: add file to extract adodb XML schema from database +r3915: remove unused code in extractSchema +r3931: port constraints & table type hack for AXMLS from 4.55 to 4.72 +r3932: Add indexes & fix FK name collisions in DB XML Schema +r3933: Remove foreign keys that point to missing fields +r3934: remove duplicate indexes in database +r3935: turn on adodb and AXMLS debugging during install +r3937: installer use template file +r3938: Put vtiger version and release date only in vtigerversion.php +r3940: config.inc.php is configuration file included by config.php +r3941: added missing parameters in template file +r3942: create install/5createTables.inc.php and modify install.php to use it when called from the command line +r3943: output one less line to compensate for create_default_users(). see #40 +r3945: fix scope issue in getUserFldArray() +r3966: remove old unused modules and files +r4051: Remove hard coded upload limits +r4057: changes made to support multiple packaging +r4058: reduce memory usage in lead attachment upload code +r4059: reduce adodb memory usage to enable larger BLOB uploads +r4392: clean up uninitialized var notice while importing leads ref #70 +r4394: disable installer after successful install for security reasons. closes #25 +r4397: Patch forUnicode-readyAlphabeticalSearch(), by justoff. +r4399: Jpgraph fixes for Traditional Chinese, by kiange. closes #37 +r4400: Fix quotes are not created correctly form Potentials or from Quote screen, by onwealdandy. closes #51 +r4401: Translate of hard code by Summing columns in reports, by kleo. closes #54 +r4402: urlencode the downloading filename to deal with special characters, by mcrowe. closes #64 +r4443: expand lead street field to match street maxlen in contacts +r5079: Detect if the key metric is for a sub module and set the partent module and appropriate sub module code when needed. Closes #93. +r5113: Added inital condition check before looping through the parts list. Closes #96. +r6804: $host_name doesn't appear to be used anywhere, removing from configureation. Closes #68. + + + vtigerCRM v4.2.3 (Dec 23, 2005) ------------------------------- - -NOTE: first time vtigerCRM users can directly install the source in their vtiger supported version of LAMP / WAMP. vulnerability fixes ------------------- @@ -20,6 +105,7 @@ b) Authentication ByPass c) Unsafe File Inclusion d) Arbitrary code execution + vtigerCRM v4.2 Patch 2 (Sep 15, 2005) ------------------------------------- @@ -125,6 +211,7 @@ 61. T2512 - Home upcoming activities 62. P8030 - Meetings not held must not be shown in upcoming activities + vtigerCRM v4.2 Patch 1 (Aug 10, 2005) ------------------------------------- @@ -197,6 +284,7 @@ 59. Internal: Single, double quotes problem in ticket comments and FAQ comments 60. Forum Topic ID 1612: Misbehaviour on validation of number fields + vtigerCRM v4.2 GA (July 18, 2005) --------------------------------- @@ -379,6 +467,7 @@ NOTE: For more details about vtigerCRM v4.2 Release Notes, Please refer to the following URL: http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4_2_Release_Notes + vtigerCRM v4.2 Alpha (May 31, 2005) ----------------------------------- @@ -397,6 +486,7 @@ 10. Event Reminders 11. Configurable Email Notifications 12. Incoming Email Support + vtigerCRM v4.0.1 (April 29, 2005) --------------------------------- @@ -465,6 +555,7 @@ 49) Displaying of Closed Ticket in Home Page. 50) Deleted entities are getting listed in Tracker. 51) Enabling History tabs in Leads, Contacts, Accounts and Potentials for Activity History. + vtigerCRM v4.0 (March 29, 2005) -------------------------------- @@ -682,6 +773,7 @@ 2. In Windowos OS, System Inoformantion is not displayed 3. While importing leads, accounts, contacts, and potentials the XLS file format can be browsed even though the allowed file format is CSV. + vtigerCRM v4.0 Beta (January 10, 2005) ------------------------------------- @@ -724,6 +816,7 @@ 18. 1093669 - Delete attachments 19. Support for Latest versions of Apache and MySQL in installation wizard (Both Linux and Windows). + vtigerCRM v3.2.1 (December 21, 2004) ------------------------------------ @@ -745,6 +838,7 @@ g) Proper Message display is done when a user with no delete privileges tries to delete the entity. h) vtiger Outlook Plug-in in server side fixes related to performance improvement. + vtigerCRM v3.2 (December 13, 2004) ---------------------------------- @@ -775,6 +869,7 @@ Released vtiger Outlook Plug-in, business productivity enhancement utility for Microsoft Outlook users. It is an open source project covered under vtiger Public License 1.0 based on Mozilla Public License 1.1. + vtigerCRM v2.0 (September 6, 2004) ---------------------------------- @@ -808,6 +903,7 @@ Send your feedback, which is vital for our understanding your needs. + vtigerCRM v1.0 (August 26, 2004) -------------------------------- Modified: vtigercrm/branches/4.2.4/modules/Users/about_us.php ============================================================================== --- vtigercrm/branches/4.2.4/modules/Users/about_us.php (original) +++ vtigercrm/branches/4.2.4/modules/Users/about_us.php Tue May 30 19:13:27 2006 @@ -37,28 +37,33 @@ - - + + - - + + + + + + + - + - - + + - - + + @@ -76,4 +81,3 @@
    +   {if $EMAIL_FLAG neq 'WEBMAIL'}   @@ -39,7 +39,7 @@
    + {foreach item=row from=$BLOCKS} {foreach item=elements key=title from=$row} {if $title eq 'Subject'} Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Tue May 30 15:48:13 2006 @@ -99,18 +99,18 @@ {rdelim} - {include file='Buttons_List1.tpl'} + {include file='Buttons_List.tpl'} + + - - - - - - - + + - - + - + + + + - - + - - + + Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 30 18:38:31 2006 @@ -126,7 +126,7 @@
      -  
    - - + + +
    + +
    + @@ -118,44 +118,52 @@ - - + + +
    +
    + + + - - - - - - - + + + + + + + + + + + +
    - - - +
    +  {$MOD.LBL_COMPOSE} +  {$MOD.LBL_SETTINGS}
    {$MOD.LBL_EMAIL_FOLDERS}  {$MOD.LBL_ALLMAILS}
    -  {$MOD.LBL_INBOX} -
      + +
    {$MOD.LBL_EMAIL_FOLDERS}  {$MOD.LBL_ALLMAILS}
    + + +  {$MOD.LBL_INBOX} +
    -  {$MOD.LBL_SENT_MAILS} -
      +
    + +  {$MOD.LBL_SENT_MAILS} +
    +
      + - - + +
      - - {$APP.LBL_SEARCH}   -   +   + {$APP.LBL_SEARCH}   + +  
      @@ -200,14 +212,17 @@
     
       
      @@ -228,7 +243,9 @@

     
    Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Tue May 30 15:48:13 2006 @@ -113,10 +113,11 @@
    - +
    - - From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 14:54:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 21:54:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6790 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060530215434.09F817D7D59@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 15:54:31 2006 New Revision: 6790 Log: Style updated - ahmed Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Tue May 30 15:54:31 2006 @@ -72,7 +72,7 @@ background:#bbbbbb url(images/tabSeperatorBg.gif) repeat-x; } -.level2text { +/*.level2text { background:#bbbbbb url(images/level2Bg.gif) repeat-x; font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -82,12 +82,25 @@ padding-bottom:5px; font-weight:bold; color:white; +}*/ + +.level2text { + background:#bbbbbb url(images/level2Bg.gif) repeat-x; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:20px; + padding-right:20px; + padding-top:3px; + padding-bottom:3px; + font-weight:bold; + color:white; } .level2text a{ text-decoration:none; color:white; - + padding-left:10px; + padding-right:10px; } .level2text a:hover { @@ -117,6 +130,10 @@ .level2textSel{ font-weight:bold; color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:3px; + padding-bottom:3px; } @@ -2446,3 +2463,26 @@ .unread_email { font-weight:bold; } + + +.tagCloud { + border:1px solid #737373; +} + + +.tagCloudTopBg { + background: url(images/tagCloudBg.gif) repeat-x; + background-color:#e5e5e5; + +} + +.tagCloudDisplay { + background-color:#e5e5e5; + padding:10px; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height: 14px; + color: #000000; + height:100px; + +} From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 14:57:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 21:57:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6791 - in /vtigercrm/trunk/themes/blue/images: tagCloudBg.gif tagCloudName.gif Message-ID: <20060530215757.C68267D7D5D@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 15:57:52 2006 New Revision: 6791 Log: Added Tag cloud images - ahmed Added: vtigercrm/trunk/themes/blue/images/tagCloudBg.gif (with props) vtigercrm/trunk/themes/blue/images/tagCloudName.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 15:19:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 22:19:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6792 - /vtigercrm/trunk/modules/Emails/EditView.php Message-ID: <20060530221901.4122E7D7D73@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 16:18:57 2006 New Revision: 6792 Log: Updated Email Edit view for Template formating - ahmed Modified: vtigercrm/trunk/modules/Emails/EditView.php Modified: vtigercrm/trunk/modules/Emails/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EditView.php (original) +++ vtigercrm/trunk/modules/Emails/EditView.php Tue May 30 16:18:57 2006 @@ -157,8 +157,8 @@ if(isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !='') { $templatedetails = getTemplateDetails($_REQUEST['templateid']); - $details['Email Information'][2][0][3][0] = $templatedetails[2]; - $details['Email Information'][3][0][3][0] = $templatedetails[1]; + $details['Email Information'][2][0][3][0] = $templatedetails[2]; //Subject + $details['Email Information'][3][0][3][0] = nl2br($templatedetails[1]); //Body } $smarty->assign("BLOCKS",$details['Email Information']); $smarty->assign("MODULE",$currentModule); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 15:20:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 22:20:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6793 - /vtigercrm/trunk/Smarty/templates/ListRoles.tpl Message-ID: <20060530222037.E39927D7D73@vtiger.fosslabs.com> Author: don Date: Tue May 30 16:20:34 2006 New Revision: 6793 Log: Fixed Ajax instantiation issue Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListRoles.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListRoles.tpl Tue May 30 16:20:34 2006 @@ -175,7 +175,7 @@ {ldelim} childId = childId.replace(/user_/gi,''); parentId = parentId.replace(/user_/gi,''); - var ajaxObj = new Ajax(ajaxSaveResponse); + var ajaxObj = new VtigerAjax(ajaxSaveResponse); var urlstring ="module=Users&action=UsersAjax&file=RoleDragDrop&ajax=true&parentId="+parentId+"&childId="+childId; ajaxObj.process("index.php?",urlstring); From vtiger-tickets at vtiger.fosslabs.com Tue May 30 15:27:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 22:27:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231243=3A?= =?utf-8?q?_unable_to_create_exel_in_PHP5?= Message-ID: <076.f553d0d7442fa0ef5488ddc5b4309f8b@vtiger.fosslabs.com> #1243: unable to create exel in PHP5 --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 15:29:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 22:29:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6794 - in /vtigercrm/trunk: Smarty/templates/CreateEmailTemplate.tpl include/utils/CommonUtils.php modules/Emails/mailsend.php Message-ID: <20060530222956.1EDA17D7D73@vtiger.fosslabs.com> Author: don Date: Tue May 30 16:29:49 2006 New Revision: 6794 Log: email temp issue has been fixed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/trunk/include/utils/CommonUtils.php vtigercrm/trunk/modules/Emails/mailsend.php Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Tue May 30 16:29:49 2006 @@ -43,31 +43,31 @@ options[0] = blankOption; - options[1] = new Option('Account: Account Name', '{$accounts_accountname}'); - options[2] = new Option('Account: Account Type', '{$accounts_account_type}'); - options[3] = new Option('Account: Industry', '{$accounts_industry}'); - options[4] = new Option('Account: Annual Revenue', '{$accounts_annualrevenue}'); - options[5] = new Option('Account: Phone', '{$accounts_phone}'); - options[6] = new Option('Account: Email', '{$accounts_email1}'); - options[7] = new Option('Account: Rating', '{$accounts_rating}'); - options[8] = new Option('Account: Website', '{$accounts_website}'); - options[9] = new Option('Account: Fax', '{$accounts_fax}'); + options[1] = new Option('Account: Account Name', '$accounts-accountname$'); + options[2] = new Option('Account: Account Type', '$accounts-account_type$'); + options[3] = new Option('Account: Industry', '$accounts-industry$'); + options[4] = new Option('Account: Annual Revenue', '$accounts-annualrevenue$'); + options[5] = new Option('Account: Phone', '$accounts-phone$'); + options[6] = new Option('Account: Email', '$accounts-email1$'); + options[7] = new Option('Account: Rating', '$accounts-rating$'); + options[8] = new Option('Account: Website', '$accounts-website$'); + options[9] = new Option('Account: Fax', '$accounts-fax$'); allOpts[1] = options; options = new Object(11); options[0] = blankOption; - options[1] = new Option('Contact: First Name', '{$contacts_firstname}'); - options[2] = new Option('Contact: Last Name', '{$contacts_lastname}'); - options[3] = new Option('Contact: Salutation', '{$contacts_salutationtype}'); - options[4] = new Option('Contact: Title', '{$contacts_title}'); - options[5] = new Option('Contact: Email', '{$contacts_email}'); - options[6] = new Option('Contact: Department', '{$contacts_department}'); - options[7] = new Option('Contact: Other Email','{$contacts_otheremail}'); - options[8] = new Option('Contact: Phone', '{$contacts_phone}'); - options[9] = new Option('Contact: Mobile', '{$contacts_mobile}'); - options[10] = new Option('Contact: Currency', '{$contacts_currency}'); + options[1] = new Option('Contact: First Name', '$contacts-firstname$'); + options[2] = new Option('Contact: Last Name', '$contacts-lastname$'); + options[3] = new Option('Contact: Salutation', '$contacts-salutationtype$'); + options[4] = new Option('Contact: Title', '$contacts-title$'); + options[5] = new Option('Contact: Email', '$contacts-email$'); + options[6] = new Option('Contact: Department', '$contacts-department$'); + options[7] = new Option('Contact: Other Email','$contacts-otheremail$'); + options[8] = new Option('Contact: Phone', '$contacts-phone$'); + options[9] = new Option('Contact: Mobile', '$contacts-mobile$'); + options[10] = new Option('Contact: Currency', '$contacts-currency$'); allOpts[2] = options; @@ -76,36 +76,36 @@ options[0] = blankOption; - options[1] = new Option('Lead: First Name', '{$leads_firstname}'); - options[2] = new Option('Lead: Last Name', '{$leads_lastname}'); - options[3] = new Option('Lead: Lead Source', '{$leads_leadsource}'); - options[4] = new Option('Lead: Status', '{$leads_leadstatus}'); - options[5] = new Option('Lead: Rating', '{$leads_rating}'); - options[6] = new Option('Lead: Industry', '{$leads_industry}'); - options[7] = new Option('Lead: Yahoo ID', '{$leads_yahooid}'); - options[8] = new Option('Lead: Email', '{$leads_email}'); - options[9] = new Option('Lead: Annual Revenue', '{$leads_annualrevenue}'); - options[10] = new Option('Lead: Title', '{$leads_designation}'); - options[11] = new Option('Lead: Salutation', '{$leads_salutation}'); + options[1] = new Option('Lead: First Name', '$leads-firstname$'); + options[2] = new Option('Lead: Last Name', '$leads-lastname$'); + options[3] = new Option('Lead: Lead Source', '$leads-leadsource$'); + options[4] = new Option('Lead: Status', '$leads-leadstatus$'); + options[5] = new Option('Lead: Rating', '$leads-rating$'); + options[6] = new Option('Lead: Industry', '$leads-industry$'); + options[7] = new Option('Lead: Yahoo ID', '$leads-yahooid$'); + options[8] = new Option('Lead: Email', '$leads-email$'); + options[9] = new Option('Lead: Annual Revenue', '$leads-annualrevenue$'); + options[10] = new Option('Lead: Title', '$leads-designation$'); + options[11] = new Option('Lead: Salutation', '$leads-salutation$'); allOpts[3] = options; options = new Object(19); options[0] = blankOption; - options[1] = new Option('User: First Name', '{$users_first_name}'); - options[2] = new Option('User: Last Name', '{$users_last_name}'); - options[3] = new Option('User: Title', '{$users_title}'); - options[4] = new Option('User: Department', '{$users_department}'); - options[5] = new Option('User: HomePhone', '{$users_phone_home}'); - options[6] = new Option('User: Mobile', '{$users_phone_mobile}'); - options[7] = new Option('User: Signature', '{$users_signature}'); - options[8] = new Option('User: Email', '{$users_email}'); - options[9] = new Option('User: Street', '{$users_address_street}'); - options[10] = new Option('User: City', '{$users_address_city}'); - options[11] = new Option('User: State', '{$users_address_state}'); - options[11] = new Option('User: Country', '{$users_address_country}'); - options[11] = new Option('User: PostalCode', '{$users_address_postalcode}'); + options[1] = new Option('User: First Name', '$users-first_name$'); + options[2] = new Option('User: Last Name', '$users-last_name$'); + options[3] = new Option('User: Title', '$users-title$'); + options[4] = new Option('User: Department', '$users-department$'); + options[5] = new Option('User: HomePhone', '$users-phone_home$'); + options[6] = new Option('User: Mobile', '$users-phone_mobile$'); + options[7] = new Option('User: Signature', '$users-signature$'); + options[8] = new Option('User: Email', '$users-email$'); + options[9] = new Option('User: Street', '$users-address_street$'); + options[10] = new Option('User: City', '$users-address_city$'); + options[11] = new Option('User: State', '$users-address_state$'); + options[11] = new Option('User: Country', '$users-address_country$'); + options[11] = new Option('User: PostalCode', '$users-address_postalcode$'); allOpts[4] = options; Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Tue May 30 16:29:49 2006 @@ -2250,6 +2250,93 @@ $log->debug("Exiting from getTemplateDetails($templateid) method ..."); return $returndata; } - +/** + * This function is used to merge the Template Details with the email description + * @param string $description -body of the mail(ie template) + * @param integer $tid - Id of the entity + * @param string $parent_type - module of the entity + * return string $description - Returns description, merged with the input template. +*/ + +function getMergedDescription($description,$id,$parent_type) +{ + global $adb,$log; + $log->debug("Entering getMergedDescription ..."); + $token_data_pair = explode('$',$description); + $fields = Array(); + for($i=1;$i < count($token_data_pair);$i+=2) + { + + $module = explode('-',$token_data_pair[$i]); + $fields[$module[0]][] = $module[1]; + + } + //replace the tokens with the values for the selected parent + switch($parent_type) + { + case 'Accounts': + if(is_array($fields["accounts"])) + { + $columnfields = implode(',',$fields["accounts"]); + $query = 'select '.$columnfields.' from account where accountid ='.$id; + $result = $adb->query($query); + foreach($fields["accounts"] as $columnname) + { + $token_data = '$accounts-'.$columnname.'$'; + $description = str_replace($token_data,$adb->query_result($result,0,$columnname),$description); + } + } + break; + case 'Contacts': + if(is_array($fields["contacts"])) + { + $columnfields = implode(',',$fields["contacts"]); + $query = 'select '.$columnfields.' from contactdetails where contactid='.$id; + $result = $adb->query($query); + foreach($fields["contacts"] as $columnname) + { + $token_data = '$contacts-'.$columnname.'$'; + $description = str_replace($token_data,$adb->query_result($result,0,$columnname),$description); + } + } + break; + case 'Leads': + if(is_array($fields["leads"])) + { + $columnfields = implode(',',$fields["leads"]); + $query = 'select '.$columnfields.' from leaddetails where leadid='.$id; + $result = $adb->query($query); + foreach($fields["leads"] as $columnname) + { + $token_data = '$leads-'.$columnname.'$'; + $description = str_replace($token_data,$adb->query_result($result,0,$columnname),$description); + } + } + break; + case 'Users': + if(is_array($fields["users"])) + { + $columnfields = implode(',',$fields["users"]); + $query = 'select '.$columnfields.' from users where id='.$id; + $result = $adb->query($query); + foreach($fields["users"] as $columnname) + { + $token_data = '$users-'.$columnname.'$'; + $description = str_replace($token_data,$adb->query_result($result,0,$columnname),$description); + } + } + break; + } + //replace the unwanted tokens by null + $token_data_pair = explode('$',$description); + for($i=1;$i < count($token_data_pair);$i+=2) + { + $token_data = '$'.$token_data_pair[$i].'$'; + $description = str_replace($token_data,'',$description); + } + $log->debug("Exiting from getMergedDescription ..."); + return $description; +} + ?> Modified: vtigercrm/trunk/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mailsend.php (original) +++ vtigercrm/trunk/modules/Emails/mailsend.php Tue May 30 16:29:49 2006 @@ -107,7 +107,9 @@ { //handle the mail send to users $emailadd = $adb->query_result($adb->query("select email1 from users where id=$mycrmid"),0,'email1'); - $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$_REQUEST['description'],'','','all',$focus->id); + $pmodule = 'Users'; + $description = getMergedDescription($focus->column_fields['description'],$mycrmid,$pmodule); + $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$description,'','','all',$focus->id); $all_to_emailids []= $emailadd; $mail_status_str .= $emailadd."=".$mail_status."&&&"; } @@ -143,7 +145,8 @@ if($emailadd != '') { - $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$focus->column_fields['description'],'','','all',$focus->id); + $description = getMergedDescription($focus->column_fields['description'],$mycrmid,$pmodule); + $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$description,'','','all',$focus->id); $all_to_emailids []= $emailadd; $mail_status_str .= $emailadd."=".$mail_status."&&&"; @@ -155,8 +158,8 @@ } } } + } - //Added to redirect the page to Emails/EditView if there is an error in mail sending if($errorheader1 == 1 || $errorheader2 == 1) { From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 15:34:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 22:34:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6795 - /vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Message-ID: <20060530223413.681907D7D73@vtiger.fosslabs.com> Author: don Date: Tue May 30 16:34:09 2006 New Revision: 6795 Log: the to mail id made to readonly Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Tue May 30 16:34:09 2006 @@ -55,7 +55,7 @@ '; $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - $query = "select crmentity.crmid, troubletickets.title, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, troubletickets.status, troubletickets.priority, crmentity.smownerid from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on contactdetails.contactid=troubletickets.parent_id left join users on users.id=crmentity.smownerid left join ticketgrouprelation on troubletickets.ticketid=ticketgrouprelation.ticketid left join groups on groups.groupname=ticketgrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; + $query = "select users.user_name,crmentity.crmid, troubletickets.title, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, troubletickets.status, troubletickets.priority, crmentity.smownerid from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on contactdetails.contactid=troubletickets.parent_id left join users on users.id=crmentity.smownerid left join ticketgrouprelation on troubletickets.ticketid=ticketgrouprelation.ticketid left join groups on groups.groupname=ticketgrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; $log->info("Ticket Related List for Contact Displayed"); $log->debug("Exiting get_tickets method ..."); return GetRelatedList('Contacts','HelpDesk',$focus,$query,$button,$returnset); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 15:44:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 22:44:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6797 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060530224442.822757D7D70@vtiger.fosslabs.com> Author: don Date: Tue May 30 16:44:38 2006 New Revision: 6797 Log: Security Migration done Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 16:44:38 2006 @@ -111,6 +111,7 @@ $res = $conn->query($sql); $noofprofiles = $conn->num_rows($res); +/* Commented by Don. Handled below for($i=0;$i<$noofprofiles;$i++) { $profile_id = $conn->query_result($res,$i,'profileid'); @@ -121,7 +122,7 @@ Execute($sql1); Execute($sql2); } - +*/ //Insert Values into action mapping table: $actionmapping_array = Array( @@ -726,7 +727,7 @@ //Inserting for all tabs -$def_org_tabid=Array(2,4,6,7,9,10,13,16,20,21,22,23); +$def_org_tabid=Array(2,4,6,7,9,10,13,16,20,21,22,23,26); foreach($def_org_tabid as $def_tabid) { $insert_query_array2 = Array( @@ -915,7 +916,7 @@ $insert_query_array4 = Array( "insert into parenttab values(1,'My Home Page',1,0),(2,'Marketing',2,0),(3,'Sales',3,0),(4,'Support',4,0),(5,'Analytics',5,0),(6,'Inventory',6,0), (7,'Tools',7,0),(8,'Settings',8,0)", - "insert into parenttabrel values(1,9,2),(1,17,3),(1,10,4),(1,3,1),(3,7,1),(3,6,2),(3,4,3),(3,2,4),(3,20,5),(3,22,6),(3,23,7),(3,14,8),(3,19,9),(3,8,10),(4,13,1),(4,15,2),(4,6,3),(4,4,4),(4,14,5),(4,8,6),(5,1,1),(5,25,2),(6,14,1), (6,18,2), (6,19,3), (6,21,4), (6,22,5), (6,20,6), (6,23,7), (7,24,1), (7,27,2), (7,8,3), (2,26,1) " + "insert into parenttabrel values(1,9,2),(1,17,3),(1,10,4),(1,3,1),(3,7,1),(3,6,2),(3,4,3),(3,2,4),(3,20,5),(3,22,6),(3,23,7),(3,14,8),(3,19,9),(3,8,10),(4,13,1),(4,15,2),(4,6,3),(4,4,4),(4,14,5),(4,8,6),(5,1,1),(5,25,2),(6,14,1), (6,18,2), (6,19,3), (6,21,4), (6,22,5), (6,20,6), (6,23,7), (7,24,1), (7,27,2), (7,8,3), (2,26,1), (2,6,2), (2,4,3) " ); foreach($insert_query_array4 as $query) { @@ -2782,7 +2783,7 @@ -//Inserting into profile2utility table +//Security profile and tab table handling by DON starts $sql_sec="select profileid from profile"; $result_sec=$conn->query($sql_sec); $num_rows=$conn->num_rows($result_sec); @@ -2801,12 +2802,6 @@ $sql4_sec="insert into profile2tab values(".$prof_id.",27,0)"; Execute($sql4_sec); - $sql5_sec="delete from profile2standardpermissions where tabid=1 and profileid=".$prof_id; - Execute($sql5_sec); - - $sql6_sec="delete from profile2standardpermissions where tabid=3 and profileid=".$prof_id; - Execute($sql6_sec); - $sql7_sec="insert into profile2standardpermissions values(".$prof_id.",26,0,0)"; Execute($sql7_sec); @@ -2824,7 +2819,44 @@ } - + //Inserting into tab tables + $sec2="INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)"; + $sec3="INSERT INTO tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)"; + + //Insert into def_org_share tables + $sec4="insert into def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)"; + + Execute($sec2); + Execute($sec3); + Execute($sec4); + + //Inserting into datashare related modules table + + //Lead Related Module + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)"); + + //Account Related Module + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)"); + + + + //Potential Related Module + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)"); + + //Quote Related Module + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)"); + + //SO Related Module + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)"); + + +//By Don Ends //Added to get the conversion rate and update for all records From vtiger-tickets at vtiger.fosslabs.com Tue May 30 16:11:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 23:11:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231215=3A?= =?utf-8?q?_created_a_PO__from_contacts_related_list_but_assigned_user_not?= =?utf-8?q?_being_populated?= In-Reply-To: <076.1c0bb4f84ea5a64f39ac1e16d2e486f4@vtiger.fosslabs.com> References: <076.1c0bb4f84ea5a64f39ac1e16d2e486f4@vtiger.fosslabs.com> Message-ID: <085.f328ff25f0201bc9424c981137f21cca@vtiger.fosslabs.com> #1215: created a PO from contacts related list but assigned user not being populated ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed Comment: (In [6798]) Fixes #1214 and #1215 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 16:11:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 23:11:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231214=3A?= =?utf-8?q?_created_a_quote_from_contacts_related_list_but_assigned_user_n?= =?utf-8?q?ot_being_populated?= In-Reply-To: <076.d4ab1c727afb4d92c713d4866b7daba3@vtiger.fosslabs.com> References: <076.d4ab1c727afb4d92c713d4866b7daba3@vtiger.fosslabs.com> Message-ID: <085.7ae0978ad1f96eb72fe287b71392feb4@vtiger.fosslabs.com> #1214: created a quote from contacts related list but assigned user not being populated ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed Comment: (In [6798]) Fixes #1214 and #1215 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 16:11:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 30 May 2006 23:11:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6798 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060530231157.24FE57D7D8D@vtiger.fosslabs.com> Author: don Date: Tue May 30 17:11:52 2006 New Revision: 6798 Log: Fixes #1214 and #1215 Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Tue May 30 17:11:52 2006 @@ -285,7 +285,6 @@ // First, get the list of IDs. $query = 'select users.user_name,groups.groupname,contactdetails.accountid, contactdetails.contactid , potential.potentialid, potential.potentialname, potential.potentialtype, potential.sales_stage, potential.amount, potential.closingdate, crmentity.crmid, crmentity.smownerid from contactdetails inner join potential on contactdetails.accountid = potential.accountid inner join crmentity on crmentity.crmid = potential.potentialid left join potentialgrouprelation on potential.potentialid=potentialgrouprelation.potentialid left join groups on groups.groupname=potentialgrouprelation.groupname left join users on users.id=crmentity.smownerid where contactdetails.contactid = '.$id.' and crmentity.deleted=0'; - if($this->column_fields['account_id'] != 0) $log->debug("Exiting get_opportunities method ..."); return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset); @@ -316,7 +315,7 @@ $log->info("Activity Related List for Contact Displayed"); - $query = "SELECT contactdetails.lastname, contactdetails.firstname, activity.activityid , activity.subject, activity.activitytype, activity.date_start, activity.due_date, cntactivityrel.contactid, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, recurringevents.recurringtype from contactdetails inner join cntactivityrel on cntactivityrel.contactid = contactdetails.contactid inner join activity on cntactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid = cntactivityrel.activityid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where contactdetails.contactid=".$id." and crmentity.deleted = 0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') "; //recurring type is added in Query -Jaguar + $query = "SELECT users.user_name,contactdetails.lastname, contactdetails.firstname, activity.activityid , activity.subject, activity.activitytype, activity.date_start, activity.due_date, cntactivityrel.contactid, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, recurringevents.recurringtype from contactdetails inner join cntactivityrel on cntactivityrel.contactid = contactdetails.contactid inner join activity on cntactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid = cntactivityrel.activityid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where contactdetails.contactid=".$id." and crmentity.deleted = 0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') "; //recurring type is added in Query -Jaguar $log->debug("Exiting get_activities method ..."); return GetRelatedList('Contacts','Activities',$focus,$query,$button,$returnset); @@ -408,7 +407,7 @@ $button .= ' '; } $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - $query = "select crmentity.*, quotes.*,potential.potentialname,contactdetails.lastname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid left outer join contactdetails on contactdetails.contactid=quotes.contactid left outer join potential on potential.potentialid=quotes.potentialid left join quotegrouprelation on quotes.quoteid=quotegrouprelation.quoteid left join groups on groups.groupname=quotegrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; + $query = "select users.user_name,crmentity.*, quotes.*,potential.potentialname,contactdetails.lastname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid left outer join contactdetails on contactdetails.contactid=quotes.contactid left outer join potential on potential.potentialid=quotes.potentialid left join users on users.id=crmentity.smownerid left join quotegrouprelation on quotes.quoteid=quotegrouprelation.quoteid left join groups on groups.groupname=quotegrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; $log->debug("Exiting get_quotes method ..."); return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset); } @@ -429,7 +428,7 @@ } $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - $query = "select crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname, contactdetails.lastname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid left outer join contactdetails on contactdetails.contactid=salesorder.contactid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and salesorder.contactid = ".$id; + $query = "select users.user_name,crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname, contactdetails.lastname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid left join users on users.id=crmentity.smownerid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid left outer join contactdetails on contactdetails.contactid=salesorder.contactid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and salesorder.contactid = ".$id; $log->debug("Exiting get_salesorder method ..."); return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset); } @@ -472,7 +471,7 @@ } $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - $query = "select crmentity.*, purchaseorder.*,vendor.vendorname,contactdetails.lastname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left outer join contactdetails on contactdetails.contactid=purchaseorder.contactid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.contactid=".$id; + $query = "select users.user_name,crmentity.*, purchaseorder.*,vendor.vendorname,contactdetails.lastname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left outer join contactdetails on contactdetails.contactid=purchaseorder.contactid left join users on users.id=crmentity.smownerid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.contactid=".$id; $log->debug("Exiting get_purchase_orders method ..."); return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:04:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:04:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6799 - in /vtigercrm/trunk/modules/Dashboard: display_charts.php index.php Message-ID: <20060531000458.DB1A87D7D9D@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:04:53 2006 New Revision: 6799 Log: Dashboard buttons made proper - ahmed Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/index.php Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue May 30 18:04:53 2006 @@ -269,17 +269,16 @@ ?> - -
      + + + @@ -124,9 +125,9 @@ {if $maintabs eq $CATEGORY} {foreach key=number item=module from=$detail} {if $module eq $MODULE_NAME} - + {else} - + {/if} {/foreach} {/if} @@ -396,8 +397,8 @@ {/literal} {* Quick Access Functionality *} -
    -
    {$APP[$module]}{$APP[$module]} {$APP[$module]} {$APP[$module]}
    +
    +
    {assign var="parentno" value=0} Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 30 15:48:13 2006 @@ -39,59 +39,100 @@ *} + - - - -
    {$APP.$CATEGORY} > {$APP.$MODULE} - - - - - - - + + +
    - - - - - -
    -
    - - - - - - - - -
    {$APP.LBL_CALENDAR_ALT}{$APP.L
-BL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT} -
    -
    - - - + + - - + {/if} + +
    {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.$CATEGORY} > {$APP.$MODULE} + + + + + + + + + - - -
      + + + + + +
    + + + {if $CHECK.EditView eq 'yes'} + {if $MODULE eq 'Activities'} + + {else} + + {/if} + {else} + + {/if} + + {if $CHECK.index eq 'yes'} + + {else} + + {/if} + + +
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...
    +
    +
      + + + + + + + + +
    {$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT}
    +
      + + + + {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } + {if $CHECK.Import eq 'yes'} + + {else} + + {/if} + {if $CHECK.Export eq 'yes'} + + {else} + + {/if} + {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} + + {if $CHECK.Export eq 'yes'} + + + {else} + + + {/if} + {else} + - -
    {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE} {$APP.LBL_EXPORT} {$APP.$MODULE}
    -
    - - - - -
    {$APP.LBL_ALL_MENU_ALT}
    -
    -
    +
      + + + + + +
    {$APP.LBL_ALL_MENU_ALT}
    +
    +
    @@ -199,6 +240,20 @@
    {/if} + + + + + + + + +
    {$ALL_TAG}
    + + + + +
    - +  
    - - + + - - + - + + -
    > + + - + - - +
    + @@ -287,8 +286,11 @@
    <? echo $app_strings['LBL_CREATE_BUTTON_LABEL']; ?> <? echo $app_strings['Dashboard']; ?>...
    +
    +
      @@ -300,16 +302,17 @@
    +  
    <? echo $app_strings['LBL_IMPORT']; ?> <? echo $app_strings['Dashboard']; ?> <? echo $app_strings['LBL_EXPORT']; ?> <? echo $app_strings['Dashboard']; ?>
    -
    +   @@ -319,10 +322,13 @@
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    + + + Modified: vtigercrm/trunk/modules/Dashboard/index.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/index.php (original) +++ vtigercrm/trunk/modules/Dashboard/index.php Tue May 30 18:04:53 2006 @@ -57,11 +57,12 @@
    > + + - + - - +
    + @@ -69,8 +70,11 @@
    <? echo $app_strings['LBL_CREATE_BUTTON_LABEL']; ?> <? echo $app_strings['Dashboard']; ?>...
    +
    +
      @@ -82,16 +86,17 @@
    +  
    <? echo $app_strings['LBL_IMPORT']; ?> <? echo $app_strings['Dashboard']; ?> <? echo $app_strings['LBL_EXPORT']; ?> <? echo $app_strings['Dashboard']; ?>
    -
    +   From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:06:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:06:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6800 - /vtigercrm/trunk/modules/Calendar/header.php Message-ID: <20060531000649.769527D7D9D@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:06:45 2006 New Revision: 6800 Log: Calendar buttons made proper - ahmed Modified: vtigercrm/trunk/modules/Calendar/header.php Modified: vtigercrm/trunk/modules/Calendar/header.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/header.php (original) +++ vtigercrm/trunk/modules/Calendar/header.php Tue May 30 18:06:45 2006 @@ -17,21 +17,26 @@ - - - + + - - +
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    '.$app_strings["My Home Page"].' > '.$app_strings["Calendar"].' + '.$app_strings["My Home Page"].' > '.$app_strings["Calendar"].' - + +
    + - -
    +
    +
    +
      + @@ -43,17 +48,18 @@
    +   +
    {$APP.LBL_IMPORT} {$APP.$MODULE} {$APP.LBL_EXPORT} {$APP.$MODULE}
    -
    +   From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:10:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:10:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6801 - /vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Message-ID: <20060531001030.444B17D7D97@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:10:26 2006 New Revision: 6801 Log: Button list1 updated - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 30 18:10:26 2006 @@ -28,37 +28,43 @@
    {$APP.LBL_ALL_MENU_ALT}
    - - - - - -
    {$APP.$CATEGORY} > {$APP.$MODULE} - + + + +
    {$APP.$CATEGORY} > {$APP.$MODULE} + + + + + + - - + - -
    + + + - - + +
    - {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} - {if $MODULE eq 'Activities'} - - {else} - - {/if} + {if $CHECK.EditView eq 'yes'} + {if $MODULE eq 'Activities'} + + {else} + + {/if} {else} - + {/if} - + +
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...
    -
    +
    +
      + - @@ -67,10 +73,11 @@
    {$APP.LBL_CALENDAR_ALT} {$APP.LBL_CLOCK_ALT}
    -
    - + + + -
      + + {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } {if $CHECK.Import eq 'yes'} @@ -84,7 +91,7 @@ {/if} {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} - @@ -97,20 +104,19 @@ {/if} -
    {$APP.LBL_EXPORT} {$APP.$MODULE} + {if $CHECK.Export eq 'yes'} {$APP.LBL_IMPORT} {$APP.$MODULE} {$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}
    -
    +
    +
      +
    {$APP.LBL_ALL_MENU_ALT}
    -
    +
    From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:19:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:19:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6802 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060531001912.64BCF7D7D97@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:19:08 2006 New Revision: 6802 Log: Updated Header tpl for all menu button (event onclick) - ahmed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Tue May 30 18:19:08 2006 @@ -397,7 +397,7 @@ {/literal} {* Quick Access Functionality *} -
    +
    Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 30 18:38:31 2006 @@ -110,7 +110,7 @@
    From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:21:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:21:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6803 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060531002114.3CFDE7D7D97@vtiger.fosslabs.com> Author: don Date: Tue May 30 18:21:09 2006 New Revision: 6803 Log: Fixed Migration Issues Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 18:21:09 2006 @@ -68,13 +68,9 @@ } //Tables profile2globalpermissions, actionmapping creation -$create_sql1 = "CREATE TABLE `profile2globalpermissions` ( -`profileid` int(19) NOT NULL default '0', - `globalactionid` int(19) NOT NULL default '0', - `globalactionpermission` int(19) default NULL, - PRIMARY KEY (`profileid`,`globalactionid`), - CONSTRAINT `fk_profile2globalpermissions` FOREIGN KEY (`profileid`) REFERENCES `profile` (`profileid`) ON DELETE CASCADE - )"; + +$create_sql1 ="CREATE TABLE `profile2globalpermissions` (`profileid` int(19) NOT NULL, `globalactionid` int(19) NOT NULL, `globalactionpermission` int(19) default NULL, PRIMARY KEY (`profileid`,`globalactionid`), KEY `idx_profile2globalpermissions` (`profileid`,`globalactionid`)) ENGINE=InnoDB DEFAULT CHARSET=latin1"; + Execute($create_sql1); $create_sql2 = "CREATE TABLE `actionmapping` ( @@ -2831,6 +2827,8 @@ Execute($sec4); //Inserting into datashare related modules table + + Execute("insert into datashare_relatedmodules_seq values(1)"); //Lead Related Module Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)"); From vtiger-tickets at vtiger.fosslabs.com Tue May 30 17:23:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 00:23:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2368=3A_I?= =?utf-8?q?nstallation_=24host=5Fname_and_=24site=5FURL_are_wrong_in_confi?= =?utf-8?b?Zy5pbmMucGhw?= In-Reply-To: <076.5c4e73b14080d2612341b7e967fa0b2f@vtiger.fosslabs.com> References: <076.5c4e73b14080d2612341b7e967fa0b2f@vtiger.fosslabs.com> Message-ID: <085.78892d0f5a67293cd1dae6ba448ba61f@vtiger.fosslabs.com> #68: Installation $host_name and $site_URL are wrong in config.inc.php ----------------------------------+----------------------------------------- Reporter: m.jacquemes at neuf.fr | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: fixed | Keywords: ----------------------------------+----------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [6804]) $host_name doesn't appear to be used anywhere, removing from configureation. Closes #68. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:23:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:23:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6804 - in /vtigercrm/branches/4.2.4: config.inc.php config.template.php install/2setConfig.php Message-ID: <20060531002336.4CCF67D7DA7@vtiger.fosslabs.com> Author: allanbush Date: Tue May 30 18:23:33 2006 New Revision: 6804 Log: $host_name doesn't appear to be used anywhere, removing from configureation. Closes #68. Modified: vtigercrm/branches/4.2.4/config.inc.php vtigercrm/branches/4.2.4/config.template.php vtigercrm/branches/4.2.4/install/2setConfig.php Modified: vtigercrm/branches/4.2.4/config.inc.php ============================================================================== --- vtigercrm/branches/4.2.4/config.inc.php (original) +++ vtigercrm/branches/4.2.4/config.inc.php Tue May 30 18:23:33 2006 @@ -31,7 +31,6 @@ //$dbconfig['db_password'] = ''; //$dbconfig['db_name'] = 'vtigercrm'; -//$host_name = ''; //$site_URL = ''; //$root_directory = ''; Modified: vtigercrm/branches/4.2.4/config.template.php ============================================================================== --- vtigercrm/branches/4.2.4/config.template.php (original) +++ vtigercrm/branches/4.2.4/config.template.php Tue May 30 18:23:33 2006 @@ -73,8 +73,6 @@ // ssl default value = false $dbconfigoption['ssl'] = false; - -$host_name = $dbconfig['db_hostname']; $site_URL = '_SITE_URL_'; Modified: vtigercrm/branches/4.2.4/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2.4/install/2setConfig.php (original) +++ vtigercrm/branches/4.2.4/install/2setConfig.php Tue May 30 18:23:33 2006 @@ -112,9 +112,6 @@ !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; - if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; - else $host_name = $hostname; - if (isset($_REQUEST['site_URL'])) $site_URL = $_REQUEST['site_URL']; else $site_URL = $web_root; @@ -150,7 +147,6 @@ */ !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm4_2_4" : $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']); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:25:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:25:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6805 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060531002534.3974A7D7D97@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:25:30 2006 New Revision: 6805 Log: Homepage tpl updated - ahmed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 30 18:25:30 2006 @@ -48,7 +48,7 @@ - + + + + + + + -
    - -
      From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:32:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:32:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6806 - in /vtigercrm/trunk: Smarty/templates/RelatedLists.tpl modules/uploads/add2db.php modules/uploads/language/en_us.lang.php modules/uploads/upload.php Message-ID: <20060531003249.EA2EC7D7D97@vtiger.fosslabs.com> Author: don Date: Tue May 30 18:32:43 2006 New Revision: 6806 Log: New UI for attachments has been integrated Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl vtigercrm/trunk/modules/uploads/add2db.php vtigercrm/trunk/modules/uploads/language/en_us.lang.php vtigercrm/trunk/modules/uploads/upload.php Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Tue May 30 18:32:43 2006 @@ -114,7 +114,7 @@ {elseif $header eq 'Attachments'}   - + {elseif $header eq 'Quotes'} @@ -216,3 +216,9 @@
    {/if} + Modified: vtigercrm/trunk/modules/uploads/add2db.php ============================================================================== --- vtigercrm/trunk/modules/uploads/add2db.php (original) +++ vtigercrm/trunk/modules/uploads/add2db.php Tue May 30 18:32:43 2006 @@ -27,10 +27,8 @@ $uploaddir = $directory; $crmid = $_REQUEST['return_id']; -for ($filecount=0;$filecountquery($sql1); - header("Location: index.php?action=".$_REQUEST['return_action']."&module=".$_REQUEST['return_module']."&record=".$_REQUEST['return_id']."&filename=".$filename.""); + echo ''; } else { - include('themes/'.$theme.'/header.php'); $errormessage = "Error Message
    • Invalid file OR
    • File has no data @@ -92,7 +89,6 @@ if($errorCode == 4) { - include('themes/'.$theme.'/header.php'); $errormessage = "Kindly give a valid file for upload!
      " ; echo $errormessage; include "upload.php"; @@ -100,19 +96,16 @@ else if($errorCode == 2) { $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 1000000 bytes
      "; - include('themes/'.$theme.'/header.php'); echo $errormessage; include "upload.php"; //echo $errorCode; } else if($errorCode == 3 || $errorcode == '') { - include('themes/'.$theme.'/header.php'); echo "Problems in file upload. Please try again!
      "; include "upload.php"; } } -} ?> Modified: vtigercrm/trunk/modules/uploads/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/uploads/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/uploads/language/en_us.lang.php Tue May 30 18:32:43 2006 @@ -23,10 +23,11 @@ $mod_strings = Array( //Added fields for uploads (attach files) -'LBL_DESCRIPTION'=>'Description:', -'LBL_FILENAME'=>'File Name:', -'LBL_ATTACH_FILE'=>'File Attachment', -'LBL_UPLOAD'=>'Upload', +'LBL_ATTACH_FILE'=>'Attach File', +'LBL_STEP_SELECT_FILE'=>'Step 1 : Select File', +'LBL_BROWSE_FILES'=>'Click the browse button and select the file to be attached', +'LBL_DESCRIPTION'=>'Step 2 : Write some description', +'LBL_OPTIONAL'=>'(optional)', ); ?> Modified: vtigercrm/trunk/modules/uploads/upload.php ============================================================================== --- vtigercrm/trunk/modules/uploads/upload.php (original) +++ vtigercrm/trunk/modules/uploads/upload.php Tue May 30 18:32:43 2006 @@ -8,73 +8,57 @@ * ********************************************************************************/ --> + + + + - -
      + -
      *
      +
    + + + -
     
    - - - - - - -
    - - - - + + + + + + - - - - - - -
    -
    *
    -
    - -
    Files Maximum 6 - - - +


    + +
    -
    -
    -
    +
     
     
    - - - + + + +
    +   + +
     
    From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:33:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:33:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6807 - /vtigercrm/trunk/modules/uploads/uploadsAjax.php Message-ID: <20060531003321.EB9EA7D7D97@vtiger.fosslabs.com> Author: don Date: Tue May 30 18:33:17 2006 New Revision: 6807 Log: New UI for attachments has been integrated Added: vtigercrm/trunk/modules/uploads/uploadsAjax.php From vtiger-tickets at vtiger.fosslabs.com Tue May 30 17:33:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 00:33:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231088=3A?= =?utf-8?q?_Issue_in_Custom_view=2C_Reports=2C_Dashboard_Security_Implemen?= =?utf-8?q?tation?= In-Reply-To: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com> References: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com> Message-ID: <085.59f36bdb6d8d0b68af3f1db01fc8803b@vtiger.fosslabs.com> #1088: Issue in Custom view, Reports, Dashboard Security Implementation ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * priority: blocker => critical * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 17:34:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 00:34:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23195=3A_?= =?utf-8?q?edit_picklist?= In-Reply-To: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> References: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> Message-ID: <085.20ff6a7b6aa26223ae86cd0fed932cb5@vtiger.fosslabs.com> #195: edit picklist ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * priority: blocker => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 17:37:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 00:37:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23757=3A_?= =?utf-8?q?Update_to_new_adodb-4=2E81_release?= In-Reply-To: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> References: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> Message-ID: <085.2d08fff9d448a032734092ea15379327@vtiger.fosslabs.com> #757: Update to new adodb-4.81 release ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: adodb database package ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * milestone: 4.2.4 => 5.0.0 * version: 4.2.4rc3 => 5.0.0 * status: reopened => closed Comment: This isn't going to happen for 4.2.4, and it's been done on all the other branches. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 17:38:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 00:38:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2331=3A_L?= =?utf-8?q?og_File_is_Not_Readable_on_Hosted_Server?= In-Reply-To: <076.9666e0579b8ace0baa3be4064a54cc5b@vtiger.fosslabs.com> References: <076.9666e0579b8ace0baa3be4064a54cc5b@vtiger.fosslabs.com> Message-ID: <085.0ba4217c753cdac59d59f571279bd412@vtiger.fosslabs.com> #31: Log File is Not Readable on Hosted Server ------------------------+--------------------------------------------------- Reporter: briand | Owner: mfedyk Type: defect | Status: closed Priority: minor | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: log read ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [6809]) Added patch from #31, closes #31. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:38:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:38:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6809 - in /vtigercrm/branches/4.2.4: config.inc.php config.template.php log4php/appenders/LoggerAppenderFile.php Message-ID: <20060531003839.97D117D7DB3@vtiger.fosslabs.com> Author: allanbush Date: Tue May 30 18:38:36 2006 New Revision: 6809 Log: Added patch from #31, closes #31. Modified: vtigercrm/branches/4.2.4/config.inc.php vtigercrm/branches/4.2.4/config.template.php vtigercrm/branches/4.2.4/log4php/appenders/LoggerAppenderFile.php Modified: vtigercrm/branches/4.2.4/config.inc.php ============================================================================== --- vtigercrm/branches/4.2.4/config.inc.php (original) +++ vtigercrm/branches/4.2.4/config.inc.php Tue May 30 18:38:36 2006 @@ -67,4 +67,12 @@ // this is for site specific special instructions $login_message = 'Please login to the application.'; +// access level for vtiger log files +// set to 1, the vtiger.log will be readable by the owner (chmod: 0600) +// set to 0, the vtiger.log will not be readable remotely (chmod: 0200) + +// 0 is recommended for security. +// You may need to set it to 1 to read it for certain hosted accounts. +$log_readable = 0; + ?> Modified: vtigercrm/branches/4.2.4/config.template.php ============================================================================== --- vtigercrm/branches/4.2.4/config.template.php (original) +++ vtigercrm/branches/4.2.4/config.template.php Tue May 30 18:38:36 2006 @@ -176,4 +176,12 @@ // translation_string_prefix default value = false $translation_string_prefix = false; +// access level for vtiger log files +// set to 1, the vtiger.log will be readable by the owner (chmod: 0600) +// set to 0, the vtiger.log will not be readable remotely (chmod: 0200) + +// 0 is recommended for security. +// You may need to set it to 1 to read it for certain hosted accounts. +$log_readable = 0; + ?> Modified: vtigercrm/branches/4.2.4/log4php/appenders/LoggerAppenderFile.php ============================================================================== --- vtigercrm/branches/4.2.4/log4php/appenders/LoggerAppenderFile.php (original) +++ vtigercrm/branches/4.2.4/log4php/appenders/LoggerAppenderFile.php Tue May 30 18:38:36 2006 @@ -26,6 +26,12 @@ require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); require_once(LOG4PHP_DIR . '/LoggerLog.php'); +if (!defined('ROOT_DIR')) define('ROOT_DIR', LOG4PHP_DIR . '/..'); +if (!defined('LOG_READ')) +{ + include(ROOT_DIR . '/config.php'); + define('LOG_READ', $log_readable); +} /** * FileAppender appends log events to a file. * @@ -77,7 +83,8 @@ $this->fp = @fopen($fileName, ($this->getAppend()? 'a':'w')); // Denying read option for log file. Added for Vulnerability fix - if (is_readable($fileName)) chmod ($fileName,0200); + if (is_readable($fileName) and (LOG_READ == 0)) chmod ($fileName,0200); + if (!is_readable($fileName) and (LOG_READ == 1)) chmod ($fileName,0600); if ($this->fp) { if ($this->getAppend()) From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:38:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:38:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6808 - in /vtigercrm/trunk: Smarty/templates/Buttons_List.tpl Smarty/templates/Buttons_List1.tpl Smarty/templates/HomePage.tpl modules/Calendar/header.php modules/Dashboard/display_charts.php modules/Dashboard/index.php Message-ID: <20060531003839.418477D7D97@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:38:31 2006 New Revision: 6808 Log: Updated tpl files - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl vtigercrm/trunk/Smarty/templates/HomePage.tpl vtigercrm/trunk/modules/Calendar/header.php vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/index.php Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue May 30 18:38:31 2006 @@ -114,7 +114,7 @@ - +
    {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_ALL_MENU_ALT}
    - +
    {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_ALL_MENU_ALT}
    - +
    {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_ALL_MENU_ALT}
    - +
    {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_ALL_MENU_ALT}
    - +
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?><? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    - +
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?><? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    4.2.3 Release Date:   (Current version)4.2.4 Release Date:   (Current version)
    4.2 Release Date:  18-7-20054.2.3 Release Date:  23 December 2005
    4.2.0 Release Date:  18 July 2005
    4.0.1 Release Date:  04-29-2005 29 April 2005
    4.0 Release Date:  03-29-20054.0.0 Release Date:  29 March 2005
    3.2 Release Date:  12-13-20043.2.0 Release Date:  13 December 2004
    - Modified: vtigercrm/branches/4.2.4/themes/Aqua/header.html ============================================================================== --- vtigercrm/branches/4.2.4/themes/Aqua/header.html (original) +++ vtigercrm/branches/4.2.4/themes/Aqua/header.html Tue May 30 19:13:27 2006 @@ -46,7 +46,7 @@ Modified: vtigercrm/branches/4.2.4/themes/blue/header.html ============================================================================== --- vtigercrm/branches/4.2.4/themes/blue/header.html (original) +++ vtigercrm/branches/4.2.4/themes/blue/header.html Tue May 30 19:13:27 2006 @@ -49,7 +49,7 @@ Modified: vtigercrm/branches/4.2.4/themes/nature/header.html ============================================================================== --- vtigercrm/branches/4.2.4/themes/nature/header.html (original) +++ vtigercrm/branches/4.2.4/themes/nature/header.html Tue May 30 19:13:27 2006 @@ -45,7 +45,7 @@ Modified: vtigercrm/branches/4.2.4/themes/orange/header.html ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/4.2.4/vtigerversion.php ============================================================================== --- vtigercrm/branches/4.2.4/vtigerversion.php (original) +++ vtigercrm/branches/4.2.4/vtigerversion.php Tue May 30 19:13:27 2006 @@ -11,6 +11,6 @@ $patch_version = ''; $modified_database = ''; -$vtiger_version = '4.2.3'; -$release_date = '23 December 2005'; +$vtiger_version = '4.2.4'; +$release_date = '1 June 2006'; ?> From vtiger-tickets at vtiger.fosslabs.com Tue May 30 18:13:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 01:13:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2352=3A_V?= =?utf-8?q?ersion_4=2E2=2E4_Updates?= In-Reply-To: <076.21057f15b1e83e134121e50411e2e24e@vtiger.fosslabs.com> References: <076.21057f15b1e83e134121e50411e2e24e@vtiger.fosslabs.com> Message-ID: <085.7621234e6432bd1de4f42402ab47a6f8@vtiger.fosslabs.com> #52: Version 4.2.4 Updates ------------------------+--------------------------------------------------- Reporter: briand | Owner: mfedyk Type: defect | Status: closed Priority: minor | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: fixed | Keywords: version 4.2.4 tags ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [6810]) Changes for 4.2.4 release as per #52. Added a few extra changes to the changelog that occured since that ticket was made. Closes #52. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 18:18:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 01:18:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6811 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060531011856.10D497D7D85@vtiger.fosslabs.com> Author: don Date: Tue May 30 19:18:52 2006 New Revision: 6811 Log: Fixed Migration issues Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 19:18:52 2006 @@ -2330,9 +2330,9 @@ "ALTER TABLE `mail_accounts` MODIFY COLUMN `user_id` INTEGER(11) NOT NULL", "ALTER TABLE `mail_accounts` ADD COLUMN `box_refresh` INTEGER(10) DEFAULT NULL", "ALTER TABLE `mail_accounts` ADD COLUMN `mails_per_page` INTEGER(10) DEFAULT NULL", -"ALTER TABLE `mail_accounts` ADD COLUMN `ssltype` VARCHAR(50) COLLATE latin1_swedish_ci DEFAULT NULL", -"ALTER TABLE `mail_accounts` ADD COLUMN `sslmeth` VARCHAR(50) COLLATE latin1_swedish_ci DEFAULT NULL", -"ALTER TABLE `mail_accounts` ADD COLUMN `showbody` VARCHAR(10) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `ssltype` VARCHAR(50) DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `sslmeth` VARCHAR(50) DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `showbody` VARCHAR(10) DEFAULT NULL", "ALTER TABLE `notes` MODIFY COLUMN `contact_id` INTEGER(19) DEFAULT '0'", "ALTER TABLE `notes` MODIFY COLUMN `notecontent` TEXT COLLATE latin1_swedish_ci", "ALTER TABLE `notificationscheduler` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci", @@ -2856,6 +2856,14 @@ //By Don Ends +//Added the tabel mail_accounts which has been added by mmbrich +$alter_query18 = "alter table mail_accounts add column int_mailer int(1) default '0'"; +Execute($alter_query18); + + + + + //Added to get the conversion rate and update for all records //include("modules/Migration/ModifyDatabase/updateCurrency.php"); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 18:25:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 01:25:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6812 - in /vtigercrm/trunk: Smarty/templates/ReportsStep0.tpl modules/Reports/Report.js modules/Reports/language/en_us.lang.php Message-ID: <20060531012502.90EDA7D7DC5@vtiger.fosslabs.com> Author: don Date: Tue May 30 19:24:55 2006 New Revision: 6812 Log: issue in report has been fixed Modified: vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl vtigercrm/trunk/modules/Reports/Report.js vtigercrm/trunk/modules/Reports/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl Tue May 30 19:24:55 2006 @@ -84,7 +84,7 @@
    {$MOD} : {$MOD.LBL_NEW_REP0_HDR2}   -   +  
    -
    +
    {$MOD.LBL_USERS} {$MOD.LBL_ROLES} {$MOD.LBL_PROFILES} @@ -44,10 +44,10 @@
    - From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:47:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 03:47:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6814 - /vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Message-ID: <20060531034708.93B847D7DB3@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 21:47:05 2006 New Revision: 6814 Log: edit field block link has been disabled Modified: vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Tue May 30 21:47:05 2006 @@ -106,7 +106,7 @@
    -
    + From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 21:28:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 04:28:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6815 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060531042858.C76197D7DD9@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 22:28:49 2006 New Revision: 6815 Log: due date value added Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Tue May 30 22:28:49 2006 @@ -104,6 +104,7 @@ document.appSave.activitytype[1].checked = true; document.appSave.date_start.value = startdate; + document.appSave.due_date.value = enddate; document.appSave.starthr.value = starthr; document.appSave.startmin.value = startmin; document.appSave.startfmt.value = startfmt; From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 21:48:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 04:48:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6816 - in /vtigercrm/trunk: Smarty/templates/AddMailAccount.tpl modules/Settings/language/en_us.lang.php Message-ID: <20060531044812.3F2617D7DF3@vtiger.fosslabs.com> Author: mmbrich Date: Tue May 30 22:48:09 2006 New Revision: 6816 Log: separate required and unsupported markers in the webmail settings page Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl vtigercrm/trunk/modules/Settings/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Tue May 30 22:48:09 2006 @@ -101,8 +101,8 @@ {$MOD.LBL_MAIL_PROTOCOL} -  {$MOD.LBL_POP} *  -  {$MOD.LBL_IMAP} *  +  {$MOD.LBL_POP} * *  +  {$MOD.LBL_IMAP} * *   {$MOD.LBL_IMAP2}  {$MOD.LBL_IMAP4} Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue May 30 22:48:09 2006 @@ -484,7 +484,7 @@ 'LBL_IMAP4'=>'IMAP4', 'LBL_POP'=>'POP', 'LBL_IMAP'=>'IMAP', -'LBL_MAIL_DISCLAIM'=>' Items marked with a * are not fully supported', +'LBL_MAIL_DISCLAIM'=>'Items marked with * are required
    Items marked with * * are not fully supported', 'LBL_SSL_OPTIONS'=>'SSL Options', 'LBL_TLS'=>'TLS', 'LBL_NO_TLS'=>'No TLS', From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 22:57:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 05:57:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6817 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060531055737.A72A07D56DA@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 23:57:33 2006 New Revision: 6817 Log: changed query for word plugin Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Tue May 30 23:57:33 2006 @@ -551,7 +551,7 @@ { global $log; $log->debug("Entering getColumnNames() method ..."); - $sql1 = "select fieldlabel from field where tabid=4 and block <> 4"; + $sql1 = "select fieldlabel from field where tabid=4 and block <> 6 and block <> 75"; $result = $this->db->query($sql1); $numRows = $this->db->num_rows($result); for($i=0; $i < $numRows;$i++) From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 23:06:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 06:06:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6818 - /vtigercrm/trunk/modules/Contacts/Merge.php Message-ID: <20060531060622.ECD0A7D7A1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 00:06:19 2006 New Revision: 6818 Log: * modified for 5.0 beta Modified: vtigercrm/trunk/modules/Contacts/Merge.php Modified: vtigercrm/trunk/modules/Contacts/Merge.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Merge.php (original) +++ vtigercrm/trunk/modules/Contacts/Merge.php Wed May 31 00:06:19 2006 @@ -77,7 +77,7 @@ } //<<<<<<<<<<<<<<<
    >>>>>>>>>>>>>>>>>>>>>>> -$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 4 order by field.tablename"; +$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 6 and field.block <> 75 order by field.tablename"; $result = $adb->query($query1); $y=$adb->num_rows($result); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 23:12:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 06:12:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6819 - /vtigercrm/trunk/modules/Accounts/Merge.php Message-ID: <20060531061252.1853E7D7DF3@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 00:12:48 2006 New Revision: 6819 Log: * modified for 5.0 beta Modified: vtigercrm/trunk/modules/Accounts/Merge.php Modified: vtigercrm/trunk/modules/Accounts/Merge.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Merge.php (original) +++ vtigercrm/trunk/modules/Accounts/Merge.php Wed May 31 00:12:48 2006 @@ -93,7 +93,7 @@ //End setting accountid=0 for the contacts which are deleted //<<<<<<<<<<<<<<<
    >>>>>>>>>>>>>>>>>>>>>>> -$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 4 order by field.tablename"; +$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 6 and field.block <> 75 order by field.tablename"; $result = $adb->query($query1); $y=$adb->num_rows($result); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 23:14:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 06:14:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6820 - /vtigercrm/trunk/modules/HelpDesk/Merge.php Message-ID: <20060531061433.B9DDB7D7DF3@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 00:14:30 2006 New Revision: 6820 Log: modified for 5.0 beta Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/Merge.php (original) +++ vtigercrm/trunk/modules/HelpDesk/Merge.php Wed May 31 00:14:30 2006 @@ -71,7 +71,7 @@ } //<<<<<<<<<<<<<<<
    >>>>>>>>>>>>>>>>>>>>>>> -$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (13,4,6) and field.uitype <> 61 and (field.tablename <>'CustomerDetails' and block <> 6) and block <> 30 order by field.tablename"; +$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (13,4,6) and field.uitype <> 61 and (field.tablename <>'CustomerDetails' and block <> 6 and block <> 75) and block <> 30 order by field.tablename"; $result = $adb->query($query1); $y=$adb->num_rows($result); From vtiger-tickets at vtiger.fosslabs.com Tue May 30 23:21:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 06:21:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231179=3A?= =?utf-8?q?_Activity_Delete_issue?= In-Reply-To: <076.a2c2c663ffa4fa41b8ffbe8acd39e028@vtiger.fosslabs.com> References: <076.a2c2c663ffa4fa41b8ffbe8acd39e028@vtiger.fosslabs.com> Message-ID: <085.b725c549dc4835664ec55297b17d1ffd@vtiger.fosslabs.com> #1179: Activity Delete issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 23:21:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 06:21:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231107=3A?= =?utf-8?q?_Error_In_calendar?= In-Reply-To: <076.924adee6499b40eb86dddcd6dc28fd0e@vtiger.fosslabs.com> References: <076.924adee6499b40eb86dddcd6dc28fd0e@vtiger.fosslabs.com> Message-ID: <085.11e83eb379c7b107acaccfeec973646b@vtiger.fosslabs.com> #1107: Error In calendar ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 23:21:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 06:21:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231103=3A?= =?utf-8?q?_Change_Owner_not_working_for_Events_in_Calendar?= In-Reply-To: <076.456354da9a057d9c87ee8cd8dca6b107@vtiger.fosslabs.com> References: <076.456354da9a057d9c87ee8cd8dca6b107@vtiger.fosslabs.com> Message-ID: <085.d83260521f94ad4e04ebefbf28840ea8@vtiger.fosslabs.com> #1103: Change Owner not working for Events in Calendar ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 23:26:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 06:26:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6821 - /vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas Message-ID: <20060531062624.8080C7D7E05@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 00:26:21 2006 New Revision: 6821 Log: * removed message box Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 23:44:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 06:44:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6822 - /vtigercrm/trunk/modules/Emails/Email.php Message-ID: <20060531064456.B20777D7E1B@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 00:44:52 2006 New Revision: 6822 Log: * modified for outlook plugin Modified: vtigercrm/trunk/modules/Emails/Email.php Modified: vtigercrm/trunk/modules/Emails/Email.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Email.php (original) +++ vtigercrm/trunk/modules/Emails/Email.php Wed May 31 00:44:52 2006 @@ -45,6 +45,10 @@ var $date_start; var $time_start; var $module_id="emailid"; + + var $rel_users_table = "salesmanactivityrel"; + var $rel_contacts_table = "cntactivityrel"; + var $rel_serel_table = "seactivityrel"; var $table_name = "activity"; var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel','attachments'); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 00:10:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:10:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6823 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060531071016.2CD9B7D7E09@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 01:10:12 2006 New Revision: 6823 Log: changes made to fix validation issue in calendar events Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Wed May 31 01:10:12 2006 @@ -204,7 +204,10 @@ { if(startformat == 'pm') { - starthour = eval(starthour) + 12; + if(starthour == '12') + starthour = 12; + else + starthour = eval(starthour) + 12; startmin = startmin; } else @@ -217,7 +220,10 @@ { if(endformat == 'pm') { - endhour = eval(endhour) + 12; + if(endhour == '12') + endhour = 12; + else + endhour = eval(endhour) + 12; endmin = endmin; } else @@ -226,13 +232,17 @@ endmin = endmin; } } - if((eval(endhour)*60+eval(endmin)) < (eval(starthour)*60+eval(startmin))) - { - alert("End Time should be greater than Start Time "); - document.appSave.endhr.focus(); - return false; - } - + if(dateComparison('due_date','End date','date_start','Start date','GE')) + { + if((eval(endhour)*60+eval(endmin)) < (eval(starthour)*60+eval(startmin))) + { + alert("End Time should be greater than Start Time "); + document.appSave.endhr.focus(); + return false; + } + } + else + return false; durationinmin = (eval(endhour)*60+eval(endmin)) - (eval(starthour)*60+eval(startmin)); if(durationinmin >= 60) { From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 00:10:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:10:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6824 - /vtigercrm/trunk/modules/Calendar/addEventUI.php Message-ID: <20060531071048.8BAC47D7E21@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 01:10:45 2006 New Revision: 6824 Log: changes made to include label Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Wed May 31 01:10:45 2006 @@ -352,7 +352,7 @@ - hours + hrs + minutes  From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 00:26:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:26:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6825 - in /vtigercrm/trunk/modules/Webmails: ListView.php MailParse.php Message-ID: <20060531072618.724737D7E26@vtiger.fosslabs.com> Author: mmbrich Date: Wed May 31 01:26:16 2006 New Revision: 6825 Log: check for IMAP and SSL support and either error out or handle connections different Modified: vtigercrm/trunk/modules/Webmails/ListView.php vtigercrm/trunk/modules/Webmails/MailParse.php Modified: vtigercrm/trunk/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/ListView.php (original) +++ vtigercrm/trunk/modules/Webmails/ListView.php Wed May 31 01:26:16 2006 @@ -12,7 +12,7 @@ if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} if($_REQUEST["start"] && $_REQUEST["start"] != "") {$start=$_REQUEST["start"];} else {$start="1";} -global $current_user; +global $current_user,$mods; require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); @@ -21,8 +21,10 @@ require_once('include/utils/UserInfoUtil.php'); require_once("modules/Webmails/MailParse.php"); +$mods = parsePHPModules(); $mailInfo = getMailServerInfo($current_user); -if($adb->num_rows($mailInfo) < 1) { + +if($adb->num_rows($mailInfo) < 1 || !isset($mods["imap"]) || $mods["imap"] == "") { echo "

    Please configure your mail settings

    "; exit(); } Modified: vtigercrm/trunk/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/MailParse.php (original) +++ vtigercrm/trunk/modules/Webmails/MailParse.php Wed May 31 01:26:16 2006 @@ -21,7 +21,7 @@ return (strlen($_tmp) % 4 == 0 ) ? "y" : "n"; } function getImapMbox($mailbox,$temprow,$readonly='') { - global $mbox; + global $mbox,$mods; $login_username= $temprow["mail_username"]; $secretkey=$temprow["mail_password"]; $imapServerAddress=$temprow["mail_servername"]; @@ -33,10 +33,18 @@ // first we will try a regular old IMAP connection: if($ssltype == "") {$ssltype = "notls";} if($sslmeth == "") {$sslmeth = "novalidate-cert";} - if($readonly == "true") + + if($readonly == "true") { + if($mods["imap"]["SSL Support"] == "enabled") $mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."/readonly}".$mailbox, $login_username, $secretkey); - else + else + $mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/readonly}".$mailbox, $login_username, $secretkey); + } else { + if($mods["imap"]["SSL Support"] == "enabled") $mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey); + else + $mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."}".$mailbox, $login_username, $secretkey); + } // next we'll try to make a port specific connection to see if that helps. // this may need to be updated to remove SSL/TLS since the c-client libs @@ -44,14 +52,21 @@ if(!$mbox) { if($mail_protocol == 'pop3') { if($readonly == "true") - $connectString = "{".$imapServerAddress."/".$mail_protocol.":110/".$ssltype."/readonly}".$mailbox; + $connectString = "{".$imapServerAddress."/".$mail_protocol.":110/readonly}".$mailbox; else - $connectString = "{".$imapServerAddress."/".$mail_protocol.":110/".$ssltype."}".$mailbox; + $connectString = "{".$imapServerAddress."/".$mail_protocol.":110/}".$mailbox; } else { - if($readonly == "true") - $connectString = "{".$imapServerAddress.":143/".$mail_protocol."/".$ssltype."/readonly}".$mailbox; - else - $connectString = "{".$imapServerAddress.":143/".$mail_protocol."/".$ssltype."}".$mailbox; + if($readonly == "true") { + if($mods["imap"]["SSL Support"] == "enabled") + $connectString = "{".$imapServerAddress.":143/".$mail_protocol."/".$ssltype."/".$sslmeth."/readonly}".$mailbox; + else + $connectString = "{".$imapServerAddress.":143/".$mail_protocol."/}".$mailbox; + } else { + if($mods["imap"]["SSL Support"] == "enabled") + $connectString = "{".$imapServerAddress.":143/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox; + else + $connectString = "{".$imapServerAddress.":143/".$mail_protocol."}".$mailbox; + } } $mbox = imap_open($connectString, $login_username, $secretkey) or die("Connection to server failed ".imap_last_error()); } @@ -103,4 +118,33 @@ } return false; } +function parsePHPModules() { + ob_start(); + phpinfo(INFO_MODULES); + $s = ob_get_contents(); + ob_end_clean(); + + $s = strip_tags($s,'

    '); + $s = preg_replace('/]*>([^<]+)<\/th>/',"\\1",$s); + $s = preg_replace('/]*>([^<]+)<\/td>/',"\\1",$s); + $vTmp = preg_split('/(

    [^<]+<\/h2>)/',$s,-1,PREG_SPLIT_DELIM_CAPTURE); + $vModules = array(); + for ($i=1;$i([^<]+)<\/h2>/',$vTmp[$i],$vMat)) { + $vName = trim($vMat[1]); + $vTmp2 = explode("\n",$vTmp[$i+1]); + foreach ($vTmp2 AS $vOne) { + $vPat = '([^<]+)<\/info>'; + $vPat3 = "/$vPat\s*$vPat\s*$vPat/"; + $vPat2 = "/$vPat\s*$vPat/"; + if (preg_match($vPat3,$vOne,$vMat)) { // 3cols + $vModules[$vName][trim($vMat[1])] = array(trim($vMat[2]),trim($vMat[3])); + } elseif (preg_match($vPat2,$vOne,$vMat)) { // 2cols + $vModules[$vName][trim($vMat[1])] = trim($vMat[2]); + } + } + } + } + return $vModules; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 00:28:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:28:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6826 - in /vtigercrm/trunk/modules/Webmails: ListView.php MailParse.php Message-ID: <20060531072841.9335C7D7E1B@vtiger.fosslabs.com> Author: mmbrich Date: Wed May 31 01:28:40 2006 New Revision: 6826 Log: call function locally since we'll have to @ each load anyways Modified: vtigercrm/trunk/modules/Webmails/ListView.php vtigercrm/trunk/modules/Webmails/MailParse.php Modified: vtigercrm/trunk/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/ListView.php (original) +++ vtigercrm/trunk/modules/Webmails/ListView.php Wed May 31 01:28:40 2006 @@ -12,7 +12,7 @@ if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} if($_REQUEST["start"] && $_REQUEST["start"] != "") {$start=$_REQUEST["start"];} else {$start="1";} -global $current_user,$mods; +global $current_user; require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); Modified: vtigercrm/trunk/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/MailParse.php (original) +++ vtigercrm/trunk/modules/Webmails/MailParse.php Wed May 31 01:28:40 2006 @@ -21,14 +21,15 @@ return (strlen($_tmp) % 4 == 0 ) ? "y" : "n"; } function getImapMbox($mailbox,$temprow,$readonly='') { - global $mbox,$mods; + global $mbox; $login_username= $temprow["mail_username"]; $secretkey=$temprow["mail_password"]; $imapServerAddress=$temprow["mail_servername"]; $mail_protocol=$temprow["mail_protocol"]; $ssltype=$temprow["ssltype"]; $sslmeth=$temprow["sslmeth"]; - + + $mods = parsePHPModules() // first we will try a regular old IMAP connection: if($ssltype == "") {$ssltype = "notls";} From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 00:29:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:29:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6827 - /vtigercrm/trunk/modules/Webmails/MailParse.php Message-ID: <20060531072916.3F39E7D779C@vtiger.fosslabs.com> Author: mmbrich Date: Wed May 31 01:29:15 2006 New Revision: 6827 Log: typo Modified: vtigercrm/trunk/modules/Webmails/MailParse.php Modified: vtigercrm/trunk/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/MailParse.php (original) +++ vtigercrm/trunk/modules/Webmails/MailParse.php Wed May 31 01:29:15 2006 @@ -29,7 +29,7 @@ $ssltype=$temprow["ssltype"]; $sslmeth=$temprow["sslmeth"]; - $mods = parsePHPModules() + $mods = parsePHPModules(); // first we will try a regular old IMAP connection: if($ssltype == "") {$ssltype = "notls";} From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 00:52:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:52:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6828 - /vtigercrm/trunk/modules/Webmails/webmails.js Message-ID: <20060531075239.C8A9D7D4899@vtiger.fosslabs.com> Author: mmbrich Date: Wed May 31 01:52:38 2006 New Revision: 6828 Log: some notes for myself or other developers venturing into this file Modified: vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Wed May 31 01:52:38 2006 @@ -55,10 +55,14 @@ window.open(url,"Download Attachments",'menubar=no,toolbar=no,location=no,status=no,resizable=no,width=450,height=450'); } function showRelationships(mid) { - // just add to vtiger for now + // TODO: present the user with a simple DHTML div to + // choose what type of relationship they would like to create + // before creating it. add_to_vtiger(mid); } function add_to_vtiger(mid) { + // TODO: update this function to allow you to set what entity type + // you would like to associate to $("status").style.display="block"; new Ajax.Request( 'index.php', @@ -81,6 +85,8 @@ } } function check_in_all_boxes(mymbox) { + // TODO: There is possibly still a bug in the mailbox counting code + // check for NaN new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, @@ -121,6 +127,8 @@ onComplete: function(t) { //alert(t.responseText); try { + // TODO: replace this at some point with prototype JSON + // tools var data = eval('(' + t.responseText + ')'); var read = parseInt($(mailbox+"_read").innerHTML); $(mailbox+"_read").innerHTML = (read+data.mails.length); @@ -228,6 +236,7 @@ ); tr.appendChild(del); + // TODO: this is ugly, replace using prototype child walker tools tr.style.display='none'; var tels = $("message_table").childNodes[1].childNodes; for(var j=0;j"; $("ndeleted_date_"+id).innerHTML = ""+$("ndeleted_date_"+id).innerHTML+""; @@ -403,6 +417,8 @@ function changeMbox(box) { location.href = "index.php?module=Webmails&action=index&mailbox="+box; } +// TODO: these two functions should be tied into a mailbox management panel of some kind. +// could be a DHTML div with AJAX calls to execute the commands on the mailbox. function show_addfolder() { var fldr = $("folderOpts"); if(fldr.style.display == 'none') From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 01:22:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 08:22:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6829 - /vtigercrm/trunk/modules/Webmails/webmails.js Message-ID: <20060531082238.9F2504C4A11@vtiger.fosslabs.com> Author: mmbrich Date: Wed May 31 02:22:36 2006 New Revision: 6829 Log: double nested function, may cause issues in IE, see function notes on reasoning Modified: vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Wed May 31 02:22:36 2006 @@ -263,15 +263,25 @@ window.setTimeout("periodic_event()",box_refresh); } function show_hidden() { - $("status").style.display="block"; + // prototype uses enumerable lists to queue events for execution. + // because of this, this function executes and returns imediately and + // the status spinner is never seen. The status spinner below is a hack + // and doesn't even attempt to pretend like it knows the event is finished. + // this cannot be fixed with the scriptaculous beforeStart and afterFinish + // event hooks for some reason, maybe because the event duration is too quick? + window.setTimeout(function() { + $("status").style.display="block"; + window.setTimeout(function() { + $("status").style.display="none"; + },2000); + },0); var els = document.getElementsByClassName("deletedRow"); for(var i=0;i Author: saraj Date: Wed May 31 03:19:33 2006 New Revision: 6830 Log: * added activitytype in addmsgto contact Modified: vtigercrm/trunk/soap/vtigerolservice.php Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Wed May 31 03:19:33 2006 @@ -308,7 +308,7 @@ $email->column_fields[assigned_user_id] = $user_id; $email->column_fields[date_start] = $date_sent; $email->column_fields[description] = $email_body; - + $email->column_fields[activitytype] = 'Emails'; $email->save("Emails"); $email->set_emails_contact_invitee_relationship($email->id,$contactid); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 02:40:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 09:40:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6831 - /vtigercrm/trunk/soap/vtigerolservice.php Message-ID: <20060531094022.143457D7E53@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 03:40:18 2006 New Revision: 6831 Log: added html entities Modified: vtigercrm/trunk/soap/vtigerolservice.php Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Wed May 31 03:40:18 2006 @@ -307,7 +307,7 @@ $email->column_fields[subject] = $email_subject; $email->column_fields[assigned_user_id] = $user_id; $email->column_fields[date_start] = $date_sent; - $email->column_fields[description] = $email_body; + $email->column_fields[description] = htmlentities($email_body); $email->column_fields[activitytype] = 'Emails'; $email->save("Emails"); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 02:42:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 09:42:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6832 - /vtigercrm/trunk/modules/Emails/DetailView.php Message-ID: <20060531094243.014ED7D7E4A@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 03:42:40 2006 New Revision: 6832 Log: removed from_html Modified: vtigercrm/trunk/modules/Emails/DetailView.php Modified: vtigercrm/trunk/modules/Emails/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/DetailView.php (original) +++ vtigercrm/trunk/modules/Emails/DetailView.php Wed May 31 03:42:40 2006 @@ -137,7 +137,7 @@ else { $entries['Email Information']['4']['Description']['value'] = from_html($entries['Email Information']['4']['Description']['value']); - $smarty->assign("BLOCKS" , from_html($entries['Email Information'])); + $smarty->assign("BLOCKS", $entries['Email Information']); } $smarty->assign("SINGLE_MOD",$app_strings['Email']); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 02:55:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 09:55:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6833 - /vtigercrm/trunk/modules/Calendar/calendarLayout.php Message-ID: <20060531095506.483D87D7E4A@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 03:55:01 2006 New Revision: 6833 Log: shared id has been included for listview in calendar Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Wed May 31 03:55:01 2006 @@ -975,6 +975,8 @@ $Entries = Array(); global $adb,$current_user,$mod_strings; $shared_ids = getSharedCalendarId($current_user->id); + if(empty($shared_ids)) + $shared_ids = $current_user->id; $query = "SELECT cntactivityrel.contactid, activity.* FROM activity INNER JOIN crmentity @@ -1058,6 +1060,8 @@ $Entries = Array(); global $adb,$current_user,$mod_strings; $shared_ids = getSharedCalendarId($current_user->id); + if(empty($shared_ids)) + $shared_ids = $current_user->id; $query = "SELECT cntactivityrel.contactid, activity.* FROM activity INNER JOIN crmentity From vtiger-tickets at vtiger.fosslabs.com Wed May 31 02:56:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 09:56:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231244=3A?= =?utf-8?q?_Support_=3E_HelpDesk_-_Ticket_Comments?= Message-ID: <076.37c737bcf82ff17f40eb1ca85dac14f6@vtiger.fosslabs.com> #1244: Support > HelpDesk - Ticket Comments -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- open a ticket, add a comment and a solution at the detail view (not at the edit view). Call the ticket list, open the ticket again: - solution is stored - comments disappeared -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 03:07:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 10:07:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6834 - /vtigercrm/trunk/soap/vtigerolservice.php Message-ID: <20060531100734.6E5D77D7E57@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 04:07:30 2006 New Revision: 6834 Log: added emaildetails entry for messagetocontact Modified: vtigercrm/trunk/soap/vtigerolservice.php Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Wed May 31 04:07:30 2006 @@ -287,7 +287,7 @@ function AddMessageToContact($username,$contactid,$msgdtls) { - //global $log; + global $adb; require_once('modules/Users/User.php'); require_once('modules/Emails/Email.php'); @@ -314,8 +314,16 @@ $email->set_emails_contact_invitee_relationship($email->id,$contactid); $email->set_emails_se_invitee_relationship($email->id,$contactid); $email->set_emails_user_invitee_relationship($email->id,$user_id); - - return $email->id; + $sql = "select email from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted =0 and contactdetails.contactid='".$contactid."'"; + $result = $adb->query($sql); + $camodulerow = $adb->fetch_array($result); + if(isset($camodulerow)) + { + $emailid = $camodulerow["email"]; + $query = 'insert into emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")'; + $adb->query($query); + } + return $email->id; } else { From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 03:43:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 10:43:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6835 - in /vtigercrm/trunk/Smarty/templates: DetailView.tpl Inventory/InventoryDetailView.tpl ListView.tpl Message-ID: <20060531104301.B87787D7E50@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 04:42:55 2006 New Revision: 6835 Log: issue in addtag and search div has been fixed Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Wed May 31 04:42:55 2006 @@ -64,7 +64,7 @@ - +
    [ {$ID} ] {$NAME} - {$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}   
    {$UPDATEINFO}
    {$UPDATEINFO}

    Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Wed May 31 04:42:55 2006 @@ -58,11 +58,11 @@ {$UPDATEINFO} Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Wed May 31 04:42:55 2006 @@ -117,7 +117,7 @@   - {$APP.LBL_GO_TO} {$APP.LNK_ADVANCED_SEARCH} + {$APP.LBL_GO_TO} {$APP.LNK_ADVANCED_SEARCH} @@ -138,7 +138,7 @@ {$APP.LNK_ADVANCED_SEARCH}  {$APP.LBL_ADV_SEARCH_MSG_ALL}  {$APP.LBL_ADV_SEARCH_MSG_ANY} - {$APP.LBL_GO_TO} {$APP.LNK_BASIC_SEARCH} + {$APP.LBL_GO_TO} {$APP.LNK_BASIC_SEARCH} From vtiger-tickets at vtiger.fosslabs.com Wed May 31 03:44:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:44:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23195=3A_?= =?utf-8?q?edit_picklist?= In-Reply-To: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> References: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> Message-ID: <085.99121d4c705192c364cf1af49966af3b@vtiger.fosslabs.com> #195: edit picklist ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * priority: critical => major -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 03:44:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:44:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231100=3A?= =?utf-8?q?_Search_Issue?= In-Reply-To: <076.121568b45778e432f494a514491fb077@vtiger.fosslabs.com> References: <076.121568b45778e432f494a514491fb077@vtiger.fosslabs.com> Message-ID: <085.53c065be556ac4522b05d7d1e8458009@vtiger.fosslabs.com> #1100: Search Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * owner: philip => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 03:44:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:44:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231100=3A?= =?utf-8?q?_Search_Issue?= In-Reply-To: <076.121568b45778e432f494a514491fb077@vtiger.fosslabs.com> References: <076.121568b45778e432f494a514491fb077@vtiger.fosslabs.com> Message-ID: <085.fb9a1dea589f8e32829d1013b7458771@vtiger.fosslabs.com> #1100: Search Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 03:48:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:48:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231166=3A?= =?utf-8?q?_Move_Role_is_not_working_in_IE=2E=2E?= In-Reply-To: <076.a830516a48e8ac68dbcee16057ec5aab@vtiger.fosslabs.com> References: <076.a830516a48e8ac68dbcee16057ec5aab@vtiger.fosslabs.com> Message-ID: <085.c6f1d80428b2e4ec83cf9610401afbb7@vtiger.fosslabs.com> #1166: Move Role is not working in IE.. ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 03:51:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:51:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231241=3A?= =?utf-8?q?_error_in_showing_the_activities_in_Product_related_list?= In-Reply-To: <076.2e657a67594262ade3f99d3cf68d91c4@vtiger.fosslabs.com> References: <076.2e657a67594262ade3f99d3cf68d91c4@vtiger.fosslabs.com> Message-ID: <085.f76e24973c6f96606d2ba17beb2e1abf@vtiger.fosslabs.com> #1241: error in showing the activities in Product related list ------------------------+--------------------------------------------------- Reporter: mickie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 03:52:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:52:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231212=3A?= =?utf-8?q?_created_a_ticket_with_an_attachment_from_contacts_related_list?= =?utf-8?q?_but_no_attachment_shown_in_ticket?= In-Reply-To: <076.7d3ac6a99bec121b259fb52f3db9bfaa@vtiger.fosslabs.com> References: <076.7d3ac6a99bec121b259fb52f3db9bfaa@vtiger.fosslabs.com> Message-ID: <085.00eb50b507f1033d8cd7f2f9f6f4b728@vtiger.fosslabs.com> #1212: created a ticket with an attachment from contacts related list but no attachment shown in ticket ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed and when we look into the ticket the attachment is shown. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 03:58:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 10:58:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6836 - /vtigercrm/trunk/modules/Calendar/Appointment.php Message-ID: <20060531105825.79DD37D7E60@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 04:58:18 2006 New Revision: 6836 Log: visibility has been removed from query Modified: vtigercrm/trunk/modules/Calendar/Appointment.php Modified: vtigercrm/trunk/modules/Calendar/Appointment.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Appointment.php (original) +++ vtigercrm/trunk/modules/Calendar/Appointment.php Wed May 31 04:58:18 2006 @@ -58,7 +58,7 @@ $q.=" ((activity.date_start < '". $to_datetime->get_formatted_date() ."' AND activity.date_start >= '". $from_datetime->get_formatted_date()."')"; if(!is_admin($current_user)) { - $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.") and activity.visibility='Public'))"; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.")))"; } $q .= " AND crmentity.deleted = 0) AND recurringevents.activityid is NULL "; $q .= " ORDER by activity.date_start,activity.time_start"; @@ -86,7 +86,7 @@ $q .= " (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') "; if(!is_admin($current_user)) { - $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.") and activity.visibility='Public'))"; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.")))"; } $q .= " AND crmentity.deleted = 0 )" ; From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 04:06:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 11:06:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6837 - /vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Message-ID: <20060531110634.A2F8B7D7E63@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 05:06:30 2006 New Revision: 6837 Log: proxy removed Modified: vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Modified: vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc ============================================================================== --- vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc (original) +++ vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Wed May 31 05:06:30 2006 @@ -43,8 +43,8 @@ var $host = "www.php.net"; // host name we are connecting to var $port = 80; // port we are connecting to - var $proxy_host = "192.168.4.158"; // proxy host to use - var $proxy_port = "80"; // proxy port to use + var $proxy_host = ""; // proxy host to use + var $proxy_port = ""; // proxy port to use var $agent = "Snoopy v1.0"; // agent we masquerade as var $referer = ""; // referer info to pass var $cookies = array(); // array of cookies to pass @@ -63,8 +63,8 @@ // NOTE: this currently does not respect // dates, domains or paths. - var $user = "raj"; // user for http authentication - var $pass = "raj"; // password for http authentication + var $user = ""; // user for http authentication + var $pass = ""; // password for http authentication // http accept types var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 04:19:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 11:19:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6838 - /vtigercrm/trunk/soap/vtigerolservice.php Message-ID: <20060531111942.256D37D7E66@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 05:19:39 2006 New Revision: 6838 Log: * modified attachment function Modified: vtigercrm/trunk/soap/vtigerolservice.php Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Wed May 31 05:19:39 2006 @@ -365,6 +365,8 @@ { global $adb; require_once('modules/Users/User.php'); + require_once('include/utils/utils.php'); + $date_var = date('YmdHis'); $seed_user = new User(); @@ -372,6 +374,12 @@ $crmid = $adb->getUniqueID("crmentity"); + $upload_file_path = decideFilePath(); + + $handle = fopen($upload_file_path.$filename,"wb"); + fwrite($handle,base64_decode($filedata),$filesize); + fclose($handle); + $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$crmid.",".$user_id.",".$user_id.",'Emails Attachment',' ',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")"; @@ -380,26 +388,21 @@ if($entityresult != false) { - $sql2="insert into attachments(attachmentsid, name, description, type, attachmentsize, attachmentcontents) - values(".$crmid.",'".$filename."',' ','".$filetype."','".$filesize."','".$adb->getEmptyBlob()."')"; - - $result=$adb->query($sql2); - - if($result != false) + $sql2="insert into attachments(attachmentsid, name, description, type, path) + values(".$crmid.",'".$filename."',' ','".$filetype."','".$upload_file_path."')"; + + $result=$adb->query($sql2); + + $sql3='insert into seattachmentsrel values('.$emailid.','.$crmid.')'; + $adb->query($sql3); + + return $crmid; + } + else { - $result = $adb->updateBlob('attachments','attachmentcontents',"attachmentsid='".$crmid."' and name='".$filename."'",addslashes($filedata)); - } - - $sql3='insert into seattachmentsrel values('.$emailid.','.$crmid.')'; - $adb->query($sql3); - - return $crmid; - } - else - { //$server->setError("Invalid username and/or password"); return ""; - } + } } function GetContacts($username) From vtiger-tickets at vtiger.fosslabs.com Wed May 31 04:20:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 11:20:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231245=3A?= =?utf-8?q?_edit_and_del_links_are_not_exist_in_listview_and_relatedlists?= Message-ID: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com> #1245: edit and del links are not exist in listview and relatedlists -----------------------+---------------------------------------------------- Reporter: mickie | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In 4.2.3 we have edit and del links are available. These links are not available now. for example i am in accounts related list where as i want to edit the contact then i want to go to the contact detialview and then edit. In the mean time, from accounts related list if i click on del link of contact then the account-contact relationship will be deleted. but now if i want to delete the relationship i want to go to the contact detailview and edit and now i should clear the relationship. This is an critical usability issue. Please provide these links. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 04:26:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 11:26:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6839 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060531112639.19C327D7E6A@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 05:26:35 2006 New Revision: 6839 Log: def activity view changed to this year Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Wed May 31 05:26:35 2006 @@ -81,6 +81,7 @@ // added by jeri to populate default image and tagcloud for admin $user->imagename = 'shanky.jpg'; $user->tagcloud = ''; + $user->activity_view = 'This Year'; $user->defhomeview = 'home_metrics'; //added by philip for default default admin emailid if($admin_email == '') @@ -142,6 +143,7 @@ $user->date_format = 'yyyy-mm-dd'; // added by jeri to populate default image and tagcloud for admin $user->imagename = 'ela.jpg'; + $user->activity_view = 'This Year'; $user->tagcloud = ''; $user->defhomeview = 'home_metrics'; //added by philip for default default admin emailid From vtiger-tickets at vtiger.fosslabs.com Wed May 31 04:27:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 11:27:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231246=3A?= =?utf-8?q?_email_not_displayed_in_contact_related_list?= Message-ID: <076.bb51c9882ca3da9b29e43b10d6709695@vtiger.fosslabs.com> #1246: email not displayed in contact related list -----------------------+---------------------------------------------------- Reporter: mickie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- when i add new email from contact relatedlist where as the new email is not shown in the related list. but when i refresh the page the email is displayed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 04:36:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 11:36:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6840 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060531113649.20C657D7E5E@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 05:36:40 2006 New Revision: 6840 Log: count of key metrics has been fixed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Wed May 31 05:36:40 2006 @@ -157,12 +157,14 @@ {foreach item=elements from=$tabledetail.Entries} - {if $tabledetail.Title.2 neq 'home_mytopinv' && $tabledetail.Title.2 neq 'home_mytopso' && $tabledetail.Title.2 neq 'home_mytopquote'} + {if $tabledetail.Title.2 neq 'home_mytopinv' && $tabledetail.Title.2 neq 'home_mytopso' && $tabledetail.Title.2 neq 'home_mytopquote' && $tabledetail.Title.2 neq 'home_metrics'} - {else} + {elseif $tabledetail.Title.2 eq 'home_metrics'} + + + {else} - {/if} - + {/if} {/foreach}
    {$elements.0} {$elements.0} {$elements.1} {$elements.1}
    From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 04:45:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 11:45:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6841 - in /vtigercrm/trunk/Smarty/templates: DetailView.tpl TagCloudDisplay.tpl Message-ID: <20060531114520.EFA817D7E5E@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 05:45:13 2006 New Revision: 6841 Log: new tag cloud has been integrated Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/TagCloudDisplay.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Wed May 31 05:45:13 2006 @@ -268,40 +268,17 @@ - - - - - - - - -
    Tag Cloud
    - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    -
    + + + + + + + + +
    {$ALL_TAG}
    + +
    {if $MERGEBUTTON eq 'permitted'} Modified: vtigercrm/trunk/Smarty/templates/TagCloudDisplay.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/TagCloudDisplay.tpl (original) +++ vtigercrm/trunk/Smarty/templates/TagCloudDisplay.tpl Wed May 31 05:45:13 2006 @@ -14,54 +14,13 @@ -
    - - - - - - -
    {$APP.LBL_TAG_CLOUD}
    - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - -
    - - - - - -
    - - - - - -
    -
    -
    + + + + + + + +
    {$ALL_TAG}
    + - From vtiger-tickets at vtiger.fosslabs.com Wed May 31 04:55:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 11:55:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231247=3A?= =?utf-8?q?_dashboard_not_printable?= Message-ID: <076.a3fd81704060a1a7525a1879e6b6b088@vtiger.fosslabs.com> #1247: dashboard not printable -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: dashboard | -----------------------+---------------------------------------------------- the dashboard, where you see all the graphics, is not printable. see File -> Print preview in browser -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 05:21:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 12:21:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6842 - in /vtigercrm/trunk: Smarty/templates/Header.tpl include/js/general.js Message-ID: <20060531122115.290C17D7E80@vtiger.fosslabs.com> Author: don Date: Wed May 31 06:21:09 2006 New Revision: 6842 Log: allmenu issue has been fixed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed May 31 06:21:09 2006 @@ -397,7 +397,7 @@ {/literal} {* Quick Access Functionality *} -
    +
    '; -$list_header .= ''; -$list_header .=''; -$list_header .= ''; -$list_header .= ''; -$list_header .=''; -$list_header .= ''; -$list_header .=''; -$list_header .= ''; -$list_header .=''; +$list_header .= ''; +$list_header .=''; +$list_header .= ''; +$list_header .= ''; +$list_header .= ''; $list_header .= ''; $xtpl->assign("LISTHEADER", $list_header); @@ -113,22 +106,13 @@ $entity_id = $adb->query_result($list_result,$i,"crmid"); if(! array_key_exists($entity_id, $pbk_array)) { - if (($i%2)==0) - $list_body .= ''; - else - $list_body .= ''; - + $list_body .= ''; $field_name=$entity_id."_listprice"; - - $list_body .= ''; - $list_body .= ''; - $list_body .= ''; - $list_body .= ''; - $list_body .=''; - $list_body .= ''; - $list_body .=''; - $list_body .= ''; - $list_body .=''; + $list_body .= ''; + $list_body .= ''; + $list_body .= ''; + $list_body .= ''; + $list_body .= ''; } } Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html (original) +++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html Wed May 31 07:46:20 2006 @@ -33,7 +33,7 @@ {PRODUCTLISTHEADER}
    Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Wed May 31 06:21:09 2006 @@ -1369,7 +1369,7 @@ var getVal = eval(leftSide) + eval(widthM); if(getVal > window.innerWidth ){ leftSide = eval(leftSide) - eval(widthM); - tagName.style.left = leftSide + 'px'; + tagName.style.left = leftSide + 34 + 'px'; } else tagName.style.left= leftSide + 'px'; From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 05:31:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 12:31:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6843 - /vtigercrm/trunk/modules/Home/index.php Message-ID: <20060531123102.E1F5C7D7E94@vtiger.fosslabs.com> Author: don Date: Wed May 31 06:30:58 2006 New Revision: 6843 Log: more link added in home page Modified: vtigercrm/trunk/modules/Home/index.php Modified: vtigercrm/trunk/modules/Home/index.php ============================================================================== --- vtigercrm/trunk/modules/Home/index.php (original) +++ vtigercrm/trunk/modules/Home/index.php Wed May 31 06:30:58 2006 @@ -78,14 +78,14 @@ if(isPermitted('Accounts','index') == "yes") { include("modules/Accounts/ListViewTop.php"); - $home_values[]=getTopAccounts(); + $home_values['Accounts']=getTopAccounts(); } break; case 'PLVT': if(isPermitted('Potentials','index') == "yes") { include("modules/Potentials/ListViewTop.php"); - $home_values[]=getTopPotentials(); + $home_values['Potentials']=getTopPotentials(); } break; @@ -93,46 +93,46 @@ if(isPermitted('Leads','index') == "yes") { include("modules/Leads/ListViewTop.php"); - $home_values[]=getNewLeads(); + $home_values['Leads']=getNewLeads(); } break; case 'GRT': if(isPermitted('Activities','index') == "yes") { - $home_values[]=getGroupTaskLists(); + $home_values['Activities']=getGroupTaskLists(); } break; case 'HLT': if(isPermitted('HelpDesk','index') == "yes") { require_once('modules/HelpDesk/ListTickets.php'); - $home_values[]=getMyTickets(); + $home_values['HelpDesk']=getMyTickets(); } break; case 'CVLVT': include("modules/CustomView/ListViewTop.php"); - $home_values[] = getKeyMetrics(); + $home_values['CustomView'] = getKeyMetrics(); break; case 'QLTQ': if(isPermitted('Quotes','index') == "yes") { require_once('modules/Quotes/ListTopQuotes.php'); - $home_values[]=getTopQuotes(); + $home_values['Quotes']=getTopQuotes(); } break; case 'OLTSO': if(isPermitted('SalesOrder','index') == "yes") { require_once('modules/SalesOrder/ListTopSalesOrder.php'); - $home_values[]=getTopSalesOrder(); + $home_values['SalesOrder']=getTopSalesOrder(); } break; case 'ILTI': if(isPermitted('Invoice','index') == "yes") { require_once('modules/Invoice/ListTopInvoice.php'); - $home_values[]=getTopInvoice(); + $home_values['Invoice']=getTopInvoice(); } break; } @@ -274,7 +274,8 @@ } $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); - return $values; + if(count($entries)>0) + return $values; } } ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 05:37:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 12:37:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6844 - in /vtigercrm/trunk/Smarty/templates: Calculator.tpl Clock.tpl MySitesContents.tpl MySitesManage.tpl PopupContents.tpl SelectEmail.tpl SettingsSubMenu.tpl UserListViewContents.tpl Message-ID: <20060531123724.12D057D7EA1@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 06:37:15 2006 New Revision: 6844 Log: vtiger License added for template files - ahmed Modified: vtigercrm/trunk/Smarty/templates/Calculator.tpl vtigercrm/trunk/Smarty/templates/Clock.tpl vtigercrm/trunk/Smarty/templates/MySitesContents.tpl vtigercrm/trunk/Smarty/templates/MySitesManage.tpl vtigercrm/trunk/Smarty/templates/PopupContents.tpl vtigercrm/trunk/Smarty/templates/SelectEmail.tpl vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Calculator.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Calculator.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Calculator.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} +
    Modified: vtigercrm/trunk/Smarty/templates/Clock.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Clock.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Clock.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} +
    Modified: vtigercrm/trunk/Smarty/templates/MySitesContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MySitesContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MySitesContents.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} +
    + + +
    {$MOD.LBL_BOOKMARK_LIST} : Modified: vtigercrm/trunk/Smarty/templates/MySitesManage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MySitesManage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MySitesManage.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} +
    Modified: vtigercrm/trunk/Smarty/templates/PopupContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/PopupContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/PopupContents.tpl Wed May 31 06:37:15 2006 @@ -1,4 +1,15 @@ - +{**} +
    Modified: vtigercrm/trunk/Smarty/templates/SelectEmail.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SelectEmail.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SelectEmail.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} +
    Modified: vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} + +
    Modified: vtigercrm/trunk/include/images/loginAlpha.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html (original) +++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html Wed May 31 07:46:20 2006 @@ -117,12 +117,15 @@ -
    -
    +

    Note : Please note that for each query the "Object" string will be displayed at the starting of the line if the query executed successfully. If the query fails then "Object" will not be displayed. we can find out the failed queries based on these Object display. @@ -219,7 +228,7 @@

    Failed Queries Log -
    +
    Author: don Date: Wed May 31 07:10:10 2006 New Revision: 6853 Log: Added License Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php vtigercrm/trunk/modules/Users/ListView.php vtigercrm/trunk/modules/Users/RoleDragDrop.php vtigercrm/trunk/modules/Users/about_us.php vtigercrm/trunk/modules/Users/profilePrivileges.php Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Wed May 31 07:10:10 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Wed May 31 07:10:14 2006 New Revision: 6854 Log: Image to display in the migration success screen Added: vtigercrm/trunk/themes/blue/images/migration_sucess.jpg (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 06:19:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:19:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6855 - /vtigercrm/trunk/include/quickcreate.php Message-ID: <20060531131955.C09007D7EC9@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:19:52 2006 New Revision: 6855 Log: Added license Modified: vtigercrm/trunk/include/quickcreate.php Modified: vtigercrm/trunk/include/quickcreate.php ============================================================================== --- vtigercrm/trunk/include/quickcreate.php (original) +++ vtigercrm/trunk/include/quickcreate.php Wed May 31 07:19:52 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Wed May 31 07:19:51 2006 New Revision: 6856 Log: License Added - ahmed Modified: vtigercrm/trunk/modules/Utilities/language/en_us.lang.php vtigercrm/trunk/modules/Webmails/DetailView.php vtigercrm/trunk/modules/Webmails/images/index.php vtigercrm/trunk/modules/Webmails/js/script.js vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Utilities/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Utilities/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Utilities/language/en_us.lang.php Wed May 31 07:19:51 2006 @@ -1,3 +1,13 @@ Modified: vtigercrm/trunk/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/DetailView.php (original) +++ vtigercrm/trunk/modules/Webmails/DetailView.php Wed May 31 07:19:51 2006 @@ -1,4 +1,13 @@ Author: saraj Date: Wed May 31 07:21:43 2006 New Revision: 6857 Log: * Removed the unwanted file Removed: vtigercrm/trunk/migration/migrate_functions.php From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 06:23:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:23:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6858 - in /vtigercrm/trunk/modules: Dashboard/accumulated_bargraph.php Home/home_rss.php Import/ImportSave.php Message-ID: <20060531132349.EC17D7D7EB0@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:23:43 2006 New Revision: 6858 Log: License Added - ahmed Modified: vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php vtigercrm/trunk/modules/Home/home_rss.php vtigercrm/trunk/modules/Import/ImportSave.php Modified: vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php (original) +++ vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php Wed May 31 07:23:43 2006 @@ -1,4 +1,13 @@ Author: saraj Date: Wed May 31 07:24:45 2006 New Revision: 6859 Log: * Modified the license because this is the file which contains our own codes not the mailer code Modified: vtigercrm/trunk/modules/Emails/mail.php Modified: vtigercrm/trunk/modules/Emails/mail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mail.php (original) +++ vtigercrm/trunk/modules/Emails/mail.php Wed May 31 07:24:45 2006 @@ -1,29 +1,16 @@ Author: saraj Date: Wed May 31 07:28:53 2006 New Revision: 6860 Log: license added Modified: vtigercrm/trunk/include/quickcreate.php Modified: vtigercrm/trunk/include/quickcreate.php ============================================================================== --- vtigercrm/trunk/include/quickcreate.php (original) +++ vtigercrm/trunk/include/quickcreate.php Wed May 31 07:28:53 2006 @@ -8,7 +8,6 @@ * All Rights Reserved. * ********************************************************************************/ - require_once("Smarty_setup.php"); require_once("include/utils/CommonUtils.php"); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 06:30:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:30:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6861 - /vtigercrm/trunk/modules/Invoice/CreatePDF.php Message-ID: <20060531133019.136577D7EB0@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:30:14 2006 New Revision: 6861 Log: * Added license Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Wed May 31 07:30:14 2006 @@ -1,4 +1,15 @@ Author: don Date: Wed May 31 07:33:10 2006 New Revision: 6862 Log: window size of about us has been changed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed May 31 07:33:10 2006 @@ -424,7 +424,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 06:37:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:37:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6863 - /vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php Message-ID: <20060531133706.912FF7D7EE3@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:37:02 2006 New Revision: 6863 Log: * Added license Modified: vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php Modified: vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php ============================================================================== --- vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php (original) +++ vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php Wed May 31 07:37:02 2006 @@ -1,4 +1,15 @@ Author: saraj Date: Wed May 31 07:39:50 2006 New Revision: 6864 Log: Added license Modified: vtigercrm/trunk/modules/Invoice/pdf_templates/footer.php vtigercrm/trunk/modules/Invoice/pdf_templates/header.php vtigercrm/trunk/modules/Invoice/pdf_templates/lastpage/body.php vtigercrm/trunk/modules/Invoice/pdf_templates/lastpage/footer.php Modified: vtigercrm/trunk/modules/Invoice/pdf_templates/footer.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/pdf_templates/footer.php (original) +++ vtigercrm/trunk/modules/Invoice/pdf_templates/footer.php Wed May 31 07:39:50 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Wed May 31 07:41:51 2006 New Revision: 6865 Log: License added for missing report files - ahmed Modified: vtigercrm/trunk/modules/Reports/ReportsAjax.php vtigercrm/trunk/modules/Reports/SaveReport.php Modified: vtigercrm/trunk/modules/Reports/ReportsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportsAjax.php (original) +++ vtigercrm/trunk/modules/Reports/ReportsAjax.php Wed May 31 07:41:51 2006 @@ -1,3 +1,12 @@ - Modified: vtigercrm/trunk/modules/Reports/SaveReport.php ============================================================================== --- vtigercrm/trunk/modules/Reports/SaveReport.php (original) +++ vtigercrm/trunk/modules/Reports/SaveReport.php Wed May 31 07:41:51 2006 @@ -1,4 +1,13 @@ Author: saraj Date: Wed May 31 07:44:33 2006 New Revision: 6866 Log: Added license Modified: vtigercrm/trunk/modules/Products/UpdateListPrice.php vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Modified: vtigercrm/trunk/modules/Products/UpdateListPrice.php ============================================================================== --- vtigercrm/trunk/modules/Products/UpdateListPrice.php (original) +++ vtigercrm/trunk/modules/Products/UpdateListPrice.php Wed May 31 07:44:33 2006 @@ -1,4 +1,14 @@ Author: don Date: Wed May 31 07:46:20 2006 New Revision: 6867 Log: ui fixes and tax congiguration added,about us page has been changed Added: vtigercrm/trunk/themes/blue/images/aboutUS.jpg (with props) vtigercrm/trunk/themes/blue/images/about_btm.jpg (with props) vtigercrm/trunk/themes/blue/images/taxConfig_btm.gif (with props) vtigercrm/trunk/themes/blue/images/taxConfig_top.gif (with props) vtigercrm/trunk/themes/blue/images/taxConfiguration.gif (with props) Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/include/images/loginAlpha.gif vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php vtigercrm/trunk/modules/Settings/language/en_us.lang.php vtigercrm/trunk/modules/Users/about_us.php Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Wed May 31 07:46:20 2006 @@ -1,173 +1,175 @@ -{**} - - - - {include file='SettingsMenu.tpl'} - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_USER_MANAGEMENT}
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_CREATE_AND_MANAGE_USERS}
    -{$MOD.LBL_USERS}
    {$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}
    -{$MOD.LBL_ROLES} -
    {$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}
    -{$MOD.LBL_PROFILES} -
    {$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}
    -{$MOD.USERGROUPLIST}
     
    {$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}
    -{$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS} -
    {$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    -{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}
    {$MOD.LBL_ASSIGN_MODULE_OWNERS}
    -{$MOD.LBL_ASSIGN_MODULE_OWNERS} - -
    {$MOD.LBL_SETTING_ANNOUNCEMENT}
    -{$MOD.LBL_ANNOUNCEMENT}
     
    -
     
    {$MOD.LBL_STUDIO}
    - - - - - - - - - - - - - - - - -
    {$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}
    -{$MOD.LBL_CUSTOM_FIELD_SETTINGS}
    {$MOD.LBL_EDIT_PICKLIST_VALUES}
    -{$MOD.LBL_PICKLIST_SETTINGS}
     
     
    -
     
    {$MOD.LBL_COMMUNICATION_TEMPLATES}
    - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    -{$MOD.EMAILTEMPLATES}
    {$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}
    -{$MOD.WORDINTEGRATION}
    {$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}
    -{$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.LBL_INVENTORY_NOTIFICATIONS}
    -{$MOD.INVENTORYNOTIFICATION}
     
    {$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
    -{$MOD.INVENTORYTERMSANDCONDITIONS}
       
     
    -
     
    {$MOD.LBL_CONFIGURATION}
    - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_SPECIFY_COMPANY_DETAILS}
    -{$MOD.LBL_ORGANIZATION_DETAILS}
    {$MOD.LBL_CONFIGURE_MAIL_SERVER}
    -{$MOD.LBL_EMAIL_CONFIG}
    {$MOD.LBL_CONFIGURE_BACKUP_SERVER}
    -{$MOD.LBL_BACKUP_SERVER_CONFIGURATION}
    {$MOD.LBL_SYSTEM_CONFIGURATION}
    -{$MOD.LBL_SYSTEM_CONFIG}
     
    {$MOD.LBL_CURRENCY_CONFIGURATION}
    -{$MOD.LBL_CURRENCY_CONFIG}
    {$MOD.LBL_MIGRATION_INFO}
    -{$MOD.LBL_MIGRATION}
     
    -
    - {include file='SettingsSubMenu.tpl'} +{**} + + + + {include file='SettingsMenu.tpl'} + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_USER_MANAGEMENT}
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_CREATE_AND_MANAGE_USERS}
    +{$MOD.LBL_USERS}
    {$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}
    +{$MOD.LBL_ROLES} +
    {$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}
    +{$MOD.LBL_PROFILES} +
    {$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}
    +{$MOD.USERGROUPLIST}
     
    {$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}
    +{$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS} +
    {$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    +{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}
    {$MOD.LBL_ASSIGN_MODULE_OWNERS}
    +{$MOD.LBL_ASSIGN_MODULE_OWNERS} + +
    {$MOD.LBL_SETTING_ANNOUNCEMENT}
    +{$MOD.LBL_ANNOUNCEMENT}
     
    +
     
    {$MOD.LBL_STUDIO}
    + + + + + + + + + + + + + + + + +
    {$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}
    +{$MOD.LBL_CUSTOM_FIELD_SETTINGS}
    {$MOD.LBL_EDIT_PICKLIST_VALUES}
    +{$MOD.LBL_PICKLIST_SETTINGS}
     
     
    +
     
    {$MOD.LBL_COMMUNICATION_TEMPLATES}
    + + + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    +{$MOD.EMAILTEMPLATES}
    {$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}
    +{$MOD.WORDINTEGRATION}
    {$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}
    +{$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.LBL_INVENTORY_NOTIFICATIONS}
    +{$MOD.INVENTORYNOTIFICATION}
     
    {$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
    +{$MOD.INVENTORYTERMSANDCONDITIONS}
       
     
    +
     
    {$MOD.LBL_CONFIGURATION}
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_SPECIFY_COMPANY_DETAILS}
    +{$MOD.LBL_ORGANIZATION_DETAILS}
    {$MOD.LBL_CONFIGURE_MAIL_SERVER}
    +{$MOD.LBL_EMAIL_CONFIG}
    {$MOD.LBL_CONFIGURE_BACKUP_SERVER}
    +{$MOD.LBL_BACKUP_SERVER_CONFIGURATION}
    {$MOD.LBL_SYSTEM_CONFIGURATION}
    +{$MOD.LBL_SYSTEM_CONFIG}
     
    {$MOD.LBL_CURRENCY_CONFIGURATION}
    +{$MOD.LBL_CURRENCY_CONFIG}
    {$MOD.LBL_INVENTORY_TAX_CONFIG}
    +{$MOD.LBL_INVENTORY_TAX_CONFIG}
    {$MOD.LBL_MIGRATION_INFO}
    +{$MOD.LBL_MIGRATION}
     
    +
    + {include file='SettingsSubMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl Wed May 31 07:46:20 2006 @@ -55,13 +55,18 @@
    - +
      + + + + +
     
    - +
    {$APP.LBL_TAX} {$MOD.LBL_CONFIGURATION}

     
     
    {$APP.LBL_VAT} : Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Wed May 31 07:46:20 2006 @@ -27,7 +27,7 @@
    + + + +
     
      {PRICEBOOKLISTHEADER} - +
    - - - {LISTHEADER} - - {LISTENTITY} + + + +
    + + {LISTHEADER} + {LISTENTITY} +
    +
     
    +
     
    Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php Wed May 31 07:46:20 2006 @@ -23,8 +23,6 @@ $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); $productname = getProductName($productid); -echo get_module_title($current_module_strings['LBL_MODULE_NAME'], $current_module_strings['LBL_ADD_PRODUCT_PRICEBOOKS'].": ".$productname, true); -echo "
    "; $xtpl=new XTemplate ('modules/Products/AddProductToPriceBooks.html'); $xtpl->assign("MOD", $mod_strings); @@ -33,18 +31,18 @@ $focus = new PriceBook(); -echo get_form_footer(); -$other_text = ' + +$other_text = '
    '; - $other_text .=''; - $other_text .=''; + $other_text .=''; $other_text .='
      '; + $other_text .='
    '; //Retreive the list from Database @@ -91,16 +89,11 @@ $list_header = ''; -$list_header .= '
    '.$mod_strings['LBL_PRICEBOOK'].''.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].''.$mod_strings['LBL_PB_LIST_PRICE'].'
    '.$mod_strings['LBL_PRICEBOOK'].''.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].''.$mod_strings['LBL_PB_LIST_PRICE'].'
    '.$adb->query_result($list_result,$i,"bookname").''.$unit_price.''.$adb->query_result($list_result,$i,"bookname").''.$unit_price.'
    - - + +
    @@ -42,10 +42,13 @@
     {RECORD_COUNTS}
    + {LISTHEADER} - {LISTENTITY} +
    +
     
    Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Wed May 31 07:46:20 2006 @@ -23,8 +23,6 @@ $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); $pricebookname = getPriceBookName($pricebook_id); -echo get_module_title($current_module_strings['LBL_MODULE_NAME'], $current_module_strings['LBL_ADD_PRODUCTS_PRICEBOOK'].": ".$pricebookname, true); -echo "
    "; $xtpl=new XTemplate ('modules/Products/AddProductsToPriceBook.html'); $xtpl->assign("MOD", $mod_strings); @@ -149,14 +147,14 @@ } -$other_text = ' +$other_text = '
    '; - $other_text .=''; - $other_text .=''; + $other_text .=''; $other_text .='
     '; + $other_text .=' 
    '; @@ -212,18 +210,12 @@ $xtpl->assign("FIELD_NAME_ARRAY",implode(",",$field_name_array)); $list_header = ''; -$list_header .= ''; -$list_header .= ''; -$list_header .=''; -$list_header .= ''; -$list_header .= ''.$mod_strings['LBL_LIST_PRODUCT_NAME'].''; -$list_header .=''; -$list_header .= ''.$mod_strings['LBL_PRODUCT_CODE'].''; -$list_header .=''; -$list_header .= ''.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].''; -$list_header .=''; -$list_header .= ''.$mod_strings['LBL_PB_LIST_PRICE'].''; -$list_header .=''; +$list_header .= ''; +$list_header .=''; +$list_header .= ''.$mod_strings['LBL_LIST_PRODUCT_NAME'].''; +$list_header .= ''.$mod_strings['LBL_PRODUCT_CODE'].''; +$list_header .= ''.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].''; +$list_header .= ''.$mod_strings['LBL_PB_LIST_PRICE'].''; $list_header .= ''; $xtpl->assign("LISTHEADER", $list_header); @@ -236,25 +228,15 @@ $entity_id = $adb->query_result($list_result,$i,"crmid"); if(! array_key_exists($entity_id, $prod_array)) { - if (($i%2)==0) - $list_body .= ''; - else - $list_body .= ''; - + $list_body .= ''; $unit_price = $adb->query_result($list_result,$i,"unit_price"); $field_name=$entity_id."_listprice"; - $list_body .= ''; - $list_body .= ''; - $list_body .= ''; - $list_body .= ''.$adb->query_result($list_result,$i,"productname").''; - $list_body .=''; - $list_body .= ''.$adb->query_result($list_result,$i,"productcode").''; - $list_body .=''; - $list_body .= ''.$unit_price.''; - $list_body .=''; - $list_body .= ''; - $list_body .=''; + $list_body .= ''; + $list_body .= ''.$adb->query_result($list_result,$i,"productname").''; + $list_body .= ''.$adb->query_result($list_result,$i,"productcode").''; + $list_body .= ''.$unit_price.''; + $list_body .= ''; } } Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Wed May 31 07:46:20 2006 @@ -596,6 +596,7 @@ 'LBL_EDIT_PICKLIST'=>'Edit Pick List', 'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.', 'LBL_SELECT_CRM_MODULE'=>'Select crm module', +'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration', ); Modified: vtigercrm/trunk/modules/Users/about_us.php ============================================================================== --- vtigercrm/trunk/modules/Users/about_us.php (original) +++ vtigercrm/trunk/modules/Users/about_us.php Wed May 31 07:46:20 2006 @@ -1,14 +1,4 @@ -<?php echo $app_strings['LBL_ABOUTUS_TITLE']?> - + + + + +vtiger CRM 5 - Free, Commercial grade Open Source CRM + + + - - - - - -
    vigercrm 

    - - - - - - - - - - - - - - - - - - - - - - - - - +
    Version:  
    Applied Patch Version:  
    4.2 Release Date:   (Current version)
    4.0.1 Release Date:  04-29-2005
    4.0 Release Date:  03-29-2005
    - - - - - - - - - - - - -
    3.2 Release Date:  12-13-2004
    Toll Free Number:  +1-877-788-4473
    vtiger Discussions:  

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

    vtiger offers an Open Source CRM solution for managing your organization's sales force automation, inventory management, and customer support & service requirements.

    vtiger also provides Open Source business productivity enhancement add-ons, such as Outlook Plug-in, Office Plug-in, and Thunderbird extension that can be used with vtiger CRM.
    -

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Team
    Ahmed
    Don
    Ela
    Gopal
    Jeri
    Mani
    Mickie
    Minnie
    Philip
    Richie
    Saint
    SRaj
     
    Credits
    Matthew Brichacek
    Michel JACQUEMES
    Mike Crowe
    Allan Bush
    Frank Piepiorra
    Dino Eberle and Jamie Jackson
    B??la??d A??ssa
    Sergio A. Kessler
    Jeff Kowalczyk
    Brian Devendorf
    Brian Laughlin
    Dennis Grant
    Fathi Boudra
    Jamie Jackson
    Joel Rydbeck
    Josh Lee
    Mike Fedyk
     
    And vtiger Community
    +
    +
     
     
    + + + + + +
    + Version : 5.0.0 Beta |  + Read License |  + Contact Us + + +
    +
    - + + From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 06:46:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:46:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6868 - in /vtigercrm/trunk/modules/PurchaseOrder/pdf_templates: footer.php header.php lastpage/body.php lastpage/footer.php Message-ID: <20060531134658.DF3035CE170@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:46:53 2006 New Revision: 6868 Log: * Added license Modified: vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/footer.php vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/lastpage/body.php vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/lastpage/footer.php Modified: vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/footer.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/footer.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/footer.php Wed May 31 07:46:53 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Wed May 31 07:49:39 2006 New Revision: 6869 Log: * Added license Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php vtigercrm/trunk/modules/Quotes/pdf_templates/footer.php vtigercrm/trunk/modules/Quotes/pdf_templates/header.php vtigercrm/trunk/modules/Quotes/pdf_templates/lastpage/body.php vtigercrm/trunk/modules/Quotes/pdf_templates/lastpage/footer.php Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Wed May 31 07:49:39 2006 @@ -1,4 +1,15 @@ Author: don Date: Wed May 31 07:51:44 2006 New Revision: 6870 Log: change owner added for invoice Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Wed May 31 07:51:44 2006 @@ -85,7 +85,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if(isPermitted('Invoice','Delete','') == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 06:52:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:52:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6871 - in /vtigercrm/trunk/modules/SalesOrder: CreateSOPDF.php pdf_templates/footer.php pdf_templates/header.php pdf_templates/lastpage/body.php pdf_templates/lastpage/footer.php Message-ID: <20060531135245.623947D79DB@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:52:37 2006 New Revision: 6871 Log: * Added license Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/footer.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/lastpage/body.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/lastpage/footer.php Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original) +++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Wed May 31 07:52:37 2006 @@ -1,4 +1,15 @@ Author: saraj Date: Wed May 31 07:55:27 2006 New Revision: 6872 Log: Added license Modified: vtigercrm/trunk/modules/Users/about_us.php Modified: vtigercrm/trunk/modules/Users/about_us.php ============================================================================== --- vtigercrm/trunk/modules/Users/about_us.php (original) +++ vtigercrm/trunk/modules/Users/about_us.php Wed May 31 07:55:27 2006 @@ -1,4 +1,15 @@ Author: saraj Date: Wed May 31 07:55:26 2006 New Revision: 6873 Log: Updated Licenses for all js files -ahmed Modified: vtigercrm/trunk/include/js/clock.js vtigercrm/trunk/include/js/customview.js vtigercrm/trunk/include/js/menu.js vtigercrm/trunk/include/js/popup.js vtigercrm/trunk/include/js/search.js vtigercrm/trunk/include/js/submenu.js Modified: vtigercrm/trunk/include/js/clock.js ============================================================================== --- vtigercrm/trunk/include/js/clock.js (original) +++ vtigercrm/trunk/include/js/clock.js Wed May 31 07:55:26 2006 @@ -1,3 +1,12 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ if (document.getElementById){ fCol='#000000'; //face/number colour. Modified: vtigercrm/trunk/include/js/customview.js ============================================================================== --- vtigercrm/trunk/include/js/customview.js (original) +++ vtigercrm/trunk/include/js/customview.js Wed May 31 07:55:26 2006 @@ -1,3 +1,13 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ + function splitValues() { var picklistObj=getObj("fldPickList") var pickListContent=picklistObj.value Modified: vtigercrm/trunk/include/js/menu.js ============================================================================== --- vtigercrm/trunk/include/js/menu.js (original) +++ vtigercrm/trunk/include/js/menu.js Wed May 31 07:55:26 2006 @@ -1,3 +1,12 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ // JavaScript Document //Layer Function /* NEW SCRIPT FOR MENU SLIDE */ Modified: vtigercrm/trunk/include/js/popup.js ============================================================================== --- vtigercrm/trunk/include/js/popup.js (original) +++ vtigercrm/trunk/include/js/popup.js Wed May 31 07:55:26 2006 @@ -1,3 +1,13 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ + function mypopup() { mywindow = window.open("copyright.html","mywindow", "height=115, width=575"); Modified: vtigercrm/trunk/include/js/search.js ============================================================================== --- vtigercrm/trunk/include/js/search.js (original) +++ vtigercrm/trunk/include/js/search.js Wed May 31 07:55:26 2006 @@ -1,3 +1,12 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ function searchshowhide(argg,argg2) { var x=document.getElementById(argg).style Modified: vtigercrm/trunk/include/js/submenu.js ============================================================================== --- vtigercrm/trunk/include/js/submenu.js (original) +++ vtigercrm/trunk/include/js/submenu.js Wed May 31 07:55:26 2006 @@ -1,3 +1,12 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ var selTags=document.getElementsByTagName("SELECT") function showSubMenu() { getObj("subMenuBg").style.display=getObj("subMenu").style.display="block" From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 07:02:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 14:02:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6874 - /vtigercrm/trunk/modules/Users/ListView.php Message-ID: <20060531140218.E60F97D7EE3@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 08:02:15 2006 New Revision: 6874 Log: Added License - ahmed Modified: vtigercrm/trunk/modules/Users/ListView.php Modified: vtigercrm/trunk/modules/Users/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Users/ListView.php (original) +++ vtigercrm/trunk/modules/Users/ListView.php Wed May 31 08:02:15 2006 @@ -1,16 +1,12 @@ Author: saraj Date: Wed May 31 08:08:21 2006 New Revision: 6875 Log: new image added for logo Modified: vtigercrm/trunk/themes/blue/images/vtiger-crm.gif Modified: vtigercrm/trunk/themes/blue/images/vtiger-crm.gif ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 07:16:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 14:16:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6876 - /vtigercrm/trunk/themes/blue/images/loginAlpha.gif Message-ID: <20060531141627.040A67D7EE9@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 08:16:24 2006 New Revision: 6876 Log: unwanted image removed Removed: vtigercrm/trunk/themes/blue/images/loginAlpha.gif From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 07:39:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 14:39:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6877 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060531143901.A56F27D7968@vtiger.fosslabs.com> Author: don Date: Wed May 31 08:38:57 2006 New Revision: 6877 Log: issue in home page has been fixed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Wed May 31 08:38:57 2006 @@ -43,7 +43,7 @@ - + - -
    {$APP.$CATEGORY} > {$APP.$MODULE}{$APP.$CATEGORY} > {$APP.$MODULE} From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 07:49:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 14:49:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6878 - /vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Message-ID: <20060531144928.0C4447D7F05@vtiger.fosslabs.com> Author: don Date: Wed May 31 08:49:25 2006 New Revision: 6878 Log: add new emails and search icon made faded for emails and webmails Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Wed May 31 08:49:25 2006 @@ -43,7 +43,7 @@ @@ -540,13 +561,6 @@

    Jump-start to vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple,

    -

    Step 1: Browse through Live - Demo

    -

    Step 2: Download product from the vtiger.com - and install in your favorite Operating System.

    -

    Step 3: Post your suggestions & comments at - vtiger Discussions under : vtiger - CRM 5.x category

    Table of Contents

    1. Summary
    2. @@ -683,13 +697,6 @@

      Jump-start to vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple,

      -

      Step 1: Browse through Live - Demo

      -

      Step 2: Download product from the vtiger.com - and install in your favorite Operating System.

      -

      Step 3: Post your suggestions & comments at - vtiger Discussions under : vtiger - CRM 5.x category

      Table of Contents

      1. Summary
      2. @@ -1505,7 +1512,7 @@
        • UI interface has been redesigned based on Smarty template engine.
        • Bug fixes based on the Operation Consolidation list.
        • -
        • Security Management enhancements. For more detail refer to vtigercrm5_alpha_Security.html
        • +
        • Security Management enhancements. For more detail refer to vtigercrm5_alpha_Security.html

        3. Bug Fixes

        Refer to the following links:

        From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 12:26:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 19:26:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6882 - /tags/vtigercrm-5.0.0-beta/ Message-ID: <20060531192630.786837D7F90@vtiger.fosslabs.com> Author: richie Date: Wed May 31 13:26:24 2006 New Revision: 6882 Log: made a copy Added: tags/vtigercrm-5.0.0-beta/ - copied from r6881, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 13:48:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 20:48:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6883 - in /customerportal/trunk: ./ css/ images/ js/ language/ nusoap/ Message-ID: <20060531204859.1EDF07D7F9C@vtiger.fosslabs.com> Author: richie Date: Wed May 31 14:48:50 2006 New Revision: 6883 Log: old files deleted Removed: customerportal/trunk/Acknowledgment.txt customerportal/trunk/CustomerAuthenticate.php customerportal/trunk/INSTALLATION.txt customerportal/trunk/LICENSE_AGREEMENT.txt customerportal/trunk/PortalConfig.php customerportal/trunk/UserTickets.php customerportal/trunk/cp_index.php customerportal/trunk/css/ customerportal/trunk/customerportal.css customerportal/trunk/functions.php customerportal/trunk/general.php customerportal/trunk/images/ customerportal/trunk/index.php customerportal/trunk/js/ customerportal/trunk/language/ customerportal/trunk/nusoap/ customerportal/trunk/supportpage.php From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 13:51:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 20:51:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6884 - in /customerportal/trunk: ./ Faq/ Tickets/ css/ images/ js/ language/ nusoap/ nusoap/lib/ Message-ID: <20060531205121.8F9ED7D7F9C@vtiger.fosslabs.com> Author: richie Date: Wed May 31 14:50:45 2006 New Revision: 6884 Log: updated version Added: customerportal/trunk/Acknowledgment.txt customerportal/trunk/CustomerAuthenticate.php customerportal/trunk/Faq/ customerportal/trunk/Faq/FaqDetail.php customerportal/trunk/Faq/SaveFaqComment.php customerportal/trunk/Faq/Utils.php customerportal/trunk/Faq/index.html customerportal/trunk/Faq/index.php customerportal/trunk/INSTALLATION.txt customerportal/trunk/LICENSE_AGREEMENT.txt customerportal/trunk/MySettings.php customerportal/trunk/PortalConfig.php customerportal/trunk/Tickets/ customerportal/trunk/Tickets/NewTicket.php customerportal/trunk/Tickets/SaveTicket.php customerportal/trunk/Tickets/TicketDetail.php customerportal/trunk/Tickets/TicketSearch.php customerportal/trunk/Tickets/TicketsList.php customerportal/trunk/Tickets/Utils.php customerportal/trunk/Tickets/downloadfile.php customerportal/trunk/Tickets/index.html customerportal/trunk/Tickets/index.php customerportal/trunk/css/ customerportal/trunk/css/dropdown.css customerportal/trunk/css/style.css customerportal/trunk/footer.html customerportal/trunk/header.html customerportal/trunk/images/ customerportal/trunk/images/category.gif (with props) customerportal/trunk/images/email.gif (with props) customerportal/trunk/images/faq.gif (with props) customerportal/trunk/images/favorite.gif (with props) customerportal/trunk/images/loginAlpha.gif (with props) customerportal/trunk/images/loginBg.gif (with props) customerportal/trunk/images/loginBgbig.gif (with props) customerportal/trunk/images/loginBgbig.jpg (with props) customerportal/trunk/images/loginBottomBg.gif (with props) customerportal/trunk/images/loginBottomURL.gif (with props) customerportal/trunk/images/loginBtnSignin.gif (with props) customerportal/trunk/images/loginSIBottomLeft.gif (with props) customerportal/trunk/images/loginSIBottomRight.gif (with props) customerportal/trunk/images/loginSITopLeft.gif (with props) customerportal/trunk/images/loginSITopRight.gif (with props) customerportal/trunk/images/loginTopBg.gif (with props) customerportal/trunk/images/loginTopShade.gif (with props) customerportal/trunk/images/loginVtigerCRM.gif (with props) customerportal/trunk/images/minus.gif (with props) customerportal/trunk/images/plus.gif (with props) customerportal/trunk/images/print.gif (with props) customerportal/trunk/images/products.gif (with props) customerportal/trunk/images/tabSeperatorBg.gif (with props) customerportal/trunk/images/vtiger-crm.gif (with props) customerportal/trunk/include.php customerportal/trunk/index.php customerportal/trunk/js/ customerportal/trunk/js/acdropdown.js customerportal/trunk/js/cookies.js customerportal/trunk/js/general.js customerportal/trunk/js/getobject2.js customerportal/trunk/js/modomt.js customerportal/trunk/language/ customerportal/trunk/language/en_us.lang.php customerportal/trunk/login.php customerportal/trunk/nusoap/ customerportal/trunk/nusoap/lib/ customerportal/trunk/nusoap/lib/nusoap.php customerportal/trunk/supportpage.php From vtiger-tickets at vtiger.fosslabs.com Wed May 31 15:40:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 22:40:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231248=3A?= =?utf-8?q?_Invoice_/_SO_/_PO?= Message-ID: <076.e4d8f1e341c634b1bfe89089253ec586@vtiger.fosslabs.com> #1248: Invoice / SO / PO -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- on Product Details no Description on each line... Please add it Please... -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 15:48:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 22:48:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231249=3A?= =?utf-8?q?_Task_Information?= Message-ID: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com> #1249: Task Information -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Task Information cannot Select HelpDesk it can select leads, Accounts.... -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 22:43:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 01 Jun 2006 05:43:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231250=3A?= =?utf-8?q?_Beta__Demo=3A_Sales_=3E_Leads_=3E_Detail_View_fatal_error?= Message-ID: <076.78fe8716a71e90b18b5ac94f0c53cd10@vtiger.fosslabs.com> #1250: Beta Demo: Sales > Leads > Detail View fatal error -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Open an existing lead, look at the tag cloud: Warning: main(include/Ajax/TagCloud.php): failed to open stream: No such file or directory in /home/site/html/products/crm/demo_5alpha/modules/Leads/TagCloud.php on line 12 Fatal error: main(): Failed opening required 'include/Ajax/TagCloud.php' (include_path='.::/usr/share/pear') in /home/site/html/products/crm/demo_5alpha/modules/Leads/TagCloud.php on line 12 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 23:01:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 01 Jun 2006 06:01:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231251=3A?= =?utf-8?q?_Chat_not_working=3F=3F?= Message-ID: <076.c47ecc4624fe78215a43eca164a2c051@vtiger.fosslabs.com> #1251: Chat not working?? -----------------------+---------------------------------------------------- Reporter: | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Chat Not working in any of the tab. Public Chat leads to the squeezed homepage in the same window. Please take care !!! -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 04:58:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 08:58:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5607 - /vtigercrm/trunk/modules/HelpDesk/ListTickets.php Message-ID: <20060501085800.B51D16800F1@vtiger.fosslabs.com> Author: don Date: Mon May 1 02:57:56 2006 New Revision: 5607 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/HelpDesk/ListTickets.php Modified: vtigercrm/trunk/modules/HelpDesk/ListTickets.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 04:58:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 08:58:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5608 - /vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php Message-ID: <20060501085850.C96D96800F1@vtiger.fosslabs.com> Author: don Date: Mon May 1 02:58:46 2006 New Revision: 5608 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php Modified: vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 04:59:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 08:59:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5609 - /vtigercrm/trunk/modules/HelpDesk/Save.php Message-ID: <20060501085917.84A9C6800F1@vtiger.fosslabs.com> Author: don Date: Mon May 1 02:59:13 2006 New Revision: 5609 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/HelpDesk/Save.php Modified: vtigercrm/trunk/modules/HelpDesk/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 05:00:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:00:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5610 - /vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Message-ID: <20060501090043.59FFC5FB0CC@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:00:39 2006 New Revision: 5610 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 05:03:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:03:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5611 - /vtigercrm/trunk/modules/HelpDesk/Forms.php Message-ID: <20060501090335.145DC6951E1@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:03:31 2006 New Revision: 5611 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/HelpDesk/Forms.php Modified: vtigercrm/trunk/modules/HelpDesk/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 05:06:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:06:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5612 - /vtigercrm/trunk/modules/Faq/Faq.php Message-ID: <20060501090631.CB3D96951E1@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:06:27 2006 New Revision: 5612 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Faq/Faq.php Modified: vtigercrm/trunk/modules/Faq/Faq.php ============================================================================== --- vtigercrm/trunk/modules/Faq/Faq.php (original) +++ vtigercrm/trunk/modules/Faq/Faq.php Mon May 1 03:06:27 2006 @@ -84,9 +84,11 @@ var $default_sort_order = 'DESC'; function Faq() { - $this->log =LoggerManager::getLogger('account'); + $this->log =LoggerManager::getLogger('faq'); + $this->log->debug("Entering Faq() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Faq'); + $this->log->debug("Exiting Faq method ..."); } /** Function to get the list of comments for the given FAQ id @@ -95,13 +97,18 @@ **/ function getFAQComments($faqid) { + global $log; + $log->debug("Entering getFAQComments(".$faqid.") method ..."); global $mod_strings; $sql = "select * from faqcomments where faqid=".$faqid; $result = $this->db->query($sql); $noofrows = $this->db->num_rows($result); if($noofrows == 0) + { + $log->debug("Exiting getFAQComments method ..."); return ''; + } $list .= '
        '; for($i=0;$i<$noofrows;$i++) @@ -116,6 +123,7 @@ } } $list .= '
        '; + $log->debug("Exiting getFAQComments method ..."); return $list; } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 05:29:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:29:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5613 - /vtigercrm/trunk/modules/Invoice/Invoice.php Message-ID: <20060501092957.D9E8F6AB602@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:29:53 2006 New Revision: 5613 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Invoice/Invoice.php Modified: vtigercrm/trunk/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.php (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.php Mon May 1 03:29:53 2006 @@ -104,29 +104,39 @@ function Invoice() { $this->log =LoggerManager::getLogger('Invoice'); + $this->log->debug("Entering Invoice() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Invoice'); + $this->log->debug("Exiting Invoice method ..."); } function get_summary_text() { + global $log; + $log->debug("Entering get_summary_text() method ..."); + $log->debug("Exiting get_summary_text method ..."); return $this->name; } function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; require_once('modules/Activities/Activity.php'); - $focus = new Activity(); + $focus = new Activity(); $button = ''; $returnset = '&return_module=Invoice&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Invoice','Activities',$focus,$query,$button,$returnset); } function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, crmentity.createdtime, crmentity.description, users.user_name @@ -143,10 +153,13 @@ and seactivityrel.crmid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Exiting get_history method ..."); return getHistory('Invoice',$query,$id); } function get_attachments($id) { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); // Armando L?scher 18.10.2005 -> ?visibleDescription // Desc: Inserted crm2.createdtime, notes.notecontent description, users.user_name // Inserted inner join users on crm2.smcreatorid= users.id @@ -177,6 +190,7 @@ inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid inner join users on crm2.smcreatorid= users.id where crmentity.crmid=".$id; + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('Invoice',$query,$id); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 05:33:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:33:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5614 - /vtigercrm/trunk/modules/Notes/Note.php Message-ID: <20060501093344.63D306AB602@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:33:40 2006 New Revision: 5614 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Notes/Note.php Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 05:37:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 09:37:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5615 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.php Message-ID: <20060501093754.E5A586AB602@vtiger.fosslabs.com> Author: don Date: Mon May 1 03:37:51 2006 New Revision: 5615 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Mon May 1 03:37:51 2006 @@ -60,12 +60,16 @@ function PriceBook() { $this->log =LoggerManager::getLogger('pricebook'); + $this->log->debug("Entering PriceBook() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PriceBooks'); + $this->log->debug("Exiting PriceBook method ..."); } function get_pricebook_products($id) { + global $log; + $log->debug("Entering get_pricebook_products(".$id.") method ..."); global $app_strings; require_once('modules/Products/Product.php'); $focus = new Product(); @@ -75,10 +79,13 @@ $returnset = '&return_module=PriceBooks&return_action=DetailView&return_id='.$id; $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid,pricebookproductrel.listprice from products inner join pricebookproductrel on products.productid = pricebookproductrel.productid inner join crmentity on crmentity.crmid = products.productid inner join pricebook on pricebook.pricebookid = pricebookproductrel.pricebookid where pricebook.pricebookid = '.$id.' and crmentity.deleted = 0'; + $log->debug("Exiting get_pricebook_products method ..."); return getPriceBookRelatedProducts($query,$focus,$returnset); } function get_pricebook_noproduct($id) - { + { + global $log; + $log->debug("Entering get_pricebook_noproduct(".$id.") method ..."); $query = "select crmentity.crmid, pricebook.* from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid where crmentity.deleted=0"; $result = $this->db->query($query); $no_count = $this->db->num_rows($result); @@ -88,19 +95,23 @@ $result_pb = $this->db->query($pb_query); if($no_count == $this->db->num_rows($result_pb)) { + $log->debug("Exiting get_pricebook_noproduct method ..."); return false; } elseif($this->db->num_rows($result_pb) == 0) { + $log->debug("Exiting get_pricebook_noproduct method ..."); return true; } elseif($this->db->num_rows($result_pb) < $no_count) { + $log->debug("Exiting get_pricebook_noproduct method ..."); return true; } } else { + $log->debug("Exiting get_pricebook_noproduct method ..."); return false; } } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 06:16:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 10:16:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5616 - /vtigercrm/trunk/modules/Vendors/Vendor.php Message-ID: <20060501101640.D00FA6CFFB9@vtiger.fosslabs.com> Author: don Date: Mon May 1 04:16:37 2006 New Revision: 5616 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Vendors/Vendor.php Modified: vtigercrm/trunk/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.php (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.php Mon May 1 04:16:37 2006 @@ -66,12 +66,16 @@ function Vendor() { $this->log =LoggerManager::getLogger('vendor'); + $this->log->debug("Entering Vendor() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Vendors'); + $this->log->debug("Exiting Vendor method ..."); } function get_products($id) { + global $log; + $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; require_once('modules/Products/Product.php'); $focus = new Product(); @@ -81,10 +85,13 @@ $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid,vendor.vendorname from products inner join crmentity on crmentity.crmid = products.productid left outer join vendor on vendor.vendorid = products.vendor_id where vendor.vendorid = '.$id.' and crmentity.deleted = 0'; + $log->debug("Exiting get_products method ..."); return GetRelatedList('Vendors','Products',$focus,$query,$button,$returnset); } function get_purchase_orders($id) { + global $log; + $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); $focus = new Order(); @@ -94,10 +101,13 @@ $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, purchaseorder.*,vendor.vendorname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.vendorid=".$id; + $log->debug("Exiting get_purchase_orders method ..."); return GetRelatedList('Vendors','PurchaseOrder',$focus,$query,$button,$returnset); } function get_contacts($id) { + global $log; + $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; require_once('modules/Contacts/Contact.php'); $focus = new Contact(); @@ -106,6 +116,7 @@ $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; $query = 'SELECT contactdetails.*, crmentity.crmid, crmentity.smownerid,vendorcontactrel.vendorid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid inner join vendorcontactrel on vendorcontactrel.contactid=contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where crmentity.deleted=0 and vendorcontactrel.vendorid = '.$id; + $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Vendor','Contacts',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 06:18:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 10:18:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5617 - /vtigercrm/trunk/modules/Products/Product.php Message-ID: <20060501101846.DD3606ECFB1@vtiger.fosslabs.com> Author: don Date: Mon May 1 04:18:42 2006 New Revision: 5617 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Products/Product.php Modified: vtigercrm/trunk/modules/Products/Product.php ============================================================================== --- vtigercrm/trunk/modules/Products/Product.php (original) +++ vtigercrm/trunk/modules/Products/Product.php Mon May 1 04:18:42 2006 @@ -89,12 +89,16 @@ function Product() { $this->log =LoggerManager::getLogger('product'); + $this->log->debug("Entering Product() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Products'); + $this->log->debug("Exiting Product method ..."); } function get_attachments($id) - { + { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); // Armando L?scher 18.10.2005 -> ?visibleDescription // Desc: Inserted crmentity.createdtime, notes.notecontent description, users.user_name // Inserted inner join users on crmentity.smcreatorid= users.id @@ -126,17 +130,23 @@ inner join users on crmentity.smcreatorid= users.id where crmentity.crmid=".$id; + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('Products',$query,$id); } function get_opportunities($id) - { + { + global $log; + $log->debug("Entering get_opportunities(".$id.") method ..."); $query = 'select potential.potentialid, potential.potentialname, potential.potentialtype, products.productid, products.productname, products.qty_per_unit, products.unit_price, products.expiry_date from potential inner join products on potential.productid = products.productid left join potentialgrouprelation on potential.potentialid=potentialgrouprelation.potentialid left join groups on groups.groupname=potentialgrouprelation.groupname where crmentity.deleted=0 and products.productid='.$id; + $log->debug("Exiting get_opportunities method ..."); renderRelatedPotentials($query); } function get_tickets($id) { + global $log; + $log->debug("Entering get_tickets(".$id.") method ..."); global $mod_strings; require_once('modules/HelpDesk/HelpDesk.php'); $focus = new HelpDesk(); @@ -146,12 +156,15 @@ $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; $query = "select users.user_name, users.id, products.productid,products.productname, troubletickets.ticketid, troubletickets.parent_id, troubletickets.title, troubletickets.status, troubletickets.priority, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from troubletickets inner join crmentity on crmentity.crmid = troubletickets.ticketid left join products on products.productid=troubletickets.product_id left join users on users.id=crmentity.smownerid left join ticketgrouprelation on troubletickets.ticketid=ticketgrouprelation.ticketid left join groups on groups.groupname=ticketgrouprelation.groupname where crmentity.deleted=0 and products.productid=".$id; + $log->debug("Exiting get_tickets method ..."); return GetRelatedList('Products','HelpDesk',$focus,$query,$button,$returnset); } function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; require_once('modules/Activities/Activity.php'); @@ -164,10 +177,13 @@ $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name,recurringevents.recurringtype from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Products','Activities',$focus,$query,$button,$returnset); } function get_quotes($id) - { + { + global $log; + $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; require_once('modules/Quotes/Quote.php'); $focus = new Quote(); @@ -177,10 +193,13 @@ $query = "select crmentity.*, quotes.*,potential.potentialname,account.accountname,quotesproductrel.productid from quotes inner join crmentity on crmentity.crmid=quotes.quoteid inner join quotesproductrel on quotesproductrel.quoteid=quotes.quoteid left outer join account on account.accountid=quotes.accountid left outer join potential on potential.potentialid=quotes.potentialid left join quotegrouprelation on quotes.quoteid=quotegrouprelation.quoteid left join groups on groups.groupname=quotegrouprelation.groupname where crmentity.deleted=0 and quotesproductrel.productid=".$id; + $log->debug("Exiting get_quotes method ..."); return GetRelatedList('Products','Quotes',$focus,$query,$button,$returnset); } function get_purchase_orders($id) { + global $log; + $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); $focus = new Order(); @@ -190,10 +209,13 @@ $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, purchaseorder.*,products.productname,poproductrel.productid from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid inner join poproductrel on poproductrel.purchaseorderid=purchaseorder.purchaseorderid inner join products on products.productid=poproductrel.productid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and products.productid=".$id; + $log->debug("Exiting get_purchase_orders method ..."); return GetRelatedList('Products','PurchaseOrder',$focus,$query,$button,$returnset); } function get_salesorder($id) { + global $log; + $log->debug("Entering get_salesorder(".$id.") method ..."); global $app_strings; require_once('modules/SalesOrder/SalesOrder.php'); $focus = new SalesOrder(); @@ -202,10 +224,13 @@ $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; $query = "select crmentity.*, salesorder.*, products.productname as productname, account.accountname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid inner join soproductrel on soproductrel.salesorderid=salesorder.salesorderid inner join products on products.productid=soproductrel.productid left outer join account on account.accountid=salesorder.accountid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and products.productid = ".$id; + $log->debug("Exiting get_salesorder method ..."); return GetRelatedList('Products','SalesOrder',$focus,$query,$button,$returnset); } function get_invoices($id) { + global $log; + $log->debug("Entering get_invoices(".$id.") method ..."); global $app_strings; require_once('modules/Invoice/Invoice.php'); $focus = new Invoice(); @@ -215,10 +240,13 @@ $query = "select crmentity.*, invoice.*, invoiceproductrel.quantity, account.accountname from invoice inner join crmentity on crmentity.crmid=invoice.invoiceid left outer join account on account.accountid=invoice.accountid inner join invoiceproductrel on invoiceproductrel.invoiceid=invoice.invoiceid left join invoicegrouprelation on invoice.invoiceid=invoicegrouprelation.invoiceid left join groups on groups.groupname=invoicegrouprelation.groupname where crmentity.deleted=0 and invoiceproductrel.productid=".$id; + $log->debug("Exiting get_invoices method ..."); return GetRelatedList('Products','Invoice',$focus,$query,$button,$returnset); } function get_product_pricebooks($id) { + global $log; + $log->debug("Entering get_product_pricebooks(".$id.") method ..."); global $mod_strings; require_once('modules/PriceBooks/PriceBook.php'); $focus = new PriceBook(); @@ -227,19 +255,25 @@ $query = 'select crmentity.crmid, pricebook.*,pricebookproductrel.productid as prodid from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid inner join pricebookproductrel on pricebookproductrel.pricebookid=pricebook.pricebookid where crmentity.deleted=0 and pricebookproductrel.productid='.$id; + $log->debug("Exiting get_product_pricebooks method ..."); return GetRelatedList('Products','PriceBooks',$focus,$query,$button,$returnset); } function product_novendor() { + global $log; + $log->debug("Entering product_novendor() method ..."); $query = "SELECT products.productname,crmentity.deleted from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0 and products.vendor_id=''"; $result=$this->db->query($query); + $log->debug("Exiting product_novendor method ..."); return $this->db->num_rows($result); } function create_export_query(&$order_by, &$where) { + global $log; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); if($this->checkIfCustomTableExists('productcf')) { @@ -333,6 +367,7 @@ if(!empty($order_by)) $query .= " ORDER BY $order_by"; + $log->debug("Exiting create_export_query method ..."); return $query; } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 06:23:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 10:23:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5618 - /vtigercrm/trunk/modules/Emails/Save.php Message-ID: <20060501102326.98B706F9743@vtiger.fosslabs.com> Author: don Date: Mon May 1 04:23:22 2006 New Revision: 5618 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Emails/Save.php Modified: vtigercrm/trunk/modules/Emails/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 06:31:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 10:31:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5619 - /vtigercrm/trunk/modules/Emails/mailbox.php Message-ID: <20060501103136.58E736F9740@vtiger.fosslabs.com> Author: don Date: Mon May 1 04:31:32 2006 New Revision: 5619 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Emails/mailbox.php Modified: vtigercrm/trunk/modules/Emails/mailbox.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mailbox.php (original) +++ vtigercrm/trunk/modules/Emails/mailbox.php Mon May 1 04:31:32 2006 @@ -254,16 +254,22 @@ function get_mime_type(&$structure) { + global $log; + $log->debug("Entering get_mime_type(".$structure.") method ..."); $primary_mime_type = array("TEXT", "MULTIPART","MESSAGE", "APPLICATION", "AUDIO","IMAGE", "VIDEO", "OTHER"); if($structure->subtype) { + $log->debug("Exiting get_mime_type method ..."); return $primary_mime_type[(int) $structure->type] . '/' .$structure->subtype; } + $log->debug("Exiting get_mime_type method ..."); return "TEXT/PLAIN"; } function get_part($stream, $msg_number, $mime_type, $structure = false,$part_number = false) { + global $log; + $log->debug("Entering get_part(".$stream.", ".$msg_number.", ".$mime_type.", ".$structure.",".$part_number.") method ..."); if(!$structure) { $structure = imap_fetchstructure($stream, $msg_number); @@ -275,10 +281,13 @@ } $text = imap_fetchbody($stream, $msg_number, $part_number); if($structure->encoding == 3) { + $log->debug("Exiting get_part method ..."); return imap_base64($text); } else if($structure->encoding == 4) { + $log->debug("Exiting get_part method ..."); return imap_qprint($text); } else { + $log->debug("Exiting get_part method ..."); return $text; } } @@ -291,11 +300,13 @@ } $data = get_part($stream, $msg_number, $mime_type, $sub_structure,$prefix . ($index + 1)); if($data) { + $log->debug("Exiting get_part method ..."); return $data; } } // END OF WHILE } // END OF MULTIPART } // END OF STRUTURE + $log->debug("Exiting get_part method ..."); return false; } // END OF FUNCTION @@ -327,6 +338,8 @@ function transformHTML($str) { + global $log; + $log->debug("Entering transformHTML(".$str.") method ..."); if ((strpos($str,"\n"; if ((strpos($str,"\n". $str; } + $log->debug("Exiting transformHTML method ..."); return $str; } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 07:20:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:20:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5620 - /vtigercrm/trunk/modules/Emails/Email.php Message-ID: <20060501112009.E35FC6F974D@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:20:06 2006 New Revision: 5620 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Emails/Email.php Modified: vtigercrm/trunk/modules/Emails/Email.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Email.php (original) +++ vtigercrm/trunk/modules/Emails/Email.php Mon May 1 05:20:06 2006 @@ -79,8 +79,11 @@ function Email() { $this->log = LoggerManager::getLogger('email'); + $this->log->debug("Entering Email() method ..."); + $this->log = LoggerManager::getLogger('email'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Emails'); + $this->log->debug("Exiting Email method ..."); } var $new_schema = true; @@ -93,6 +96,7 @@ function get_contacts($id) { global $log; + $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; global $app_strings; @@ -103,6 +107,7 @@ $query = 'select contactdetails.accountid, contactdetails.contactid, contactdetails.firstname,contactdetails.lastname, contactdetails.department, contactdetails.title, contactdetails.email, contactdetails.phone, contactdetails.emailoptout, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from contactdetails inner join cntactivityrel on cntactivityrel.contactid=contactdetails.contactid inner join crmentity on crmentity.crmid = contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where cntactivityrel.activityid='.PearDatabase::quote($id).' and crmentity.deleted=0'; $log->info("Contact Related List for Email is Displayed"); + $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Emails','Contacts',$focus,$query,$button,$returnset); } @@ -113,6 +118,8 @@ */ function get_users($id) { + global $log; + $log->debug("Entering get_users(".$id.") method ..."); global $adb; global $mod_strings; global $app_strings; @@ -164,6 +171,7 @@ if($entries_list != '') $return_data = array("header"=>$header, "entries"=>$entries); + $log->debug("Exiting get_users method ..."); return $return_data; } @@ -173,6 +181,7 @@ function get_attachments($id) { global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); $query = "select notes.title,'Notes ' ActivityType, notes.filename, attachments.type FileType,crm2.modifiedtime lastmodified, seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid, @@ -198,6 +207,7 @@ where crmentity.crmid=".PearDatabase::quote($id); $log->info("Notes&Attachments Related List for Email is Displayed"); + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('Emails',$query,$id); } @@ -205,9 +215,12 @@ * Returns a list of the Emails to be exported */ function create_export_query(&$order_by, &$where) - { + { + global $log; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); $query = 'SELECT activity.activityid, activity.subject, activity.activitytype, attachments.name as filename, crmentity.description as email_content FROM activity inner join crmentity on crmentity.crmid=activity.activityid left join seattachmentsrel on activity.activityid=seattachmentsrel.crmid left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid where activity.activitytype="Emails" and crmentity.deleted=0'; + $log->debug("Exiting create_export_query method ..."); return $query; } @@ -216,8 +229,11 @@ */ function set_emails_contact_invitee_relationship($email_id, $contact_id) { + global $log; + $log->debug("Entering set_emails_contact_invitee_relationship(".$email_id.",". $contact_id.") method ..."); $query = "insert into $this->rel_contacts_table (contactid,activityid) values('$contact_id','$email_id')"; $this->db->query($query,true,"Error setting email to contact relationship: "."
        $query"); + $log->debug("Exiting set_emails_contact_invitee_relationship method ..."); } /** @@ -225,8 +241,11 @@ */ function set_emails_se_invitee_relationship($email_id, $contact_id) { + global $log; + $log->debug("Entering set_emails_se_invitee_relationship(".$email_id.",". $contact_id.") method ..."); $query = "insert into $this->rel_serel_table (crmid,activityid) values('$contact_id','$email_id')"; $this->db->query($query,true,"Error setting email to contact relationship: "."
        $query"); + $log->debug("Exiting set_emails_se_invitee_relationship method ..."); } /** @@ -234,8 +253,11 @@ */ function set_emails_user_invitee_relationship($email_id, $user_id) { + global $log; + $log->debug("Entering set_emails_user_invitee_relationship(".$email_id.",". $user_id.") method ..."); $query = "insert into $this->rel_users_table (smid,activityid) values ('$user_id', '$email_id')"; $this->db->query($query,true,"Error setting email to user relationship: "."
        $query"); + $log->debug("Exiting set_emails_user_invitee_relationship method ..."); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 07:22:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:22:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5621 - /vtigercrm/trunk/modules/Leads/Save.php Message-ID: <20060501112237.325FA6F974D@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:22:33 2006 New Revision: 5621 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Leads/Save.php Modified: vtigercrm/trunk/modules/Leads/Save.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Save.php (original) +++ vtigercrm/trunk/modules/Leads/Save.php Mon May 1 05:22:33 2006 @@ -73,6 +73,7 @@ //Code to save the custom field info into database function save_customfields($entity_id) { + $log->debug("Entering save_customfields(".$entity_id.") method ..."); $log->debug("save custom field invoked ".$entity_id); global $adb; $dbquery="select * from customfields where module='Leads'"; @@ -146,5 +147,6 @@ } } + $log->debug("Exiting save_customfields method ..."); } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 07:23:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:23:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5622 - /vtigercrm/trunk/modules/Leads/result.php Message-ID: <20060501112325.D6D4B6F974D@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:23:21 2006 New Revision: 5622 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Leads/result.php Modified: vtigercrm/trunk/modules/Leads/result.php ============================================================================== --- vtigercrm/trunk/modules/Leads/result.php (original) +++ vtigercrm/trunk/modules/Leads/result.php Mon May 1 05:23:21 2006 @@ -117,7 +117,10 @@ //echo $description; function deleteFile($filename) { + global $log; + $log->debug("Entering deleteFile(".$filename.") method ..."); unlink($filename); + $log->debug("Exiting deleteFile method ..."); } @@ -202,6 +205,8 @@ function insert2DB($salutation,$firstname,$lastname,$company,$designation,$leadsrc,$industry,$annualrevenue,$licensekey,$phone,$mobile,$fax,$email,$yahooid,$website,$leadstatus,$rating,$empct) { + global $log; + $log->debug("Entering insert2DB(".$salutation.",".$firstname.",".$lastname.",".$company.",".$designation.",".$leadsrc.",".$industry.",".$annualrevenue.",".$licensekey.",".$phone.",".$mobile.",".$fax.",".$email.",".$yahooid.",".$website.",".$leadstatus.",".$rating.",".$empct.") method ..."); $id = create_guid(); $date_entered = date('YmdHis'); $date_modified = date('YmdHis'); @@ -212,6 +217,7 @@ $sql = "INSERT INTO leads (id,date_entered,date_modified,modified_user_id,assigned_user_id,salutation,first_name,last_name,company,designation,lead_source,industry,annual_revenue,license_key,phone,mobile,fax,email,yahoo_id,website,lead_status,rating,employees) VALUES ('$id',".$adb->formatString('leads','date_entered',$date_entered).",".$adb->formatString('leads','date_modified',$date_modified).",'$modified_user_id','$assigned_user_id','$salutation','$firstname','$lastname','$company','$designation','$leadsrc','$industry','$annualrevenue','$licensekey','$phone','$mobile','$fax','$email','$yahooid','$website','$leadstatus','$rating','$empcount')"; $result = $adb->query($sql); + $log->debug("Exiting insert2DB method ..."); return $id; } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 07:23:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:23:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5623 - /vtigercrm/trunk/modules/Leads/ListViewTop.php Message-ID: <20060501112356.42A0B6F974D@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:23:52 2006 New Revision: 5623 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Leads/ListViewTop.php Modified: vtigercrm/trunk/modules/Leads/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListViewTop.php (original) +++ vtigercrm/trunk/modules/Leads/ListViewTop.php Mon May 1 05:23:52 2006 @@ -22,6 +22,8 @@ function getNewLeads() { + global $log; + $log->debug("Entering getNewLeads() method ..."); require_once('XTemplate/xtpl.php'); require_once("data/Tracker.php"); require_once("include/utils/utils.php"); @@ -119,10 +121,13 @@ $entries[$lead_fields['LEAD_ID']]=$value; } $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); + $log->debug("Exiting getNewLeads method ..."); return $values; } function getLeadView($lead_view) { + global $log; + $log->debug("Entering getLeadView(".$lead_view.") method ..."); $today = date("Y-m-d", time()); if($lead_view == 'Today') @@ -150,6 +155,7 @@ $LEAD_VIEW_SELECT_OPTION .= ''; $LEAD_VIEW_SELECT_OPTION .= ''; + $log->debug("Exiting getLeadView method ..."); return $LEAD_VIEW_SELECT_OPTION; } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 07:25:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:25:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5624 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060501112543.857786D90A6@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:25:39 2006 New Revision: 5624 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Mon May 1 05:25:39 2006 @@ -144,30 +144,38 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Lead() { + function Lead() { $this->log = LoggerManager::getLogger('lead'); + $this->log->debug("Entering Lead() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Leads'); + $this->log->debug("Exiting Lead method ..."); } // Mike Crowe Mod --------------------------------------------------------Default ordering for us function getSortOrder() { + global $log; + $log->debug("Entering getSortOrder() method ..."); if(isset($_REQUEST['sorder'])) $sorder = $_REQUEST['sorder']; else $sorder = (($_SESSION['LEADS_SORT_ORDER'] != '')?($_SESSION['LEADS_SORT_ORDER']):($this->default_sort_order)); + $log->debug("Exiting getSortOrder method ..."); return $sorder; } function getOrderBy() { + global $log; + $log->debug("Entering getOrderBy() method ..."); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; else $order_by = (($_SESSION['LEADS_ORDER_BY'] != '')?($_SESSION['LEADS_ORDER_BY']):($this->default_order_by)); + $log->debug("Exiting getOrderBy method ..."); return $order_by; } // Mike Crowe Mod -------------------------------------------------------- @@ -176,6 +184,8 @@ function create_export_query(&$order_by, &$where) { + global $log; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); if($this->checkIfCustomTableExists('leadscf')) { @@ -219,6 +229,7 @@ if(!empty($order_by)) $query .= " ORDER BY $order_by"; + $log->debug("Exiting create_export_query method ..."); return $query; } @@ -228,6 +239,8 @@ */ function get_activities($id) { + global $log; + $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; $focus = new Activity(); @@ -243,6 +256,7 @@ // First, get the list of IDs. $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name,recurringevents.recurringtype from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus !='' && activity.eventstatus = 'Planned')"; + $log->debug("Exiting get_activities method ..."); return GetRelatedList('Leads','Activities',$focus,$query,$button,$returnset); } @@ -250,6 +264,8 @@ */ function get_emails($id) { + + $log->debug("Entering get_emails(".$id.") method ..."); global $mod_strings; require_once('include/RelatedListView.php'); @@ -265,11 +281,14 @@ $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; $query ="select activity.activityid, activity.subject, activity.semodule, activity.activitytype, activity.date_start, activity.status, activity.priority, crmentity.crmid,crmentity.smownerid,crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid inner join users on users.id=crmentity.smownerid where activity.activitytype='Emails' and crmentity.deleted=0 and seactivityrel.crmid=".$id; + $log->debug("Exiting get_emails method ..."); return GetRelatedList('Leads','Emails',$focus,$query,$button,$returnset); } function get_history($id) { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); $query = "SELECT activity.activityid, activity.subject, activity.status, activity.eventstatus, activity.activitytype, contactdetails.contactid, contactdetails.firstname, contactdetails.lastname, crmentity.modifiedtime, @@ -287,11 +306,14 @@ and seactivityrel.crmid=".$id; //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Exiting get_history method ..."); return getHistory('Leads',$query,$id); } function get_attachments($id) { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); // Armando L?scher 18.10.2005 -> ?visibleDescription // Desc: Inserted crm2.createdtime, notes.notecontent description, users.user_name // Inserted inner join users on crm2.smcreatorid= users.id @@ -324,11 +346,14 @@ where crmentity.crmid=".$id." order by createdtime desc"; + $log->debug("Exiting get_attachments method ..."); return getAttachmentsAndNotes('Leads',$query,$id); } function get_products($id) { + global $log; + $log->debug("Entering get_products(".$id.") method ..."); require_once('modules/Products/Product.php'); global $mod_strings; global $app_strings; @@ -344,18 +369,24 @@ $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid from products inner join seproductsrel on products.productid = seproductsrel.productid inner join crmentity on crmentity.crmid = products.productid inner join leaddetails on leaddetails.leadid = seproductsrel.crmid where leaddetails.leadid = '.$id.' and crmentity.deleted = 0'; + $log->debug("Exiting get_products method ..."); return GetRelatedList('Leads','Products',$focus,$query,$button,$returnset); } function get_lead_field_options($list_option) { + global $log; + $log->debug("Entering get_lead_field_options(".$list_option.") method ..."); $comboFieldArray = getComboArray($this->combofieldNames); + $log->debug("Exiting get_lead_field_options method ..."); return $comboFieldArray[$list_option]; } //Used By vtigerCRM Word Plugin function getColumnNames_Lead() { + global $log; + $log->debug("Entering getColumnNames_Lead() method ..."); $sql1 = "select fieldlabel from field where tabid=7"; $result = $this->db->query($sql1); $numRows = $this->db->num_rows($result); @@ -366,6 +397,7 @@ $custom_fields[$i] = strtoupper($custom_fields[$i]); } $mergeflds = $custom_fields; + $log->debug("Exiting getColumnNames_Lead method ..."); return $mergeflds; } //End From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 07:26:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 11:26:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5625 - /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Message-ID: <20060501112633.A11636D90A6@vtiger.fosslabs.com> Author: don Date: Mon May 1 05:26:29 2006 New Revision: 5625 Log: logs entry has been included in all functions Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Mon May 1 05:26:29 2006 @@ -58,7 +58,7 @@ function getInsertValues($type,$type_id) { global $id,$adb,$log; - + $log->debug("Entering getInsertValues(".$type.",".$type_id.") method ..."); $sql_convert_lead="select * from convertleadmapping "; $convert_result = $adb->query($sql_convert_lead); $noofrows = $adb->num_rows($convert_result); @@ -66,7 +66,7 @@ for($i=0;$i<$noofrows;$i++) { $flag="false"; - $log->info("In convertleadmapping function"); + $log->info("In convertleadmapping function"); $lead_id=$adb->query_result($convert_result,$i,"leadfid"); //Getting the relatd customfields for Accounts/Contact/potential from convertleadmapping table $account_id_val=$adb->query_result($convert_result,$i,"accountfid"); @@ -135,6 +135,7 @@ $log->debug("columns to be inserted are ".$type_insert_column); $log->debug("columns to be inserted are ".$insert_value); $values = array ($type_insert_column,$insert_value); + $log->debug("Exiting getInsertValues method ..."); return $values; } //function Ends @@ -142,7 +143,7 @@ function getRelatedNotesAttachments($id,$accountid) { global $adb,$log,$id; - + $log->debug("Entering getRelatedNotesAttachments(".$id.",".$accountid.") method ..."); $sql_lead_notes ="select * from senotesrel where crmid=".$id; $lead_notes_result = $adb->query($sql_lead_notes); @@ -176,13 +177,14 @@ $sql_insert_account_attachment="insert into seattachmentsrel(crmid,attachmentsid) values (".$accountid.",".$lead_related_attachment_id.")"; $adb->query($sql_insert_account_attachment); } + $log->debug("Exiting getRelatedNotesAttachments method ..."); } function getRelatedActivities($accountid,$contact_id) { global $adb,$log,$id; - + $log->debug("Entering getRelatedActivities(".$accountid.",".$contact_id.") method ..."); $sql_lead_activity="select * from seactivityrel where crmid=".$id; $lead_activity_result = $adb->query($sql_lead_activity); $noofrows = $adb->num_rows($lead_activity_result); @@ -213,7 +215,7 @@ $sql_insert_account_activity="insert into seactivityrel(crmid,activityid) values (".$contact_id.",".$lead_related_activity_id.")"; $adb->query($sql_insert_account_activity); } } - + $log->debug("Exiting getRelatedActivities method ..."); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 09:33:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 13:33:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5626 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060501133304.1F5066FF4EE@vtiger.fosslabs.com> Author: don Date: Mon May 1 07:32:58 2006 New Revision: 5626 Log: Added pref view in header.tpl-ahmed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon May 1 07:32:58 2006 @@ -27,7 +27,7 @@
    - + @@ -62,13 +64,16 @@ - + - + - + - - - + + + {* *} + @@ -249,3 +255,58 @@ {$JAVASCRIPT} +
    + +
    - {if $CHECK.EditView eq 'yes'} + {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} {if $MODULE eq 'Activities'} {else} @@ -53,7 +53,7 @@ {/if} - {if $CHECK.index eq 'yes'} + {if $CHECK.index eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} {else} From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 07:56:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 14:56:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6879 - /vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl Message-ID: <20060531145642.6DDAC7D7F12@vtiger.fosslabs.com> Author: don Date: Wed May 31 08:56:38 2006 New Revision: 6879 Log: display field changed from Relative module to report type Modified: vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl Modified: vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl Wed May 31 08:56:38 2006 @@ -38,7 +38,7 @@
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...
    - + From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:03:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:03:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23308=3A_?= =?utf-8?q?Drilldown_for_leads_by_industry_shows_no_data?= In-Reply-To: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com> References: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com> Message-ID: <085.54860fca9238cbc5eca953e2865bbf37@vtiger.fosslabs.com> #308: Drilldown for leads by industry shows no data ------------------------+--------------------------------------------------- Reporter: richie | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * owner: jerrydgeorge => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:04:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:04:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231113=3A?= =?utf-8?q?_export_to_pdf_fails_from_quotes?= In-Reply-To: <076.431db81bc7b29e1e6bec57b2346fde3b@vtiger.fosslabs.com> References: <076.431db81bc7b29e1e6bec57b2346fde3b@vtiger.fosslabs.com> Message-ID: <085.bb3002f6e3bb0f7145d8c0779468d481@vtiger.fosslabs.com> #1113: export to pdf fails from quotes ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: quote ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:05:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:05:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231087=3A?= =?utf-8?q?_Home_page=3A_KPIs_numbers_not_displayed?= In-Reply-To: <076.138e9c1830c9213d3cf54687d27e0598@vtiger.fosslabs.com> References: <076.138e9c1830c9213d3cf54687d27e0598@vtiger.fosslabs.com> Message-ID: <085.25166fbf85b14d988a9e31b3d50eef24@vtiger.fosslabs.com> #1087: Home page: KPIs numbers not displayed ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:06:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:06:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231193=3A?= =?utf-8?q?_Issue_in_sharing_calendar?= In-Reply-To: <076.774e42257b1b98382dcf56d4974ba9b6@vtiger.fosslabs.com> References: <076.774e42257b1b98382dcf56d4974ba9b6@vtiger.fosslabs.com> Message-ID: <085.4b216f2a183b575818676153bf268e99@vtiger.fosslabs.com> #1193: Issue in sharing calendar ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:07:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:07:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231194=3A?= =?utf-8?q?_Issue_in_calendar_sharing?= In-Reply-To: <076.b1ca2f924c00c8c74dcb02f25d9f19c6@vtiger.fosslabs.com> References: <076.b1ca2f924c00c8c74dcb02f25d9f19c6@vtiger.fosslabs.com> Message-ID: <085.4cb612ba862ac8e349410245a8443da1@vtiger.fosslabs.com> #1194: Issue in calendar sharing ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:07:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:07:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2381=3A_?= =?utf-8?q?=22Available_Merge_Fields=22_does_not_work_in_the_email_templat?= =?utf-8?q?es_=28adding_a_merge_field_to_a_template_does_not_result_in_tha?= =?utf-8?q?t_field_being_merged=29?= In-Reply-To: <076.247dfccd0d5a7f69c4c5016ef5f5c24b@vtiger.fosslabs.com> References: <076.247dfccd0d5a7f69c4c5016ef5f5c24b@vtiger.fosslabs.com> Message-ID: <085.7905b85deedf9509c4e6603f70ad7a86@vtiger.fosslabs.com> #81: "Available Merge Fields" does not work in the email templates (adding a merge field to a template does not result in that field being merged) ------------------------------------+--------------------------------------- Reporter: scott at crazycolour.com | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: merge fields not available in email template ------------------------------------+--------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Merge Fields results in the field being merged -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:09:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:09:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231223=3A?= =?utf-8?q?_Broken_Image_in_Migrate_from_Previous_Version_page?= In-Reply-To: <076.ed626e227471eb252b6e5bacaade56dc@vtiger.fosslabs.com> References: <076.ed626e227471eb252b6e5bacaade56dc@vtiger.fosslabs.com> Message-ID: <085.b505555621c5e2c69557c595dd1f7d99@vtiger.fosslabs.com> #1223: Broken Image in Migrate from Previous Version page ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:09:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:09:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231097=3A?= =?utf-8?q?_E_mail_template_not_functionning_in_demo_when_composing_a_new_?= =?utf-8?q?mail?= In-Reply-To: <076.e559e0d604cc2af8f811c0b6346408b6@vtiger.fosslabs.com> References: <076.e559e0d604cc2af8f811c0b6346408b6@vtiger.fosslabs.com> Message-ID: <085.7d2988bfb52fc2c64547ff46b2ea9a00@vtiger.fosslabs.com> #1097: E mail template not functionning in demo when composing a new mail ------------------------+--------------------------------------------------- Reporter: NonoFr | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: email template ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:10:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:10:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231104=3A?= =?utf-8?q?_Issue_in_notes_attachment?= In-Reply-To: <076.72db068eaf2b283598eb7f6d6eae55de@vtiger.fosslabs.com> References: <076.72db068eaf2b283598eb7f6d6eae55de@vtiger.fosslabs.com> Message-ID: <085.05df16e3820ff14ef747fe03d2aacb62@vtiger.fosslabs.com> #1104: Issue in notes attachment ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => invalid * status: new => closed Comment: this is a vulnerability issue. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:11:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:11:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231131=3A?= =?utf-8?q?_Copy_Merge_Field_Value_is_not__replaced_with_value_and_parentt?= =?utf-8?q?ab_not_parsed_for_edit_template?= In-Reply-To: <076.bef32b69825917dc34da8cbc8db15847@vtiger.fosslabs.com> References: <076.bef32b69825917dc34da8cbc8db15847@vtiger.fosslabs.com> Message-ID: <085.dcbba482ea66344e54d18a6ddad400f2@vtiger.fosslabs.com> #1131: Copy Merge Field Value is not replaced with value and parenttab not parsed for edit template ------------------------+--------------------------------------------------- Reporter: mangai | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: Issue fixed - Merge field value is getting replaced -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:12:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:12:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23275=3A_?= =?utf-8?q?Old_UI_for_attachments?= In-Reply-To: <076.8f5bc7ae23373550435516f3f8ca4071@vtiger.fosslabs.com> References: <076.8f5bc7ae23373550435516f3f8ca4071@vtiger.fosslabs.com> Message-ID: <085.a7229ec4be282bb17d64a9bebc6787c9@vtiger.fosslabs.com> #275: Old UI for attachments ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: attachments ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:17:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:17:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231187=3A?= =?utf-8?q?_Issue_in_email_templates?= In-Reply-To: <076.185b1400a90d3b7e7c77e617cab40e68@vtiger.fosslabs.com> References: <076.185b1400a90d3b7e7c77e617cab40e68@vtiger.fosslabs.com> Message-ID: <085.944d1fa79e5d2b4d24029e45d7dd68b1@vtiger.fosslabs.com> #1187: Issue in email templates ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Text alignment is made proper -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:19:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:19:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23848=3A_?= =?utf-8?q?Issue_in_All_Menu?= In-Reply-To: <076.346ae4e7a4103125d315251e89b5686e@vtiger.fosslabs.com> References: <076.346ae4e7a4103125d315251e89b5686e@vtiger.fosslabs.com> Message-ID: <085.9b0c4ea3c4fcd13205695a78a05b24bb@vtiger.fosslabs.com> #848: Issue in All Menu ------------------------+--------------------------------------------------- Reporter: don | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:20:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:20:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23924=3A_?= =?utf-8?q?Report_Creator_Page_shows_inconsistent_List_Headings?= In-Reply-To: <076.829046d4246e195e3547bf92d6e9ca5c@vtiger.fosslabs.com> References: <076.829046d4246e195e3547bf92d6e9ca5c@vtiger.fosslabs.com> Message-ID: <085.9f51c6c69893be4d8fbb9f7552d653f8@vtiger.fosslabs.com> #924: Report Creator Page shows inconsistent List Headings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: Jeri Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: reports ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:21:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:21:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231106=3A?= =?utf-8?q?_Issue_in_Calendar_Quick_Access_link?= In-Reply-To: <076.c6e100f8424625fa3cd82a6c919480dd@vtiger.fosslabs.com> References: <076.c6e100f8424625fa3cd82a6c919480dd@vtiger.fosslabs.com> Message-ID: <085.a2b90e26f452270f35f1c7c8001fc004@vtiger.fosslabs.com> #1106: Issue in Calendar Quick Access link ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:21:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:21:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23934=3A_?= =?utf-8?q?issue_in_Open_All_Menu_button?= In-Reply-To: <076.52083af7ba9689e650dea5dfcd819408@vtiger.fosslabs.com> References: <076.52083af7ba9689e650dea5dfcd819408@vtiger.fosslabs.com> Message-ID: <085.df4d312f65e65752c78f9717cfbfedae@vtiger.fosslabs.com> #934: issue in Open All Menu button ------------------------+--------------------------------------------------- Reporter: mickie | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 08:21:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:21:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231191=3A?= =?utf-8?q?_Edit_field_blocks_is_not_removed_from_settings_menusubtab?= In-Reply-To: <076.01547e41e69b4f6064fc86b46e1b68dc@vtiger.fosslabs.com> References: <076.01547e41e69b4f6064fc86b46e1b68dc@vtiger.fosslabs.com> Message-ID: <085.ac4ee17850b46dada4c6caf94265c94c@vtiger.fosslabs.com> #1191: Edit field blocks is not removed from settings menusubtab ------------------------+--------------------------------------------------- Reporter: mangai | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 09:55:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 16:55:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6880 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060531165550.EE5857D7F22@vtiger.fosslabs.com> Author: don Date: Wed May 31 10:55:44 2006 New Revision: 6880 Log: Release Notes for v5 beta Added: vtigercrm/trunk/Release_Notes.html From vtiger-tickets at vtiger.fosslabs.com Wed May 31 10:11:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:11:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23966=3A_?= =?utf-8?q?Report_Creator?= In-Reply-To: <076.7b9a319c4401673d54f4041c4120473a@vtiger.fosslabs.com> References: <076.7b9a319c4401673d54f4041c4120473a@vtiger.fosslabs.com> Message-ID: <085.2ae377fbbe7405a25816e60e85b23a23@vtiger.fosslabs.com> #966: Report Creator ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 10:12:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:12:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231013=3A?= =?utf-8?q?_Home_=3E_Activities_List_View?= In-Reply-To: <076.9c54fa128df249b46893b8dd398eddf0@vtiger.fosslabs.com> References: <076.9c54fa128df249b46893b8dd398eddf0@vtiger.fosslabs.com> Message-ID: <085.0de4cb67de932595ebe361ce25ce6753@vtiger.fosslabs.com> #1013: Home > Activities List View ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 10:12:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:12:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231017=3A?= =?utf-8?q?_Helpdesk_-_File_upload_page_UI_is_in_old_format?= In-Reply-To: <076.192abdb76e706e9ecd0149341039ec5d@vtiger.fosslabs.com> References: <076.192abdb76e706e9ecd0149341039ec5d@vtiger.fosslabs.com> Message-ID: <085.795718350d617ec7db9edc15e16c5bc0@vtiger.fosslabs.com> #1017: Helpdesk - File upload page UI is in old format ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: helpdesk fileupload ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 10:13:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:13:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231021=3A?= =?utf-8?q?_Faq_-_Listview_Pagination_throws_javascript_exception?= In-Reply-To: <076.a1dc08db90d13c34fbf821d94e8e9d78@vtiger.fosslabs.com> References: <076.a1dc08db90d13c34fbf821d94e8e9d78@vtiger.fosslabs.com> Message-ID: <085.64b3e41c99745e3c4abab4cdf0bbe870@vtiger.fosslabs.com> #1021: Faq - Listview Pagination throws javascript exception ------------------------+--------------------------------------------------- Reporter: saraj | Owner: philip Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: faq pagination ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 10:13:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:13:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231042=3A?= =?utf-8?q?_Tag_Clould_should_be_changed?= In-Reply-To: <076.0b78bce2e9d0dbdad2f10faee2399413@vtiger.fosslabs.com> References: <076.0b78bce2e9d0dbdad2f10faee2399413@vtiger.fosslabs.com> Message-ID: <085.b4b1ee3c6c61aee83f6d9bf57a4c075e@vtiger.fosslabs.com> #1042: Tag Clould should be changed ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 10:14:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:14:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231115=3A?= =?utf-8?q?_Report_Creator_=3E_Relative_Module_not_showing?= In-Reply-To: <076.bfc887d15993de2dff63a0499087006d@vtiger.fosslabs.com> References: <076.bfc887d15993de2dff63a0499087006d@vtiger.fosslabs.com> Message-ID: <085.18f8911d710840d78f64a286c4e0cc04@vtiger.fosslabs.com> #1115: Report Creator > Relative Module not showing ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 10:46:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 31 May 2006 17:46:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6881 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060531174622.E14567D7F69@vtiger.fosslabs.com> Author: don Date: Wed May 31 11:46:18 2006 New Revision: 6881 Log: release notes for 5beta Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Wed May 31 11:46:18 2006 @@ -41,7 +41,7 @@

    Appeal to Developers, Testers, Analysts, Writers, and real end users!

    Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta,

    -

    Step 1: Browse through Live Demo

    +

    Step 1: Browse through Live Demo

    Step 2: Download product from the vtiger.com and install in your favorite Operating System.

    Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

    Table of Contents

    @@ -87,7 +87,7 @@
    @@ -211,6 +211,30 @@ + + + + + + + + + + + + + + + + + + + + + + + +
    1. {$MOD.LBL_REPORT_DETAILS}
    2. {$MOD.LBL_RELATIVE_MODULE}
    3.{$MOD.LBL_RELATIVE_MODULE}
    3.{$MOD.LBL_REPORT_TYPE}
    4.{$MOD.LBL_SELECT_COLUMNS}
    5. {$MOD.LBL_SPECIFY_GROUPING}
    6. {$MOD.LBL_CALCULATIONS}
    Product Documentation
    28 Mass Change owner option in various modules
    29Inventory Revamped
    30Advanced and Basic Search UI changed
    31Automatic Tax Calculator Integrated
    32Pagination to the related list added
    33Migration support from 4.2.3 to 5.0 Beta Integrated

     

    @@ -352,9 +376,6 @@

    Appeal to Developers, Testers, Analysts, Writers, and real end users!

    Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Alpha 5,

    -

    Step 1: Browse through Live Demo

    -

    Step 2: Download product from the vtiger.com and install in your favorite Operating System.

    -

    Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

    Table of Contents

    1. Summary
    2. @@ -403,7 +424,7 @@
    Product Documentation
    - +
    My Preferences My Preferences Logout ({$CURRENT_USER})
    From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 09:36:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 13:36:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5627 - /vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Message-ID: <20060501133648.9A6D2702BF7@vtiger.fosslabs.com> Author: don Date: Mon May 1 07:36:44 2006 New Revision: 5627 Log: Added the primary email id Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Mon May 1 07:36:44 2006 @@ -1,4 +1,5 @@ + @@ -20,6 +21,7 @@ + @@ -39,7 +41,7 @@
      My Details My Mail Server Details My Mail Server Details  
    {$EDIT_BUTTON} +   + + {* {$CHANGE_PW_BUTTON}*}
    My Details
    User Name*User Name {$USER_NAME} Admin @@ -82,16 +87,17 @@ {$GROUPASSIGNED}
    Last Name *Last Name {$LAST_NAME}My Role *My Role {$ROLEASSIGNED}
    PasswordMy Status *E-Mail Id{$EMAIL1}*My Status {$STATUS}
     
    + + + + + + + + + + + + + + + + + + + + + + + + +
    Change Password

    Enter Current Password :
    Enter New Password :
    Confirm New Password :
     
    +    + +
     
    + + + From vtigercrm-commits at vtiger.fosslabs.com Mon May 1 09:39:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 01 May 2006 13:39:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5628 - /vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Message-ID: <20060501133902.CBD43702BF7@vtiger.fosslabs.com> Author: don Date: Mon May 1 07:38:59 2006 New Revision: 5628 Log: Added the primary email id Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Mon May 1 07:38:59 2006 @@ -256,7 +256,6 @@ {$JAVASCRIPT}
    -
    @@ -286,7 +285,6 @@
    Change Password
     
    -
    - - - - - - - - - - {include file='SettingsMenu.tpl'} - -
    - - - - -
    {$MOD.LBL_USER_MANAGEMENT}
    - - - - - - - - - - - - - - - - - - - - -
    - {$USER_IMAGE} - {$EDIT_BUTTON} - {$CHANGE_PW_BUTTON} - {$LOGIN_HISTORY_BUTTON} - {$DUPLICATE_BUTTON} - {$DELETE_BUTTON} - {$LIST_MAILSERVER_BUTTON} - {$CHANGE_HOMEPAGE_BUTTON} - {$LISTROLES_BUTTON} -
     
    - -
    -
    - - - - - - - - - - - -
    - - - - - - - - -
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} 
    -
    -
    - - - -
     
    - - - - - - - - - - - {if $MODE eq 'edit'} - - - - - - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_USER_INFORMATION}
    *{$UMOD.LBL_USER_NAME} {$USER_NAME}{$UMOD.LBL_ADMIN}
    *{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
    {$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}*{$UMOD.LBL_LAST_NAME}{$LAST_NAME}
    *{$UMOD.LBL_USER_ROLE}{$ROLEASSIGNED} {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED}
    *{$UMOD.LBL_EMAIL}{$EMAIL1}*{$UMOD.LBL_STATUS}{$STATUS}
     
    {$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
    *{$UMOD.LBL_COLOR}{$COLORASSIGNED}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
     
    -
    -
    -
    - - - -
     
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_USER_MORE_INFN}
    {$UMOD.LBL_TITLE}{$TITLE}{$UMOD.LBL_OFFICE_PHONE}{$PHONE_WORK}
    {$UMOD.LBL_DEPARTMENT}{$DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}{$PHONE_MOBILE}
    {$UMOD.LBL_REPORTS_TO}{$REPORTS_TO_NAME}{$REPORTS_TO_ID} {$UMOD.LBL_OTHER_PHONE}{$PHONE_OTHER}
    {$UMOD.LBL_OTHER_EMAIL}{$EMAIL2}{$UMOD.LBL_FAX}{$PHONE_FAX}
    {$UMOD.LBL_YAHOO_ID}{$YAHOO_ID}{$UMOD.LBL_HOME_PHONE}{$PHONE_HOME}
    {$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}  
    {$UMOD.LBL_SIGNATURE}{$SIGNATURE}{$UMOD.LBL_NOTES}{$DESCRIPTION} -
     
    -
    -
    -
    - - - -
     
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_USER_ADDR_INFN}
    {$UMOD.LBL_ADDRESS}{$ADDRESS_STREET}  
    {$UMOD.LBL_CITY}{$ADDRESS_CITY}  
    {$UMOD.LBL_STATE}{$ADDRESS_STATE}  
    {$UMOD.LBL_POSTAL_CODE}{$ADDRESS_POSTALCODE}  
    {$UMOD.LBL_COUNTRY}{$ADDRESS_COUNTRY}  
     
    -
    -
    -
     
    -
    - -
    -
    - -
    -
    -
    - -{$JAVASCRIPT} - {include file='SettingsSubMenu.tpl'} + + + + + + + + + + + + {include file='SettingsMenu.tpl'} + +
    + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + +
    + + {$MOD.LBL_SETTINGS} + > {$MOD.LBL_USER_MANAGEMENT} +
    +
    {$USER_NAME}
    + Detail View of {$FIRST_NAME} {$LAST_NAME} +
    +
     
    + {$EDIT_BUTTON} + {$CHANGE_PW_BUTTON} + {$LOGIN_HISTORY_BUTTON} + {$DUPLICATE_BUTTON} + {$DELETE_BUTTON} + {$LIST_MAILSERVER_BUTTON} + {$CHANGE_HOMEPAGE_BUTTON} + {$LISTROLES_BUTTON} +
     
    + + + + + + + + + + + +
    + + + + + + + + +
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} 
    +
    +
    + + + +
     
    + + + + + + + + + + + {if $MODE eq 'edit'} + + + + + + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_USER_INFORMATION}
    *{$UMOD.LBL_USER_NAME} {$USER_NAME}{$UMOD.LBL_ADMIN}
    *{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
    {$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}*{$UMOD.LBL_LAST_NAME}{$LAST_NAME}
    *{$UMOD.LBL_USER_ROLE}{$ROLEASSIGNED} {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED}
    *{$UMOD.LBL_EMAIL}{$EMAIL1}*{$UMOD.LBL_STATUS}{$STATUS}
     
    {$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
    *{$UMOD.LBL_COLOR}{$COLORASSIGNED}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
     
    +
    +
    +
    + + + +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_USER_MORE_INFN}
    {$UMOD.LBL_TITLE}{$TITLE}{$UMOD.LBL_OFFICE_PHONE}{$PHONE_WORK}
    {$UMOD.LBL_DEPARTMENT}{$DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}{$PHONE_MOBILE}
    {$UMOD.LBL_REPORTS_TO}{$REPORTS_TO_NAME}{$REPORTS_TO_ID} {$UMOD.LBL_OTHER_PHONE}{$PHONE_OTHER}
    {$UMOD.LBL_OTHER_EMAIL}{$EMAIL2}{$UMOD.LBL_FAX}{$PHONE_FAX}
    {$UMOD.LBL_YAHOO_ID}{$YAHOO_ID}{$UMOD.LBL_HOME_PHONE}{$PHONE_HOME}
    {$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}  
    {$UMOD.LBL_SIGNATURE}{$SIGNATURE}{$UMOD.LBL_NOTES}{$DESCRIPTION} +
     
    +
    +
    +
    + + + +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_USER_ADDR_INFN}
    {$UMOD.LBL_ADDRESS}{$ADDRESS_STREET}  
    {$UMOD.LBL_CITY}{$ADDRESS_CITY}  
    {$UMOD.LBL_STATE}{$ADDRESS_STATE}  
    {$UMOD.LBL_POSTAL_CODE}{$ADDRESS_POSTALCODE}  
    {$UMOD.LBL_COUNTRY}{$ADDRESS_COUNTRY}  
     
    +
    +
    +
     
    + + + +
    + +
    +
    + + + + +{$JAVASCRIPT} + {include file='SettingsSubMenu.tpl'} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 03:32:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 07:32:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5639 - /vtigercrm/trunk/Smarty/templates/UserListView.tpl Message-ID: <20060502073204.3D040702E07@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 01:31:49 2006 New Revision: 5639 Log: Added the UI Changes in userlistview.tpl - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Tue May 2 01:31:49 2006 @@ -3,79 +3,78 @@ {include file='SettingsMenu.tpl'} -
    - - - - - -
    {$MOD.LBL_USER_MANAGEMENT}
    - - - - - - - - - - - - - -
    -{if $USER_IMAGES neq ''} - - -
    -[X] Close -
    -{foreach item=imagename from=$USER_IMAGES} - {$imagename} -{/foreach} -
    -
    -{/if} -
    {$RECORD_COUNTS} - - {$NAVIGATION} -
    -
     
    - - + -{foreach item=header from=$LIST_HEADER} - -{/foreach} - -{section name=entries loop=$LIST_ENTRIES} - - {foreach item=listvalues from=$LIST_ENTRIES[entries]} - - {/foreach} - -{/section} -
    + + -
    {$header}
    {$listvalues}
    - -
    - - - - - - - - - - - -
    {$CMOD.LBL_STATISTICS}
    {$CMOD.LBL_TOTAL}{$USER_COUNT.user} {$CMOD.LBL_USERS}
    {$CMOD.LBL_ADMIN}{$USER_COUNT.admin} {$CMOD.LBL_USERS}
    {$CMOD.LBL_OTHERS}{$USER_COUNT.nonadmin} {$CMOD.LBL_USERS}
    -
    -
    + + + + + + + + + + + +
    + + {$MOD.LBL_SETTINGS} + > {$MOD.LBL_USER_MANAGEMENT} +
    +
    + + + + + + + + + + {$NAVIGATION} + +
     {$MOD.LBL_USER_MANAGEMENT} + +
     
    {$RECORD_COUNTS} 
    +
    +
    + + + + + + + + + + + +
    + {$CMOD.LBL_STATISTICS}
    {$CMOD.LBL_TOTAL}{$USER_COUNT.user} {$CMOD.LBL_USERS}
    {$CMOD.LBL_ADMIN} : {$USER_COUNT.admin} {$CMOD.LBL_USERS}
    {$CMOD.LBL_OTHERS}{$USER_COUNT.nonadmin} {$CMOD.LBL_USERS}
    +
    + + + + {foreach item=header from=$LIST_HEADER} + + {/foreach} + + {section name=entries loop=$LIST_ENTRIES} + + {foreach item=listvalues from=$LIST_ENTRIES[entries]} + + {/foreach} + + {/section} + +
    {$header}
    {$listvalues}
    +
    +
    From vtiger-tickets at vtiger.fosslabs.com Tue May 2 04:10:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 08:10:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23194=3A_?= =?utf-8?q?massdelete_in_ListView_shows_hacking_attempt?= In-Reply-To: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> References: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> Message-ID: <085.b68339f49568a4b4f01c565fed239676@vtiger.fosslabs.com> #194: massdelete in ListView shows hacking attempt ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: philip Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: worksforme | Keywords: massdelete ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => worksforme * status: new => closed Comment: No module specified, also this will not work in mozilla version less than 1.5 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 04:13:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 08:13:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23194=3A_?= =?utf-8?q?massdelete_in_ListView_shows_hacking_attempt?= In-Reply-To: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> References: <076.1ca2595c177e192b1f562a9749f81d8c@vtiger.fosslabs.com> Message-ID: <085.21eb500712841a734baded70649c8beb@vtiger.fosslabs.com> #194: massdelete in ListView shows hacking attempt ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: philip Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: worksforme | Keywords: massdelete ---------------------------+------------------------------------------------ -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 04:21:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 08:21:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23561=3A_?= =?utf-8?q?listview_broken_in_IE?= In-Reply-To: <076.8118f2181b324708891dc5c04b35521f@vtiger.fosslabs.com> References: <076.8118f2181b324708891dc5c04b35521f@vtiger.fosslabs.com> Message-ID: <085.3e68399ecf9f5d26189b1d0b780a4be2@vtiger.fosslabs.com> #561: listview broken in IE --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 04:24:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 08:24:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23259=3A_?= =?utf-8?q?New_User_-_Reports_To_-_CSS_Not_applied_properly?= In-Reply-To: <076.8733a323192caf9065436361d9d6cd14@vtiger.fosslabs.com> References: <076.8733a323192caf9065436361d9d6cd14@vtiger.fosslabs.com> Message-ID: <085.83de5401d86ca80a8297a71d4196e565@vtiger.fosslabs.com> #259: New User - Reports To - CSS Not applied properly ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 04:25:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 08:25:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5640 - in /vtigercrm/trunk: Smarty/templates/GlobalListView.tpl modules/Home/UnifiedSearch.php Message-ID: <20060502082504.0E3E0702DED@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 02:24:55 2006 New Revision: 5640 Log: * Modified to display the search criteria in Header and added the function docs Modified: vtigercrm/trunk/Smarty/templates/GlobalListView.tpl vtigercrm/trunk/modules/Home/UnifiedSearch.php Modified: vtigercrm/trunk/Smarty/templates/GlobalListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GlobalListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GlobalListView.tpl Tue May 2 02:24:55 2006 @@ -49,7 +49,7 @@ - + -
    {$MODULE}{$MODULE}{$SEARCH_CRITERIA}
    - - - - - - - - - -

    - {$MOD.LBL_SETTINGS} - > {$UMOD.LBL_EMAIL_TEMPLATES_LIST} -
    -
     
    - - - - - - - - - - - - - {**} - - - - - - - - {foreach item=template from=$TEMPLATES} - - - - - - - - {/foreach} - - - - - -
     
      -
    -
     
    {$UMOD.LBL_TEMPLATE_HEADER}{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_TEMPLATE_TOOLS}
    - {if $template.foldername == "Public"} - - {else} - - {/if} -  {$template.templatename}{$template.description}View Sample Email
    - -  {$UMOD.LBL_TEMPLATE_PRIVATE} -        -  {$UMOD.LBL_TEMPLATE_PUBLIC} - - - -
    - -
     
    - - - - - - -{$JAVASCRIPT} -{include file='SettingsSubMenu.tpl'} - - + + + + + + + + + {include file='SettingsMenu.tpl'} + + +
    + + + + + + + + + + + +

    + {$MOD.LBL_SETTINGS} + > {$UMOD.LBL_EMAIL_TEMPLATES_LIST} +
    +
     
    + + + + + + + + + + + + + {**} + + + + + + +
     
      +
    +
     
    + + + + + + + + + {foreach item=template from=$TEMPLATES} + + + + + + + + {/foreach} + +
    {$UMOD.LBL_TEMPLATE_HEADER}{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_TEMPLATE_TOOLS}
    + {if $template.foldername == "Public"} + + {else} + + {/if} +  {$template.templatename}{$template.description}View Sample Email
    +
    + +  {$UMOD.LBL_TEMPLATE_PRIVATE} +        +  {$UMOD.LBL_TEMPLATE_PUBLIC} + + + +
    + +
     
    + + +
    + +{$JAVASCRIPT} +{include file='SettingsSubMenu.tpl'} + + From vtiger-tickets at vtiger.fosslabs.com Tue May 2 07:59:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 11:59:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23596=3A_?= =?utf-8?q?CompanyInformation_Edit/Detail_view_in_IE?= In-Reply-To: <076.727e2445c9d30d2feff16293f90f0d90@vtiger.fosslabs.com> References: <076.727e2445c9d30d2feff16293f90f0d90@vtiger.fosslabs.com> Message-ID: <085.f2a76295fe242a446a7bd65248ba7aa6@vtiger.fosslabs.com> #596: CompanyInformation Edit/Detail view in IE --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:00:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:00:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5654 - /vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Message-ID: <20060502120015.64B79702E36@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:00:10 2006 New Revision: 5654 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Tue May 2 06:00:10 2006 @@ -1,88 +1,88 @@ - - - - - - {include file='SettingsMenu.tpl'} - - -
    - - - - - - - - - - - -

    - {$MOD.LBL_SETTINGS} - > {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}" -
    -
     
    - - - - - - - - - - - - - - - - - - - -
     
    - - - - -
    - - {$TEMPLATENAME}
    - {$TEMPLATENAME} Template -
    -
      
    - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_FOLDER}{$FOLDERNAME}
      
    {$UMOD.LBL_SUBJECT}{$DESCRIPTION}
      
    {$UMOD.LBL_MESSAGE}{$BODY}
    -
    -
     
    - - - -
    - -{$JAVASCRIPT} -{include file='SettingsSubMenu.tpl'} - - + + + + + + {include file='SettingsMenu.tpl'} + + +
    + + + + + + + + + + + +

    + {$MOD.LBL_SETTINGS} + > {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} "{$TEMPLATENAME}" +
    +
     
    + + + + + + + + + + + + + + + + + + + +
     
    + + + + +
    + + {$TEMPLATENAME}
    + {$TEMPLATENAME} Template +
    +
      
    + + + + + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_FOLDER}{$FOLDERNAME}
      
    {$UMOD.LBL_SUBJECT}{$DESCRIPTION}
      
    {$UMOD.LBL_MESSAGE}{$BODY}
    +
    +
     
    + + + +
    + +{$JAVASCRIPT} +{include file='SettingsSubMenu.tpl'} + + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:03:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:03:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5655 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060502120330.B8F79702E41@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:03:24 2006 New Revision: 5655 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Tue May 2 06:03:24 2006 @@ -1,298 +1,298 @@ - - - - - - - - - {include file='SettingsMenu.tpl'} - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - -

    - {if $EMODE eq 'edit'} - {$MOD.LBL_SETTINGS} - > Communication Templates > Editing Email Templates > {$TEMPLATENAME} - {else} - {$MOD.LBL_SETTINGS} - > Communication Templates > Creating Email Templates > New - {/if} -
    -
     
    - - - - - - - - - - - - - -
     
    - - - - - - -
    - - - *{$UMOD.LBL_TEMPLATE_NAME}
    -

    - Description:
    -

    - *Folder: - -
    - -
    - -
    - {if $EMODE eq 'edit'} - - {else} - - {/if} -
    - -
      
    - - - - - - - - - - - - - - - - - - -
    *{$UMOD.LBL_TEMPLATE_SUBJECT} - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}
    Available Merge Fields
     
    {$UMOD.LBL_SELECT_FIELD_TYPE}
     
    {$UMOD.LBL_SELECT_FIELD}
     
    {$UMOD.LBL_MERGE_FIELD_VALUE}
    ({$UMOD.LBL_COPY_AND_PASTE_MERGE_FIELD})
    - - -
      
    {$UMOD.LBL_TEMPLATE_MESSAGE} - -
    -
    -
     
     
    -    - {if $EMODE eq 'edit'} - - {else} - - {/if} -  
    - -
    -
    - - - -{$JAVASCRIPT} -{include file='SettingsSubMenu.tpl'} - + + + + + + + + + {include file='SettingsMenu.tpl'} + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + +

    + {if $EMODE eq 'edit'} + {$MOD.LBL_SETTINGS} + > Communication Templates > Editing Email Templates > {$TEMPLATENAME} + {else} + {$MOD.LBL_SETTINGS} + > Communication Templates > Creating Email Templates > New + {/if} +
    +
     
    + + + + + + + + + + + + + +
     
    + + + + + + +
    + + + *{$UMOD.LBL_TEMPLATE_NAME}
    +
    + Description:
    +

    + *Folder: + +
    + +
    + +
    + {if $EMODE eq 'edit'} + + {else} + + {/if} +
    + +
      
    + + + + + + + + + + + + + + + + + + +
    *{$UMOD.LBL_TEMPLATE_SUBJECT} + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}
    Available Merge Fields
     
    {$UMOD.LBL_SELECT_FIELD_TYPE}
     
    {$UMOD.LBL_SELECT_FIELD}
     
    {$UMOD.LBL_MERGE_FIELD_VALUE}
    ({$UMOD.LBL_COPY_AND_PASTE_MERGE_FIELD})
    + + +
      
    {$UMOD.LBL_TEMPLATE_MESSAGE} + +
    +
    +
     
     
    +    + {if $EMODE eq 'edit'} + + {else} + + {/if} +  
    + +
    +
    + + + +{$JAVASCRIPT} +{include file='SettingsSubMenu.tpl'} + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:04:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:04:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5656 - /vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Message-ID: <20060502120411.25127702E41@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:04:04 2006 New Revision: 5656 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Tue May 2 06:04:04 2006 @@ -1,101 +1,101 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
    - - - - - - - - - - - - - - - - - -

    -{$MOD.LBL_SETTINGS} {$UMOD.LBL_MAILMERGE_TEMPLATES_ATTACHMENT} -
    -
     
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {$UMOD.LBL_TEMPLATE_DETAILS}
    {$UMOD.LBL_DESCRIPTION} :

    - - {$UMOD.LBL_SELECT_MODULE}
    - Select a module to assign this Template -
    {$UMOD.LBL_MODULENAMES} :

    - - {$UMOD.LBL_UPLOAD} -
    {$UMOD.LBL_MERGE_FILE}
    (Eg - .doc, .rtf files)
    -   -   -
     
    -

    -
     
    -
    - {include file='SettingsSubMenu.tpl'} - + + + + + {include file='SettingsMenu.tpl'} + + +
    + + + + + + + + + + + + + + + + + +

    +{$MOD.LBL_SETTINGS} {$UMOD.LBL_MAILMERGE_TEMPLATES_ATTACHMENT} +
    +
     
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     {$UMOD.LBL_TEMPLATE_DETAILS}
    {$UMOD.LBL_DESCRIPTION} :

    + + {$UMOD.LBL_SELECT_MODULE}
    + Select a module to assign this Template +
    {$UMOD.LBL_MODULENAMES} :

    + + {$UMOD.LBL_UPLOAD} +
    {$UMOD.LBL_MERGE_FILE}
    (Eg - .doc, .rtf files)
    +   +   +
     
    +

    +
     
    +
    + {include file='SettingsSubMenu.tpl'} + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:07:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:07:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5657 - /vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Message-ID: <20060502120756.117CD702E41@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:07:51 2006 New Revision: 5657 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Tue May 2 06:07:51 2006 @@ -71,44 +71,48 @@ - - + - +
     
    + + - + - - {**} + {**} - - - - - - - - - {foreach item=template from=$WORDTEMPLATES} - - - - - - - - - - {/foreach} - -
     
      -
    +
    +
     
     
    {$UMOD.LBL_FILE}{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_MODULENAMES}{$UMOD.LBL_DOWNLOAD}{$UMOD.LBL_FILE_TYPE}
    {$template.filename}{$template.description}{$template.module}{$UMOD.LBL_DOWNLOAD_NOW}{$template.filetype}
    - + + + + + + + + + + + {foreach item=template from=$WORDTEMPLATES} + + + + + + + + + {/foreach} +
    {$UMOD.LBL_FILE}{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_MODULENAMES}{$UMOD.LBL_DOWNLOAD}{$UMOD.LBL_FILE_TYPE}
    {$template.filename}{$template.description}{$template.module}{$UMOD.LBL_DOWNLOAD_NOW}{$template.filetype}
    + + + +   From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:12:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:12:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23734=3A_?= =?utf-8?q?Issue_in_Rss_UI?= In-Reply-To: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com> References: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com> Message-ID: <085.843a30d43c54a87864f670278499247e@vtiger.fosslabs.com> #734: Issue in Rss UI ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jeri Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * owner: Ela => jeri -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:12:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:12:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5658 - /vtigercrm/trunk/modules/Settings/CreateCustomField.php Message-ID: <20060502121243.AA0C4702E3A@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:12:38 2006 New Revision: 5658 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Tue May 2 06:12:38 2006 @@ -119,7 +119,7 @@ -
    +
    From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:15:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:15:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23563=3A_?= =?utf-8?q?emailtemplate_detailview_in_IE?= In-Reply-To: <076.ee4a4557db76341e3ee0c500cd78cd8a@vtiger.fosslabs.com> References: <076.ee4a4557db76341e3ee0c500cd78cd8a@vtiger.fosslabs.com> Message-ID: <085.641abc6eb8097ff0cbbd5d19c13d18db@vtiger.fosslabs.com> #563: emailtemplate detailview in IE --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:16:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:16:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23576=3A_?= =?utf-8?q?Notes_Search_in_IE?= In-Reply-To: <076.b5fc216a689fc534703bad146e060008@vtiger.fosslabs.com> References: <076.b5fc216a689fc534703bad146e060008@vtiger.fosslabs.com> Message-ID: <085.3a45fb3076f8ebcc7d529dbe69bda90f@vtiger.fosslabs.com> #576: Notes Search in IE --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: --------------------------------+------------------------------------------- Changes (by ela): * resolution: => invalid * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:17:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:17:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23558=3A_?= =?utf-8?q?no_label_for_attchment?= In-Reply-To: <076.0c01366cfeb80db86c51e75c9ef4322b@vtiger.fosslabs.com> References: <076.0c01366cfeb80db86c51e75c9ef4322b@vtiger.fosslabs.com> Message-ID: <085.53817bfdf00590ece95ba3d060d7a6df@vtiger.fosslabs.com> #558: no label for attchment --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:17:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:17:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5659 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060502121758.44C9F702E49@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:17:53 2006 New Revision: 5659 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Tue May 2 06:17:53 2006 @@ -190,19 +190,20 @@
    Add Field
    +
    - +
    {**} - +
    - - -
    + -
    +
    From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:24:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:24:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5660 - /vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Message-ID: <20060502122430.A8DA6702E33@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:24:24 2006 New Revision: 5660 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Tue May 2 06:24:24 2006 @@ -1,129 +1,129 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
    - - - - - - - - -

    -{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {$ORGANIZATIONNAME}

    -
    {$MOD.LBL_ORGANIZATION_NAME} : {$ORGANIZATIONNAME}
    {$MOD.LBL_ORGANIZATION_ADDRESS} : {$ORGANIZATIONADDRESS}
    {$MOD.LBL_ORGANIZATION_CITY} : {$ORGANIZATIONCITY}
    {$MOD.LBL_ORGANIZATION_STATE} : {$ORGANIZATIONSTATE}
    {$MOD.LBL_ORGANIZATION_CODE} : {$ORGANIZATIONCODE}
    {$MOD.LBL_ORGANIZATION_COUNTRY} : {$ORGANIZATIONCOUNTRY}

    - - - - - - - - - - - - - - - -
    {$MOD.LBL_ORGANIZATION_PHONE} : {$ORGANIZATIONPHONE}{$MOD.LBL_ORGANIZATION_WEBSITE} : {$ORGANIZATIONWEBSITE}
    {$MOD.LBL_ORGANIZATION_FAX} : {$ORGANIZATIONFAX}{$MOD.LBL_ORGANIZATION_LOGO} : {$ORGANIZATIONLOGONAME}

    - -    -
    -
    - - -
     
    -
    -
    - {include file='SettingsSubMenu.tpl'} -{literal} - -{/literal} + + + + + {include file='SettingsMenu.tpl'} + + +
    + + + + + + + + +

    +{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     {$ORGANIZATIONNAME}

    +
    {$MOD.LBL_ORGANIZATION_NAME} : {$ORGANIZATIONNAME}
    {$MOD.LBL_ORGANIZATION_ADDRESS} : {$ORGANIZATIONADDRESS}
    {$MOD.LBL_ORGANIZATION_CITY} : {$ORGANIZATIONCITY}
    {$MOD.LBL_ORGANIZATION_STATE} : {$ORGANIZATIONSTATE}
    {$MOD.LBL_ORGANIZATION_CODE} : {$ORGANIZATIONCODE}
    {$MOD.LBL_ORGANIZATION_COUNTRY} : {$ORGANIZATIONCOUNTRY}

    + + + + + + + + + + + + + + + +
    {$MOD.LBL_ORGANIZATION_PHONE} : {$ORGANIZATIONPHONE}{$MOD.LBL_ORGANIZATION_WEBSITE} : {$ORGANIZATIONWEBSITE}
    {$MOD.LBL_ORGANIZATION_FAX} : {$ORGANIZATIONFAX}{$MOD.LBL_ORGANIZATION_LOGO} : {$ORGANIZATIONLOGONAME}

    + +    +
    +
    +
    + +
     
    +
    + + + + {include file='SettingsSubMenu.tpl'} +{literal} + +{/literal} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:25:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:25:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5661 - /vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Message-ID: <20060502122534.0EBAF702E66@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:25:15 2006 New Revision: 5661 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Tue May 2 06:25:15 2006 @@ -1,151 +1,151 @@ - - - - - {include file='SettingsMenu.tpl'} - - -
    - - - - - - - - -

    -{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - {if $ORGANIZATIONLOGONAME neq ''} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {$ORGANIZATIONNAME} - {$ERRORFLAG} -

    *{$MOD.LBL_ORGANIZATION_NAME} : - -
    {$MOD.LBL_ORGANIZATION_ADDRESS} :
    {$MOD.LBL_ORGANIZATION_CITY} :
    {$MOD.LBL_ORGANIZATION_STATE} :
    {$MOD.LBL_ORGANIZATION_CODE} :
    {$MOD.LBL_ORGANIZATION_COUNTRY} :

    - - - - - - - - - - - - - - - -
    {$MOD.LBL_ORGANIZATION_PHONE} : {$MOD.LBL_ORGANIZATION_WEBSITE} :
    {$MOD.LBL_ORGANIZATION_FAX} : {$MOD.LBL_ORGANIZATION_LOGO} : - - [{$ORGANIZATIONLOGONAME}] -

    - -
    -
    -
    - -
     
    -
    - - - - {include file='SettingsSubMenu.tpl'} -{literal} - -{/literal} + + + + + {include file='SettingsMenu.tpl'} + + +
    + + + + + + + + +

    +{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + {if $ORGANIZATIONLOGONAME neq ''} + + {else} + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {$ORGANIZATIONNAME} + {$ERRORFLAG} +

    *{$MOD.LBL_ORGANIZATION_NAME} : + +
    {$MOD.LBL_ORGANIZATION_ADDRESS} :
    {$MOD.LBL_ORGANIZATION_CITY} :
    {$MOD.LBL_ORGANIZATION_STATE} :
    {$MOD.LBL_ORGANIZATION_CODE} :
    {$MOD.LBL_ORGANIZATION_COUNTRY} :

    + + + + + + + + + + + + + + + +
    {$MOD.LBL_ORGANIZATION_PHONE} : {$MOD.LBL_ORGANIZATION_WEBSITE} :
    {$MOD.LBL_ORGANIZATION_FAX} : {$MOD.LBL_ORGANIZATION_LOGO} : + + [{$ORGANIZATIONLOGONAME}] +

    + +
    +
    +
    + +
     
    +
    + + + + {include file='SettingsSubMenu.tpl'} +{literal} + +{/literal} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:36:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:36:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5662 - /vtigercrm/trunk/modules/Home/UnifiedSearch.php Message-ID: <20060502123604.AE970702E70@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:35:52 2006 New Revision: 5662 Log: * Modified to display the Total Number of records found and module based record counts Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:38:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:38:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23472=3A_?= =?utf-8?q?Search_result_count_is_missing_in_global_search?= In-Reply-To: <076.b8b6a34e31005f060bcb9a5e08e7ad43@vtiger.fosslabs.com> References: <076.b8b6a34e31005f060bcb9a5e08e7ad43@vtiger.fosslabs.com> Message-ID: <085.8a8be10cca3c7eb44fca46f0c2024245@vtiger.fosslabs.com> #472: Search result count is missing in global search ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This has been fixed as to display the Total number of records count and the module based count has been displayed. File has been checkedin in svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 08:45:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 12:45:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23742=3A_?= =?utf-8?q?New_Ticket_screen?= In-Reply-To: <076.94e6b59f3e5bca0bd95e96ed6e6c80e3@vtiger.fosslabs.com> References: <076.94e6b59f3e5bca0bd95e96ed6e6c80e3@vtiger.fosslabs.com> Message-ID: <085.e33c432865e3ae4be706a4fb8850cd9f@vtiger.fosslabs.com> #742: New Ticket screen ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:45:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:45:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5663 - /vtigercrm/trunk/include/Menu.php Message-ID: <20060502124553.54756702E6C@vtiger.fosslabs.com> Author: don Date: Tue May 2 06:45:47 2006 New Revision: 5663 Log: Removed the calling of permitted actions from session Modified: vtigercrm/trunk/include/Menu.php Modified: vtigercrm/trunk/include/Menu.php ============================================================================== --- vtigercrm/trunk/include/Menu.php (original) +++ vtigercrm/trunk/include/Menu.php Tue May 2 06:45:47 2006 @@ -25,7 +25,8 @@ global $moduleList; require_once('include/utils/utils.php'); -$permissionData = $_SESSION['action_permission_set']; +require_once('include/utils/UserInfoUtil.php'); + $module_menu_array = Array('Contacts' => $app_strings['LNK_NEW_CONTACT'], 'Leads'=> $app_strings['LNK_NEW_LEAD'], @@ -74,7 +75,7 @@ if(in_array($module_display, $moduleList)) { - if($permissionData[$tabid][1] ==0) + if(isPermitted($module_display,'EditView') == 'yes') { $tempArray = Array("index.php?module=".$module_display."&action=".$curr_action."&return_module=".$module_display."&return_action=".$ret_action.$add_url, $label); $module_menu[$i] = $tempArray; From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 08:56:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 12:56:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5664 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060502125621.9D63F702E74@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 06:56:17 2006 New Revision: 5664 Log: Added the UI Changes - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue May 2 06:56:17 2006 @@ -70,9 +70,9 @@ - - - + + +
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}{$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}  
    From vtiger-tickets at vtiger.fosslabs.com Tue May 2 09:00:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:00:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23630=3A_?= =?utf-8?q?Issue_in_User_Detail_View?= In-Reply-To: <076.24acb030007b9b2b25e501432266a4a7@vtiger.fosslabs.com> References: <076.24acb030007b9b2b25e501432266a4a7@vtiger.fosslabs.com> Message-ID: <085.182d0fd648ceedd80944c9dc57c6e9af@vtiger.fosslabs.com> #630: Issue in User Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Browser ---------------------------+------------------------------------------------ Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 09:01:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:01:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23667=3A_?= =?utf-8?q?Users_DetailVIew_goes_Up_if_we_Click_on_the_tab?= In-Reply-To: <076.511538ff98ef7c37b460ea8a0d311c2e@vtiger.fosslabs.com> References: <076.511538ff98ef7c37b460ea8a0d311c2e@vtiger.fosslabs.com> Message-ID: <085.3fb326cc60e0d2b9113d3a121b08a525@vtiger.fosslabs.com> #667: Users DetailVIew goes Up if we Click on the tab ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 09:05:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:05:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23389=3A_?= =?utf-8?q?Chat_is_not_good_in_IE_Browser?= In-Reply-To: <076.68bfacb5e13b1f9f17f61db3db336043@vtiger.fosslabs.com> References: <076.68bfacb5e13b1f9f17f61db3db336043@vtiger.fosslabs.com> Message-ID: <085.12fc24d55814f020f767f95a92121242@vtiger.fosslabs.com> #389: Chat is not good in IE Browser ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: assigned Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * status: new => assigned * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 09:08:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:08:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23501=3A_?= =?utf-8?q?IE_Issue?= In-Reply-To: <076.afe1d49e34fa7f7addddc3b5b5e173f7@vtiger.fosslabs.com> References: <076.afe1d49e34fa7f7addddc3b5b5e173f7@vtiger.fosslabs.com> Message-ID: <085.d0b0789714ddaf9a8a2ab8f315b6ac3e@vtiger.fosslabs.com> #501: IE Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * resolution: => fixed * status: assigned => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 09:21:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:21:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23426=3A_?= =?utf-8?q?adding_users_to_a_group_must_reduce_the_number_of_users_in_the_?= =?utf-8?q?LHS?= In-Reply-To: <076.38a327c75c245e49b3602c5dca07ae55@vtiger.fosslabs.com> References: <076.38a327c75c245e49b3602c5dca07ae55@vtiger.fosslabs.com> Message-ID: <085.df60f1a45a4960bdeec4901c52e9aae5@vtiger.fosslabs.com> #426: adding users to a group must reduce the number of users in the LHS ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: groups ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 09:24:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:24:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23140=3A_?= =?utf-8?q?slider_not_working_IE?= In-Reply-To: <076.2f545feb010bb599fcef09367a99dd42@vtiger.fosslabs.com> References: <076.2f545feb010bb599fcef09367a99dd42@vtiger.fosslabs.com> Message-ID: <085.8425c5467e8f5b918bb53c9959006f5f@vtiger.fosslabs.com> #140: slider not working IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: slider ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 09:26:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:26:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23145=3A_?= =?utf-8?q?User_Detail_View_-_role_name_in_different_font?= In-Reply-To: <076.ae9ea2111e31305dea3c4f5add30eea1@vtiger.fosslabs.com> References: <076.ae9ea2111e31305dea3c4f5add30eea1@vtiger.fosslabs.com> Message-ID: <085.590c45b490f2bd534f7cca3d4221ae3e@vtiger.fosslabs.com> #145: User Detail View - role name in different font ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: font ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 09:29:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 13:29:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23159=3A_?= =?utf-8?q?edit_user_=3A_no_foto_shown?= In-Reply-To: <076.252636d06b42ca35a5600b493874b7eb@vtiger.fosslabs.com> References: <076.252636d06b42ca35a5600b493874b7eb@vtiger.fosslabs.com> Message-ID: <085.8ab9c2074630c1144124199b073febb8@vtiger.fosslabs.com> #159: edit user : no foto shown ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: no foto in user edit ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 10:02:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 14:02:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5665 - /vtigercrm/trunk/modules/Users/ChangePassword.php Message-ID: <20060502140230.868F2702E83@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 08:02:25 2006 New Revision: 5665 Log: Change Password made functional - Ahmed Modified: vtigercrm/trunk/modules/Users/ChangePassword.php Modified: vtigercrm/trunk/modules/Users/ChangePassword.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 10:03:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 14:03:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5666 - /vtigercrm/trunk/modules/Users/Save.php Message-ID: <20060502140338.62124702E83@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 08:03:34 2006 New Revision: 5666 Log: Change Password made functional - Ahmed Modified: vtigercrm/trunk/modules/Users/Save.php Modified: vtigercrm/trunk/modules/Users/Save.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue May 2 10:04:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:04:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23342=3A_?= =?utf-8?q?Validation_missing_for_change_password?= In-Reply-To: <076.9750b47cca145f59185db18ec7d18b2f@vtiger.fosslabs.com> References: <076.9750b47cca145f59185db18ec7d18b2f@vtiger.fosslabs.com> Message-ID: <085.772c6cb8e9bf7929cc41988db7ccadbf@vtiger.fosslabs.com> #342: Validation missing for change password ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: change password ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 10:05:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:05:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23342=3A_?= =?utf-8?q?Validation_missing_for_change_password?= In-Reply-To: <076.9750b47cca145f59185db18ec7d18b2f@vtiger.fosslabs.com> References: <076.9750b47cca145f59185db18ec7d18b2f@vtiger.fosslabs.com> Message-ID: <085.e05da8ee36c736db0ef8b28c1368f808@vtiger.fosslabs.com> #342: Validation missing for change password ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: change password ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Validation Done for password form. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 10:06:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:06:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2389=3A_C?= =?utf-8?q?annot_change_admin_Password?= In-Reply-To: <076.2fbbb821e635faa80c32396756edac60@vtiger.fosslabs.com> References: <076.2fbbb821e635faa80c32396756edac60@vtiger.fosslabs.com> Message-ID: <085.2202113b87773e3e30981215851185af@vtiger.fosslabs.com> #89: Cannot change admin Password ----------------------------------+----------------------------------------- Reporter: libregeek at gmail.com | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Cannot change password ----------------------------------+----------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 10:07:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:07:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2389=3A_C?= =?utf-8?q?annot_change_admin_Password?= In-Reply-To: <076.2fbbb821e635faa80c32396756edac60@vtiger.fosslabs.com> References: <076.2fbbb821e635faa80c32396756edac60@vtiger.fosslabs.com> Message-ID: <085.882df733899057bc157cdbde5ab3de0d@vtiger.fosslabs.com> #89: Cannot change admin Password ----------------------------------+----------------------------------------- Reporter: libregeek at gmail.com | Owner: ahmed Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Cannot change password ----------------------------------+----------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed - Admin Password can be changed now without redirecting the same to the home page -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 10:13:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:13:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23158=3A_?= =?utf-8?q?Unable_to_change_password_IE?= In-Reply-To: <076.abef1a60c9e3d592d325f3f425753615@vtiger.fosslabs.com> References: <076.abef1a60c9e3d592d325f3f425753615@vtiger.fosslabs.com> Message-ID: <085.11919e10f84f7a54482c4163b60aad01@vtiger.fosslabs.com> #158: Unable to change password IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: edit password ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 10:14:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:14:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23158=3A_?= =?utf-8?q?Unable_to_change_password_IE?= In-Reply-To: <076.abef1a60c9e3d592d325f3f425753615@vtiger.fosslabs.com> References: <076.abef1a60c9e3d592d325f3f425753615@vtiger.fosslabs.com> Message-ID: <085.dbdbd35a9c56af149308067291b7b9b8@vtiger.fosslabs.com> #158: Unable to change password IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: edit password ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed - Change Password Made Functional in IE with proper validation. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 10:51:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:51:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23369=3A_?= =?utf-8?q?settings_menu_is_not_good_in_IE_browser?= In-Reply-To: <076.b6a9d61f71437be813abb7ca8c29694c@vtiger.fosslabs.com> References: <076.b6a9d61f71437be813abb7ca8c29694c@vtiger.fosslabs.com> Message-ID: <085.bbfd74ea3a1f798bba62f919cb3964a3@vtiger.fosslabs.com> #369: settings menu is not good in IE browser ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 10:54:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:54:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23136=3A_?= =?utf-8?q?minimized_box_expands_on_clicking_any_link?= In-Reply-To: <076.8d6cd6ae9121ebb445f0cde58813b20f@vtiger.fosslabs.com> References: <076.8d6cd6ae9121ebb445f0cde58813b20f@vtiger.fosslabs.com> Message-ID: <085.ef05ba86852ba7c46a35ee8a967d534e@vtiger.fosslabs.com> #136: minimized box expands on clicking any link ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: minimization fails ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 10:58:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 14:58:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23135=3A_?= =?utf-8?q?missing_communication_templates?= In-Reply-To: <076.5997046850f52c2dcc019dbeb3ff2438@vtiger.fosslabs.com> References: <076.5997046850f52c2dcc019dbeb3ff2438@vtiger.fosslabs.com> Message-ID: <085.7d6a685b0251e2071a1349dddf3e2fe6@vtiger.fosslabs.com> #135: missing communication templates ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:00:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 15:00:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23167=3A_?= =?utf-8?q?standarduser_detail_view_screen_proper?= In-Reply-To: <076.1d766ff6b338fa4771ae7fe7e1bd0c51@vtiger.fosslabs.com> References: <076.1d766ff6b338fa4771ae7fe7e1bd0c51@vtiger.fosslabs.com> Message-ID: <085.601bcba21e388bac939234c793569e06@vtiger.fosslabs.com> #167: standarduser detail view screen proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:22:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 15:22:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23392=3A_?= =?utf-8?q?Issue_in_Field_Access_IE_browser?= In-Reply-To: <076.da3a82840e4830a891413c4cbde054cd@vtiger.fosslabs.com> References: <076.da3a82840e4830a891413c4cbde054cd@vtiger.fosslabs.com> Message-ID: <085.484d36204a3031e0d0c14b06d50ddcc2@vtiger.fosslabs.com> #392: Issue in Field Access IE browser ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jeri Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * owner: ela => jeri -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 11:25:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 15:25:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5667 - /vtigercrm/trunk/modules/Home/UnifiedSearch.php Message-ID: <20060502152512.A6D40702E96@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 09:25:07 2006 New Revision: 5667 Log: * Added customview functionality to get the assigned to values which are same like in ListView of all modules Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:27:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 15:27:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23467=3A_?= =?utf-8?q?Issue_in_global_seach?= In-Reply-To: <076.af78d74012efe9405d4e54b0d4502661@vtiger.fosslabs.com> References: <076.af78d74012efe9405d4e54b0d4502661@vtiger.fosslabs.com> Message-ID: <085.58d7ba962fc7e23cdd0fa2ee6798b865@vtiger.fosslabs.com> #467: Issue in global seach ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed and changed files checkedin in svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:31:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 15:31:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23153=3A_?= =?utf-8?q?More_Information=2C_Address_Information_fails_IE?= In-Reply-To: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> References: <076.6b87af7d35ac5bf492e6e729ae7b5c58@vtiger.fosslabs.com> Message-ID: <085.244543cb5f61e58539d7557cfaf2071c@vtiger.fosslabs.com> #153: More Information, Address Information fails IE ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: More Info ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 11:41:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 15:41:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23166=3A_?= =?utf-8?q?edit_view_different_from_detail_view_in_Users?= In-Reply-To: <076.305e0e2f49604557e718c0b4c9732e6d@vtiger.fosslabs.com> References: <076.305e0e2f49604557e718c0b4c9732e6d@vtiger.fosslabs.com> Message-ID: <085.008d431e8d5c9e5a8bcc77ffd4e2e8d2@vtiger.fosslabs.com> #166: edit view different from detail view in Users ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: edit view/detail view ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 14:32:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:32:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23239=3A_?= =?utf-8?q?Improper_expand-collapase?= In-Reply-To: <076.5823353ff6ccc9495006e3cc32c0cd19@vtiger.fosslabs.com> References: <076.5823353ff6ccc9495006e3cc32c0cd19@vtiger.fosslabs.com> Message-ID: <085.549ef4fb5a32aadd008a53f24dd9fc08@vtiger.fosslabs.com> #239: Improper expand-collapase ------------------------+--------------------------------------------------- Reporter: saraj | Owner: Elavalagan Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Expand Collapse ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 14:36:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:36:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23304=3A_?= =?utf-8?q?Show_contents_on-mousover?= In-Reply-To: <076.12b5e03c26eb7033b97b03b38ef20578@vtiger.fosslabs.com> References: <076.12b5e03c26eb7033b97b03b38ef20578@vtiger.fosslabs.com> Message-ID: <085.4543bae4d1e8aadaa49bca6878f6cc8b@vtiger.fosslabs.com> #304: Show contents on-mousover ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: User Detail view ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 14:37:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:37:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23316=3A_?= =?utf-8?q?Error_Message_merges_with_the_arrow?= In-Reply-To: <076.2e31abce995b69bf750fa51b6fc23dc7@vtiger.fosslabs.com> References: <076.2e31abce995b69bf750fa51b6fc23dc7@vtiger.fosslabs.com> Message-ID: <085.5aba5d63e09cfb08244a04d07c5d5a7e@vtiger.fosslabs.com> #316: Error Message merges with the arrow ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Duplicate user Error message ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 14:39:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:39:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23345=3A_?= =?utf-8?q?No_css/smartification_for_Login_History?= In-Reply-To: <076.6e3fb9b3ca30ba32d7be19a23d4a1c22@vtiger.fosslabs.com> References: <076.6e3fb9b3ca30ba32d7be19a23d4a1c22@vtiger.fosslabs.com> Message-ID: <085.b1af98050c52196233c65f778357e2a9@vtiger.fosslabs.com> #345: No css/smartification for Login History ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Login History ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 14:41:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:41:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23366=3A_?= =?utf-8?q?Non_functional_Change_foto_form?= In-Reply-To: <076.30468475e2d031606a3c41a1e641e8bd@vtiger.fosslabs.com> References: <076.30468475e2d031606a3c41a1e641e8bd@vtiger.fosslabs.com> Message-ID: <085.5bbed3dbc6f00b8bf0953c8859b47a15@vtiger.fosslabs.com> #366: Non functional Change foto form ------------------------+--------------------------------------------------- Reporter: saraj | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: change photo ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 14:45:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 18:45:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23614=3A_?= =?utf-8?q?Edit_Pick_list_popup_is_half_displayed?= In-Reply-To: <076.19bd966bb5be11457c9445cff5c6903c@vtiger.fosslabs.com> References: <076.19bd966bb5be11457c9445cff5c6903c@vtiger.fosslabs.com> Message-ID: <085.84dab25a976f318e75c7c9e9a477c281@vtiger.fosslabs.com> #614: Edit Pick list popup is half displayed ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ela Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Pick List Settings ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:06:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:06:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23264=3A_?= =?utf-8?q?Priority_Color_issue?= In-Reply-To: <076.cd84196e248706270bd26f418a850f2f@vtiger.fosslabs.com> References: <076.cd84196e248706270bd26f418a850f2f@vtiger.fosslabs.com> Message-ID: <085.b744f8b84b2984d353c64b5de10e9596@vtiger.fosslabs.com> #264: Priority Color issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Color priority ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:07:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:07:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23374=3A_?= =?utf-8?q?ListView_UI_issue?= In-Reply-To: <076.772f081d80c75e4d58bc5ff8aab6601e@vtiger.fosslabs.com> References: <076.772f081d80c75e4d58bc5ff8aab6601e@vtiger.fosslabs.com> Message-ID: <085.767cf2e3f9b71db44d378104935e7496@vtiger.fosslabs.com> #374: ListView UI issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: philip Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:09:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:09:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23511=3A_?= =?utf-8?q?UI_issue_in_Organisation_Sharing_Privileges?= In-Reply-To: <076.fe0ea81408ef07b9329d7ab6936815df@vtiger.fosslabs.com> References: <076.fe0ea81408ef07b9329d7ab6936815df@vtiger.fosslabs.com> Message-ID: <085.0aa3e5211a4a5ddd8b80a9442ed81ea2@vtiger.fosslabs.com> #511: UI issue in Organisation Sharing Privileges ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: UI ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:15:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:15:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23542=3A_?= =?utf-8?q?Sales_Order_not_added_ot_potentials_related_lists?= In-Reply-To: <076.9beb3974ac0560b949c5f74283de241d@vtiger.fosslabs.com> References: <076.9beb3974ac0560b949c5f74283de241d@vtiger.fosslabs.com> Message-ID: <085.b4ed7ea3333ab0760bf87937c049a6b5@vtiger.fosslabs.com> #542: Sales Order not added ot potentials related lists ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: Related Lists ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:19:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:19:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23589=3A_?= =?utf-8?q?Email_link_in_user_list_view_should_be_mailto_link?= In-Reply-To: <076.e39853c0ab0ebbcd0d8555aa39b63cbe@vtiger.fosslabs.com> References: <076.e39853c0ab0ebbcd0d8555aa39b63cbe@vtiger.fosslabs.com> Message-ID: <085.47313ba234b64cb4c08051e2260937b1@vtiger.fosslabs.com> #589: Email link in user list view should be mailto link ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Security ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:19:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:19:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23702=3A_?= =?utf-8?q?New_UI_For_Login_History?= In-Reply-To: <076.86851b5e2b6ae7b46beeca1ab823881c@vtiger.fosslabs.com> References: <076.86851b5e2b6ae7b46beeca1ab823881c@vtiger.fosslabs.com> Message-ID: <085.e4e5fd1a292f5a2c4791c232ccfd7dc0@vtiger.fosslabs.com> #702: New UI For Login History ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:21:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:21:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23347=3A_?= =?utf-8?q?Validation_not_proper_for_imports?= In-Reply-To: <076.139e96c58d8f549425203aec6ec1342b@vtiger.fosslabs.com> References: <076.139e96c58d8f549425203aec6ec1342b@vtiger.fosslabs.com> Message-ID: <085.1c2ed2fe75ea5b150cf0fce95f947dd2@vtiger.fosslabs.com> #347: Validation not proper for imports ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: import ---------------------------+------------------------------------------------ Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:26:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:26:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23303=3A_?= =?utf-8?q?Security_Issues_with_HelpDesk?= In-Reply-To: <076.be4389901e26c984cd7ea7bb7d59c5c9@vtiger.fosslabs.com> References: <076.be4389901e26c984cd7ea7bb7d59c5c9@vtiger.fosslabs.com> Message-ID: <085.25aec96bbf8e54a5a455f44693b48ac6@vtiger.fosslabs.com> #303: Security Issues with HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 15:27:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:27:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5668 - in /vtigercrm/trunk/themes/blue/images: BackupServer_btm.gif BackupServer_top.gif CurrConfig_btm.gif CurrConfig_top.gif Inventory_btm.gif Inventory_top.gif MailMerge_btm.gif MailMerge_top.gif MailServer_btm.gif MailServer_top.gif Message-ID: <20060502192715.688B2702EA7@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:26:45 2006 New Revision: 5668 Log: Added the images for settings no image files-Ahmed Added: vtigercrm/trunk/themes/blue/images/BackupServer_btm.gif (with props) vtigercrm/trunk/themes/blue/images/BackupServer_top.gif (with props) vtigercrm/trunk/themes/blue/images/CurrConfig_btm.gif (with props) vtigercrm/trunk/themes/blue/images/CurrConfig_top.gif (with props) vtigercrm/trunk/themes/blue/images/Inventory_btm.gif (with props) vtigercrm/trunk/themes/blue/images/Inventory_top.gif (with props) vtigercrm/trunk/themes/blue/images/MailMerge_btm.gif (with props) vtigercrm/trunk/themes/blue/images/MailMerge_top.gif (with props) vtigercrm/trunk/themes/blue/images/MailServer_btm.gif (with props) vtigercrm/trunk/themes/blue/images/MailServer_top.gif (with props) From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:28:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:28:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23383=3A_?= =?utf-8?q?Improper_Alignment_while_attaching_Multiple_files_-_HelpDesk?= In-Reply-To: <076.05350b18c07640b9f51b5ee10d606d0a@vtiger.fosslabs.com> References: <076.05350b18c07640b9f51b5ee10d606d0a@vtiger.fosslabs.com> Message-ID: <085.a4c7a3bd2f975c70d0355a07edf28755@vtiger.fosslabs.com> #383: Improper Alignment while attaching Multiple files - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:29:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:29:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23321=3A_?= =?utf-8?q?Old_UI_in_Add_New_Attachment_-_HelpDesk?= In-Reply-To: <076.f82ff5a4a8d6f04287845ea0f72538e6@vtiger.fosslabs.com> References: <076.f82ff5a4a8d6f04287845ea0f72538e6@vtiger.fosslabs.com> Message-ID: <085.51fe2e4ec520410cb8830770f2d6f502@vtiger.fosslabs.com> #321: Old UI in Add New Attachment - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:30:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:30:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23415=3A_?= =?utf-8?q?Menu_Pointer_Image_Issue_-_Reports?= In-Reply-To: <076.6ff31ad4eb06ac7e5cb11a02dd3ddecb@vtiger.fosslabs.com> References: <076.6ff31ad4eb06ac7e5cb11a02dd3ddecb@vtiger.fosslabs.com> Message-ID: <085.e276bc671d5984b892c9ceb079994941@vtiger.fosslabs.com> #415: Menu Pointer Image Issue - Reports ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 15:31:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:31:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5669 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060502193139.4370C702EA7@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:31:33 2006 New Revision: 5669 Log: changed the pop window properties of change password button - ahmed Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:37:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:37:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23299=3A_?= =?utf-8?q?calendar_icon_in_email_detail_view_is_not_working?= In-Reply-To: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> References: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> Message-ID: <085.f7521dde4ea654115cb3b6e484b2c276@vtiger.fosslabs.com> #299: calendar icon in email detail view is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:37:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:37:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23299=3A_?= =?utf-8?q?calendar_icon_in_email_detail_view_is_not_working?= In-Reply-To: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> References: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> Message-ID: <085.9e0d34a89ca6c747ff2f7dfa39218e6e@vtiger.fosslabs.com> #299: calendar icon in email detail view is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: reopened Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: fixed => * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:38:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:38:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23299=3A_?= =?utf-8?q?calendar_icon_in_email_detail_view_is_not_working?= In-Reply-To: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> References: <076.f4740241d1a705154fa45b8d669e624f@vtiger.fosslabs.com> Message-ID: <085.70faae8354b509a954ec59dc3f074386@vtiger.fosslabs.com> #299: calendar icon in email detail view is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: reopened => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:39:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:39:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23370=3A_?= =?utf-8?q?clock_and_calculator_overlapped_with_emails_edit_view_layer?= In-Reply-To: <076.6129dfb75d56ab5200f4fca417ebe57a@vtiger.fosslabs.com> References: <076.6129dfb75d56ab5200f4fca417ebe57a@vtiger.fosslabs.com> Message-ID: <085.a5da5b9013e563c86bb7a0e4c879d7e7@vtiger.fosslabs.com> #370: clock and calculator overlapped with emails edit view layer --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:41:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:41:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23520=3A_?= =?utf-8?q?New_-Emails_quick_create_is_not_working?= In-Reply-To: <076.e24db133eec90e5dc2b5c84e0d9486dc@vtiger.fosslabs.com> References: <076.e24db133eec90e5dc2b5c84e0d9486dc@vtiger.fosslabs.com> Message-ID: <085.b279bef968b76b814645441667430d6a@vtiger.fosslabs.com> #520: New -Emails quick create is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:45:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:45:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23752=3A_?= =?utf-8?q?Add_postgresql_support_to_trunk?= Message-ID: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> #752: Add postgresql support to trunk ---------------------------------------+------------------------------------ Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: adodb postgresql database | ---------------------------------------+------------------------------------ Developers interested in postgresql support intend to replicate the successful work done to enable postgresql support in source:vtigercrm/branches/4.2, as referenced by tickets #62 and #17, and merged in r5306. The branch should be made with the command: {{{ svn cp http://(name-at)vtiger.fosslabs.com/svn/vtiger/vtigercrm/trunk http://(name- at)vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/5.0_postgresql_integration -m 'refs #(this ticket). Create a branch of vtigercrm/trunk named vtigercrm/branches/5.0_postgresql_integration. Development on this branch should be merged back to vtigercrm/trunk as soon as complete, to be included in vtigercrm/tags/vtigercrm-5.0.0beta series of releases' }}} -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 15:46:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:46:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5670 - /vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl Message-ID: <20060502194618.8FD86702EA6@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:46:06 2006 New Revision: 5670 Log: Added the images in Inventory T&C - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl Tue May 2 13:46:06 2006 @@ -30,11 +30,17 @@ - +
    - + {if $INV_TERMS_MODE eq 'view'} - {else} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 15:49:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:49:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5671 - /vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl Message-ID: <20060502194923.A6B7E702EA7@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:49:10 2006 New Revision: 5671 Log: Added the images in Email config - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl Tue May 2 13:49:10 2006 @@ -35,10 +35,16 @@ + +
      + + + + +
     
    +
    +

    - +
    - - + + {if $EMAILCONFIG_MODE neq 'edit'} - -
     Mail Server (SMTP) - Settings{$ERROR_MSG}

    + + + + +
     
    +
    Mail Server (SMTP) - Settings{$ERROR_MSG}

    From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:49:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:49:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23439=3A_?= =?utf-8?q?Validation_is_not_working_for_quick_create_form?= In-Reply-To: <076.edf94bb3508212d7dd3244389b2a56d2@vtiger.fosslabs.com> References: <076.edf94bb3508212d7dd3244389b2a56d2@vtiger.fosslabs.com> Message-ID: <085.ac815d7cdfbcfd77278851a46c9233cc@vtiger.fosslabs.com> #439: Validation is not working for quick create form ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 15:51:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:51:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5672 - /vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl Message-ID: <20060502195105.9E1F5702EA6@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:50:53 2006 New Revision: 5672 Log: Added the images in Backup Server config - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl Tue May 2 13:50:53 2006 @@ -32,11 +32,17 @@ - +
    - + {if $BKP_SERVER_MODE neq 'edit'} - {else} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 15:52:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 19:52:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5673 - /vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Message-ID: <20060502195222.C8660702ECA@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 13:52:08 2006 New Revision: 5673 Log: Added the images in Currency Edit view - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Tue May 2 13:52:08 2006 @@ -38,10 +38,16 @@ - + - + - + - + - + From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:10:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:10:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23242=3A_?= =?utf-8?q?Security_Settings_-_LHS_navigation_missing_for_Roles_section?= In-Reply-To: <076.978f8d6d19ec9e1fa5607e8f75858cd8@vtiger.fosslabs.com> References: <076.978f8d6d19ec9e1fa5607e8f75858cd8@vtiger.fosslabs.com> Message-ID: <085.def3e503dcea7592adf0b1c01cfeb85c@vtiger.fosslabs.com> #242: Security Settings - LHS navigation missing for Roles section ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ela Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 16:10:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:10:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5677 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060502201028.9C425702EC1@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:10:23 2006 New Revision: 5677 Log: Added the images in Usereditview - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Tue May 2 14:10:23 2006 @@ -1,255 +1,272 @@ - - - - - - -
      + + + + +
     
    +
    +

    - +
    - - + From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:52:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:52:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23449=3A_?= =?utf-8?q?Issue_with_inner_scroll_in_Create_View_Screen?= In-Reply-To: <076.af8a6ec71dac7dc76c6c7216e25cbe13@vtiger.fosslabs.com> References: <076.af8a6ec71dac7dc76c6c7216e25cbe13@vtiger.fosslabs.com> Message-ID: <085.eae37c206a5e87af81b5ccc8b63cce8d@vtiger.fosslabs.com> #449: Issue with inner scroll in Create View Screen ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 15:55:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 19:55:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23313=3A_?= =?utf-8?q?Hacking_Attempt_Issue_in_Quick_Create?= In-Reply-To: <076.27119f7d66b8afb1666388aa77e8ff04@vtiger.fosslabs.com> References: <076.27119f7d66b8afb1666388aa77e8ff04@vtiger.fosslabs.com> Message-ID: <085.43af0cea4da2072b794a453c919f3842@vtiger.fosslabs.com> #313: Hacking Attempt Issue in Quick Create ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:00:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:00:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23476=3A_?= =?utf-8?q?Issue_in_quick_create?= In-Reply-To: <076.d12ad7f4315ab75de243cc17d0b21d7c@vtiger.fosslabs.com> References: <076.d12ad7f4315ab75de243cc17d0b21d7c@vtiger.fosslabs.com> Message-ID: <085.db29a077a88e3baea7e222dd4a5816e1@vtiger.fosslabs.com> #476: Issue in quick create ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 16:05:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:05:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5674 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060502200503.908B7702EC1@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:04:53 2006 New Revision: 5674 Log: Added new style in settings for IE - Ahmed Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Tue May 2 14:04:53 2006 @@ -590,161 +590,159 @@ /* For Settings */ .lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-color:#BBBBBB; + border-left:1px solid #666666; + border-right:1px solid #666666; + border-top:0px solid #666666; + border-collapse:collapse; + text-align:right; + padding-top:0px; + padding-left:5px; + padding-right:5px; + vertical-align:top; } .lftMnuHdr{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:100%; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + color:white; + background-color:#DDDDDD; + border-bottom:1px solid #BBBBBB; + text-decoration:none; + width:99%; } .lftMnuHdr tr td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:20px; - padding-right:5px; - padding-left:0px; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + color:white; + background-color:#DDDDDD; + border-bottom:1px solid #BBBBBB; + text-align:left; + text-decoration:none; + height:25px; + padding-right:0px; + padding-left:0px; } a.lftMnuHdr{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:20px; - padding-left:5px; - padding-top:3px; - width:100%; - display:block; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + color:white; + background-color:#666666; + border-top:1px solid #BBBBBB; + border-bottom:1px solid #999999; + text-align:left; + text-decoration:none; + height:25px; + padding-left:5px; + width:100%; + display:block; + vertical-align:middle; } a.lftMnuHdr:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:20px; - padding-left:5px; - padding-top:3px; - width:100%; - display:block; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + color:white; + background-color:#666666; + border-top:1px solid #BBBBBB; + border-bottom:1px solid #999999; + text-align:left; + text-decoration:none; + height:25px; + padding-left:5px; + width:100%; + display:block; } a.lftSubMnu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:95%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + display:block; + color:#666666; + height:20px; + width:93%; + text-align:left; + padding-left:15px; + text-decoration:none; + border-bottom:1px solid #BBBBBB; + padding-top:2px; + white-space:nowrap; } a.lftSubMnu:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:95%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + display:block; + color:#666666; + height:20px; + width:93%; + text-align:left; + padding-left:15px; + text-decoration:none; + border-bottom:1px solid #BBBBBB; + padding-top:2px; + white-space:nowrap; + background-color:#CCCCCC; } .padTab{ - padding-top:10px; - padding-left:10px; - padding-left:10px; - padding-bottom:0px; - vertical-align:top; - background-color:#FFFFFF; + padding-top:10px; + padding-left:10px; + padding-left:10px; + padding-bottom:0px; + vertical-align:top; + background-color:#FFFFFF; } .controlTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + text-align:center; + font-weight:bold; + text-decoration:none; + width:100%; + border:0px; +} .controlTab tr td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + text-align:center; + font-weight:bold; + text-decoration:none; + vertical-align:bottom; } #company{ - position:relative; - width:100%; - height:230px; - display:block; - background-color:#FFFFFF; - white-space:nowrap; - overflow:auto; - border:1px solid #CCCCCC; -} - + position:relative; + width:100%; + height:200px; + display:block; + background-color:#FFFFFF; + white-space:nowrap; + overflow:auto; + border:1px solid #CCCCCC; +} + #user{position:relative;left:0px;top:0px;width:100%;display:block;} #studio{position:relative;left:0px;top:0px;width:100%;display:block;} -#comm{position:relative;left:0px;top:0px;width:100%;display:block;} +#communication{position:relative;left:0px;top:0px;width:100%;display:block;} #config{position:relative;left:0px;top:0px;width:100%;display:block;} #userTab{position:relative;left:0px;top:0px;width:100%;display:none;} #studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - #scrollTab{ position:relative; From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 16:06:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:06:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5675 - /vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Message-ID: <20060502200610.4B582702EC1@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:05:58 2006 New Revision: 5675 Log: Added the images in Create word template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Tue May 2 14:05:58 2006 @@ -32,8 +32,14 @@ - + - + - + - + - + - + - + - + - + - + - + - +
     Currency
    +
    + + + + +
     
    +
    Currency

    - - + + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 16:09:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:09:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5676 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060502200914.62A3F702EC1@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:09:00 2006 New Revision: 5676 Log: Added the images in Userdetailview - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue May 2 14:09:00 2006 @@ -90,7 +90,7 @@ - + @@ -104,34 +104,34 @@ {/if} - + - + - - + + - + - + - + - + - + - +
     {$UMOD.LBL_TEMPLATE_DETAILS} + + + + +
     
    +
    {$UMOD.LBL_TEMPLATE_DETAILS}
    {$UMOD.LBL_DESCRIPTION} :
    *{$UMOD.LBL_USER_NAME} {$USER_NAME}{$USER_NAME}  {$UMOD.LBL_ADMIN}
    {$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}{$FIRST_NAME}  *{$UMOD.LBL_LAST_NAME}{$LAST_NAME}{$LAST_NAME} 
    *{$UMOD.LBL_USER_ROLE}{$ROLEASSIGNED} {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED}{$ROLEASSIGNED}  {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED} 
    *{$UMOD.LBL_EMAIL}{$EMAIL1}{$EMAIL1}  *{$UMOD.LBL_STATUS}{$STATUS}{$STATUS} 
     
    {$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$ACTIVITY_VIEW}  {$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}{$LEAD_VIEW} 
    *{$UMOD.LBL_COLOR}{$COLORASSIGNED}{$COLORASSIGNED}  {$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}{$CURRENCY_NAME} 
     
    @@ -148,46 +148,45 @@
    {$UMOD.LBL_TITLE}{$TITLE}{$TITLE}  {$UMOD.LBL_OFFICE_PHONE}{$PHONE_WORK}{$PHONE_WORK} 
    {$UMOD.LBL_DEPARTMENT}{$DEPARTMENT}{$DEPARTMENT}  {$UMOD.LBL_MOBILE_PHONE}{$PHONE_MOBILE}{$PHONE_MOBILE} 
    {$UMOD.LBL_REPORTS_TO} {$REPORTS_TO_NAME}{$REPORTS_TO_ID}  {$UMOD.LBL_OTHER_PHONE}{$PHONE_OTHER}{$PHONE_OTHER} 
    {$UMOD.LBL_OTHER_EMAIL}{$EMAIL2}{$EMAIL2}  {$UMOD.LBL_FAX}{$PHONE_FAX}{$PHONE_FAX} 
    {$UMOD.LBL_YAHOO_ID}{$YAHOO_ID}{$YAHOO_ID}  {$UMOD.LBL_HOME_PHONE}{$PHONE_HOME}{$PHONE_HOME} 
    {$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}{$DATE_FORMAT}     
    {$UMOD.LBL_SIGNATURE}{$SIGNATURE}{$SIGNATURE}  {$UMOD.LBL_NOTES}{$DESCRIPTION} - {$DESCRIPTION} 
     
    @@ -204,31 +203,31 @@
    {$UMOD.LBL_ADDRESS}{$ADDRESS_STREET}{$ADDRESS_STREET}     
    {$UMOD.LBL_CITY}{$ADDRESS_CITY}{$ADDRESS_CITY}     
    {$UMOD.LBL_STATE}{$ADDRESS_STATE}{$ADDRESS_STATE}     
    {$UMOD.LBL_POSTAL_CODE}{$ADDRESS_POSTALCODE}{$ADDRESS_POSTALCODE}     
    {$UMOD.LBL_COUNTRY}{$ADDRESS_COUNTRY}{$ADDRESS_COUNTRY}     
    - - {include file='SettingsMenu.tpl'} - -
    - - - - -
    {$MOD.LBL_USER_MANAGEMENT}
    - - - - - - - - - - - - - - - - - - - - -
     
    - - - - - - - - - - - - -
    - - - - - - - - -
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} 
    -
    -
    - - - -
     
    - - - - - - - - - - - {if $MODE neq 'edit'} - - - - - - - {/if} - - - - - - - - - - - - - - - - - - {$USER_STATUS_OPTIONS} - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_NEW_FORM_TITLE}
    *{$UMOD.LBL_USER_NAME} {$UMOD.LBL_ADMIN}
    *{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
    {$UMOD.LBL_FIRST_NAME} *{$UMOD.LBL_LAST_NAME}
    *{$UMOD.LBL_USER_ROLE}{$USER_ROLE}*{$UMOD.LBL_EMAIL}
    *{$UMOD.LBL_STATUS} 
     
    {$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
    *{$UMOD.LBL_COLOR}  {$CAL_COLOR}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
     
    -
    -
    -
    - - - -
     
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_NEW_FORM_TITLE}
    {$UMOD.LBL_TITLE}{$UMOD.LBL_OFFICE_PHONE}
    {$UMOD.LBL_DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}
    {$UMOD.LBL_REPORTS_TO} {$UMOD.LBL_OTHER_PHONE}
    {$UMOD.LBL_OTHER_EMAIL}{$UMOD.LBL_FAX}
    {$UMOD.LBL_YAHOO_ID}{$UMOD.LBL_HOME_PHONE}
    {$UMOD.LBL_USER_IMAGE}{$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}
    - {$UMOD.LBL_TAG_CLOUD} -
    {$UMOD.LBL_SIGNATURE}{$UMOD.LBL_NOTES} -
     
    -
    -
    - -
    - - - -
     
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_NEW_FORM_TITLE}
    {$UMOD.LBL_ADDRESS}  
    {$UMOD.LBL_CITY}  
    {$UMOD.LBL_STATE}  
    {$UMOD.LBL_POSTAL_CODE}  
    {$UMOD.LBL_COUNTRY}  
     
    -
    -
    -
     
    - - -
    -
    - -
    -
    -
    - -{$JAVASCRIPT} - - {include file='SettingsSubMenu.tpl'} + + + + + + + + + {include file='SettingsMenu.tpl'} + +
    + + + + +
    + + + + + + + + +
    + + {$MOD.LBL_SETTINGS} + > {$MOD.LBL_USER_MANAGEMENT} +
    +
    {$USER_NAME}
    + Edit View of {$FIRST_NAME} {$LAST_NAME} +
    +
    + + + + + + + + + + + + + + + + + + + + +
     
    + + + + + + + + + + + + +
    + + + + + + + + +
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} 
    +
    +
    + + + +
     
    + + + + + + + + + + + {if $MODE neq 'edit'} + + + + + + + {/if} + + + + + + + + + + + + + + + + + + {$USER_STATUS_OPTIONS} + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_NEW_FORM_TITLE}
    *{$UMOD.LBL_USER_NAME} {$UMOD.LBL_ADMIN}
    *{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
    {$UMOD.LBL_FIRST_NAME} *{$UMOD.LBL_LAST_NAME}
    *{$UMOD.LBL_USER_ROLE}{$USER_ROLE}*{$UMOD.LBL_EMAIL}
    *{$UMOD.LBL_STATUS} 
     
    {$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
    *{$UMOD.LBL_COLOR}  {$CAL_COLOR}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
     
    +
    +
    +
    + + + +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_NEW_FORM_TITLE}
    {$UMOD.LBL_TITLE}{$UMOD.LBL_OFFICE_PHONE}
    {$UMOD.LBL_DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}
    {$UMOD.LBL_REPORTS_TO} {$UMOD.LBL_OTHER_PHONE}
    {$UMOD.LBL_OTHER_EMAIL}{$UMOD.LBL_FAX}
    {$UMOD.LBL_YAHOO_ID}{$UMOD.LBL_HOME_PHONE}
    {$UMOD.LBL_USER_IMAGE}{$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}
    + {$UMOD.LBL_TAG_CLOUD} +
    {$UMOD.LBL_SIGNATURE}{$UMOD.LBL_NOTES} +
     
    +
    +
    + +
    + + + +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_NEW_FORM_TITLE}
    {$UMOD.LBL_ADDRESS}  
    {$UMOD.LBL_CITY}  
    {$UMOD.LBL_STATE}  
    {$UMOD.LBL_POSTAL_CODE}  
    {$UMOD.LBL_COUNTRY}  
     
    +
    +
    +
     
    + + +
    +
    + +
    +
    +
    + +{$JAVASCRIPT} + + {include file='SettingsSubMenu.tpl'} From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 16:12:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:12:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5678 - /vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Message-ID: <20060502201252.298DE702EA7@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:12:45 2006 New Revision: 5678 Log: Added the changes for IE - Ahmed Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Tue May 2 14:12:45 2006 @@ -1,9 +1,9 @@ - +
    - {else} @@ -47,7 +47,7 @@ @@ -81,11 +81,11 @@
    +
    @@ -16,7 +16,7 @@
    -
    + @@ -65,7 +64,7 @@ {$MOD.LBL_BACKUP_SERVER_CONFIGURATION}{$MOD.LBL_SYSTEM_CONFIG}{$MOD.LBL_CURRENCY_CONFIG} -{$MOD.LBL_MIGRATION} +{$MOD.LBL_MIGRATION} From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:13:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:13:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23746=3A_?= =?utf-8?q?New_=3CRecord=3E_-_Handling_Tickets_and_FAQ?= In-Reply-To: <076.8a974f855c1ae2b8ba9418701ef5c2f7@vtiger.fosslabs.com> References: <076.8a974f855c1ae2b8ba9418701ef5c2f7@vtiger.fosslabs.com> Message-ID: <085.74c6b427e3891830d1490021108c196f@vtiger.fosslabs.com> #746: New - Handling Tickets and FAQ ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:16:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:16:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23257=3A_?= =?utf-8?q?User_Management_-_Sub_tabs_actions_differ?= In-Reply-To: <076.f28264e22e3c7288a956ba1e76f97b54@vtiger.fosslabs.com> References: <076.f28264e22e3c7288a956ba1e76f97b54@vtiger.fosslabs.com> Message-ID: <085.f7e6731e58ecc203b5f4712e10d0f348@vtiger.fosslabs.com> #257: User Management - Sub tabs actions differ ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:17:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:17:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23354=3A_?= =?utf-8?q?Create_Activities_-_New_Links_are_far_way_from_each_other?= In-Reply-To: <076.d728bc840c3411160e5c1544b0757af2@vtiger.fosslabs.com> References: <076.d728bc840c3411160e5c1544b0757af2@vtiger.fosslabs.com> Message-ID: <085.62d758f511a3fe2f075f7e7079014150@vtiger.fosslabs.com> #354: Create Activities - New Links are far way from each other ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:19:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:19:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23475=3A_?= =?utf-8?q?Settings=3A_Sub-tabs_in_Users=2C_Profiles=2C_and_Roles_are_inco?= =?utf-8?q?nsistent?= In-Reply-To: <076.6bc07ced293941eb262865a8634fd724@vtiger.fosslabs.com> References: <076.6bc07ced293941eb262865a8634fd724@vtiger.fosslabs.com> Message-ID: <085.39526bc06c1598209ec510d7effd5b2a@vtiger.fosslabs.com> #475: Settings: Sub-tabs in Users, Profiles, and Roles are inconsistent ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:20:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:20:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23477=3A_?= =?utf-8?q?Admin_Check_box_-_Redundant?= In-Reply-To: <076.bfd18d9b0d7148c3b406d51ac0ea5015@vtiger.fosslabs.com> References: <076.bfd18d9b0d7148c3b406d51ac0ea5015@vtiger.fosslabs.com> Message-ID: <085.ae7a5788f22bae476c17cacbeaac3be5@vtiger.fosslabs.com> #477: Admin Check box - Redundant ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * version: 5.0.0 => 5.0.1 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 16:20:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:20:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5679 - /vtigercrm/trunk/modules/Users/ChangePassword.php Message-ID: <20060502202057.8EF36702EDF@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:20:51 2006 New Revision: 5679 Log: Added new style css to change password - Ahmed Modified: vtigercrm/trunk/modules/Users/ChangePassword.php Modified: vtigercrm/trunk/modules/Users/ChangePassword.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 16:24:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 20:24:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5680 - /vtigercrm/trunk/modules/Users/Save.php Message-ID: <20060502202411.76FF0702EDF@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 14:24:05 2006 New Revision: 5680 Log: New user creation is now functional - Ahmed Modified: vtigercrm/trunk/modules/Users/Save.php Modified: vtigercrm/trunk/modules/Users/Save.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:24:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:24:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23205=3A_?= =?utf-8?q?no_image_mail_server_info?= In-Reply-To: <076.d44d3396d8e036259f267ae772a82b40@vtiger.fosslabs.com> References: <076.d44d3396d8e036259f267ae772a82b40@vtiger.fosslabs.com> Message-ID: <085.d8d1ff0925e62ce9912f4297b38ff206@vtiger.fosslabs.com> #205: no image mail server info ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: mail server info ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:26:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:26:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23202=3A_?= =?utf-8?q?=27no_image=27_while_company_info_edit?= In-Reply-To: <076.49b980f60f323d38dd3fb5eb903756ac@vtiger.fosslabs.com> References: <076.49b980f60f323d38dd3fb5eb903756ac@vtiger.fosslabs.com> Message-ID: <085.656d195ff381d02365f6a8326650f682@vtiger.fosslabs.com> #202: 'no image' while company info edit ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: company info ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:26:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:26:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23213=3A_?= =?utf-8?q?no_image_backup_server_config?= In-Reply-To: <076.3f0dea16607ae71bf674ea181a738a8e@vtiger.fosslabs.com> References: <076.3f0dea16607ae71bf674ea181a738a8e@vtiger.fosslabs.com> Message-ID: <085.a78c248107fe610c8d7456942943ce17@vtiger.fosslabs.com> #213: no image backup server config ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: backup server config ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:27:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:27:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23232=3A_?= =?utf-8?q?misalignment_in_Inventory_Terms_and_Conditions_UI?= In-Reply-To: <076.4fc8ed4216aad11ae8ce31e9e1229069@vtiger.fosslabs.com> References: <076.4fc8ed4216aad11ae8ce31e9e1229069@vtiger.fosslabs.com> Message-ID: <085.3dc52ba38d2c0f92a998ddfe028de363@vtiger.fosslabs.com> #232: misalignment in Inventory Terms and Conditions UI ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: inventory ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:29:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:29:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23134=3A_?= =?utf-8?q?Settings_Left_side_screen_too_big?= In-Reply-To: <076.97dc79f5ef0ccc78a5d2282fc9283bb1@vtiger.fosslabs.com> References: <076.97dc79f5ef0ccc78a5d2282fc9283bb1@vtiger.fosslabs.com> Message-ID: <085.65e901d4a48bcb1cf6bd439787850529@vtiger.fosslabs.com> #134: Settings Left side screen too big ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Left hand side screen Settings ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 16:34:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 20:34:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23333=3A_?= =?utf-8?q?No_css_for_Change_password_popup?= In-Reply-To: <076.166732b8cfc76c7f522640e2cbaa3eef@vtiger.fosslabs.com> References: <076.166732b8cfc76c7f522640e2cbaa3eef@vtiger.fosslabs.com> Message-ID: <085.25685eaaeafd84c12eac96098a68db78@vtiger.fosslabs.com> #333: No css for Change password popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: User Change Password popup ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 17:04:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 21:04:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23203=3A_?= =?utf-8?q?UI_issue_in_tag?= In-Reply-To: <076.c68798cae45ed03d0e7c2b988d395d60@vtiger.fosslabs.com> References: <076.c68798cae45ed03d0e7c2b988d395d60@vtiger.fosslabs.com> Message-ID: <085.0de54bcba211cf0e3cca9b7777780765@vtiger.fosslabs.com> #203: UI issue in tag ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: UI ---------------------------+------------------------------------------------ Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 17:07:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 21:07:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23407=3A_?= =?utf-8?q?Inconsistency_in_Pagination?= In-Reply-To: <076.18acc4366a70c7be608f072b875694f1@vtiger.fosslabs.com> References: <076.18acc4366a70c7be608f072b875694f1@vtiger.fosslabs.com> Message-ID: <085.ec21c98b0d5a65bd42658fa167498c20@vtiger.fosslabs.com> #407: Inconsistency in Pagination ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 17:12:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 21:12:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23113=3A_?= =?utf-8?q?Issue_in_Create_Leads_Screen?= In-Reply-To: <076.48d81357938176da9aa5cb5437084734@vtiger.fosslabs.com> References: <076.48d81357938176da9aa5cb5437084734@vtiger.fosslabs.com> Message-ID: <085.518ca1375a5a566450859f96d7912e4e@vtiger.fosslabs.com> #113: Issue in Create Leads Screen ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 17:13:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 21:13:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23438=3A_?= =?utf-8?q?Positioning_of_the_addtag_button_is_improper?= In-Reply-To: <076.e3699430f94d979a408b8b7caa0b6fb3@vtiger.fosslabs.com> References: <076.e3699430f94d979a408b8b7caa0b6fb3@vtiger.fosslabs.com> Message-ID: <085.9a3678afe9aec3c00c3aa20dca061d56@vtiger.fosslabs.com> #438: Positioning of the addtag button is improper ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 18:18:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 22:18:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23753=3A_?= =?utf-8?q?Fix_mime-types_throughout_/trunk?= Message-ID: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> #753: Fix mime-types throughout /trunk -----------------------+---------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: mime | -----------------------+---------------------------------------------------- source:vtigercrm/trunk has many files with no mime-type subversion property. It is important to fix these before release tags are made (including beta tags). -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 18:32:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 22:32:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23752=3A_?= =?utf-8?q?Add_postgresql_support_to_trunk?= In-Reply-To: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> References: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> Message-ID: <085.041489e134e5b9dfa3edb33007707774@vtiger.fosslabs.com> #752: Add postgresql support to trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: adodb postgresql database ------------------------+--------------------------------------------------- Comment (by jeffk): Per Allan Bush, this work will be attempted on the trunk, without making a feature branch. Developers and testers should still file related issues on this bug. All commits relating to postgresql support on source:vtigercrm/trunk should add the text 'refs #752' in their commit message. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 18:40:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 02 May 2006 22:40:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23753=3A_?= =?utf-8?q?Fix_mime-types_throughout_/trunk?= In-Reply-To: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> References: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> Message-ID: <085.3ae04c092c34c90e8fda71bf1f81c89e@vtiger.fosslabs.com> #753: Fix mime-types throughout /trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mime ------------------------+--------------------------------------------------- Comment (by jeffk): (In [5681]) refs #753. fixing one mime-type property -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 18:40:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 02 May 2006 22:40:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5681 - /vtigercrm/trunk/README.txt Message-ID: <20060502224030.0AC56702EF1@vtiger.fosslabs.com> Author: jeffk Date: Tue May 2 16:40:26 2006 New Revision: 5681 Log: refs #753. fixing one mime-type property Modified: vtigercrm/trunk/README.txt (props changed) From vtiger-tickets at vtiger.fosslabs.com Tue May 2 20:24:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 00:24:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23388=3A_?= =?utf-8?q?In_consistent_headings_in_Setting_pages?= In-Reply-To: <076.cd4fd81a0701b4d2a86d39847cf87427@vtiger.fosslabs.com> References: <076.cd4fd81a0701b4d2a86d39847cf87427@vtiger.fosslabs.com> Message-ID: <085.c54add10d0c827881e3c215fa96c5855@vtiger.fosslabs.com> #388: In consistent headings in Setting pages ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Settings ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 2 20:24:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 00:24:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23250=3A_?= =?utf-8?q?Arrangement_of_icons_inconsistent?= In-Reply-To: <076.609795e90d591a97352576571bb0aae0@vtiger.fosslabs.com> References: <076.609795e90d591a97352576571bb0aae0@vtiger.fosslabs.com> Message-ID: <085.464b80b265bec3b510cf588c62075be9@vtiger.fosslabs.com> #250: Arrangement of icons inconsistent ------------------------+--------------------------------------------------- Reporter: saraj | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: icons inconsistent ------------------------+--------------------------------------------------- Changes (by ela): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 23:57:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 03:57:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5682 - /vtigercrm/trunk/Smarty/templates/Settings.tpl Message-ID: <20060503035743.DCBC2702F1E@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 21:57:39 2006 New Revision: 5682 Log: UI Changes done in settings - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue May 2 21:57:39 2006 @@ -1,9 +1,9 @@ -
    {$MOD.LBL_CONFIGURATION}
    +
    {include file='SettingsMenu.tpl'} - + - - + - +
    - +
    @@ -75,6 +75,7 @@ + @@ -103,16 +104,14 @@ - + - - - - + From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 23:58:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 03:58:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5683 - /vtigercrm/trunk/Smarty/templates/UserListView.tpl Message-ID: <20060503035828.54E6A702F20@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 21:58:24 2006 New Revision: 5683 Log: UI Changes done in settings - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Tue May 2 21:58:24 2006 @@ -15,7 +15,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue May 2 23:58:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 03:58:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5684 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060503035850.D85FA702F20@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 21:58:47 2006 New Revision: 5684 Log: UI Changes done in settings - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Tue May 2 21:58:47 2006 @@ -24,7 +24,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 01:01:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 05:01:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5685 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060503050159.9C8A5702F34@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 23:01:50 2006 New Revision: 5685 Log: Added the mailto link for Emails in User Detail View - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue May 2 23:01:50 2006 @@ -115,7 +115,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 01:36:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 05:36:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5686 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060503053647.B14BF702F3F@vtiger.fosslabs.com> Author: saraj Date: Tue May 2 23:36:42 2006 New Revision: 5686 Log: Added Other Phone field instead of only other - Ahmed Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 02:35:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 06:35:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5687 - /vtigercrm/trunk/Smarty/libs/Smarty.class.php Message-ID: <20060503063533.2C74D702F4C@vtiger.fosslabs.com> Author: richie Date: Wed May 3 00:35:28 2006 New Revision: 5687 Log: @ added to 1234 and 1217 lines Modified: vtigercrm/trunk/Smarty/libs/Smarty.class.php Modified: vtigercrm/trunk/Smarty/libs/Smarty.class.php ============================================================================== --- vtigercrm/trunk/Smarty/libs/Smarty.class.php (original) +++ vtigercrm/trunk/Smarty/libs/Smarty.class.php Wed May 3 00:35:28 2006 @@ -1212,7 +1212,7 @@ header('HTTP/1.1 304 Not Modified'); } else { - header('Last-Modified: '.$_gmt_mtime); + @header('Last-Modified: '.$_gmt_mtime); echo $_smarty_results; } } else { @@ -1231,7 +1231,7 @@ } else { $this->_cache_info['template'][$resource_name] = true; if ($this->cache_modified_check && $display) { - header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT'); + @header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT'); } } } From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 02:36:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 06:36:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5688 - /vtigercrm/trunk/Smarty_setup.php Message-ID: <20060503063612.40497702F4C@vtiger.fosslabs.com> Author: richie Date: Wed May 3 00:36:08 2006 New Revision: 5688 Log: Extra space removed at the end of file Modified: vtigercrm/trunk/Smarty_setup.php Modified: vtigercrm/trunk/Smarty_setup.php ============================================================================== --- vtigercrm/trunk/Smarty_setup.php (original) +++ vtigercrm/trunk/Smarty_setup.php Wed May 3 00:36:08 2006 @@ -16,4 +16,3 @@ } ?> - From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 02:52:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 06:52:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5689 - /vtigercrm/trunk/pkg/bin/startvTiger.bat Message-ID: <20060503065209.CFE11702F49@vtiger.fosslabs.com> Author: richie Date: Wed May 3 00:52:05 2006 New Revision: 5689 Log: message changed Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Wed May 3 00:52:05 2006 @@ -150,13 +150,23 @@ echo "" echo "" echo "********* Service not started as port # %apache_port% occupied ******* " -echo "********* Kindly free port %apache_port% and restart again or give a different port which is free******* " +echo "" +echo "" +echo "" +echo "" +echo "********* I am sorry. I am not able to start the product as the apache port that you have specified: port # %apache_port% seems to be occupied ******* . You could give me a different port number if you wish by doing the following ...." +echo "" +echo "" echo "" echo "" echo "********* Open the apache/conf/httpd.conf file, search for 'Listen' and change the port number ******* " echo "" echo "" -echo "********* Make the apache port change in startvTiger.bat and stopvTiger.bat too******* " +echo "" +echo "" +echo "********* Change the apache port in startvTiger.bat and stopvTiger.bat too and then access the product from the browser in the following manner http://localhost:apacheport******* " +echo "" +echo "" echo "" echo "" echo "" From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 03:08:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 07:08:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5690 - /vtigercrm/trunk/pkg/bin/startvTiger.bat Message-ID: <20060503070816.C5066702F57@vtiger.fosslabs.com> Author: richie Date: Wed May 3 01:08:12 2006 New Revision: 5690 Log: sleep for 20 seconds added. This is so as at times, when the server is started, it seems that the port is shown as occupied as it does not get enuf time to start Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Wed May 3 01:08:12 2006 @@ -50,6 +50,9 @@ echo "installing vtigercrm5_beta apache service" echo "" echo "" +echo "Starting vtigercrm5_beta apache service after sleeping for 20 seconds" +echo "" +%SLEEP_STR% -n 20 127.0.0.1>nul bin\apache -k install -n vtigercrm5_beta -f conf\httpd.conf echo "" echo "Starting vtigercrm5_beta apache service" From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 03:58:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 07:58:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5691 - /vtigercrm/trunk/modules/Users/Forms.php Message-ID: <20060503075859.8F056702F5A@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 01:58:55 2006 New Revision: 5691 Log: Added validation for UserEditView - Ahmed Modified: vtigercrm/trunk/modules/Users/Forms.php Modified: vtigercrm/trunk/modules/Users/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Users/Forms.php (original) +++ vtigercrm/trunk/modules/Users/Forms.php Wed May 3 01:58:55 2006 @@ -74,11 +74,11 @@ return false; } if (trim(form.email1.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email1.value)) { - alert('"' + form.email1.value + '" $err_invalid_email_address'); + alert('"' + form.email1.value + '" is $err_invalid_email_address'); return false; } if (trim(form.email2.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email2.value)) { - alert('"' + form.email2.value + '" $err_invalid_email_address'); + alert('"' + form.email2.value + '" value in other email field is $err_invalid_email_address'); return false; } if(trim(form.new_password.value) != trim(form.confirm_new_password.value)) @@ -97,4 +97,67 @@ return $the_script; } +function get_validate_record_js1 () { +global $mod_strings; +global $app_strings; + +$lbl_last_name = $mod_strings['LBL_LIST_LAST_NAME']; +$lbl_user_name = $mod_strings['LBL_LIST_USER_NAME']; +$lbl_new_password = $mod_strings['LBL_LIST_PASSWORD']; +$lbl_confirm_new_password = $mod_strings['LBL_LIST_CONFIRM_PASSWORD']; +$lbl_user_email1 = $mod_strings['LBL_LIST_EMAIL']; +$err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS']; +$err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS']; + +$the_script = << + + + +EOQ; + +return $the_script; +} + + + ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 04:00:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 08:00:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5692 - /vtigercrm/trunk/modules/Users/EditView.php Message-ID: <20060503080021.7BCF1702F46@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 02:00:17 2006 New Revision: 5692 Log: Added validation for UserEditView - Ahmed Modified: vtigercrm/trunk/modules/Users/EditView.php Modified: vtigercrm/trunk/modules/Users/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditView.php (original) +++ vtigercrm/trunk/modules/Users/EditView.php Wed May 3 02:00:17 2006 @@ -99,8 +99,11 @@ $smarty->assign("RETURN_ID", $_REQUEST['return_id']); $RETURN_ID = $_REQUEST['return_id']; } - -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); +if($mode == 'edit') + $smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js1()); +else + $smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); + $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); $smarty->assign("ID", $focus->id); $smarty->assign("USER_NAME", $focus->user_name); From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 04:02:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 08:02:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5693 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060503080224.D978C702EA4@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 02:02:20 2006 New Revision: 5693 Log: Added validation for UserEditView - Ahmed Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Wed May 3 02:02:20 2006 @@ -38,7 +38,6 @@ '; - -$list = imap_getmailboxes($mbox, "{".$imapServerAddress."}", "*"); -sort($list); -if (is_array($list)) { - $boxes = ''; + +$list = imap_getmailboxes($mbox, "{".$imapServerAddress."}", "*"); +sort($list); +if (is_array($list)) { + $boxes = ''; -} -$navigationOutput .= ''; -$navigationOutput .= ''; - -imap_close($mbox); -//print_r($listview_entries); + $boxes .= ''; +} +$navigationOutput .= ''; +$navigationOutput .= ''; + +imap_close($mbox); +//print_r($listview_entries); $smarty = new vtigerCRM_Smarty; $smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); -$smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("LISTENTITY", $listview_entries); -$smarty->assign("LISTHEADER", $listview_header); -$smarty->assign("MODULE","Webmails"); -$smarty->assign("SINGLE_MOD",'Webmails'); -$smarty->assign("BUTTONS",$other_text); -$smarty->assign("CATEGORY","My Home Page"); -$smarty->assign("NAVIGATION", $navigationOutput); +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("LISTENTITY", $listview_entries); +$smarty->assign("LISTHEADER", $listview_header); +$smarty->assign("MODULE","Webmails"); +$smarty->assign("SINGLE_MOD",'Webmails'); +$smarty->assign("BUTTONS",$other_text); +$smarty->assign("CATEGORY","My Home Page"); +$smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("FOLDER_SELECT", $boxes); -$smarty->assign("NUM_EMAILS", $numEmails); +$smarty->assign("NUM_EMAILS", $numEmails); $smarty->assign("MAILBOX", $mailbox); $smarty->assign("ACCOUNT", $account_name); $smarty->assign("BOXLIST",$folders); -$smarty->display("Webmails.tpl"); -//$smarty->display("ListView.tpl"); - -?> +$smarty->display("Webmails.tpl"); +//$smarty->display("ListView.tpl"); + +?> Modified: vtigercrm/trunk/modules/Webmails/body.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/body.php (original) +++ vtigercrm/trunk/modules/Webmails/body.php Wed May 3 06:00:54 2006 @@ -21,8 +21,8 @@ if(isset($_REQUEST["mailbox"]) && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} global $mbox; -$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); - +//$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); +$mbox = @imap_open('{'.$imapServerAddress.'/'.$mail_protocol.'}'.$mailbox, $login_username, $secretkey) or die("Connection to server failed with: ".imap_last_error()); $email = new Webmail($mbox,$mailid); $email->loadMail(); From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:20:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 12:20:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5711 - /vtigercrm/trunk/modules/Users/add2db.php Message-ID: <20060503122006.D4AC9702FD7@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 06:20:01 2006 New Revision: 5711 Log: Added Javascript validation in Mail Merge - Ahmed Modified: vtigercrm/trunk/modules/Users/add2db.php Modified: vtigercrm/trunk/modules/Users/add2db.php ============================================================================== --- vtigercrm/trunk/modules/Users/add2db.php (original) +++ vtigercrm/trunk/modules/Users/add2db.php Wed May 3 06:20:01 2006 @@ -100,23 +100,25 @@ if($errorCode == 4) { include('themes/'.$theme.'/header.php'); - $errormessage = "Kindly give a valid file for upload!
    " ; - echo $errormessage; include "upload.php"; + // $errormessage = "Kindly give a valid file for upload!
    " ; + echo ""; } else if($errorCode == 2) { - $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file
    "; include('themes/'.$theme.'/header.php'); - echo $errormessage; include "upload.php"; + //$errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file
    "; + echo ""; + //echo $errormessage; //echo $errorCode; } else if($errorCode == 3) { include('themes/'.$theme.'/header.php'); - echo "Problems in file upload. Please try again!
    "; include "upload.php"; + echo ""; + } } From vtiger-tickets at vtiger.fosslabs.com Wed May 3 08:22:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 12:22:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23557=3A_?= =?utf-8?q?javascript_validation_for_mailmerge_creation?= In-Reply-To: <076.4c9123e555ad11a98d8fe9df89747f63@vtiger.fosslabs.com> References: <076.4c9123e555ad11a98d8fe9df89747f63@vtiger.fosslabs.com> Message-ID: <085.b2b75de1e50c79bb49eeece7045b96e5@vtiger.fosslabs.com> #557: javascript validation for mailmerge creation --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Javascript validation done for mail merge creation -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 08:32:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 12:32:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23738=3A_?= =?utf-8?q?custom_date_field_does_not_work?= In-Reply-To: <076.a77c78c65d038159208fb0ccaed11ec1@vtiger.fosslabs.com> References: <076.a77c78c65d038159208fb0ccaed11ec1@vtiger.fosslabs.com> Message-ID: <085.c675b7c882db14270c7aa5e6c226162f@vtiger.fosslabs.com> #738: custom date field does not work ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: custom, field ------------------------+--------------------------------------------------- Changes (by don): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:47:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 12:47:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5712 - in /vtigercrm/trunk/modules/Import: ImportMap.php ImportStep4.php Message-ID: <20060503124715.779C5702FE5@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 06:47:10 2006 New Revision: 5712 Log: * commented the function call retrieve_by_string_fields which is not used now for mapping Modified: vtigercrm/trunk/modules/Import/ImportMap.php vtigercrm/trunk/modules/Import/ImportStep4.php Modified: vtigercrm/trunk/modules/Import/ImportMap.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportMap.php (original) +++ vtigercrm/trunk/modules/Import/ImportMap.php Wed May 3 06:47:10 2006 @@ -76,7 +76,7 @@ { $query_arr = array('assigned_user_id'=>$owner_id,'name'=>$name); - $this->retrieve_by_string_fields($query_arr, false); + //$this->retrieve_by_string_fields($query_arr, false); $result = 1; $this->assigned_user_id = $owner_id; Modified: vtigercrm/trunk/modules/Import/ImportStep4.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportStep4.php (original) +++ vtigercrm/trunk/modules/Import/ImportStep4.php Wed May 3 06:47:10 2006 @@ -153,7 +153,6 @@ } - p("user_field=".$user_field." if=".$focus->importable_fields[$user_field]); // match up the "official" field to the user @@ -164,7 +163,6 @@ // now mark that we've seen this field $field_to_pos[$user_field] = $pos; $col_pos_to_field[$pos] = $user_field; - } } @@ -270,17 +268,18 @@ if($totalnoofrows > $RECORDCOUNT && $START < $totalnoofrows) { - $rows1 = Array(); - for($j=$START;$j<$START+$RECORDCOUNT;$j++) - { - $rows1[] = $datarows[$j]; - } - $res = InsertImportRecords($datarows,$rows1,$focus,$ret_field_count,$col_pos_to_field,$START,$RECORDCOUNT,$_REQUEST['module'],$totalnoofrows,$skipped_record_count); - -if($START != 0) - echo ''.$res.''; - - $count = $_REQUEST['count']; + $rows1 = Array(); + for($j=$START;$j<$START+$RECORDCOUNT;$j++) + { + $rows1[] = $datarows[$j]; + } + + $res = InsertImportRecords($datarows,$rows1,$focus,$ret_field_count,$col_pos_to_field,$START,$RECORDCOUNT,$_REQUEST['module'],$totalnoofrows,$skipped_record_count); + + if($START != 0) + echo ''.$res.''; + + $count = $_REQUEST['count']; } else { @@ -300,11 +299,8 @@ if( $has_header) { - - foreach($col_pos_to_field as $pos=>$field_name) { - if ( isset($firstrow[$pos]) && isset( $field_name)) { $header_to_field[ $firstrow[$pos] ] = $field_name; @@ -323,10 +319,8 @@ $mapping_file = new ImportMap(); - $query_arr = array('assigned_user_id'=>$current_user->id,'name'=>$mapping_file_name); - - - $mapping_file->retrieve_by_string_fields($query_arr, false); + //$query_arr = array('assigned_user_id'=>$current_user->id,'name'=>$mapping_file_name); + //$mapping_file->retrieve_by_string_fields($query_arr, false); $result = $mapping_file->save_map( $current_user->id, $mapping_file_name, From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:49:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 12:49:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5713 - in /vtigercrm/trunk/modules/Import: ImportStep1.html ImportStep2.html ImportStep3.html ImportStep4.html error.html Message-ID: <20060503124955.6E970702EF1@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 06:49:49 2006 New Revision: 5713 Log: * Unwnated files has been removed as now we had written in tpl files Removed: vtigercrm/trunk/modules/Import/ImportStep1.html vtigercrm/trunk/modules/Import/ImportStep2.html vtigercrm/trunk/modules/Import/ImportStep3.html vtigercrm/trunk/modules/Import/ImportStep4.html vtigercrm/trunk/modules/Import/error.html From vtiger-tickets at vtiger.fosslabs.com Wed May 3 09:30:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 13:30:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23754=3A_?= =?utf-8?q?Thunderbird_plugin_does_not_find_contacts?= Message-ID: <076.0f14fd08f60f589fea2f8a7eecc2b4c7@vtiger.fosslabs.com> #754: Thunderbird plugin does not find contacts ----------------------------------+----------------------------------------- Reporter: hpw at softechmatrix.nl | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: thunderbirdextn | Version: 4.2.3 Keywords: contact not found | ----------------------------------+----------------------------------------- This is an issue I have at one of my clients: In most cases the Thunderbird plugin can not find the contact in vTiger. It seems dependant on the specific contact in the database as some contact can be found (repeatable without a problem) but most contacts can not be found (again repeatable, they wont be found no matter how many tries). I have no idea how to help you guys to recreate this behaviour. If you need any material from me (specific files, additional info, etc.) just post a reply to this ticket (or drop me an email). I monitor my tickets on a weekly basis ;) -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 10:08:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 14:08:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5714 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060503140834.872C1702FFE@vtiger.fosslabs.com> Author: don Date: Wed May 3 08:08:27 2006 New Revision: 5714 Log: i18n of quick create label done Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Wed May 3 08:08:27 2006 @@ -49,6 +49,7 @@ global $currentModule; +global $app_strings; global $app_list_strings; global $moduleList; global $theme; @@ -64,6 +65,7 @@ $qc_modules = getQuickCreateModules(); $smarty->assign("QCMODULE", $qc_modules); +$smarty->assign("APP", $app_strings); $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 10:11:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 14:11:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5715 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060503141132.D5B6F702FFE@vtiger.fosslabs.com> Author: don Date: Wed May 3 08:11:28 2006 New Revision: 5715 Log: i18n of quick create label done Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed May 3 08:11:28 2006 @@ -56,7 +56,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 10:14:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 14:14:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5716 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060503141403.125D9703009@vtiger.fosslabs.com> Author: don Date: Wed May 3 08:13:58 2006 New Revision: 5716 Log: i18n of quick create label done Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Wed May 3 08:13:58 2006 @@ -1666,6 +1666,21 @@ global $adb; global $mod_strings; + + $new_label=Array('Leads'=>'LNK_NEW_LEAD', + 'Accounts'=>'LNK_NEW_ACCOUNT', + 'Activities'=>'LNK_NEW_TASK', + 'Campaigns'=>'LNK_NEW_CAMPAIGN', + 'Emails'=>'LNK_NEW_EMAIL', + 'Events'=>'LNK_NEW_EVENT', + 'HelpDesk'=>'LNK_NEW_HDESK', + 'Notes'=>'LNK_NEW_NOTE', + 'Potentials'=>'LNK_NEW_OPPORTUNITY', + 'PriceBooks'=>'LNK_NEW_PRICEBOOK', + 'Products'=>'LNK_NEW_PRODUCT', + 'Contacts'=>'LNK_NEW_CONTACT', + 'Vendors'=>'LNK_NEW_VENDOR'); + $qc_query = "select distinct tablabel,tab.name from field inner join tab on tab.tabid = field.tabid where quickcreate=0 order by tab.tablabel"; $result = $adb->query($qc_query); $noofrows = $adb->num_rows($result); @@ -1673,7 +1688,9 @@ for($i = 0; $i < $noofrows; $i++) { $tablabel = $adb->query_result($result,$i,'tablabel'); + $tabname = $adb->query_result($result,$i,'name'); + $tablabel = $new_label[$tabname]; if(isPermitted($tabname,'EditView','') == 'yes') { $return_qcmodule[] = $tablabel; From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 10:16:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 14:16:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5717 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060503141659.4CFC670300B@vtiger.fosslabs.com> Author: don Date: Wed May 3 08:16:55 2006 New Revision: 5717 Log: i18n of quick create label done Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Wed May 3 10:18:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 14:18:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23747=3A_?= =?utf-8?q?Handling_=3CNew=3ERecord=3A_Tasks_and_Events?= In-Reply-To: <076.2ad5054a596cd3d9eadad40186d30945@vtiger.fosslabs.com> References: <076.2ad5054a596cd3d9eadad40186d30945@vtiger.fosslabs.com> Message-ID: <085.0aabb9acda5d4caaa827925a76d97421@vtiger.fosslabs.com> #747: Handling Record: Tasks and Events ------------------------+--------------------------------------------------- Reporter: gopal | Owner: don Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 10:32:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 14:32:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5718 - in /vtigercrm/trunk/modules/System: ./ includes/ includes/lang/ includes/mb/ includes/os/ includes/xml/ templates/aq/ templates/black/ templates/blue/ templates/bulix/ templates/classic/ templates/kde/ templates/metal/ templates/orange/ templates/typo3/ templates/wintendoxp/ Message-ID: <20060503143255.36413703006@vtiger.fosslabs.com> Author: richie Date: Wed May 3 08:30:23 2006 New Revision: 5718 Log: latest version updated Modified: vtigercrm/trunk/modules/System/config.php vtigercrm/trunk/modules/System/includes/XPath.class.php vtigercrm/trunk/modules/System/includes/class.Template.inc.php vtigercrm/trunk/modules/System/includes/common_functions.php vtigercrm/trunk/modules/System/includes/lang/ar_utf8.php vtigercrm/trunk/modules/System/includes/lang/bg.php vtigercrm/trunk/modules/System/includes/lang/big5.php vtigercrm/trunk/modules/System/includes/lang/br.php vtigercrm/trunk/modules/System/includes/lang/ca.php vtigercrm/trunk/modules/System/includes/lang/cn.php vtigercrm/trunk/modules/System/includes/lang/cs.php vtigercrm/trunk/modules/System/includes/lang/ct.php vtigercrm/trunk/modules/System/includes/lang/da.php vtigercrm/trunk/modules/System/includes/lang/de.php vtigercrm/trunk/modules/System/includes/lang/en.php vtigercrm/trunk/modules/System/includes/lang/es.php vtigercrm/trunk/modules/System/includes/lang/et.php vtigercrm/trunk/modules/System/includes/lang/eu.php vtigercrm/trunk/modules/System/includes/lang/fi.php vtigercrm/trunk/modules/System/includes/lang/fr.php vtigercrm/trunk/modules/System/includes/lang/gr.php vtigercrm/trunk/modules/System/includes/lang/he.php vtigercrm/trunk/modules/System/includes/lang/hu.php vtigercrm/trunk/modules/System/includes/lang/id.php vtigercrm/trunk/modules/System/includes/lang/is.php vtigercrm/trunk/modules/System/includes/lang/it.php vtigercrm/trunk/modules/System/includes/lang/ja.php vtigercrm/trunk/modules/System/includes/lang/jp.php vtigercrm/trunk/modules/System/includes/lang/ko.php vtigercrm/trunk/modules/System/includes/lang/lt.php vtigercrm/trunk/modules/System/includes/lang/lv.php vtigercrm/trunk/modules/System/includes/lang/nl.php vtigercrm/trunk/modules/System/includes/lang/no.php vtigercrm/trunk/modules/System/includes/lang/pl.php vtigercrm/trunk/modules/System/includes/lang/pt-br.php vtigercrm/trunk/modules/System/includes/lang/pt.php vtigercrm/trunk/modules/System/includes/lang/ro.php vtigercrm/trunk/modules/System/includes/lang/ru.php vtigercrm/trunk/modules/System/includes/lang/sk.php vtigercrm/trunk/modules/System/includes/lang/sv.php vtigercrm/trunk/modules/System/includes/lang/tr.php vtigercrm/trunk/modules/System/includes/lang/tw.php vtigercrm/trunk/modules/System/includes/mb/class.healthd.inc.php vtigercrm/trunk/modules/System/includes/mb/class.hwsensors.inc.php vtigercrm/trunk/modules/System/includes/mb/class.lmsensors.inc.php vtigercrm/trunk/modules/System/includes/mb/class.mbm5.inc.php vtigercrm/trunk/modules/System/includes/mb/class.mbmon.inc.php vtigercrm/trunk/modules/System/includes/os/class.BSD.common.inc.php vtigercrm/trunk/modules/System/includes/os/class.Darwin.inc.php vtigercrm/trunk/modules/System/includes/os/class.FreeBSD.inc.php vtigercrm/trunk/modules/System/includes/os/class.HP-UX.inc.php vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php vtigercrm/trunk/modules/System/includes/os/class.NetBSD.inc.php vtigercrm/trunk/modules/System/includes/os/class.OpenBSD.inc.php vtigercrm/trunk/modules/System/includes/os/class.SunOS.inc.php vtigercrm/trunk/modules/System/includes/os/class.WINNT.inc.php vtigercrm/trunk/modules/System/includes/system_footer.php vtigercrm/trunk/modules/System/includes/system_header.php vtigercrm/trunk/modules/System/includes/xml/filesystems.php vtigercrm/trunk/modules/System/includes/xml/hardware.php vtigercrm/trunk/modules/System/includes/xml/mbinfo.php vtigercrm/trunk/modules/System/includes/xml/memory.php vtigercrm/trunk/modules/System/includes/xml/network.php vtigercrm/trunk/modules/System/includes/xml/vitals.php vtigercrm/trunk/modules/System/phpsysinfo.dtd vtigercrm/trunk/modules/System/systemconfig.php vtigercrm/trunk/modules/System/templates/aq/aq.css vtigercrm/trunk/modules/System/templates/aq/box.tpl vtigercrm/trunk/modules/System/templates/aq/form.tpl vtigercrm/trunk/modules/System/templates/black/black.css vtigercrm/trunk/modules/System/templates/black/box.tpl vtigercrm/trunk/modules/System/templates/black/form.tpl vtigercrm/trunk/modules/System/templates/blue/blue.css vtigercrm/trunk/modules/System/templates/blue/box.tpl vtigercrm/trunk/modules/System/templates/blue/form.tpl vtigercrm/trunk/modules/System/templates/bulix/box.tpl vtigercrm/trunk/modules/System/templates/bulix/bulix.css vtigercrm/trunk/modules/System/templates/bulix/form.tpl vtigercrm/trunk/modules/System/templates/classic/box.tpl vtigercrm/trunk/modules/System/templates/classic/classic.css vtigercrm/trunk/modules/System/templates/classic/form.tpl vtigercrm/trunk/modules/System/templates/kde/box.tpl vtigercrm/trunk/modules/System/templates/kde/form.tpl vtigercrm/trunk/modules/System/templates/metal/box.tpl vtigercrm/trunk/modules/System/templates/metal/form.tpl vtigercrm/trunk/modules/System/templates/metal/metal.css vtigercrm/trunk/modules/System/templates/orange/box.tpl vtigercrm/trunk/modules/System/templates/orange/form.tpl vtigercrm/trunk/modules/System/templates/orange/orange.css vtigercrm/trunk/modules/System/templates/typo3/box.tpl vtigercrm/trunk/modules/System/templates/typo3/form.tpl vtigercrm/trunk/modules/System/templates/wintendoxp/box.tpl vtigercrm/trunk/modules/System/templates/wintendoxp/form.tpl vtigercrm/trunk/modules/System/templates/wintendoxp/wintendoxp.css Modified: vtigercrm/trunk/modules/System/config.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/XPath.class.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/class.Template.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/common_functions.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ar_utf8.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/bg.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/big5.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/br.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ca.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/cn.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/cs.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ct.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/da.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/de.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/en.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/es.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/et.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/eu.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/fi.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/fr.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/gr.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/he.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/hu.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/id.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/is.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/it.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ja.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/jp.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ko.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/lt.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/lv.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/nl.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/no.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/pl.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/pt-br.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/pt.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ro.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/ru.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/sk.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/sv.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/tr.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/lang/tw.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/mb/class.healthd.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/mb/class.hwsensors.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/mb/class.lmsensors.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/mb/class.mbm5.inc.php ============================================================================== --- vtigercrm/trunk/modules/System/includes/mb/class.mbm5.inc.php (original) +++ vtigercrm/trunk/modules/System/includes/mb/class.mbm5.inc.php Wed May 3 08:30:23 2006 @@ -24,8 +24,8 @@ // need more csv logs to make it better. // class mbinfo { - var buf_label; - var buf_value; + var $buf_label; + var $buf_value; function temperature() { $results = array(); Modified: vtigercrm/trunk/modules/System/includes/mb/class.mbmon.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.BSD.common.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.Darwin.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.FreeBSD.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.HP-UX.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.NetBSD.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.OpenBSD.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.SunOS.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/os/class.WINNT.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/system_footer.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/system_header.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/filesystems.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/hardware.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/mbinfo.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/memory.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/network.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/xml/vitals.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/phpsysinfo.dtd ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/systemconfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/aq/aq.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/aq/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/aq/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/black/black.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/black/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/black/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/blue/blue.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/blue/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/blue/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/bulix/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/bulix/bulix.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/bulix/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/classic/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/classic/classic.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/classic/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/kde/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/kde/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/metal/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/metal/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/metal/metal.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/orange/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/orange/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/orange/orange.css ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/typo3/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/typo3/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/wintendoxp/box.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/wintendoxp/form.tpl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/templates/wintendoxp/wintendoxp.css ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 11:17:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:17:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5719 - /vtigercrm/trunk/modules/Settings/SaveMailAccount.php Message-ID: <20060503151745.348EF70300F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 09:17:38 2006 New Revision: 5719 Log: Redirection problem rectified while saving mail server information - Ahmed Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php ============================================================================== --- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original) +++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Wed May 3 09:17:38 2006 @@ -12,7 +12,7 @@ global $current_user; $displayname=$_REQUEST['displayname']; -$user_id = $current_user->id; +$userid = $current_user->id; $email=$_REQUEST['email']; $account_name=$_REQUEST['account_name']; $mailprotocol=$_REQUEST['mailprotocol']; @@ -33,7 +33,7 @@ if(isset($_REQUEST['edit']) && $_REQUEST['edit'] && $_REQUEST['record']!='') { - $sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."', box_refresh='".$box_refresh."', mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', showbody='no' where account_id = '".$id."'"; + $sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."', box_refresh='".$box_refresh."', mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', showbody='no' where user_id = '".$id."'"; } else { @@ -43,5 +43,5 @@ $adb->query($sql); -header("Location:index.php?module=Settings&action=ListMailAccount"); +header("Location:index.php?module=Settings&action=AddMailAccount&record=$userid"); ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 11:22:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:22:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5720 - /vtigercrm/trunk/modules/Settings/AddMailAccount.php Message-ID: <20060503152219.CD52270301A@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 09:22:13 2006 New Revision: 5720 Log: Redirection problem rectified while saving mail server information - Ahmed Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.php Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddMailAccount.php (original) +++ vtigercrm/trunk/modules/Settings/AddMailAccount.php Wed May 3 09:22:13 2006 @@ -34,7 +34,7 @@ if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { - $sql = "select * from mail_accounts where account_id=".$_REQUEST['record']; + $sql = "select * from mail_accounts where user_id=".$_REQUEST['record']; $result = $adb->query($sql); $rowcount = $adb->num_rows($result); @@ -43,6 +43,7 @@ while($temprow = $adb->fetchByAssoc($result)) { $smarty->assign("DISPLAYNAME", $temprow['display_name']); + $smarty->assign("ID", $temprow['user_id']); $smarty->assign("EMAIL", $temprow['mail_id']); $smarty->assign("ACCOUNTNAME", $temprow['account_name']); $smarty->assign($temprow['mail_protocol'],$temprow['mail_protocol']); From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 11:34:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:34:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5721 - in /vtigercrm/trunk/modules/System/includes: system_footer.php system_header.php Message-ID: <20060503153407.D09D1703021@vtiger.fosslabs.com> Author: richie Date: Wed May 3 09:34:01 2006 New Revision: 5721 Log: changes made to accomodate the newer version Modified: vtigercrm/trunk/modules/System/includes/system_footer.php vtigercrm/trunk/modules/System/includes/system_header.php Modified: vtigercrm/trunk/modules/System/includes/system_footer.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/includes/system_header.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 11:34:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:34:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5722 - in /vtigercrm/trunk/modules/System: config.php systemconfig.php Message-ID: <20060503153419.D09E9703021@vtiger.fosslabs.com> Author: richie Date: Wed May 3 09:34:13 2006 New Revision: 5722 Log: cchanges made to accomodate the newer version Modified: vtigercrm/trunk/modules/System/config.php vtigercrm/trunk/modules/System/systemconfig.php Modified: vtigercrm/trunk/modules/System/config.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/System/systemconfig.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Wed May 3 11:36:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 15:36:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23221=3A_?= =?utf-8?q?system_configuration_hangs?= In-Reply-To: <076.1b3561fa42e0dbfb58c5c24a884f58d0@vtiger.fosslabs.com> References: <076.1b3561fa42e0dbfb58c5c24a884f58d0@vtiger.fosslabs.com> Message-ID: <085.cb2e0ec8743932c8214c71024ec0b0d4@vtiger.fosslabs.com> #221: system configuration hangs ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: system ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: Fixed with changeset 5722 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 11:40:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:40:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5723 - /vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Message-ID: <20060503154006.4FBCF703027@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 09:40:00 2006 New Revision: 5723 Log: Modified Emails Per Page Label Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Wed May 3 09:40:00 2006 @@ -127,7 +127,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 11:52:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:52:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5724 - /vtigercrm/trunk/modules/System/includes/common_functions.php Message-ID: <20060503155238.19F77703034@vtiger.fosslabs.com> Author: richie Date: Wed May 3 09:52:32 2006 New Revision: 5724 Log: webpath replaced by getcwd Modified: vtigercrm/trunk/modules/System/includes/common_functions.php Modified: vtigercrm/trunk/modules/System/includes/common_functions.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 11:56:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 15:56:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5725 - /vtigercrm/trunk/modules/System/includes/xml/vitals.php Message-ID: <20060503155655.A991A703036@vtiger.fosslabs.com> Author: richie Date: Wed May 3 09:56:51 2006 New Revision: 5725 Log: getcwd replaces webpath Modified: vtigercrm/trunk/modules/System/includes/xml/vitals.php Modified: vtigercrm/trunk/modules/System/includes/xml/vitals.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 13:46:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 17:46:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5726 - /vtigercrm/trunk/vtigerversion.php Message-ID: <20060503174600.6717170666F@vtiger.fosslabs.com> Author: allanbush Date: Wed May 3 11:45:57 2006 New Revision: 5726 Log: Removed executable property as this file isn't an executable. Modified: vtigercrm/trunk/vtigerversion.php (props changed) From vtiger-tickets at vtiger.fosslabs.com Wed May 3 14:49:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 18:49:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23753=3A_?= =?utf-8?q?Fix_mime-types_throughout_/trunk?= In-Reply-To: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> References: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> Message-ID: <085.9778ae4aa1175d8fd3102f00f1aebc1f@vtiger.fosslabs.com> #753: Fix mime-types throughout /trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mime ------------------------+--------------------------------------------------- Changes (by allanbush): * priority: major => critical Comment: Worse then missing mime-types there are several non-binary files with binary mime-types. This disables SVN's ability to elegantly track the changes so we can't see what changes were made when. As such this should be fixed as soon as possible to prevent the lose of anymore changesets. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 15:00:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 19:00:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23753=3A_?= =?utf-8?q?Fix_mime-types_throughout_/trunk?= In-Reply-To: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> References: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> Message-ID: <085.facca684f4cabff2bdea2fb753c5a13f@vtiger.fosslabs.com> #753: Fix mime-types throughout /trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mime ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5727]) Replaced binary mime-types with text/plain. Refs #753. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 15:00:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 19:00:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5727 - in /vtigercrm/trunk: Copyright.txt INSTALLATION.txt LICENSE.txt config.php graph.php log4php.properties phprint.php Message-ID: <20060503190042.0C8C3708DE4@vtiger.fosslabs.com> Author: allanbush Date: Wed May 3 13:00:38 2006 New Revision: 5727 Log: Replaced binary mime-types with text/plain. Refs #753. Modified: vtigercrm/trunk/Copyright.txt (props changed) vtigercrm/trunk/INSTALLATION.txt (props changed) vtigercrm/trunk/LICENSE.txt (props changed) vtigercrm/trunk/config.php (props changed) vtigercrm/trunk/graph.php (props changed) vtigercrm/trunk/log4php.properties (props changed) vtigercrm/trunk/phprint.php (props changed) From vtiger-tickets at vtiger.fosslabs.com Wed May 3 17:30:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 21:30:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23753=3A_?= =?utf-8?q?Fix_mime-types_throughout_/trunk?= In-Reply-To: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> References: <076.55962470f683701efd9c87631a817e33@vtiger.fosslabs.com> Message-ID: <085.0bda66c0b3da56de10d578a05cd2c5c7@vtiger.fosslabs.com> #753: Fix mime-types throughout /trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: mime ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [5728]) Set mime-type property for all files. Closes #753. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 17:30:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 21:30:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5728 - in /vtigercrm/trunk: ./ Image/ Image/Canvas/ Image/Canvas/Fonts/ Image/Canvas/GD/ Image/Graph/ Image/Graph/Axis/ Image/Graph/Axis/Marker/ Image/Graph/DataPreprocessor/ Image/Graph/DataSelector/ Image/Graph/Dataset/ Image/Graph/Figure/ Image/Graph/Fill/ Image/Graph/Grid/ Image/Graph/Images/Maps/ Image/Graph/Layout/ Image/Graph/Line/ Image/Graph/Marker/ Image/Graph/Marker/Pointing/ Image/Graph/Plot/ Image/Graph/Plot/Fit/ Image/Graph/Plot/Smoothed/ Image/Graph/Plotarea/ Smarty/ Smarty/cache/ Smarty/configs/ Smarty/libs/ Smarty/libs/internals/ Smarty/libs/plugins/ Smarty/misc/ Smarty/templates/ Smarty/templates/Settings/ Smarty/templates_c/ XTemplate/ adodb/ adodb/contrib/ adodb/datadict/ adodb/drivers/ adodb/lang/ adodb/pear/Auth/Container/ adodb/perf/ adodb/session/ adodb/session/old/ adodb/tests/ adodb/xsl/ cache/ cache/images/ cache/import/ cache/upload/ class_http/ cron/ data/ database/ include/ include/Ajax/ include/ListView/ include/calculator/ include/clock/ include/database/ include/db_backup/ include/dd/ include/dd/dd_files/ include/fckeditor/ include/fckeditor/editor/ include/fckeditor/editor/_source/classes/ include/fckeditor/editor/_source/commandclasses/ include/fckeditor/editor/_source/globals/ include/fckeditor/editor/_source/internals/ include/fckeditor/editor/css/ include/fckeditor/editor/css/behaviors/ include/fckeditor/editor/dialog/ include/fckeditor/editor/dialog/common/ include/fckeditor/editor/dialog/fck_about/ include/fckeditor/editor/dialog/fck_docprops/ include/fckeditor/editor/dialog/fck_image/ include/fckeditor/editor/dialog/fck_link/ include/fckeditor/editor/dialog/fck_select/ include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/ include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/ include/fckeditor/editor/dialog/fck_universalkey/ include/fckeditor/editor/filemanager/browser/default/ include/fckeditor/editor/filemanager/browser/default/connectors/ include/fckeditor/editor/filemanager/browser/default/connectors/asp/ include/fckeditor/editor/filemanager/browser/default/connectors/aspx/ include/fckeditor/editor/filemanager/browser/default/connectors/cfm/ include/fckeditor/editor/filemanager/browser/default/connectors/perl/ include/fckeditor/editor/filemanager/browser/default/connectors/php/ include/fckeditor/editor/filemanager/browser/default/js/ include/fckeditor/editor/js/ include/fckeditor/editor/lang/ include/fckeditor/editor/plugins/placeholder/ include/fckeditor/editor/plugins/placeholder/lang/ include/fckeditor/editor/plugins/tablecommands/ include/fckeditor/editor/skins/default/ include/fckeditor/editor/skins/office2003/ include/fckeditor/editor/skins/silver/ include/feedParser/ include/fpdf/ include/fpdf/font/ include/fpdf/templates/ include/freetag/ include/images/ include/js/ include/language/ include/lastrss/ include/nusoap/ include/php_writeexcel/ include/prototype-1.4.0/ include/prototype-1.4.0/dist/ include/prototype-1.4.0/lib/ include/prototype-1.4.0/src/ include/prototype-1.4.0/test/ include/scriptaculous/ include/utils/ install/ jscalendar/ jscalendar/lang/ log4php/ log4php/appenders/ log4php/config/ log4php/helpers/ log4php/layouts/ log4php/or/ log4php/spi/ log4php/varia/ log4php/xml/ logs/ migration/ modules/Accounts/ modules/Accounts/language/ modules/Activities/ modules/Activities/language/ modules/Administration/ modules/Administration/language/ modules/Calendar/ modules/Calendar/admin/ modules/Calendar/auth/ modules/Calendar/db/ modules/Calendar/language/ modules/Calendar/layout/ modules/Calendar/localization/ modules/Calendar/tmp/ modules/Campaigns/ modules/Campaigns/language/ modules/Contacts/ modules/Contacts/js/ modules/Contacts/language/ modules/CustomView/ modules/CustomView/language/ modules/Dashboard/ modules/Dashboard/language/ modules/Emails/ modules/Emails/language/ modules/Emails/templates/ modules/Faq/ modules/Faq/language/ modules/Help/ modules/Help/language/ modules/HelpDesk/ modules/HelpDesk/language/ modules/Home/ modules/Home/language/ modules/Import/ modules/Import/language/ modules/Invoice/ modules/Invoice/language/ modules/Invoice/pdf_templates/ modules/Invoice/pdf_templates/lastpage/ modules/Leads/ modules/Leads/language/ modules/Migration/ modules/Migration/ModifyDatabase/ modules/Migration/language/ modules/Notes/ modules/Notes/language/ modules/Portal/ modules/Portal/language/ modules/Potentials/ modules/Potentials/language/ modules/PriceBooks/ modules/PriceBooks/language/ modules/Products/ modules/Products/language/ modules/PurchaseOrder/ modules/PurchaseOrder/language/ modules/PurchaseOrder/pdf_templates/ modules/PurchaseOrder/pdf_templates/lastpage/ modules/Quotes/ modules/Quotes/language/ modules/Quotes/pdf_templates/ modules/Quotes/pdf_templates/lastpage/ modules/Reports/ modules/Reports/language/ modules/Rss/ modules/Rss/language/ modules/SalesOrder/ modules/SalesOrder/language/ modules/SalesOrder/pdf_templates/ modules/SalesOrder/pdf_templates/lastpage/ modules/Settings/ modules/Settings/language/ modules/System/ modules/System/includes/ modules/System/includes/lang/ modules/System/includes/mb/ modules/System/includes/os/ modules/System/includes/xml/ modules/System/language/ modules/System/templates/aq/ modules/System/templates/black/ modules/System/templates/blue/ modules/System/templates/bulix/ modules/System/templates/classic/ modules/System/templates/kde/ modules/System/templates/metal/ modules/System/templates/orange/ modules/System/templates/typo3/ modules/System/templates/wintendoxp/ modules/Users/ modules/Users/language/ modules/Utilities/ modules/Vendors/ modules/Vendors/language/ modules/Webmails/ modules/Webmails/images/ modules/Webmails/js/ modules/Webmails/language/ modules/Webmails/templates/ modules/Yahoo/language/ modules/imports/ modules/imports/Excel/ modules/uploads/ modules/uploads/language/ pkg/apache/conf/ pkg/bin/ pkg/license/ pkg/php/ schema/ soap/ storage/ test/contact/ test/logo/ test/product/ test/upload/ test/user/ test/wordtemplatedownload/ themes/Aqua/ themes/Aqua/images/ themes/blue/ themes/blue/images/ themes/nature/ themes/orange/ user_privileges/ Message-ID: <20060503213010.62650709DEF@vtiger.fosslabs.com> Author: allanbush Date: Wed May 3 15:19:46 2006 New Revision: 5728 Log: Set mime-type property for all files. Closes #753. Modified: vtigercrm/trunk/Image/Canvas.php (props changed) vtigercrm/trunk/Image/Canvas/Color.php (props changed) vtigercrm/trunk/Image/Canvas/Fonts/README (props changed) vtigercrm/trunk/Image/Canvas/Fonts/VeraCopyright.txt (props changed) vtigercrm/trunk/Image/Canvas/Fonts/fontmap.txt (props changed) vtigercrm/trunk/Image/Canvas/GD.php (props changed) vtigercrm/trunk/Image/Canvas/GD/JPG.php (props changed) vtigercrm/trunk/Image/Canvas/GD/PNG.php (props changed) vtigercrm/trunk/Image/Canvas/ImageMap.php (props changed) vtigercrm/trunk/Image/Canvas/PDF.php (props changed) vtigercrm/trunk/Image/Canvas/SVG.php (props changed) vtigercrm/trunk/Image/Canvas/Tool.php (props changed) vtigercrm/trunk/Image/Canvas/WithMap.php (props changed) vtigercrm/trunk/Image/Color.php (props changed) vtigercrm/trunk/Image/Graph.php (props changed) vtigercrm/trunk/Image/Graph/Axis.php (props changed) vtigercrm/trunk/Image/Graph/Axis/Category.php (props changed) vtigercrm/trunk/Image/Graph/Axis/Logarithmic.php (props changed) vtigercrm/trunk/Image/Graph/Axis/Marker/Area.php (props changed) vtigercrm/trunk/Image/Graph/Axis/Marker/Line.php (props changed) vtigercrm/trunk/Image/Graph/Axis/Radar.php (props changed) vtigercrm/trunk/Image/Graph/Common.php (props changed) vtigercrm/trunk/Image/Graph/Config.php (props changed) vtigercrm/trunk/Image/Graph/Constants.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Array.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Currency.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Date.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Formatted.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Function.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/NumberText.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/RomanNumerals.php (props changed) vtigercrm/trunk/Image/Graph/DataPreprocessor/Sequential.php (props changed) vtigercrm/trunk/Image/Graph/DataSelector.php (props changed) vtigercrm/trunk/Image/Graph/DataSelector/EveryNthPoint.php (props changed) vtigercrm/trunk/Image/Graph/DataSelector/NoZeros.php (props changed) vtigercrm/trunk/Image/Graph/DataSelector/Values.php (props changed) vtigercrm/trunk/Image/Graph/Dataset.php (props changed) vtigercrm/trunk/Image/Graph/Dataset/Function.php (props changed) vtigercrm/trunk/Image/Graph/Dataset/Random.php (props changed) vtigercrm/trunk/Image/Graph/Dataset/Sequential.php (props changed) vtigercrm/trunk/Image/Graph/Dataset/Trivial.php (props changed) vtigercrm/trunk/Image/Graph/Dataset/VectorFunction.php (props changed) vtigercrm/trunk/Image/Graph/Element.php (props changed) vtigercrm/trunk/Image/Graph/Figure/Circle.php (props changed) vtigercrm/trunk/Image/Graph/Figure/Ellipse.php (props changed) vtigercrm/trunk/Image/Graph/Figure/Polygon.php (props changed) vtigercrm/trunk/Image/Graph/Figure/Rectangle.php (props changed) vtigercrm/trunk/Image/Graph/Fill.php (props changed) vtigercrm/trunk/Image/Graph/Fill/Array.php (props changed) vtigercrm/trunk/Image/Graph/Fill/Gradient.php (props changed) vtigercrm/trunk/Image/Graph/Fill/Image.php (props changed) vtigercrm/trunk/Image/Graph/Font.php (props changed) vtigercrm/trunk/Image/Graph/Grid.php (props changed) vtigercrm/trunk/Image/Graph/Grid/Bars.php (props changed) vtigercrm/trunk/Image/Graph/Grid/Lines.php (props changed) vtigercrm/trunk/Image/Graph/Grid/Polar.php (props changed) vtigercrm/trunk/Image/Graph/Images/Maps/README (props changed) vtigercrm/trunk/Image/Graph/Layout.php (props changed) vtigercrm/trunk/Image/Graph/Layout/Horizontal.php (props changed) vtigercrm/trunk/Image/Graph/Layout/Matrix.php (props changed) vtigercrm/trunk/Image/Graph/Layout/Vertical.php (props changed) vtigercrm/trunk/Image/Graph/Legend.php (props changed) vtigercrm/trunk/Image/Graph/Line/Array.php (props changed) vtigercrm/trunk/Image/Graph/Line/Dashed.php (props changed) vtigercrm/trunk/Image/Graph/Line/Dotted.php (props changed) vtigercrm/trunk/Image/Graph/Line/Formatted.php (props changed) vtigercrm/trunk/Image/Graph/Line/Solid.php (props changed) vtigercrm/trunk/Image/Graph/Logo.php (props changed) vtigercrm/trunk/Image/Graph/Marker.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Array.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Asterisk.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Average.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Box.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Bubble.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Circle.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Cross.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Diamond.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Icon.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Pinpoint.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Plus.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Pointing.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Pointing/Angular.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Pointing/Radial.php (props changed) vtigercrm/trunk/Image/Graph/Marker/ReversePinpoint.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Star.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Triangle.php (props changed) vtigercrm/trunk/Image/Graph/Marker/Value.php (props changed) vtigercrm/trunk/Image/Graph/Plot.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Area.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Band.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Bar.php (props changed) vtigercrm/trunk/Image/Graph/Plot/BoxWhisker.php (props changed) vtigercrm/trunk/Image/Graph/Plot/CandleStick.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Dot.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Fit/Line.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Impulse.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Line.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Odo.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Pie.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Radar.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Smoothed/Area.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Smoothed/Bezier.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Smoothed/Line.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Smoothed/Radar.php (props changed) vtigercrm/trunk/Image/Graph/Plot/Step.php (props changed) vtigercrm/trunk/Image/Graph/Plotarea.php (props changed) vtigercrm/trunk/Image/Graph/Plotarea/Element.php (props changed) vtigercrm/trunk/Image/Graph/Plotarea/Map.php (props changed) vtigercrm/trunk/Image/Graph/Plotarea/Radar.php (props changed) vtigercrm/trunk/Image/Graph/Simple.php (props changed) vtigercrm/trunk/Image/Graph/Title.php (props changed) vtigercrm/trunk/Image/Graph/Tool.php (props changed) vtigercrm/trunk/LICENSE_AGREEMENT.txt (props changed) vtigercrm/trunk/PEAR.php (props changed) vtigercrm/trunk/Popup.php (props changed) vtigercrm/trunk/Release_Notes.html (props changed) vtigercrm/trunk/SendReminder.php (props changed) vtigercrm/trunk/Smarty/BUGS (props changed) vtigercrm/trunk/Smarty/COPYING.lib (props changed) vtigercrm/trunk/Smarty/ChangeLog (props changed) vtigercrm/trunk/Smarty/FAQ (props changed) vtigercrm/trunk/Smarty/INSTALL (props changed) vtigercrm/trunk/Smarty/NEWS (props changed) vtigercrm/trunk/Smarty/QUICK_START (props changed) vtigercrm/trunk/Smarty/README (props changed) vtigercrm/trunk/Smarty/RELEASE_NOTES (props changed) vtigercrm/trunk/Smarty/cache/index.html (props changed) vtigercrm/trunk/Smarty/configs/index.html (props changed) vtigercrm/trunk/Smarty/libs/Config_File.class.php (props changed) vtigercrm/trunk/Smarty/libs/Smarty.class.php (props changed) vtigercrm/trunk/Smarty/libs/Smarty_Compiler.class.php (props changed) vtigercrm/trunk/Smarty/libs/debug.tpl (props changed) vtigercrm/trunk/Smarty/libs/internals/core.assemble_plugin_filepath.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.assign_smarty_interface.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.create_dir_structure.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.display_debug_console.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.get_include_path.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.get_microtime.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.get_php_resource.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.is_secure.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.is_trusted.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.load_plugins.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.load_resource_plugin.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.process_cached_inserts.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.process_compiled_include.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.read_cache_file.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.rm_auto.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.rmdir.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.run_insert_handler.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.smarty_include_php.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.write_cache_file.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.write_compiled_include.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.write_compiled_resource.php (props changed) vtigercrm/trunk/Smarty/libs/internals/core.write_file.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/block.textformat.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/compiler.assign.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.assign_debug_info.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.config_load.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.counter.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.cycle.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.debug.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.eval.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.fetch.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_checkboxes.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_image.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_options.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_radios.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_select_date.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_select_time.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.html_table.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.mailto.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.math.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.popup.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/function.popup_init.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.capitalize.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.cat.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.count_characters.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.count_paragraphs.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.count_sentences.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.count_words.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.date_format.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.debug_print_var.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.default.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.escape.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.indent.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.lower.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.nl2br.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.regex_replace.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.replace.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.spacify.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.string_format.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.strip.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.strip_tags.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.truncate.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.upper.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/modifier.wordwrap.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/outputfilter.trimwhitespace.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/shared.escape_special_chars.php (props changed) vtigercrm/trunk/Smarty/libs/plugins/shared.make_timestamp.php (props changed) vtigercrm/trunk/Smarty/misc/smarty_icon.README (props changed) vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (props changed) vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (props changed) vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (props changed) vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (props changed) vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (props changed) vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (props changed) vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl (props changed) vtigercrm/trunk/Smarty/templates/CreateView.tpl (props changed) vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (props changed) vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl (props changed) vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl (props changed) vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl (props changed) vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl (props changed) vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl (props changed) vtigercrm/trunk/Smarty/templates/CustomView.tpl (props changed) vtigercrm/trunk/Smarty/templates/DetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (props changed) vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl (props changed) vtigercrm/trunk/Smarty/templates/EditProfile.tpl (props changed) vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl (props changed) vtigercrm/trunk/Smarty/templates/EmailContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (props changed) vtigercrm/trunk/Smarty/templates/Emails.tpl (props changed) vtigercrm/trunk/Smarty/templates/FieldAccess.tpl (props changed) vtigercrm/trunk/Smarty/templates/FieldAccessindex.tpl (props changed) vtigercrm/trunk/Smarty/templates/FieldOrderindex.tpl (props changed) vtigercrm/trunk/Smarty/templates/GlobalListView.tpl (props changed) vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl (props changed) vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/Header.tpl (props changed) vtigercrm/trunk/Smarty/templates/HomePage.tpl (props changed) vtigercrm/trunk/Smarty/templates/ImportMap.tpl (props changed) vtigercrm/trunk/Smarty/templates/ImportStep1.tpl (props changed) vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (props changed) vtigercrm/trunk/Smarty/templates/Importerror.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListGroup.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListLeadCustomFieldMapping.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListView.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (props changed) vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (props changed) vtigercrm/trunk/Smarty/templates/MailAccountDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/Organizationindex.tpl (props changed) vtigercrm/trunk/Smarty/templates/PickListindex.tpl (props changed) vtigercrm/trunk/Smarty/templates/Popup.tpl (props changed) vtigercrm/trunk/Smarty/templates/Portal.tpl (props changed) vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (props changed) vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl (props changed) vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (props changed) vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportColumns.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportFilters.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportRun.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/Reports.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl (props changed) vtigercrm/trunk/Smarty/templates/ReportsType.tpl (props changed) vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/RoleEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/Rss.tpl (props changed) vtigercrm/trunk/Smarty/templates/RssFeeds.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (props changed) vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl (props changed) vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (props changed) vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl (props changed) vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (props changed) vtigercrm/trunk/Smarty/templates/UserEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates/UserListView.tpl (props changed) vtigercrm/trunk/Smarty/templates/UserProfile.tpl (props changed) vtigercrm/trunk/Smarty/templates/Webmails.tpl (props changed) vtigercrm/trunk/Smarty/templates/salesEditView.tpl (props changed) vtigercrm/trunk/Smarty/templates_c/vtigercrm.txt (props changed) vtigercrm/trunk/Smarty_setup.php (props changed) vtigercrm/trunk/XTemplate/LICENSE (props changed) vtigercrm/trunk/XTemplate/README (props changed) vtigercrm/trunk/XTemplate/debug.php (props changed) vtigercrm/trunk/XTemplate/xtpl.php (props changed) vtigercrm/trunk/adodb/adodb-csvlib.inc.php (props changed) vtigercrm/trunk/adodb/adodb-datadict.inc.php (props changed) vtigercrm/trunk/adodb/adodb-error.inc.php (props changed) vtigercrm/trunk/adodb/adodb-errorhandler.inc.php (props changed) vtigercrm/trunk/adodb/adodb-errorpear.inc.php (props changed) vtigercrm/trunk/adodb/adodb-exceptions.inc.php (props changed) vtigercrm/trunk/adodb/adodb-iterator.inc.php (props changed) vtigercrm/trunk/adodb/adodb-lib.inc.php (props changed) vtigercrm/trunk/adodb/adodb-pager.inc.php (props changed) vtigercrm/trunk/adodb/adodb-pear.inc.php (props changed) vtigercrm/trunk/adodb/adodb-perf.inc.php (props changed) vtigercrm/trunk/adodb/adodb-perf.inc.php.#.LENS-03-09-05 (props changed) vtigercrm/trunk/adodb/adodb-php4.inc.php (props changed) vtigercrm/trunk/adodb/adodb-time.inc.php (props changed) vtigercrm/trunk/adodb/adodb-xmlschema.inc.php (props changed) vtigercrm/trunk/adodb/adodb.inc.php (props changed) vtigercrm/trunk/adodb/contrib/toxmlrpc.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-access.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-sapdb.inc.php (props changed) vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-access.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php (props changed) vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-ar.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-bg.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-bgutf8.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-ca.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-cn.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-cz.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-da.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-de.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-en.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-es.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-esperanto.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-fr.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-hu.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-it.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-nl.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-pl.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-pt-br.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-ro.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-ru1251.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-sv.inc.php (props changed) vtigercrm/trunk/adodb/lang/adodb-uk1251.inc.php (props changed) vtigercrm/trunk/adodb/pear/Auth/Container/ADOdb.php (props changed) vtigercrm/trunk/adodb/perf/perf-db2.inc.php (props changed) vtigercrm/trunk/adodb/perf/perf-informix.inc.php (props changed) vtigercrm/trunk/adodb/perf/perf-mssql.inc.php (props changed) vtigercrm/trunk/adodb/perf/perf-mysql.inc.php (props changed) vtigercrm/trunk/adodb/perf/perf-oci8.inc.php (props changed) vtigercrm/trunk/adodb/perf/perf-postgres.inc.php (props changed) vtigercrm/trunk/adodb/pivottable.inc.php (props changed) vtigercrm/trunk/adodb/rsfilter.inc.php (props changed) vtigercrm/trunk/adodb/server.php (props changed) vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php (props changed) vtigercrm/trunk/adodb/session/adodb-compress-gzip.php (props changed) vtigercrm/trunk/adodb/session/adodb-cryptsession.php (props changed) vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php (props changed) vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php (props changed) vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php (props changed) vtigercrm/trunk/adodb/session/adodb-encrypt-sha1.php (props changed) vtigercrm/trunk/adodb/session/adodb-session-clob.php (props changed) vtigercrm/trunk/adodb/session/adodb-session.php (props changed) vtigercrm/trunk/adodb/session/crypt.inc.php (props changed) vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php (props changed) vtigercrm/trunk/adodb/session/old/adodb-session-clob.php (props changed) vtigercrm/trunk/adodb/session/old/adodb-session.php (props changed) vtigercrm/trunk/adodb/session/old/crypt.inc.php (props changed) vtigercrm/trunk/adodb/tests/benchmark.php (props changed) vtigercrm/trunk/adodb/tests/client.php (props changed) vtigercrm/trunk/adodb/tests/pdo.php (props changed) vtigercrm/trunk/adodb/tests/test-datadict.php (props changed) vtigercrm/trunk/adodb/tests/test-perf.php (props changed) vtigercrm/trunk/adodb/tests/test-pgblob.php (props changed) vtigercrm/trunk/adodb/tests/test-php5.php (props changed) vtigercrm/trunk/adodb/tests/test-xmlschema.php (props changed) vtigercrm/trunk/adodb/tests/test.php (props changed) vtigercrm/trunk/adodb/tests/test2.php (props changed) vtigercrm/trunk/adodb/tests/test3.php (props changed) vtigercrm/trunk/adodb/tests/test4.php (props changed) vtigercrm/trunk/adodb/tests/test5.php (props changed) vtigercrm/trunk/adodb/tests/test_rs_array.php (props changed) vtigercrm/trunk/adodb/tests/testcache.php (props changed) vtigercrm/trunk/adodb/tests/testdatabases.inc.php (props changed) vtigercrm/trunk/adodb/tests/testgenid.php (props changed) vtigercrm/trunk/adodb/tests/testmssql.php (props changed) vtigercrm/trunk/adodb/tests/testoci8.php (props changed) vtigercrm/trunk/adodb/tests/testoci8cursor.php (props changed) vtigercrm/trunk/adodb/tests/testpaging.php (props changed) vtigercrm/trunk/adodb/tests/testpear.php (props changed) vtigercrm/trunk/adodb/tests/testsessions.php (props changed) vtigercrm/trunk/adodb/tests/time.php (props changed) vtigercrm/trunk/adodb/tests/tmssql.php (props changed) vtigercrm/trunk/adodb/toexport.inc.php (props changed) vtigercrm/trunk/adodb/tohtml.inc.php (props changed) vtigercrm/trunk/adodb/xsl/convert-0.1-0.2.xsl (props changed) vtigercrm/trunk/adodb/xsl/convert-0.2-0.1.xsl (props changed) vtigercrm/trunk/adodb/xsl/remove-0.2.xsl (props changed) vtigercrm/trunk/cache/images/index.html (props changed) vtigercrm/trunk/cache/import/index.html (props changed) vtigercrm/trunk/cache/index.html (props changed) vtigercrm/trunk/cache/upload/index.html (props changed) vtigercrm/trunk/class_http/class_http.php (props changed) vtigercrm/trunk/class_http/image_cache.php (props changed) vtigercrm/trunk/config.db.php (props changed) vtigercrm/trunk/config.inc.php (props changed) vtigercrm/trunk/config.template.php (props changed) vtigercrm/trunk/connection.php (props changed) vtigercrm/trunk/copyright.html (props changed) vtigercrm/trunk/cron/class.phpmailer.php (props changed) vtigercrm/trunk/cron/class.smtp.php (props changed) vtigercrm/trunk/cron/executecron.sh (props changed) vtigercrm/trunk/cron/intimateTaskStatus.bat (props changed) vtigercrm/trunk/cron/intimateTaskStatus.php (props changed) vtigercrm/trunk/cron/jobstartwindows.bat (props changed) vtigercrm/trunk/cron/output.txt (props changed) vtigercrm/trunk/cron/send_mail.php (props changed) vtigercrm/trunk/cron/sendreminder.sh (props changed) vtigercrm/trunk/data/CRMEntity.php (props changed) vtigercrm/trunk/data/SugarBean.php (props changed) vtigercrm/trunk/data/Tracker.php (props changed) vtigercrm/trunk/database/DatabaseConnection.php (props changed) vtigercrm/trunk/getCompanyProfile.php (props changed) vtigercrm/trunk/include/Ajax/CommonAjax.php (props changed) vtigercrm/trunk/include/ComboStrings.php (props changed) vtigercrm/trunk/include/ComboUtil.php (props changed) vtigercrm/trunk/include/CustomFieldUtil.php (props changed) vtigercrm/trunk/include/FormValidationUtil.php (props changed) vtigercrm/trunk/include/ListView/ListView.php (props changed) vtigercrm/trunk/include/Menu.php (props changed) vtigercrm/trunk/include/PopulateComboValues.php (props changed) vtigercrm/trunk/include/PopulateCustomFieldTables.php (props changed) vtigercrm/trunk/include/RelatedListView.php (props changed) vtigercrm/trunk/include/SearchBlock.html (props changed) vtigercrm/trunk/include/SearchBlock.php (props changed) vtigercrm/trunk/include/calculator/Calc.php (props changed) vtigercrm/trunk/include/calculator/calc.js (props changed) vtigercrm/trunk/include/clock/Clock.php (props changed) vtigercrm/trunk/include/database/PearDatabase.php (props changed) vtigercrm/trunk/include/db_backup/backup.php (props changed) vtigercrm/trunk/include/db_backup/ftp.php (props changed) vtigercrm/trunk/include/dd/Sajax.php (props changed) vtigercrm/trunk/include/dd/dd.php (props changed) vtigercrm/trunk/include/dd/dd_files/coordinates.js (props changed) vtigercrm/trunk/include/dd/dd_files/drag.js (props changed) vtigercrm/trunk/include/dd/dd_files/dragdrop.js (props changed) vtigercrm/trunk/include/dd/dd_files/lists.css (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckcontextmenugroup.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckcontextmenuitem.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckcontextmenuseparator.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckevents.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckpanel_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckpanel_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckplugin.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckspecialcombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckstyledef.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckstyledef_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckstyledef_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckstylesloader.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbar.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarbutton.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarcombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckxml_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/classes/fckxml_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fck_othercommands.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fcknamedcommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fckstylecommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fcktablecommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/globals/fck_constants.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/globals/fckeditorapi.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_1.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_1_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_1_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_2.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_2_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_2_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_last.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fck_onload.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckbrowserinfo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcodeformatter.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcommands.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckconfig.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcontextmenu.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcontextmenu_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcontextmenu_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckcoreextensions.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckdebug.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckdialog.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckdialog_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckdialog_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcklanguagemanager.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcknamespace.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckplugins.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckregexlib.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckscriptloader.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckselection.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckselection_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckselection_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktablehandler.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktablehandler_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktablehandler_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktoolbaritems.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktoolbarset.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktools.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktools_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fcktools_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckundo_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckundo_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckurlparams.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckxhtml.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckxhtml_gecko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckxhtml_ie.js (props changed) vtigercrm/trunk/include/fckeditor/editor/_source/internals/fckxhtmlentities.js (props changed) vtigercrm/trunk/include/fckeditor/editor/css/behaviors/anchors.htc (props changed) vtigercrm/trunk/include/fckeditor/editor/css/behaviors/disablehandles.htc (props changed) vtigercrm/trunk/include/fckeditor/editor/css/behaviors/hiddenfield.htc (props changed) vtigercrm/trunk/include/fckeditor/editor/css/behaviors/moz-bindings.xml (props changed) vtigercrm/trunk/include/fckeditor/editor/css/behaviors/showtableborders.htc (props changed) vtigercrm/trunk/include/fckeditor/editor/css/fck_editorarea.css (props changed) vtigercrm/trunk/include/fckeditor/editor/css/fck_internal.css (props changed) vtigercrm/trunk/include/fckeditor/editor/css/fck_showtableborders_gecko.css (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/common/fck_dialog_common.css (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/common/fck_dialog_common.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/common/fcknumericfield.htc (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/common/moz-bindings.xml (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_about.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_about/lgpl.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_anchor.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_button.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_checkbox.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_colorselector.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_docprops.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_find.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_flash.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_form.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_hiddenfield.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_image.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_image/fck_image.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_image/fck_image_preview.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_link.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_link/fck_link.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_listprop.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_paste.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_radiobutton.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_replace.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_select.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_select/fck_select.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_smiley.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_source.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_specialchar.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_table.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_tablecell.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_template.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_textarea.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_textfield.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey.html (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey/data.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey/diacritic.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey/dialogue.js (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey/fck_universalkey.css (props changed) vtigercrm/trunk/include/fckeditor/editor/dialog/fck_universalkey/multihexa.js (props changed) vtigercrm/trunk/include/fckeditor/editor/fckblank.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckdebug.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckdialog.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckdocument.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckeditor.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckeditor.original.html (props changed) vtigercrm/trunk/include/fckeditor/editor/fckeditorarea.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/browser.css (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/browser.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/basexml.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/class_upload.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/commands.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/config.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/connector.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/io.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/asp/util.asp (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/aspx/connector.aspx (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/cfm/config.cfm (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/cfm/connector.cfm (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/basexml.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/commands.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/connector.cgi (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/io.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/upload_fck.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/perl/util.pl (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/basexml.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/commands.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/config.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/io.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/php/util.php (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/connectors/test.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmactualfolder.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmfolders.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmresourceslist.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmresourcetype.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/frmupload.html (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/js/common.js (props changed) vtigercrm/trunk/include/fckeditor/editor/filemanager/browser/default/js/fckxml.js (props changed) vtigercrm/trunk/include/fckeditor/editor/js/fck_startup.js (props changed) vtigercrm/trunk/include/fckeditor/editor/js/fckeditorcode_gecko_1.js (props changed) vtigercrm/trunk/include/fckeditor/editor/js/fckeditorcode_gecko_2.js (props changed) vtigercrm/trunk/include/fckeditor/editor/js/fckeditorcode_ie_1.js (props changed) vtigercrm/trunk/include/fckeditor/editor/js/fckeditorcode_ie_2.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/_getfontformat.html (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/_translationstatus.txt (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ar.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/bg.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/bs.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ca.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/cs.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/da.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/de.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/el.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/en-au.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/en-uk.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/en.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/eo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/es.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/et.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/eu.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/fa.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/fcklanguagemanager.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/fi.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/fo.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/fr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/gl.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/gr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/he.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/hi.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/hr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/hu.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/it.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ja.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ko.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/lt.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/lv.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/mn.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ms.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/nl.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/no.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/pl.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/pt-br.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/pt.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ro.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/ru.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/sk.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/sl.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/sr-latn.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/sr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/sv.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/th.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/tr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/uk.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/vi.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/zh-cn.js (props changed) vtigercrm/trunk/include/fckeditor/editor/lang/zh.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/fck_placeholder.html (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/fckplugin.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/lang/de.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/lang/en.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/lang/fr.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/lang/it.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/placeholder/lang/pl.js (props changed) vtigercrm/trunk/include/fckeditor/editor/plugins/tablecommands/fckplugin.js (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/default/fck_contextmenu.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/default/fck_dialog.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/default/fck_editor.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/office2003/fck_contextmenu.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/office2003/fck_dialog.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/office2003/fck_editor.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/silver/fck_contextmenu.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/silver/fck_dialog.css (props changed) vtigercrm/trunk/include/fckeditor/editor/skins/silver/fck_editor.css (props changed) vtigercrm/trunk/include/fckeditor/fckconfig.js (props changed) vtigercrm/trunk/include/fckeditor/fckeditor.js (props changed) vtigercrm/trunk/include/fckeditor/fckeditor.php (props changed) vtigercrm/trunk/include/fckeditor/fckstyles.xml (props changed) vtigercrm/trunk/include/fckeditor/fcktemplates.xml (props changed) vtigercrm/trunk/include/fckeditor/license.txt (props changed) vtigercrm/trunk/include/feedParser/feedParser.php (props changed) vtigercrm/trunk/include/feedParser/xmlParser.php (props changed) vtigercrm/trunk/include/file.php (props changed) vtigercrm/trunk/include/formbase.php (props changed) vtigercrm/trunk/include/fpdf/font/courier.php (props changed) vtigercrm/trunk/include/fpdf/font/helvetica.php (props changed) vtigercrm/trunk/include/fpdf/font/helveticab.php (props changed) vtigercrm/trunk/include/fpdf/font/helveticabi.php (props changed) vtigercrm/trunk/include/fpdf/font/helveticai.php (props changed) vtigercrm/trunk/include/fpdf/font/symbol.php (props changed) vtigercrm/trunk/include/fpdf/font/times.php (props changed) vtigercrm/trunk/include/fpdf/font/timesb.php (props changed) vtigercrm/trunk/include/fpdf/font/timesbi.php (props changed) vtigercrm/trunk/include/fpdf/font/timesi.php (props changed) vtigercrm/trunk/include/fpdf/font/zapfdingbats.php (props changed) vtigercrm/trunk/include/fpdf/fpdf.css (props changed) vtigercrm/trunk/include/fpdf/fpdf.php (props changed) vtigercrm/trunk/include/fpdf/pdf.php (props changed) vtigercrm/trunk/include/fpdf/templates/body.php (props changed) vtigercrm/trunk/include/freetag/freetag.class.php (props changed) vtigercrm/trunk/include/freetag/license.txt (props changed) vtigercrm/trunk/include/images/vtigercrm_icon.ico (props changed) vtigercrm/trunk/include/js/ColorPicker2.js (props changed) vtigercrm/trunk/include/js/Inventory.js (props changed) vtigercrm/trunk/include/js/ListView.js (props changed) vtigercrm/trunk/include/js/Mail.js (props changed) vtigercrm/trunk/include/js/Merge.js (props changed) vtigercrm/trunk/include/js/ajax.js (props changed) vtigercrm/trunk/include/js/clock.js (props changed) vtigercrm/trunk/include/js/conveyor.js (props changed) vtigercrm/trunk/include/js/customview.js (props changed) vtigercrm/trunk/include/js/dtlviewajax.js (props changed) vtigercrm/trunk/include/js/effectspack.js (props changed) vtigercrm/trunk/include/js/general.js (props changed) vtigercrm/trunk/include/js/menu.js (props changed) vtigercrm/trunk/include/js/popup.js (props changed) vtigercrm/trunk/include/js/prototype.js (props changed) vtigercrm/trunk/include/js/prototype_fade.js (props changed) vtigercrm/trunk/include/js/scale_demo.js (props changed) vtigercrm/trunk/include/js/scroller.js (props changed) vtigercrm/trunk/include/js/search.js (props changed) vtigercrm/trunk/include/js/searchajax.js (props changed) vtigercrm/trunk/include/js/slider.js (props changed) vtigercrm/trunk/include/js/submenu.js (props changed) vtigercrm/trunk/include/js/thumbnail.js (props changed) vtigercrm/trunk/include/js/xfade2.js (props changed) vtigercrm/trunk/include/language/en_us.lang.php (props changed) vtigercrm/trunk/include/lastrss/lastRSS.php (props changed) vtigercrm/trunk/include/logging.php (props changed) vtigercrm/trunk/include/nusoap/changelog (props changed) vtigercrm/trunk/include/nusoap/class.nusoap_base.php (props changed) vtigercrm/trunk/include/nusoap/class.soap_fault.php (props changed) vtigercrm/trunk/include/nusoap/class.soap_parser.php (props changed) vtigercrm/trunk/include/nusoap/class.soap_server.php (props changed) vtigercrm/trunk/include/nusoap/class.soap_transport_http.php (props changed) vtigercrm/trunk/include/nusoap/class.soap_val.php (props changed) vtigercrm/trunk/include/nusoap/class.soapclient.php (props changed) vtigercrm/trunk/include/nusoap/class.wsdl.php (props changed) vtigercrm/trunk/include/nusoap/class.wsdlcache.php (props changed) vtigercrm/trunk/include/nusoap/class.xmlschema.php (props changed) vtigercrm/trunk/include/nusoap/nusoap.php (props changed) vtigercrm/trunk/include/nusoap/nusoapmime.php (props changed) vtigercrm/trunk/include/php_writeexcel/LICENSE (props changed) vtigercrm/trunk/include/php_writeexcel/class.excel.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_biffwriter.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_format.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_formula.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_olewriter.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_workbook.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_workbookbig.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/class.writeexcel_worksheet.inc.php (props changed) vtigercrm/trunk/include/php_writeexcel/functions.writeexcel_utility.inc.php (props changed) vtigercrm/trunk/include/prototype-1.4.0/CHANGELOG (props changed) vtigercrm/trunk/include/prototype-1.4.0/LICENSE (props changed) vtigercrm/trunk/include/prototype-1.4.0/README (props changed) vtigercrm/trunk/include/prototype-1.4.0/Rakefile (props changed) vtigercrm/trunk/include/prototype-1.4.0/dist/prototype.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/lib/protodoc.rb (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/HEADER (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/ajax.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/array.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/base.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/dom.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/enumerable.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/event.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/form.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/hash.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/position.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/prototype.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/range.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/src/string.js (props changed) vtigercrm/trunk/include/prototype-1.4.0/test/console.html (props changed) vtigercrm/trunk/include/prototype-1.4.0/test/test.css (props changed) vtigercrm/trunk/include/scriptaculous/builder.js (props changed) vtigercrm/trunk/include/scriptaculous/controls.js (props changed) vtigercrm/trunk/include/scriptaculous/dom-drag.js (props changed) vtigercrm/trunk/include/scriptaculous/dragdrop.js (props changed) vtigercrm/trunk/include/scriptaculous/effects.js (props changed) vtigercrm/trunk/include/scriptaculous/prototype.js (props changed) vtigercrm/trunk/include/scriptaculous/scriptaculous.js (props changed) vtigercrm/trunk/include/scriptaculous/slider.js (props changed) vtigercrm/trunk/include/scriptaculous/unittest.js (props changed) vtigercrm/trunk/include/style.css (props changed) vtigercrm/trunk/include/upload_file.php (props changed) vtigercrm/trunk/include/utils/CommonUtils.php (props changed) vtigercrm/trunk/include/utils/DeleteUtils.php (props changed) vtigercrm/trunk/include/utils/DetailViewUtils.php (props changed) vtigercrm/trunk/include/utils/EditViewUtils.php (props changed) vtigercrm/trunk/include/utils/GetGroupUsers.php (props changed) vtigercrm/trunk/include/utils/GetParentGroups.php (props changed) vtigercrm/trunk/include/utils/GetUserGroups.php (props changed) vtigercrm/trunk/include/utils/GraphUtils.php (props changed) vtigercrm/trunk/include/utils/InventoryUtils.php (props changed) vtigercrm/trunk/include/utils/ListViewUtils.php (props changed) vtigercrm/trunk/include/utils/SearchUtils.php (props changed) vtigercrm/trunk/include/utils/UserInfoUtil.php (props changed) vtigercrm/trunk/include/utils/export.php (props changed) vtigercrm/trunk/include/utils/utils.php (props changed) vtigercrm/trunk/index.php (props changed) vtigercrm/trunk/install.php (props changed) vtigercrm/trunk/install/0welcome.php (props changed) vtigercrm/trunk/install/1checkSystem.php (props changed) vtigercrm/trunk/install/2setConfig.php (props changed) vtigercrm/trunk/install/3confirmConfig.php (props changed) vtigercrm/trunk/install/4createConfigFile.php (props changed) vtigercrm/trunk/install/5createTables.inc.php (props changed) vtigercrm/trunk/install/5createTables.php (props changed) vtigercrm/trunk/install/install.css (props changed) vtigercrm/trunk/install/populateSeedData.php (props changed) vtigercrm/trunk/jscalendar/calendar-setup.js (props changed) vtigercrm/trunk/jscalendar/calendar-win2k-cold-1.css (props changed) vtigercrm/trunk/jscalendar/calendar.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-af.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-br.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-ca.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-cs-win.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-da.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-de.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-du.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-el.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-en.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-es.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-fi.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-fr.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-hr-utf8.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-hr.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-hu.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-it.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-jp.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-ko-utf8.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-ko.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-lt-utf8.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-lt.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-nl.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-no.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-pl-utf8.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-pl.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-pt.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-ro.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-ru.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-si.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-sk.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-sp.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-sv.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-tr.js (props changed) vtigercrm/trunk/jscalendar/lang/calendar-zh.js (props changed) vtigercrm/trunk/log4php/Logger.php (props changed) vtigercrm/trunk/log4php/LoggerAppender.php (props changed) vtigercrm/trunk/log4php/LoggerAppenderSkeleton.php (props changed) vtigercrm/trunk/log4php/LoggerBasicConfigurator.php (props changed) vtigercrm/trunk/log4php/LoggerCategory.php (props changed) vtigercrm/trunk/log4php/LoggerDefaultCategoryFactory.php (props changed) vtigercrm/trunk/log4php/LoggerHierarchy.php (props changed) vtigercrm/trunk/log4php/LoggerLayout.php (props changed) vtigercrm/trunk/log4php/LoggerLevel.php (props changed) vtigercrm/trunk/log4php/LoggerLog.php (props changed) vtigercrm/trunk/log4php/LoggerMDC.php (props changed) vtigercrm/trunk/log4php/LoggerManager.php (props changed) vtigercrm/trunk/log4php/LoggerNDC.php (props changed) vtigercrm/trunk/log4php/LoggerPropertyConfigurator.php (props changed) vtigercrm/trunk/log4php/LoggerRoot.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderEcho.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderMail.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderMailEvent.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderNull.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderPhp.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderRollingFile.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderSocket.php (props changed) vtigercrm/trunk/log4php/appenders/LoggerAppenderSyslog.php (props changed) vtigercrm/trunk/log4php/config/LoggerPropertyGetter.php (props changed) vtigercrm/trunk/log4php/config/LoggerPropertySetter.php (props changed) vtigercrm/trunk/log4php/helpers/LoggerFormattingInfo.php (props changed) vtigercrm/trunk/log4php/helpers/LoggerOptionConverter.php (props changed) vtigercrm/trunk/log4php/helpers/LoggerPatternConverter.php (props changed) vtigercrm/trunk/log4php/helpers/LoggerPatternParser.php (props changed) vtigercrm/trunk/log4php/helpers/LoggerTransform.php (props changed) vtigercrm/trunk/log4php/layouts/LoggerLayoutHtml.php (props changed) vtigercrm/trunk/log4php/layouts/LoggerLayoutSimple.php (props changed) vtigercrm/trunk/log4php/layouts/LoggerLayoutTTCC.php (props changed) vtigercrm/trunk/log4php/layouts/LoggerPatternLayout.php (props changed) vtigercrm/trunk/log4php/layouts/LoggerXmlLayout.php (props changed) vtigercrm/trunk/log4php/or/LoggerDefaultRenderer.php (props changed) vtigercrm/trunk/log4php/or/LoggerObjectRenderer.php (props changed) vtigercrm/trunk/log4php/or/LoggerRendererMap.php (props changed) vtigercrm/trunk/log4php/spi/LoggerConfigurator.php (props changed) vtigercrm/trunk/log4php/spi/LoggerFactory.php (props changed) vtigercrm/trunk/log4php/spi/LoggerFilter.php (props changed) vtigercrm/trunk/log4php/spi/LoggerLocationInfo.php (props changed) vtigercrm/trunk/log4php/spi/LoggerLoggingEvent.php (props changed) vtigercrm/trunk/log4php/varia/LoggerDenyAllFilter.php (props changed) vtigercrm/trunk/log4php/varia/LoggerLevelMatchFilter.php (props changed) vtigercrm/trunk/log4php/varia/LoggerLevelRangeFilter.php (props changed) vtigercrm/trunk/log4php/varia/LoggerStringMatchFilter.php (props changed) vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php (props changed) vtigercrm/trunk/log4php_1.properties (props changed) vtigercrm/trunk/logs/todel.txt.txt (props changed) vtigercrm/trunk/migration/migrate_functions.php (props changed) vtigercrm/trunk/modules/Accounts/Account.js (props changed) vtigercrm/trunk/modules/Accounts/Account.php (props changed) vtigercrm/trunk/modules/Accounts/AccountsAjax.php (props changed) vtigercrm/trunk/modules/Accounts/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Accounts/CustomAction.php (props changed) vtigercrm/trunk/modules/Accounts/CustomView.php (props changed) vtigercrm/trunk/modules/Accounts/Delete.php (props changed) vtigercrm/trunk/modules/Accounts/DetailView.php (props changed) vtigercrm/trunk/modules/Accounts/EditView.php (props changed) vtigercrm/trunk/modules/Accounts/Forms.php (props changed) vtigercrm/trunk/modules/Accounts/HeadLines.php (props changed) vtigercrm/trunk/modules/Accounts/Import.php (props changed) vtigercrm/trunk/modules/Accounts/ListView.php (props changed) vtigercrm/trunk/modules/Accounts/ListViewTop.php (props changed) vtigercrm/trunk/modules/Accounts/Merge.php (props changed) vtigercrm/trunk/modules/Accounts/Popup.php (props changed) vtigercrm/trunk/modules/Accounts/PopupSearchForm.html (props changed) vtigercrm/trunk/modules/Accounts/Popup_picker.html (props changed) vtigercrm/trunk/modules/Accounts/Popup_picker.php (props changed) vtigercrm/trunk/modules/Accounts/Save.php (props changed) vtigercrm/trunk/modules/Accounts/Tickerdetail.php (props changed) vtigercrm/trunk/modules/Accounts/index.php (props changed) vtigercrm/trunk/modules/Accounts/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Activities/ActivitiesAjax.php (props changed) vtigercrm/trunk/modules/Activities/Activity.js (props changed) vtigercrm/trunk/modules/Activities/Activity.php (props changed) vtigercrm/trunk/modules/Activities/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Activities/CustomView.php (props changed) vtigercrm/trunk/modules/Activities/Delete.php (props changed) vtigercrm/trunk/modules/Activities/DetailView.php (props changed) vtigercrm/trunk/modules/Activities/EditView.php (props changed) vtigercrm/trunk/modules/Activities/Event.php (props changed) vtigercrm/trunk/modules/Activities/Forms.php (props changed) vtigercrm/trunk/modules/Activities/GroupAllocationView.html (props changed) vtigercrm/trunk/modules/Activities/GroupAllocationView.php (props changed) vtigercrm/trunk/modules/Activities/ListView.php (props changed) vtigercrm/trunk/modules/Activities/OpenListView.php (props changed) vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php (props changed) vtigercrm/trunk/modules/Activities/Save.php (props changed) vtigercrm/trunk/modules/Activities/SearchForm.html (props changed) vtigercrm/trunk/modules/Activities/SendReminder.bat (props changed) vtigercrm/trunk/modules/Activities/index.php (props changed) vtigercrm/trunk/modules/Activities/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Activities/updateRelations.php (props changed) vtigercrm/trunk/modules/Administration/Forms.php (props changed) vtigercrm/trunk/modules/Administration/index.php (props changed) vtigercrm/trunk/modules/Administration/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Calendar/Authenticate.php (props changed) vtigercrm/trunk/modules/Calendar/CalendarCommon.php (props changed) vtigercrm/trunk/modules/Calendar/Date.pinc (props changed) vtigercrm/trunk/modules/Calendar/Delete.php (props changed) vtigercrm/trunk/modules/Calendar/Forms.php (props changed) vtigercrm/trunk/modules/Calendar/Save.php (props changed) vtigercrm/trunk/modules/Calendar/UserCalendar.php (props changed) vtigercrm/trunk/modules/Calendar/acl.pinc (props changed) vtigercrm/trunk/modules/Calendar/addEventUI.php (props changed) vtigercrm/trunk/modules/Calendar/admin/admin.pinc (props changed) vtigercrm/trunk/modules/Calendar/admin/create_config.php (props changed) vtigercrm/trunk/modules/Calendar/admin/demodata.p3 (props changed) vtigercrm/trunk/modules/Calendar/admin/en.p3 (props changed) vtigercrm/trunk/modules/Calendar/admin/mconfig.pinc (props changed) vtigercrm/trunk/modules/Calendar/admin/scheme.php (props changed) vtigercrm/trunk/modules/Calendar/admin/sv.p3 (props changed) vtigercrm/trunk/modules/Calendar/admin/update.php (props changed) vtigercrm/trunk/modules/Calendar/appointment.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_cmdline.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_db.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_http.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_ldap.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_pam.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_typo3.pinc (props changed) vtigercrm/trunk/modules/Calendar/auth/auth_x509.pinc (props changed) vtigercrm/trunk/modules/Calendar/base.pinc (props changed) vtigercrm/trunk/modules/Calendar/calendar.php (props changed) vtigercrm/trunk/modules/Calendar/calendar_dayview.php (props changed) vtigercrm/trunk/modules/Calendar/calendar_monthview.php (props changed) vtigercrm/trunk/modules/Calendar/calendar_share.php (props changed) vtigercrm/trunk/modules/Calendar/calendar_weekview.php (props changed) vtigercrm/trunk/modules/Calendar/company.pinc (props changed) vtigercrm/trunk/modules/Calendar/config.php (props changed) vtigercrm/trunk/modules/Calendar/config_default.pinc (props changed) vtigercrm/trunk/modules/Calendar/database.pinc (props changed) vtigercrm/trunk/modules/Calendar/db.p3 (props changed) vtigercrm/trunk/modules/Calendar/db/db.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_interbase.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_mssql.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_mysql.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_oci.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_ora.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/db_pg.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/table.pinc (props changed) vtigercrm/trunk/modules/Calendar/db/table_custom_example.pinc (props changed) vtigercrm/trunk/modules/Calendar/department.pinc (props changed) vtigercrm/trunk/modules/Calendar/disable_sharing.php (props changed) vtigercrm/trunk/modules/Calendar/gettext.php (props changed) vtigercrm/trunk/modules/Calendar/handler.pinc (props changed) vtigercrm/trunk/modules/Calendar/history.pinc (props changed) vtigercrm/trunk/modules/Calendar/i18n.php (props changed) vtigercrm/trunk/modules/Calendar/index.php (props changed) vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Calendar/layout/adq_layout.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/classic_base.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/classic_layout.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/layout_base.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/new_layout.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/test_layout.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/theme_base.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/theme_blue.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/theme_red.pinc (props changed) vtigercrm/trunk/modules/Calendar/layout/theme_white.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/cs.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/de.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/el.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/en-us.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/en.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/es-mx.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/es-ni.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/es-ve.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/es.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/fr.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_au.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_be.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_ch.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_cl.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_co.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_cs.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_de.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_de_at.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_en_uk.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_es.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_es_ve.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_fr.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_hk.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_hu.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_it.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_ja.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_ko.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_mx.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_ni.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_nl.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_nz.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_pl.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_pt.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_ru.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_sv.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_us.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/holiday_vi.pinc (props changed) vtigercrm/trunk/modules/Calendar/localization/it.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/ko.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_cs.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_de.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_es.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_nl.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_pl.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_sv.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_template.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/namedays_vi.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/nl.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/pl.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/pt-br.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/pt.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/ru.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/sv.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/tw.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/vi.p3 (props changed) vtigercrm/trunk/modules/Calendar/localization/zh.p3 (props changed) vtigercrm/trunk/modules/Calendar/location.pinc (props changed) vtigercrm/trunk/modules/Calendar/login.pinc (props changed) vtigercrm/trunk/modules/Calendar/logout.php (props changed) vtigercrm/trunk/modules/Calendar/mail.pinc (props changed) vtigercrm/trunk/modules/Calendar/minical.php (props changed) vtigercrm/trunk/modules/Calendar/minitimer.php (props changed) vtigercrm/trunk/modules/Calendar/module_base.pinc (props changed) vtigercrm/trunk/modules/Calendar/modules.pinc (props changed) vtigercrm/trunk/modules/Calendar/mytutos.php (props changed) vtigercrm/trunk/modules/Calendar/new_calendar.php (props changed) vtigercrm/trunk/modules/Calendar/pdf.pinc (props changed) vtigercrm/trunk/modules/Calendar/permission.p3 (props changed) vtigercrm/trunk/modules/Calendar/preference.pinc (props changed) vtigercrm/trunk/modules/Calendar/product.pinc (props changed) vtigercrm/trunk/modules/Calendar/script.js (props changed) vtigercrm/trunk/modules/Calendar/task.pinc (props changed) vtigercrm/trunk/modules/Calendar/team.pinc (props changed) vtigercrm/trunk/modules/Calendar/timetrack.pinc (props changed) vtigercrm/trunk/modules/Calendar/tmp/vtigercrm.calendar (props changed) vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php (props changed) vtigercrm/trunk/modules/Calendar/user.pinc (props changed) vtigercrm/trunk/modules/Calendar/webelements.p3 (props changed) vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Campaigns/Campaign.js (props changed) vtigercrm/trunk/modules/Campaigns/Campaign.php (props changed) vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php (props changed) vtigercrm/trunk/modules/Campaigns/CustomView.php (props changed) vtigercrm/trunk/modules/Campaigns/Delete.php (props changed) vtigercrm/trunk/modules/Campaigns/DetailView.php (props changed) vtigercrm/trunk/modules/Campaigns/EditView.php (props changed) vtigercrm/trunk/modules/Campaigns/ListView.php (props changed) vtigercrm/trunk/modules/Campaigns/Save.php (props changed) vtigercrm/trunk/modules/Campaigns/index.php (props changed) vtigercrm/trunk/modules/Campaigns/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Contacts/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Contacts/Contact.js (props changed) vtigercrm/trunk/modules/Contacts/Contact.php (props changed) vtigercrm/trunk/modules/Contacts/ContactsAjax.php (props changed) vtigercrm/trunk/modules/Contacts/CustomAction.php (props changed) vtigercrm/trunk/modules/Contacts/CustomView.php (props changed) vtigercrm/trunk/modules/Contacts/Delete.php (props changed) vtigercrm/trunk/modules/Contacts/DetailView.php (props changed) vtigercrm/trunk/modules/Contacts/EditView.php (props changed) vtigercrm/trunk/modules/Contacts/Forms.php (props changed) vtigercrm/trunk/modules/Contacts/Import.php (props changed) vtigercrm/trunk/modules/Contacts/ListView.php (props changed) vtigercrm/trunk/modules/Contacts/Merge.php (props changed) vtigercrm/trunk/modules/Contacts/Popup.php (props changed) vtigercrm/trunk/modules/Contacts/PopupSearchForm.html (props changed) vtigercrm/trunk/modules/Contacts/Popup_picker.html (props changed) vtigercrm/trunk/modules/Contacts/Save.php (props changed) vtigercrm/trunk/modules/Contacts/chat.css (props changed) vtigercrm/trunk/modules/Contacts/chat.php (props changed) vtigercrm/trunk/modules/Contacts/contactSeedData.php (props changed) vtigercrm/trunk/modules/Contacts/index.php (props changed) vtigercrm/trunk/modules/Contacts/js/ajax.js (props changed) vtigercrm/trunk/modules/Contacts/js/chat.js (props changed) vtigercrm/trunk/modules/Contacts/js/css-window_p.js (props changed) vtigercrm/trunk/modules/Contacts/js/dom-drag_p.js (props changed) vtigercrm/trunk/modules/Contacts/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Contacts/vtchat.php (props changed) vtigercrm/trunk/modules/CustomView/CustomAction.html (props changed) vtigercrm/trunk/modules/CustomView/CustomAction.php (props changed) vtigercrm/trunk/modules/CustomView/CustomView.js (props changed) vtigercrm/trunk/modules/CustomView/CustomView.php (props changed) vtigercrm/trunk/modules/CustomView/Delete.php (props changed) vtigercrm/trunk/modules/CustomView/EditView.php (props changed) vtigercrm/trunk/modules/CustomView/Forms.php (props changed) vtigercrm/trunk/modules/CustomView/ListViewTop.php (props changed) vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (props changed) vtigercrm/trunk/modules/CustomView/Save.php (props changed) vtigercrm/trunk/modules/CustomView/SaveAction.php (props changed) vtigercrm/trunk/modules/CustomView/SendMailAction.php (props changed) vtigercrm/trunk/modules/CustomView/index.php (props changed) vtigercrm/trunk/modules/CustomView/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php (props changed) vtigercrm/trunk/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php (props changed) vtigercrm/trunk/modules/Dashboard/Chart_outcome_by_month.php (props changed) vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_lead_source.php (props changed) vtigercrm/trunk/modules/Dashboard/Chart_pipeline_by_sales_stage.php (props changed) vtigercrm/trunk/modules/Dashboard/Entity_charts.php (props changed) vtigercrm/trunk/modules/Dashboard/Forms.php (props changed) vtigercrm/trunk/modules/Dashboard/ReportsCharts.php (props changed) vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php (props changed) vtigercrm/trunk/modules/Dashboard/display_charts.php (props changed) vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php (props changed) vtigercrm/trunk/modules/Dashboard/index.php (props changed) vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Dashboard/line_graph.php (props changed) vtigercrm/trunk/modules/Dashboard/pie_graph.php (props changed) vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php (props changed) vtigercrm/trunk/modules/Emails/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Emails/Choose.php (props changed) vtigercrm/trunk/modules/Emails/ChooseEmail.php (props changed) vtigercrm/trunk/modules/Emails/CustomView.php (props changed) vtigercrm/trunk/modules/Emails/Delete.php (props changed) vtigercrm/trunk/modules/Emails/DetailView.php (props changed) vtigercrm/trunk/modules/Emails/EditView.php (props changed) vtigercrm/trunk/modules/Emails/Email.js (props changed) vtigercrm/trunk/modules/Emails/Email.php (props changed) vtigercrm/trunk/modules/Emails/EmailsAjax.php (props changed) vtigercrm/trunk/modules/Emails/Forms.php (props changed) vtigercrm/trunk/modules/Emails/ListView.php (props changed) vtigercrm/trunk/modules/Emails/PHPMailer_LICENSE.txt (props changed) vtigercrm/trunk/modules/Emails/Save.php (props changed) vtigercrm/trunk/modules/Emails/SearchForm.html (props changed) vtigercrm/trunk/modules/Emails/SelectEmails.php (props changed) vtigercrm/trunk/modules/Emails/class.phpmailer.php (props changed) vtigercrm/trunk/modules/Emails/class.smtp.php (props changed) vtigercrm/trunk/modules/Emails/gotodownload.php (props changed) vtigercrm/trunk/modules/Emails/index.php (props changed) vtigercrm/trunk/modules/Emails/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Emails/mail.php (props changed) vtigercrm/trunk/modules/Emails/mailbox.php (props changed) vtigercrm/trunk/modules/Emails/mailsend.php (props changed) vtigercrm/trunk/modules/Emails/sendmail.php (props changed) vtigercrm/trunk/modules/Emails/templates/testemailtemplateusage.php (props changed) vtigercrm/trunk/modules/Emails/templates/todel.txt (props changed) vtigercrm/trunk/modules/Emails/updateRelations.php (props changed) vtigercrm/trunk/modules/Faq/CustomView.php (props changed) vtigercrm/trunk/modules/Faq/Delete.php (props changed) vtigercrm/trunk/modules/Faq/DetailView.php (props changed) vtigercrm/trunk/modules/Faq/EditView.php (props changed) vtigercrm/trunk/modules/Faq/Faq.js (props changed) vtigercrm/trunk/modules/Faq/Faq.php (props changed) vtigercrm/trunk/modules/Faq/FaqAjax.php (props changed) vtigercrm/trunk/modules/Faq/Forms.php (props changed) vtigercrm/trunk/modules/Faq/ListView.php (props changed) vtigercrm/trunk/modules/Faq/Save.php (props changed) vtigercrm/trunk/modules/Faq/SearchForm.html (props changed) vtigercrm/trunk/modules/Faq/index.php (props changed) vtigercrm/trunk/modules/Faq/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Help/Forms.php (props changed) vtigercrm/trunk/modules/Help/index.php (props changed) vtigercrm/trunk/modules/Help/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php (props changed) vtigercrm/trunk/modules/HelpDesk/Convert.html (props changed) vtigercrm/trunk/modules/HelpDesk/Convert.php (props changed) vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php (props changed) vtigercrm/trunk/modules/HelpDesk/ConvertToEntities.php (props changed) vtigercrm/trunk/modules/HelpDesk/CumulStatistics.html (props changed) vtigercrm/trunk/modules/HelpDesk/CumulStatistics.php (props changed) vtigercrm/trunk/modules/HelpDesk/CustomView.php (props changed) vtigercrm/trunk/modules/HelpDesk/Delete.php (props changed) vtigercrm/trunk/modules/HelpDesk/DetailView.php (props changed) vtigercrm/trunk/modules/HelpDesk/EditView.php (props changed) vtigercrm/trunk/modules/HelpDesk/Forms.php (props changed) vtigercrm/trunk/modules/HelpDesk/HelpDesk.js (props changed) vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (props changed) vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php (props changed) vtigercrm/trunk/modules/HelpDesk/ListTickets.php (props changed) vtigercrm/trunk/modules/HelpDesk/ListView.php (props changed) vtigercrm/trunk/modules/HelpDesk/Merge.php (props changed) vtigercrm/trunk/modules/HelpDesk/Save.php (props changed) vtigercrm/trunk/modules/HelpDesk/SearchForm.html (props changed) vtigercrm/trunk/modules/HelpDesk/TicketHistory.html (props changed) vtigercrm/trunk/modules/HelpDesk/TicketHistory.php (props changed) vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php (props changed) vtigercrm/trunk/modules/HelpDesk/index.php (props changed) vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Home/Forms.php (props changed) vtigercrm/trunk/modules/Home/LastViewed.php (props changed) vtigercrm/trunk/modules/Home/UnifiedSearch.php (props changed) vtigercrm/trunk/modules/Home/home_rss.php (props changed) vtigercrm/trunk/modules/Home/index.php (props changed) vtigercrm/trunk/modules/Home/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Import/Forms.php (props changed) vtigercrm/trunk/modules/Import/ImportAccount.php (props changed) vtigercrm/trunk/modules/Import/ImportAjax.php (props changed) vtigercrm/trunk/modules/Import/ImportButton.php (props changed) vtigercrm/trunk/modules/Import/ImportContact.php (props changed) vtigercrm/trunk/modules/Import/ImportLead.php (props changed) vtigercrm/trunk/modules/Import/ImportMap.php (props changed) vtigercrm/trunk/modules/Import/ImportOpportunity.php (props changed) vtigercrm/trunk/modules/Import/ImportProduct.php (props changed) vtigercrm/trunk/modules/Import/ImportSave.php (props changed) vtigercrm/trunk/modules/Import/ImportStep1.php (props changed) vtigercrm/trunk/modules/Import/ImportStep2.php (props changed) vtigercrm/trunk/modules/Import/ImportStep3.php (props changed) vtigercrm/trunk/modules/Import/ImportStep4.php (props changed) vtigercrm/trunk/modules/Import/ImportSteplast.php (props changed) vtigercrm/trunk/modules/Import/ImportStepundo.php (props changed) vtigercrm/trunk/modules/Import/UsersLastImport.php (props changed) vtigercrm/trunk/modules/Import/error.php (props changed) vtigercrm/trunk/modules/Import/index.php (props changed) vtigercrm/trunk/modules/Import/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Import/parse_utils.php (props changed) vtigercrm/trunk/modules/Invoice/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Invoice/CreatePDF.php (props changed) vtigercrm/trunk/modules/Invoice/CustomView.php (props changed) vtigercrm/trunk/modules/Invoice/Delete.php (props changed) vtigercrm/trunk/modules/Invoice/DetailView.php (props changed) vtigercrm/trunk/modules/Invoice/EditView.php (props changed) vtigercrm/trunk/modules/Invoice/Forms.php (props changed) vtigercrm/trunk/modules/Invoice/Invoice.js (props changed) vtigercrm/trunk/modules/Invoice/Invoice.php (props changed) vtigercrm/trunk/modules/Invoice/InvoiceAjax.php (props changed) vtigercrm/trunk/modules/Invoice/ListTopInvoice.php (props changed) vtigercrm/trunk/modules/Invoice/ListView.php (props changed) vtigercrm/trunk/modules/Invoice/Popup.php (props changed) vtigercrm/trunk/modules/Invoice/Save.php (props changed) vtigercrm/trunk/modules/Invoice/index.php (props changed) vtigercrm/trunk/modules/Invoice/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Invoice/pdf_templates/footer.php (props changed) vtigercrm/trunk/modules/Invoice/pdf_templates/header.php (props changed) vtigercrm/trunk/modules/Invoice/pdf_templates/lastpage/body.php (props changed) vtigercrm/trunk/modules/Invoice/pdf_templates/lastpage/footer.php (props changed) vtigercrm/trunk/modules/Leads/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Leads/ConvertLead.html (props changed) vtigercrm/trunk/modules/Leads/ConvertLead.php (props changed) vtigercrm/trunk/modules/Leads/CustomAction.php (props changed) vtigercrm/trunk/modules/Leads/CustomView.php (props changed) vtigercrm/trunk/modules/Leads/Delete.php (props changed) vtigercrm/trunk/modules/Leads/DetailView.php (props changed) vtigercrm/trunk/modules/Leads/EditView.php (props changed) vtigercrm/trunk/modules/Leads/Forms.php (props changed) vtigercrm/trunk/modules/Leads/Import.php (props changed) vtigercrm/trunk/modules/Leads/Lead.js (props changed) vtigercrm/trunk/modules/Leads/Lead.php (props changed) vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (props changed) vtigercrm/trunk/modules/Leads/LeadsAjax.php (props changed) vtigercrm/trunk/modules/Leads/ListView.php (props changed) vtigercrm/trunk/modules/Leads/ListViewTop.php (props changed) vtigercrm/trunk/modules/Leads/Merge.php (props changed) vtigercrm/trunk/modules/Leads/Popup.php (props changed) vtigercrm/trunk/modules/Leads/PopupSearchForm.html (props changed) vtigercrm/trunk/modules/Leads/Popup_picker.html (props changed) vtigercrm/trunk/modules/Leads/Save.php (props changed) vtigercrm/trunk/modules/Leads/index.php (props changed) vtigercrm/trunk/modules/Leads/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Leads/result.php (props changed) vtigercrm/trunk/modules/Migration/Migration.php (props changed) vtigercrm/trunk/modules/Migration/MigrationCheck.php (props changed) vtigercrm/trunk/modules/Migration/MigrationStep1.php (props changed) vtigercrm/trunk/modules/Migration/MigrationStep2.php (props changed) vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (props changed) vtigercrm/trunk/modules/Migration/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Migration/updateCurrency.php (props changed) vtigercrm/trunk/modules/Notes/CustomView.php (props changed) vtigercrm/trunk/modules/Notes/Delete.php (props changed) vtigercrm/trunk/modules/Notes/DetailView.php (props changed) vtigercrm/trunk/modules/Notes/EditView.php (props changed) vtigercrm/trunk/modules/Notes/Forms.php (props changed) vtigercrm/trunk/modules/Notes/ListView.php (props changed) vtigercrm/trunk/modules/Notes/Note.js (props changed) vtigercrm/trunk/modules/Notes/Note.php (props changed) vtigercrm/trunk/modules/Notes/NotesAjax.php (props changed) vtigercrm/trunk/modules/Notes/Save.php (props changed) vtigercrm/trunk/modules/Notes/index.php (props changed) vtigercrm/trunk/modules/Notes/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Portal/Delete.php (props changed) vtigercrm/trunk/modules/Portal/ListView.php (props changed) vtigercrm/trunk/modules/Portal/Popup.php (props changed) vtigercrm/trunk/modules/Portal/Portal.js (props changed) vtigercrm/trunk/modules/Portal/Portalstyle.css (props changed) vtigercrm/trunk/modules/Portal/index.php (props changed) vtigercrm/trunk/modules/Portal/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Potentials/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Potentials/Charts.php (props changed) vtigercrm/trunk/modules/Potentials/CustomView.php (props changed) vtigercrm/trunk/modules/Potentials/Delete.php (props changed) vtigercrm/trunk/modules/Potentials/DetailView.php (props changed) vtigercrm/trunk/modules/Potentials/EditView.php (props changed) vtigercrm/trunk/modules/Potentials/Forms.php (props changed) vtigercrm/trunk/modules/Potentials/Import.php (props changed) vtigercrm/trunk/modules/Potentials/ListView.php (props changed) vtigercrm/trunk/modules/Potentials/ListViewTop.php (props changed) vtigercrm/trunk/modules/Potentials/Opportunity.js (props changed) vtigercrm/trunk/modules/Potentials/Opportunity.php (props changed) vtigercrm/trunk/modules/Potentials/Popup.php (props changed) vtigercrm/trunk/modules/Potentials/PopupSearchForm.html (props changed) vtigercrm/trunk/modules/Potentials/Popup_picker.html (props changed) vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (props changed) vtigercrm/trunk/modules/Potentials/Save.php (props changed) vtigercrm/trunk/modules/Potentials/index.php (props changed) vtigercrm/trunk/modules/Potentials/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Potentials/updateRelations.php (props changed) vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php (props changed) vtigercrm/trunk/modules/PriceBooks/CustomView.php (props changed) vtigercrm/trunk/modules/PriceBooks/Delete.php (props changed) vtigercrm/trunk/modules/PriceBooks/DetailView.php (props changed) vtigercrm/trunk/modules/PriceBooks/EditView.php (props changed) vtigercrm/trunk/modules/PriceBooks/ListView.php (props changed) vtigercrm/trunk/modules/PriceBooks/Popup.php (props changed) vtigercrm/trunk/modules/PriceBooks/PriceBook.js (props changed) vtigercrm/trunk/modules/PriceBooks/PriceBook.php (props changed) vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php (props changed) vtigercrm/trunk/modules/PriceBooks/Save.php (props changed) vtigercrm/trunk/modules/PriceBooks/index.php (props changed) vtigercrm/trunk/modules/PriceBooks/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html (props changed) vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (props changed) vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html (props changed) vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (props changed) vtigercrm/trunk/modules/Products/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Products/CustomView.php (props changed) vtigercrm/trunk/modules/Products/Delete.php (props changed) vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php (props changed) vtigercrm/trunk/modules/Products/DetailView.php (props changed) vtigercrm/trunk/modules/Products/EditListPrice.html (props changed) vtigercrm/trunk/modules/Products/EditListPrice.php (props changed) vtigercrm/trunk/modules/Products/EditView.php (props changed) vtigercrm/trunk/modules/Products/Forms.php (props changed) vtigercrm/trunk/modules/Products/Import.php (props changed) vtigercrm/trunk/modules/Products/ListView.php (props changed) vtigercrm/trunk/modules/Products/Popup.php (props changed) vtigercrm/trunk/modules/Products/Product.js (props changed) vtigercrm/trunk/modules/Products/Product.php (props changed) vtigercrm/trunk/modules/Products/ProductsAjax.php (props changed) vtigercrm/trunk/modules/Products/Productsslide.js (props changed) vtigercrm/trunk/modules/Products/Save.php (props changed) vtigercrm/trunk/modules/Products/UpdateListPrice.php (props changed) vtigercrm/trunk/modules/Products/addPbProductRelToDB.php (props changed) vtigercrm/trunk/modules/Products/index.php (props changed) vtigercrm/trunk/modules/Products/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Products/multifile.js (props changed) vtigercrm/trunk/modules/Products/updateRelations.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/CustomView.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/Delete.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/EditView.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/Forms.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/ListView.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/Popup.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js (props changed) vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/Save.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/index.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/footer.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/lastpage/body.php (props changed) vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/lastpage/footer.php (props changed) vtigercrm/trunk/modules/Quotes/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Quotes/CreatePDF.php (props changed) vtigercrm/trunk/modules/Quotes/CustomView.php (props changed) vtigercrm/trunk/modules/Quotes/Delete.php (props changed) vtigercrm/trunk/modules/Quotes/DetailView.php (props changed) vtigercrm/trunk/modules/Quotes/EditView.php (props changed) vtigercrm/trunk/modules/Quotes/Forms.php (props changed) vtigercrm/trunk/modules/Quotes/ListTopQuotes.php (props changed) vtigercrm/trunk/modules/Quotes/ListView.php (props changed) vtigercrm/trunk/modules/Quotes/Popup.php (props changed) vtigercrm/trunk/modules/Quotes/Quote.js (props changed) vtigercrm/trunk/modules/Quotes/Quote.php (props changed) vtigercrm/trunk/modules/Quotes/QuotesAjax.php (props changed) vtigercrm/trunk/modules/Quotes/Save.php (props changed) vtigercrm/trunk/modules/Quotes/index.php (props changed) vtigercrm/trunk/modules/Quotes/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Quotes/pdf_templates/footer.php (props changed) vtigercrm/trunk/modules/Quotes/pdf_templates/header.php (props changed) vtigercrm/trunk/modules/Quotes/pdf_templates/lastpage/body.php (props changed) vtigercrm/trunk/modules/Quotes/pdf_templates/lastpage/footer.php (props changed) vtigercrm/trunk/modules/Reports/AdvancedFilter.html (props changed) vtigercrm/trunk/modules/Reports/AdvancedFilter.php (props changed) vtigercrm/trunk/modules/Reports/ChangeFolder.php (props changed) vtigercrm/trunk/modules/Reports/CreatePDF.php (props changed) vtigercrm/trunk/modules/Reports/CreateXL.php (props changed) vtigercrm/trunk/modules/Reports/Delete.php (props changed) vtigercrm/trunk/modules/Reports/DeleteReportFolder.php (props changed) vtigercrm/trunk/modules/Reports/Forms.php (props changed) vtigercrm/trunk/modules/Reports/ListView.html (props changed) vtigercrm/trunk/modules/Reports/ListView.php (props changed) vtigercrm/trunk/modules/Reports/NewReport0.html (props changed) vtigercrm/trunk/modules/Reports/NewReport0.php (props changed) vtigercrm/trunk/modules/Reports/NewReport1.php (props changed) vtigercrm/trunk/modules/Reports/NewReportFolder.html (props changed) vtigercrm/trunk/modules/Reports/NewReportFolder.php (props changed) vtigercrm/trunk/modules/Reports/PopulateReports.php (props changed) vtigercrm/trunk/modules/Reports/Report.js (props changed) vtigercrm/trunk/modules/Reports/ReportColumns.html (props changed) vtigercrm/trunk/modules/Reports/ReportColumns.php (props changed) vtigercrm/trunk/modules/Reports/ReportColumnsTotal.html (props changed) vtigercrm/trunk/modules/Reports/ReportColumnsTotal.php (props changed) vtigercrm/trunk/modules/Reports/ReportFilters.php (props changed) vtigercrm/trunk/modules/Reports/ReportGrouping.html (props changed) vtigercrm/trunk/modules/Reports/ReportGrouping.php (props changed) vtigercrm/trunk/modules/Reports/ReportRun.php (props changed) vtigercrm/trunk/modules/Reports/ReportType.html (props changed) vtigercrm/trunk/modules/Reports/ReportType.php (props changed) vtigercrm/trunk/modules/Reports/Reports.php (props changed) vtigercrm/trunk/modules/Reports/ReportsAjax.php (props changed) vtigercrm/trunk/modules/Reports/Save.php (props changed) vtigercrm/trunk/modules/Reports/SaveAndRun.php (props changed) vtigercrm/trunk/modules/Reports/SaveReport.html (props changed) vtigercrm/trunk/modules/Reports/SaveReport.php (props changed) vtigercrm/trunk/modules/Reports/SaveReport0.php (props changed) vtigercrm/trunk/modules/Reports/SaveReportFolder.php (props changed) vtigercrm/trunk/modules/Reports/StandardFilter.html (props changed) vtigercrm/trunk/modules/Reports/StandardFilter.php (props changed) vtigercrm/trunk/modules/Reports/index.php (props changed) vtigercrm/trunk/modules/Reports/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Rss/Delete.php (props changed) vtigercrm/trunk/modules/Rss/Forms.php (props changed) vtigercrm/trunk/modules/Rss/ListView.html (props changed) vtigercrm/trunk/modules/Rss/ListView.php (props changed) vtigercrm/trunk/modules/Rss/Popup.html (props changed) vtigercrm/trunk/modules/Rss/Popup.php (props changed) vtigercrm/trunk/modules/Rss/Rss.js (props changed) vtigercrm/trunk/modules/Rss/Rss.php (props changed) vtigercrm/trunk/modules/Rss/RssAjax.php (props changed) vtigercrm/trunk/modules/Rss/Save.php (props changed) vtigercrm/trunk/modules/Rss/Star.php (props changed) vtigercrm/trunk/modules/Rss/index.php (props changed) vtigercrm/trunk/modules/Rss/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php (props changed) vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (props changed) vtigercrm/trunk/modules/SalesOrder/CustomView.php (props changed) vtigercrm/trunk/modules/SalesOrder/Delete.php (props changed) vtigercrm/trunk/modules/SalesOrder/DetailView.php (props changed) vtigercrm/trunk/modules/SalesOrder/EditView.php (props changed) vtigercrm/trunk/modules/SalesOrder/Forms.php (props changed) vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php (props changed) vtigercrm/trunk/modules/SalesOrder/ListView.php (props changed) vtigercrm/trunk/modules/SalesOrder/Popup.php (props changed) vtigercrm/trunk/modules/SalesOrder/SalesOrder.js (props changed) vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (props changed) vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php (props changed) vtigercrm/trunk/modules/SalesOrder/Save.php (props changed) vtigercrm/trunk/modules/SalesOrder/index.php (props changed) vtigercrm/trunk/modules/SalesOrder/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/SalesOrder/pdf_templates/footer.php (props changed) vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php (props changed) vtigercrm/trunk/modules/SalesOrder/pdf_templates/lastpage/body.php (props changed) vtigercrm/trunk/modules/SalesOrder/pdf_templates/lastpage/footer.php (props changed) vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (props changed) vtigercrm/trunk/modules/Settings/AddMailAccount.html (props changed) vtigercrm/trunk/modules/Settings/AddMailAccount.php (props changed) vtigercrm/trunk/modules/Settings/BackupServerConfig.php (props changed) vtigercrm/trunk/modules/Settings/ComboFieldList.html (props changed) vtigercrm/trunk/modules/Settings/ComboFieldList.php (props changed) vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php (props changed) vtigercrm/trunk/modules/Settings/CreateCustomField.php (props changed) vtigercrm/trunk/modules/Settings/CurrencyDelete.php (props changed) vtigercrm/trunk/modules/Settings/CurrencyEditView.php (props changed) vtigercrm/trunk/modules/Settings/CurrencyInfo.html (props changed) vtigercrm/trunk/modules/Settings/CurrencyInfo.php (props changed) vtigercrm/trunk/modules/Settings/CurrencyListView.php (props changed) vtigercrm/trunk/modules/Settings/CustomFieldList.php (props changed) vtigercrm/trunk/modules/Settings/DeleteCustomField.php (props changed) vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php (props changed) vtigercrm/trunk/modules/Settings/DeleteMailAccount.php (props changed) vtigercrm/trunk/modules/Settings/EditComboField.php (props changed) vtigercrm/trunk/modules/Settings/EditCompanyDetails.php (props changed) vtigercrm/trunk/modules/Settings/EditField.html (props changed) vtigercrm/trunk/modules/Settings/EditFieldBlock.php (props changed) vtigercrm/trunk/modules/Settings/EmailConfig.php (props changed) vtigercrm/trunk/modules/Settings/FileStorage.php (props changed) vtigercrm/trunk/modules/Settings/Forms.php (props changed) vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (props changed) vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php (props changed) vtigercrm/trunk/modules/Settings/ListMailAccount.php (props changed) vtigercrm/trunk/modules/Settings/ListModuleOwners.php (props changed) vtigercrm/trunk/modules/Settings/OrganizationConfig.php (props changed) vtigercrm/trunk/modules/Settings/PickList.php (props changed) vtigercrm/trunk/modules/Settings/Save.php (props changed) vtigercrm/trunk/modules/Settings/SaveCompany.php (props changed) vtigercrm/trunk/modules/Settings/SaveConvertLead.php (props changed) vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php (props changed) vtigercrm/trunk/modules/Settings/SaveMailAccount.php (props changed) vtigercrm/trunk/modules/Settings/SettingsAjax.php (props changed) vtigercrm/trunk/modules/Settings/SettingsSubMenu.php (props changed) vtigercrm/trunk/modules/Settings/UpdateComboValues.php (props changed) vtigercrm/trunk/modules/Settings/add2db.php (props changed) vtigercrm/trunk/modules/Settings/customfield.html (props changed) vtigercrm/trunk/modules/Settings/downloadfile.php (props changed) vtigercrm/trunk/modules/Settings/fieldtypes.html (props changed) vtigercrm/trunk/modules/Settings/fieldtypes.php (props changed) vtigercrm/trunk/modules/Settings/index.php (props changed) vtigercrm/trunk/modules/Settings/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/System/config.php (props changed) vtigercrm/trunk/modules/System/includes/XPath.class.php (props changed) vtigercrm/trunk/modules/System/includes/class.Template.inc.php (props changed) vtigercrm/trunk/modules/System/includes/common_functions.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ar_utf8.php (props changed) vtigercrm/trunk/modules/System/includes/lang/bg.php (props changed) vtigercrm/trunk/modules/System/includes/lang/big5.php (props changed) vtigercrm/trunk/modules/System/includes/lang/br.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ca.php (props changed) vtigercrm/trunk/modules/System/includes/lang/cn.php (props changed) vtigercrm/trunk/modules/System/includes/lang/cs.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ct.php (props changed) vtigercrm/trunk/modules/System/includes/lang/da.php (props changed) vtigercrm/trunk/modules/System/includes/lang/de.php (props changed) vtigercrm/trunk/modules/System/includes/lang/en.php (props changed) vtigercrm/trunk/modules/System/includes/lang/es.php (props changed) vtigercrm/trunk/modules/System/includes/lang/et.php (props changed) vtigercrm/trunk/modules/System/includes/lang/eu.php (props changed) vtigercrm/trunk/modules/System/includes/lang/fi.php (props changed) vtigercrm/trunk/modules/System/includes/lang/fr.php (props changed) vtigercrm/trunk/modules/System/includes/lang/gr.php (props changed) vtigercrm/trunk/modules/System/includes/lang/he.php (props changed) vtigercrm/trunk/modules/System/includes/lang/hu.php (props changed) vtigercrm/trunk/modules/System/includes/lang/id.php (props changed) vtigercrm/trunk/modules/System/includes/lang/index.html (props changed) vtigercrm/trunk/modules/System/includes/lang/is.php (props changed) vtigercrm/trunk/modules/System/includes/lang/it.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ja.php (props changed) vtigercrm/trunk/modules/System/includes/lang/jp.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ko.php (props changed) vtigercrm/trunk/modules/System/includes/lang/lt.php (props changed) vtigercrm/trunk/modules/System/includes/lang/lv.php (props changed) vtigercrm/trunk/modules/System/includes/lang/nl.php (props changed) vtigercrm/trunk/modules/System/includes/lang/no.php (props changed) vtigercrm/trunk/modules/System/includes/lang/pl.php (props changed) vtigercrm/trunk/modules/System/includes/lang/pt-br.php (props changed) vtigercrm/trunk/modules/System/includes/lang/pt.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ro.php (props changed) vtigercrm/trunk/modules/System/includes/lang/ru.php (props changed) vtigercrm/trunk/modules/System/includes/lang/sk.php (props changed) vtigercrm/trunk/modules/System/includes/lang/sv.php (props changed) vtigercrm/trunk/modules/System/includes/lang/tr.php (props changed) vtigercrm/trunk/modules/System/includes/lang/tw.php (props changed) vtigercrm/trunk/modules/System/includes/mb/class.healthd.inc.php (props changed) vtigercrm/trunk/modules/System/includes/mb/class.hwsensors.inc.php (props changed) vtigercrm/trunk/modules/System/includes/mb/class.lmsensors.inc.php (props changed) vtigercrm/trunk/modules/System/includes/mb/class.mbm5.inc.php (props changed) vtigercrm/trunk/modules/System/includes/mb/class.mbmon.inc.php (props changed) vtigercrm/trunk/modules/System/includes/mb/index.html (props changed) vtigercrm/trunk/modules/System/includes/os/class.BSD.common.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.Darwin.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.FreeBSD.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.HP-UX.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.NetBSD.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.OpenBSD.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.SunOS.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.WINNT.inc.bak.php (props changed) vtigercrm/trunk/modules/System/includes/os/class.WINNT.inc.php (props changed) vtigercrm/trunk/modules/System/includes/os/index.html (props changed) vtigercrm/trunk/modules/System/includes/system_footer.php (props changed) vtigercrm/trunk/modules/System/includes/system_header.php (props changed) vtigercrm/trunk/modules/System/includes/xml/filesystems.php (props changed) vtigercrm/trunk/modules/System/includes/xml/hardware.php (props changed) vtigercrm/trunk/modules/System/includes/xml/index.html (props changed) vtigercrm/trunk/modules/System/includes/xml/mbinfo.php (props changed) vtigercrm/trunk/modules/System/includes/xml/memory.php (props changed) vtigercrm/trunk/modules/System/includes/xml/network.php (props changed) vtigercrm/trunk/modules/System/includes/xml/vitals.php (props changed) vtigercrm/trunk/modules/System/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/System/phpsysinfo.dtd (props changed) vtigercrm/trunk/modules/System/phpsysinfo_service.exe (props changed) vtigercrm/trunk/modules/System/systemconfig.php (props changed) vtigercrm/trunk/modules/System/templates/aq/aq.css (props changed) vtigercrm/trunk/modules/System/templates/aq/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/aq/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/black/black.css (props changed) vtigercrm/trunk/modules/System/templates/black/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/black/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/blue/blue.css (props changed) vtigercrm/trunk/modules/System/templates/blue/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/blue/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/bulix/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/bulix/bulix.css (props changed) vtigercrm/trunk/modules/System/templates/bulix/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/classic/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/classic/classic.css (props changed) vtigercrm/trunk/modules/System/templates/classic/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/kde/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/kde/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/kde/kde.css (props changed) vtigercrm/trunk/modules/System/templates/metal/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/metal/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/metal/metal.css (props changed) vtigercrm/trunk/modules/System/templates/orange/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/orange/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/orange/orange.css (props changed) vtigercrm/trunk/modules/System/templates/typo3/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/typo3/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/typo3/typo3.css (props changed) vtigercrm/trunk/modules/System/templates/wintendoxp/box.tpl (props changed) vtigercrm/trunk/modules/System/templates/wintendoxp/form.tpl (props changed) vtigercrm/trunk/modules/System/templates/wintendoxp/wintendoxp.css (props changed) vtigercrm/trunk/modules/Users/Announcements.php (props changed) vtigercrm/trunk/modules/Users/Authenticate.php (props changed) vtigercrm/trunk/modules/Users/ChangePassword.php (props changed) vtigercrm/trunk/modules/Users/CreateProfile.php (props changed) vtigercrm/trunk/modules/Users/CreateProfile1.php (props changed) vtigercrm/trunk/modules/Users/CreateSharingRule.php (props changed) vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (props changed) vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php (props changed) vtigercrm/trunk/modules/Users/Delete.php (props changed) vtigercrm/trunk/modules/Users/DeleteGroup.php (props changed) vtigercrm/trunk/modules/Users/DeleteProfile.php (props changed) vtigercrm/trunk/modules/Users/DeleteRole.php (props changed) vtigercrm/trunk/modules/Users/DeleteSharingRule.php (props changed) vtigercrm/trunk/modules/Users/DeleteUser.php (props changed) vtigercrm/trunk/modules/Users/DetailView.php (props changed) vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php (props changed) vtigercrm/trunk/modules/Users/EditHomeOrder.php (props changed) vtigercrm/trunk/modules/Users/EditInventoryNotification.php (props changed) vtigercrm/trunk/modules/Users/EditNotification.php (props changed) vtigercrm/trunk/modules/Users/EditView.php (props changed) vtigercrm/trunk/modules/Users/Error.php (props changed) vtigercrm/trunk/modules/Users/Forms.php (props changed) vtigercrm/trunk/modules/Users/GroupDetailView.php (props changed) vtigercrm/trunk/modules/Users/ListProfiles.php (props changed) vtigercrm/trunk/modules/Users/ListView.php (props changed) vtigercrm/trunk/modules/Users/Listhistory.php (props changed) vtigercrm/trunk/modules/Users/Login.php (props changed) vtigercrm/trunk/modules/Users/LoginHistory.php (props changed) vtigercrm/trunk/modules/Users/Logout.php (props changed) vtigercrm/trunk/modules/Users/OrgSharingDetailView.php (props changed) vtigercrm/trunk/modules/Users/OrgSharingEditView.php (props changed) vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php (props changed) vtigercrm/trunk/modules/Users/Popup.php (props changed) vtigercrm/trunk/modules/Users/Popup_picker.html (props changed) vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php (props changed) vtigercrm/trunk/modules/Users/RecalculateSharingRules.php (props changed) vtigercrm/trunk/modules/Users/RoleDeleteStep1.php (props changed) vtigercrm/trunk/modules/Users/RoleDetailView.php (props changed) vtigercrm/trunk/modules/Users/Save.php (props changed) vtigercrm/trunk/modules/Users/SaveGroup.php (props changed) vtigercrm/trunk/modules/Users/SaveInventoryNotification.php (props changed) vtigercrm/trunk/modules/Users/SaveNotification.php (props changed) vtigercrm/trunk/modules/Users/SaveOrgSharing.php (props changed) vtigercrm/trunk/modules/Users/SaveProfile.php (props changed) vtigercrm/trunk/modules/Users/SaveRole.php (props changed) vtigercrm/trunk/modules/Users/SaveSharingRule.php (props changed) vtigercrm/trunk/modules/Users/SearchForm.html (props changed) vtigercrm/trunk/modules/Users/Security.php (props changed) vtigercrm/trunk/modules/Users/ShowHistory.html (props changed) vtigercrm/trunk/modules/Users/ShowHistory.php (props changed) vtigercrm/trunk/modules/Users/TabCustomise.html (props changed) vtigercrm/trunk/modules/Users/TabCustomise.php (props changed) vtigercrm/trunk/modules/Users/TemplateMerge.php (props changed) vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php (props changed) vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (props changed) vtigercrm/trunk/modules/Users/UpdateTab.html (props changed) vtigercrm/trunk/modules/Users/UpdateTab.php (props changed) vtigercrm/trunk/modules/Users/User.php (props changed) vtigercrm/trunk/modules/Users/UserDeleteStep1.php (props changed) vtigercrm/trunk/modules/Users/UsersAjax.php (props changed) vtigercrm/trunk/modules/Users/about_us.php (props changed) vtigercrm/trunk/modules/Users/add2db.php (props changed) vtigercrm/trunk/modules/Users/binaryfilelist.php (props changed) vtigercrm/trunk/modules/Users/createemailtemplate.php (props changed) vtigercrm/trunk/modules/Users/createnewgroup.php (props changed) vtigercrm/trunk/modules/Users/createrole.php (props changed) vtigercrm/trunk/modules/Users/deleteemailtemplate.php (props changed) vtigercrm/trunk/modules/Users/deletewordtemplate.php (props changed) vtigercrm/trunk/modules/Users/detailviewemailtemplate.php (props changed) vtigercrm/trunk/modules/Users/downloadfile.php (props changed) vtigercrm/trunk/modules/Users/editemailtemplate.php (props changed) vtigercrm/trunk/modules/Users/fade.css (props changed) vtigercrm/trunk/modules/Users/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Users/listemailtemplates.php (props changed) vtigercrm/trunk/modules/Users/listgroups.php (props changed) vtigercrm/trunk/modules/Users/listinventorynotifications.php (props changed) vtigercrm/trunk/modules/Users/listnotificationschedulers.php (props changed) vtigercrm/trunk/modules/Users/listroles.html (props changed) vtigercrm/trunk/modules/Users/listroles.php (props changed) vtigercrm/trunk/modules/Users/listwordtemplates.php (props changed) vtigercrm/trunk/modules/Users/lookupemailtemplates.php (props changed) vtigercrm/trunk/modules/Users/massChangeStatus.php (props changed) vtigercrm/trunk/modules/Users/massdelete.php (props changed) vtigercrm/trunk/modules/Users/notify_detail.php (props changed) vtigercrm/trunk/modules/Users/populatetemplate.php (props changed) vtigercrm/trunk/modules/Users/profilePrivileges.php (props changed) vtigercrm/trunk/modules/Users/saveemailtemplate.php (props changed) vtigercrm/trunk/modules/Users/savetermsandconditions.php (props changed) vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (props changed) vtigercrm/trunk/modules/Users/updateNotificationSchedulers.php (props changed) vtigercrm/trunk/modules/Users/upload.php (props changed) vtigercrm/trunk/modules/Utilities/Merge.php (props changed) vtigercrm/trunk/modules/Vendors/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Vendors/CustomView.php (props changed) vtigercrm/trunk/modules/Vendors/Delete.php (props changed) vtigercrm/trunk/modules/Vendors/DetailView.php (props changed) vtigercrm/trunk/modules/Vendors/EditView.php (props changed) vtigercrm/trunk/modules/Vendors/ListView.php (props changed) vtigercrm/trunk/modules/Vendors/Popup.php (props changed) vtigercrm/trunk/modules/Vendors/Save.php (props changed) vtigercrm/trunk/modules/Vendors/Vendor.js (props changed) vtigercrm/trunk/modules/Vendors/Vendor.php (props changed) vtigercrm/trunk/modules/Vendors/VendorsAjax.php (props changed) vtigercrm/trunk/modules/Vendors/index.php (props changed) vtigercrm/trunk/modules/Vendors/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Vendors/updateRelations.php (props changed) vtigercrm/trunk/modules/Webmails/CallRelatedList.php (props changed) vtigercrm/trunk/modules/Webmails/CustomView.php (props changed) vtigercrm/trunk/modules/Webmails/DetailView.php (props changed) vtigercrm/trunk/modules/Webmails/EditView.php (props changed) vtigercrm/trunk/modules/Webmails/EditView.php.orig (props changed) vtigercrm/trunk/modules/Webmails/Forms.php (props changed) vtigercrm/trunk/modules/Webmails/ListView.php (props changed) vtigercrm/trunk/modules/Webmails/ListView.php.orig (props changed) vtigercrm/trunk/modules/Webmails/MailParse.php (props changed) vtigercrm/trunk/modules/Webmails/PopupRelationChooser.php (props changed) vtigercrm/trunk/modules/Webmails/Save.php (props changed) vtigercrm/trunk/modules/Webmails/TODO (props changed) vtigercrm/trunk/modules/Webmails/Webmail.php (props changed) vtigercrm/trunk/modules/Webmails/WebmailsAjax.php (props changed) vtigercrm/trunk/modules/Webmails/body.php (props changed) vtigercrm/trunk/modules/Webmails/class.phpmailer.php (props changed) vtigercrm/trunk/modules/Webmails/class.smtp.php (props changed) vtigercrm/trunk/modules/Webmails/dlAttachments.php (props changed) vtigercrm/trunk/modules/Webmails/images/index.php (props changed) vtigercrm/trunk/modules/Webmails/index.php (props changed) vtigercrm/trunk/modules/Webmails/js/script.js (props changed) vtigercrm/trunk/modules/Webmails/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/Webmails/sendmail.php (props changed) vtigercrm/trunk/modules/Webmails/showOverviewUI.php (props changed) vtigercrm/trunk/modules/Webmails/templates/Address Change (props changed) vtigercrm/trunk/modules/Webmails/templates/Announcement for Release (props changed) vtigercrm/trunk/modules/Webmails/templates/Follow Up (props changed) vtigercrm/trunk/modules/Webmails/templates/Good received acknowledgement (props changed) vtigercrm/trunk/modules/Webmails/templates/Pending Invoices (props changed) vtigercrm/trunk/modules/Webmails/templates/Test Announcement (props changed) vtigercrm/trunk/modules/Webmails/templates/testemailtemplateusage.php (props changed) vtigercrm/trunk/modules/Webmails/templates/todel.txt (props changed) vtigercrm/trunk/modules/Webmails/testview.php (props changed) vtigercrm/trunk/modules/Yahoo/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/imports/Excel/OLE.inc (props changed) vtigercrm/trunk/modules/imports/Excel/reader.php (props changed) vtigercrm/trunk/modules/imports/Headers.php (props changed) vtigercrm/trunk/modules/imports/import.php (props changed) vtigercrm/trunk/modules/uploads/add2db.php (props changed) vtigercrm/trunk/modules/uploads/deleteattachments.php (props changed) vtigercrm/trunk/modules/uploads/downloadfile.php (props changed) vtigercrm/trunk/modules/uploads/language/en_us.lang.php (props changed) vtigercrm/trunk/modules/uploads/upload.php (props changed) vtigercrm/trunk/parent_tabdata.php (props changed) vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (props changed) vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (props changed) vtigercrm/trunk/pkg/bin/datamigration.bat (props changed) vtigercrm/trunk/pkg/bin/datamigration.sh (props changed) vtigercrm/trunk/pkg/bin/find_replace.bat (props changed) vtigercrm/trunk/pkg/bin/startvTiger.bat (props changed) vtigercrm/trunk/pkg/bin/startvTiger.sh (props changed) vtigercrm/trunk/pkg/bin/stopvTiger.bat (props changed) vtigercrm/trunk/pkg/bin/stopvTiger.sh (props changed) vtigercrm/trunk/pkg/bin/uninstallvtiger.sh (props changed) vtigercrm/trunk/pkg/license/License_linux.txt (props changed) vtigercrm/trunk/pkg/license/License_windows.txt (props changed) vtigercrm/trunk/pkg/php/php.ini (props changed) vtigercrm/trunk/quickcreate.php (props changed) vtigercrm/trunk/schema/DatabaseSchema.xml (props changed) vtigercrm/trunk/soap/contactserialize.php (props changed) vtigercrm/trunk/soap/customerportal.php (props changed) vtigercrm/trunk/soap/vtigerolservice.php (props changed) vtigercrm/trunk/soap/webforms.php (props changed) vtigercrm/trunk/storage/vtiger.txt (props changed) vtigercrm/trunk/tabdata.php (props changed) vtigercrm/trunk/test/contact/a.txt (props changed) vtigercrm/trunk/test/logo/logo.txt (props changed) vtigercrm/trunk/test/logo/sale.jpeg (props changed) vtigercrm/trunk/test/product/vtigercrm.txt (props changed) vtigercrm/trunk/test/upload/vtigercrm.txt (props changed) vtigercrm/trunk/test/user/a.txt (props changed) vtigercrm/trunk/test/wordtemplatedownload/todel.txt (props changed) vtigercrm/trunk/themes/Aqua/footer.php (props changed) vtigercrm/trunk/themes/Aqua/header.html (props changed) vtigercrm/trunk/themes/Aqua/header.php (props changed) vtigercrm/trunk/themes/Aqua/images/black.png (props changed) vtigercrm/trunk/themes/Aqua/layout_utils.php (props changed) vtigercrm/trunk/themes/Aqua/loginheader.html (props changed) vtigercrm/trunk/themes/Aqua/loginheader.php (props changed) vtigercrm/trunk/themes/Aqua/style.css (props changed) vtigercrm/trunk/themes/blue/footer.php (props changed) vtigercrm/trunk/themes/blue/header.php (props changed) vtigercrm/trunk/themes/blue/images/Thumbs.db (props changed) vtigercrm/trunk/themes/blue/images/bl_bar.jpg (props changed) vtigercrm/trunk/themes/blue/images/cal16x16Call.jpg (props changed) vtigercrm/trunk/themes/blue/images/cal16x16Linked.jpg (props changed) vtigercrm/trunk/themes/blue/images/cal16x16Meeting.jpg (props changed) vtigercrm/trunk/themes/blue/images/cal16x16ToDo.jpg (props changed) vtigercrm/trunk/themes/blue/images/vtiger-crm.jpg (props changed) vtigercrm/trunk/themes/blue/images/vtiger.jpg (props changed) vtigercrm/trunk/themes/blue/layout_utils.php (props changed) vtigercrm/trunk/themes/blue/loginheader.html (props changed) vtigercrm/trunk/themes/blue/loginheader.php (props changed) vtigercrm/trunk/themes/blue/style.css (props changed) vtigercrm/trunk/themes/nature/footer.php (props changed) vtigercrm/trunk/themes/nature/header.html (props changed) vtigercrm/trunk/themes/nature/header.php (props changed) vtigercrm/trunk/themes/nature/layout_utils.php (props changed) vtigercrm/trunk/themes/nature/loginheader.html (props changed) vtigercrm/trunk/themes/nature/loginheader.php (props changed) vtigercrm/trunk/themes/nature/style.css (props changed) vtigercrm/trunk/themes/orange/footer.php (props changed) vtigercrm/trunk/themes/orange/header.html (props changed) vtigercrm/trunk/themes/orange/header.php (props changed) vtigercrm/trunk/themes/orange/layout_utils.php (props changed) vtigercrm/trunk/themes/orange/loginheader.html (props changed) vtigercrm/trunk/themes/orange/loginheader.php (props changed) vtigercrm/trunk/themes/orange/style.css (props changed) vtigercrm/trunk/user_privileges/index.html (props changed) vtigercrm/trunk/vtigercrm5_alpha_Security.html (props changed) vtigercrm/trunk/vtigerservice.php (props changed) vtigercrm/trunk/vtigerversion.php (props changed) From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 00:05:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:05:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5729 - /vtigercrm/trunk/log4php/appenders/ Message-ID: <20060504040522.A3075709F1E@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:05:05 2006 New Revision: 5729 Log: log4php version has been updated Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php vtigercrm/trunk/log4php/appenders/LoggerAppenderEcho.php vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php vtigercrm/trunk/log4php/appenders/LoggerAppenderMail.php vtigercrm/trunk/log4php/appenders/LoggerAppenderMailEvent.php vtigercrm/trunk/log4php/appenders/LoggerAppenderNull.php vtigercrm/trunk/log4php/appenders/LoggerAppenderPhp.php vtigercrm/trunk/log4php/appenders/LoggerAppenderRollingFile.php vtigercrm/trunk/log4php/appenders/LoggerAppenderSocket.php vtigercrm/trunk/log4php/appenders/LoggerAppenderSyslog.php Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php ============================================================================== --- vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php (original) +++ vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php Wed May 3 22:05:05 2006 @@ -1,139 +1,139 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage appenders - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - - -define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT', 'php://stdout'); -define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDERR', 'php://stderr'); - -/** - * ConsoleAppender appends log events to STDOUT or STDERR using a layout specified by the user. - * - *

    Optional parameter is {@link $target}. The default target is Stdout.

    - *

    Note: Use this Appender with command-line php scripts. - * On web scripts this appender has no effects.

    - *

    This appender requires a layout.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage appenders - */ -class LoggerAppenderConsole extends LoggerAppenderSkeleton { - - /** - * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords STDOUT and STDERR (case insensitive). - * Default is STDOUT - * @var string - */ - var $target = 'php://stdout'; - - /** - * @var boolean - * @access private - */ - var $requiresLayout = true; - - /** - * @var mixed the resource used to open stdout/stderr - * @access private - */ - var $fp = false; - - /** - * Constructor. - * - * @param string $name appender name - */ - function LoggerAppenderConsole($name) - { - $this->LoggerAppenderSkeleton($name); - } - - /** - * Set console target. - * @param mixed $value a constant or a string - */ - function setTarget($value) - { - $v = trim($value); - if ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDOUT') { - $this->target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT; - } elseif ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDERR') { - $target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT; - } else { - LoggerLog::debug( - "LoggerAppenderConsole::targetWarn() ". - "Invalid target. Using '".LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT."' by default." - ); - } - } - - function getTarget() - { - return $this->target; - } - - function activateOptions() - { - LoggerLog::debug("LoggerAppenderConsole::activateOptions()"); - - $this->fp = @fopen($this->getTarget(), 'w'); - - if ($this->fp and $this->layout !== null) - @fwrite($this->fp, $this->layout->getHeader()); - - $this->closed = (bool)($this->fp === false); - } - - /** - * @see LoggerAppender::close() - */ - function close() - { - LoggerLog::debug("LoggerAppenderConsole::close()"); - - if ($this->fp and $this->layout !== null) { - @fwrite($this->fp, $this->layout->getFooter()); - } - @fclose($this->fp); - $this->closed = true; - } - - function append($event) - { - if ($this->fp and $this->layout !== null) { - - LoggerLog::debug("LoggerAppenderConsole::append()"); - - @fwrite($this->fp, $this->layout->format($event)); - } - } -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage appenders + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + + +define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT', 'php://stdout'); +define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDERR', 'php://stderr'); + +/** + * ConsoleAppender appends log events to STDOUT or STDERR using a layout specified by the user. + * + *

    Optional parameter is {@link $target}. The default target is Stdout.

    + *

    Note: Use this Appender with command-line php scripts. + * On web scripts this appender has no effects.

    + *

    This appender requires a layout.

    + * + * @author VxR + * @version $Revision: 1.11 $ + * @package log4php + * @subpackage appenders + */ +class LoggerAppenderConsole extends LoggerAppenderSkeleton { + + /** + * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords STDOUT and STDERR (case insensitive). + * Default is STDOUT + * @var string + */ + var $target = 'php://stdout'; + + /** + * @var boolean + * @access private + */ + var $requiresLayout = true; + + /** + * @var mixed the resource used to open stdout/stderr + * @access private + */ + var $fp = false; + + /** + * Constructor. + * + * @param string $name appender name + */ + function LoggerAppenderConsole($name) + { + $this->LoggerAppenderSkeleton($name); + } + + /** + * Set console target. + * @param mixed $value a constant or a string + */ + function setTarget($value) + { + $v = trim($value); + if ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDOUT') { + $this->target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT; + } elseif ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDERR') { + $target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT; + } else { + LoggerLog::debug( + "LoggerAppenderConsole::targetWarn() ". + "Invalid target. Using '".LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT."' by default." + ); + } + } + + function getTarget() + { + return $this->target; + } + + function activateOptions() + { + LoggerLog::debug("LoggerAppenderConsole::activateOptions()"); + + $this->fp = @fopen($this->getTarget(), 'w'); + + if ($this->fp and $this->layout !== null) + @fwrite($this->fp, $this->layout->getHeader()); + + $this->closed = (bool)($this->fp === false); + } + + /** + * @see LoggerAppender::close() + */ + function close() + { + LoggerLog::debug("LoggerAppenderConsole::close()"); + + if ($this->fp and $this->layout !== null) { + @fwrite($this->fp, $this->layout->getFooter()); + } + @fclose($this->fp); + $this->closed = true; + } + + function append($event) + { + if ($this->fp and $this->layout !== null) { + + LoggerLog::debug("LoggerAppenderConsole::append()"); + + @fwrite($this->fp, $this->layout->format($event)); + } + } +} + ?> Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php ============================================================================== --- vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php (original) +++ vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php Wed May 3 22:05:05 2006 @@ -1,97 +1,97 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage appenders - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/appenders/LoggerAppenderFile.php'); - -/** - * LoggerAppenderDailyFile appends log events to a file ne. - * - * A formatted version of the date pattern is used as to create the file name - * using the {@link PHP_MANUAL#sprintf} function. - *

    Parameters are {@link $datePattern}, {@link $file}. Note that file - * parameter should include a '%s' identifier and should always be set - * before {@link $file} param.

    - * - * @author Abel Gonzalez - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage appenders - */ -class LoggerAppenderDailyFile extends LoggerAppenderFile { - - /** - * Format date. - * It follows the {@link PHP_MANUAL#date()} formatting rules and should always be set before {@link $file} param. - * @var string - */ - var $datePattern = "Ymd"; - - /** - * Constructor - * - * @param string $name appender name - */ - function LoggerAppenderDailyFile($name) - { - $this->LoggerAppenderFile($name); - } - - /** - * Sets date format for the file name. - * @param string $format a regular date() string format - */ - function setDatePattern ( $format ) - { - $this->datePattern = $format; - } - - /** - * @return string returns date format for the filename - */ - function getDatePattern ( ) - { - return $this->datePattern; - } - - /** - * The File property takes a string value which should be the name of the file to append to. - * Sets and opens the file where the log output will go. - * - * @see LoggerAppenderFile::setFile() - */ - function setFile() - { - $numargs = func_num_args(); - $args = func_get_args(); - - if ($numargs == 1 and is_string($args[0])) { - parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) ); - } elseif ($numargs == 2 and is_string($args[0]) and is_bool($args[1])) { - parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] ); - } - } - -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage appenders + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +require_once(LOG4PHP_DIR . '/appenders/LoggerAppenderFile.php'); + +/** + * LoggerAppenderDailyFile appends log events to a file ne. + * + * A formatted version of the date pattern is used as to create the file name + * using the {@link PHP_MANUAL#sprintf} function. + *

    Parameters are {@link $datePattern}, {@link $file}. Note that file + * parameter should include a '%s' identifier and should always be set + * before {@link $file} param.

    + * + * @author Abel Gonzalez + * @version $Revision: 1.7 $ + * @package log4php + * @subpackage appenders + */ +class LoggerAppenderDailyFile extends LoggerAppenderFile { + + /** + * Format date. + * It follows the {@link PHP_MANUAL#date()} formatting rules and should always be set before {@link $file} param. + * @var string + */ + var $datePattern = "Ymd"; + + /** + * Constructor + * + * @param string $name appender name + */ + function LoggerAppenderDailyFile($name) + { + $this->LoggerAppenderFile($name); + } + + /** + * Sets date format for the file name. + * @param string $format a regular date() string format + */ + function setDatePattern ( $format ) + { + $this->datePattern = $format; + } + + /** + * @return string returns date format for the filename + */ + function getDatePattern ( ) + { + return $this->datePattern; + } + + /** + * The File property takes a string value which should be the name of the file to append to. + * Sets and opens the file where the log output will go. + * + * @see LoggerAppenderFile::setFile() + */ + function setFile() + { + $numargs = func_num_args(); + $args = func_get_args(); + + if ($numargs == 1 and is_string($args[0])) { + parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) ); + } elseif ($numargs == 2 and is_string($args[0]) and is_bool($args[1])) { + parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] ); + } + } + +} + ?> Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php ============================================================================== --- vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php (original) +++ vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php Wed May 3 22:05:05 2006 @@ -1,209 +1,209 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage appenders - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); -require_once('DB.php'); - -/** - * Appends log events to a db table using PEAR::DB class. - * - *

    This appender uses a table in a database to log events.

    - *

    Parameters are {@link $dsn}, {@link $createTable}, {@link table} and {@link $sql}.

    - *

    See examples in test directory.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage appenders - * @since 0.3 - */ -class LoggerAppenderDb extends LoggerAppenderSkeleton { - - /** - * Create the log table if it does not exists (optional). - * @var boolean - */ - var $createTable = true; - - /** - * PEAR::Db Data source name. Read PEAR::Db for dsn syntax (mandatory). - * @var string - */ - var $dsn; - - /** - * A {@link LoggerPatternLayout} string used to format a valid insert query (mandatory). - * @var string - */ - var $sql; - - /** - * Table name to write events. Used only if {@link $createTable} is true. - * @var string - */ - var $table; - - /** - * @var object PEAR::Db instance - * @access private - */ - var $db = null; - - /** - * @var boolean used to check if all conditions to append are true - * @access private - */ - var $canAppend = true; - - /** - * @access private - */ - var $requiresLayout = false; - - /** - * Constructor. - * - * @param string $name appender name - */ - function LoggerAppenderDb($name) - { - $this->LoggerAppenderSkeleton($name); - } - - /** - * Setup db connection. - * Based on defined options, this method connects to db defined in {@link $dsn} - * and creates a {@link $table} table if {@link $createTable} is true. - * @return boolean true if all ok. - */ - function activateOptions() - { - $this->db = DB::connect($this->dsn); - - if (DB::isError($this->db)) { - LoggerLog::debug("LoggerAppenderDb::activateOptions() DB Connect Error [".$this->db->getMessage()."]"); - $this->db = null; - $this->closed = true; - $this->canAppend = false; - - } else { - - $this->layout = LoggerLayout::factory('LoggerPatternLayout'); - $this->layout->setConversionPattern($this->getSql()); - - // test if log table exists - $tableInfo = $this->db->tableInfo($this->table, $mode = null); - if (DB::isError($tableInfo) and $this->getCreateTable()) { - $query = "CREATE TABLE {$this->table} (timestamp varchar(32),logger varchar(32),level varchar(32),message varchar(64),thread varchar(32),file varchar(64),line varchar(4) );"; - - LoggerLog::debug("LoggerAppenderDb::activateOptions() creating table '{$this->table}'... using sql='$query'"); - - $result = $this->db->query($query); - if (DB::isError($result)) { - LoggerLog::debug("LoggerAppenderDb::activateOptions() error while creating '{$this->table}'. Error is ".$result->getMessage()); - $this->canAppend = false; - return; - } - } - $this->canAppend = true; - } - - } - - function append($event) - { - if ($this->canAppend) { - - $query = $this->layout->format($event); - - LoggerLog::debug("LoggerAppenderDb::append() query='$query'"); - - $this->db->query($query); - } - } - - function close() - { - if ($this->db !== null) - $this->db->disconnect(); - $this->closed = true; - } - - /** - * @return boolean - */ - function getCreateTable() - { - return $this->createTable; - } - - /** - * @return string the defined dsn - */ - function getDsn() - { - return $this->dsn; - } - - /** - * @return string the sql pattern string - */ - function getSql() - { - return $this->sql; - } - - /** - * @return string the table name to create - */ - function getTable() - { - return $this->table; - } - - function setCreateTable($flag) - { - $this->createTable = LoggerOptionConverter::toBoolean($flag, true); - } - - function setDsn($newDsn) - { - $this->dsn = $newDsn; - } - - function setSql($sql) - { - $this->sql = $sql; - } - - function setTable($table) - { - $this->table = $table; - } - -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage appenders + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php'); +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); +require_once('DB.php'); + +/** + * Appends log events to a db table using PEAR::DB class. + * + *

    This appender uses a table in a database to log events.

    + *

    Parameters are {@link $dsn}, {@link $createTable}, {@link table} and {@link $sql}.

    + *

    See examples in test directory.

    + * + * @author VxR + * @version $Revision: 1.7 $ + * @package log4php + * @subpackage appenders + * @since 0.3 + */ +class LoggerAppenderDb extends LoggerAppenderSkeleton { + + /** + * Create the log table if it does not exists (optional). + * @var boolean + */ + var $createTable = true; + + /** + * PEAR::Db Data source name. Read PEAR::Db for dsn syntax (mandatory) From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 00:07:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:07:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5730 - /vtigercrm/trunk/log4php/ Message-ID: <20060504040732.334DC709F1E@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:07:13 2006 New Revision: 5730 Log: log4php latest version has been updated Modified: vtigercrm/trunk/log4php/Logger.php vtigercrm/trunk/log4php/LoggerAppender.php vtigercrm/trunk/log4php/LoggerAppenderSkeleton.php vtigercrm/trunk/log4php/LoggerBasicConfigurator.php vtigercrm/trunk/log4php/LoggerCategory.php vtigercrm/trunk/log4php/LoggerDefaultCategoryFactory.php vtigercrm/trunk/log4php/LoggerHierarchy.php vtigercrm/trunk/log4php/LoggerLayout.php vtigercrm/trunk/log4php/LoggerLevel.php vtigercrm/trunk/log4php/LoggerLog.php vtigercrm/trunk/log4php/LoggerMDC.php vtigercrm/trunk/log4php/LoggerManager.php vtigercrm/trunk/log4php/LoggerNDC.php vtigercrm/trunk/log4php/LoggerPropertyConfigurator.php vtigercrm/trunk/log4php/LoggerRoot.php Modified: vtigercrm/trunk/log4php/Logger.php ============================================================================== --- vtigercrm/trunk/log4php/Logger.php (original) +++ vtigercrm/trunk/log4php/Logger.php Wed May 3 22:07:13 2006 @@ -1,67 +1,67 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/LoggerCategory.php'); -require_once(LOG4PHP_DIR . '/LoggerManager.php'); - -/** - * Main class for logging operations - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - */ -class Logger extends LoggerCategory { - - /** - * Constructor - * @param string $name logger name - */ - function Logger($name) - { - $this->LoggerCategory($name); - } - - /** - * Get a Logger by name (Delegate to {@link LoggerManager}) - * @param string $name logger name - * @param LoggerFactory $factory a {@link LoggerFactory} instance or null - * @return Logger - * @static - */ - function &getLogger($name, $factory = null) - { - return LoggerManager::getLogger($name, $factory); - } - - /** - * get the Root Logger (Delegate to {@link LoggerManager}) - * @return LoggerRoot - * @static - */ - function &getRootLogger() - { - return LoggerManager::getRootLogger(); - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/LoggerCategory.php'); +require_once(LOG4PHP_DIR . '/LoggerManager.php'); + +/** + * Main class for logging operations + * + * @author VxR + * @version $Revision: 1.9 $ + * @package log4php + */ +class Logger extends LoggerCategory { + + /** + * Constructor + * @param string $name logger name + */ + function Logger($name) + { + $this->LoggerCategory($name); + } + + /** + * Get a Logger by name (Delegate to {@link LoggerManager}) + * @param string $name logger name + * @param LoggerFactory $factory a {@link LoggerFactory} instance or null + * @return Logger + * @static + */ + function &getLogger($name, $factory = null) + { + return LoggerManager::getLogger($name, $factory); + } + + /** + * get the Root Logger (Delegate to {@link LoggerManager}) + * @return LoggerRoot + * @static + */ + function &getRootLogger() + { + return LoggerManager::getRootLogger(); + } +} ?> Modified: vtigercrm/trunk/log4php/LoggerAppender.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerAppender.php (original) +++ vtigercrm/trunk/log4php/LoggerAppender.php Wed May 3 22:07:13 2006 @@ -1,218 +1,218 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - * Abstract class that defines output logs strategies. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @abstract - */ -class LoggerAppender { - - /** - * Factory - * - * @param string $name appender name - * @param string $class create an instance of this appender class - * @return LoggerAppender - */ - function factory($name, $class) - { - $class = basename($class); - if (!empty($class)) { - if (!class_exists($class)) - @include_once(LOG4PHP_DIR . "/appenders/{$class}.php"); - if (class_exists($class)) - return new $class($name); - } - return null; - } - - /** - * Singleton - * - * @param string $name appender name - * @param string $class create or get a reference instance of this class - * @return LoggerAppender - */ - function &singleton($name, $class = '') - { - static $instances; - - if (!empty($name)) { - if (!isset($instances[$name])) { - if (!empty($class)) { - $appender = LoggerAppender::factory($name, $class); - if ($appender !== null) { - $instances[$name] = $appender; - return $instances[$name]; - } - } - return null; - } - return $instances[$name]; - } - return null; - } - - /* --------------------------------------------------------------------------*/ - /* --------------------------------------------------------------------------*/ - /* --------------------------------------------------------------------------*/ - - /** - * Add a filter to the end of the filter list. - * - * @param LoggerFilter $newFilter add a new LoggerFilter - * @abstract - */ - function addFilter($newFilter) - { - // override - } - - /** - * Clear the list of filters by removing all the filters in it. - * @abstract - */ - function clearFilters() - { - // override - } - - /** - * Return the first filter in the filter chain for this Appender. - * The return value may be null if no is filter is set. - * @return Filter - */ - function &getFilter() - { - // override - } - - /** - * Release any resources allocated. - * Subclasses of {@link LoggerAppender} should implement - * this method to perform proper closing procedures. - * @abstract - */ - function close() - { - //override me - } - - /** - * This method performs threshold checks and invokes filters before - * delegating actual logging to the subclasses specific append() method. - * @param LoggerLoggingEvent $event - * @abstract - */ - function doAppend($event) - { - //override me - } - - /** - * Get the name of this appender. - * @return string - */ - function getName() - { - //override me - } - - /** - * Do not use this method. - * - * @param object $errorHandler - */ - function setErrorHandler($errorHandler) - { - // override me - } - - /** - * Do not use this method. - * @return object Returns the ErrorHandler for this appender. - */ - function &getErrorHandler() - { - return $this->errorHandler; - } - - /** - * Set the Layout for this appender. - * - * @param LoggerLayout $layout - */ - function setLayout($layout) - { - // override me - } - - /** - * Returns this appender layout. - * @return LoggerLayout - */ - function &getLayout() - { - // override me - } - - /** - * Set the name of this appender. - * - * The name is used by other components to identify this appender. - * - * @param string $name - */ - function setName($name) - { - // override me - } - - /** - * Configurators call this method to determine if the appender - * requires a layout. - * - *

    If this method returns true, meaning that layout is required, - * then the configurator will configure a layout using the configuration - * information at its disposal. If this method returns false, - * meaning that a layout is not required, then layout configuration will be - * skipped even if there is available layout configuration - * information at the disposal of the configurator.

    - * - *

    In the rather exceptional case, where the appender - * implementation admits a layout but can also work without it, then - * the appender should return true.

    - * - * @return boolean - */ - function requiresLayout() - { - // override me - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + * Abstract class that defines output logs strategies. + * + * @author VxR + * @version $Revision: 1.14 $ + * @package log4php + * @abstract + */ +class LoggerAppender { + + /** + * Factory + * + * @param string $name appender name + * @param string $class create an instance of this appender class + * @return LoggerAppender + */ + function factory($name, $class) + { + $class = basename($class); + if (!empty($class)) { + if (!class_exists($class)) + @include_once(LOG4PHP_DIR . "/appenders/{$class}.php"); + if (class_exists($class)) + return new $class($name); + } + return null; + } + + /** + * Singleton + * + * @param string $name appender name + * @param string $class create or get a reference instance of this class + * @return LoggerAppender + */ + function &singleton($name, $class = '') + { + static $instances; + + if (!empty($name)) { + if (!isset($instances[$name])) { + if (!empty($class)) { + $appender = LoggerAppender::factory($name, $class); + if ($appender !== null) { + $instances[$name] = $appender; + return $instances[$name]; + } + } + return null; + } + return $instances[$name]; + } + return null; + } + + /* --------------------------------------------------------------------------*/ + /* --------------------------------------------------------------------------*/ + /* --------------------------------------------------------------------------*/ + + /** + * Add a filter to the end of the filter list. + * + * @param LoggerFilter $newFilter add a new LoggerFilter + * @abstract + */ + function addFilter($newFilter) + { + // override + } + + /** + * Clear the list of filters by removing all the filters in it. + * @abstract + */ + function clearFilters() + { + // override + } + + /** + * Return the first filter in the filter chain for this Appender. + * The return value may be null if no is filter is set. + * @return Filter + */ + function &getFilter() + { + // override + } + + /** + * Release any resources allocated. + * Subclasses of {@link LoggerAppender} should implement + * this method to perform proper closing procedures. + * @abstract + */ + function close() + { + //override me + } + + /** + * This method performs threshold checks and invokes filters before + * delegating actual logging to the subclasses specific append() method. + * @param LoggerLoggingEvent $event + * @abstract + */ + function doAppend($event) + { + //override me + } + + /** + * Get the name of this appender. + * @return string + */ + function getName() + { + //override me + } + + /** + * Do not use this method. + * + * @param object $errorHandler + */ + function setErrorHandler($errorHandler) + { + // override me + } + + /** + * Do not use this method. + * @return object Returns the ErrorHandler for this appender. + */ + function &getErrorHandler() + { + return $this->errorHandler; + } + + /** + * Set the Layout for this appender. + * + * @param LoggerLayout $layout + */ + function setLayout($layout) + { + // override me + } + + /** + * Returns this appender layout. + * @return LoggerLayout + */ + function &getLayout() + { + // override me + } + + /** + * Set the name of this appender. + * + * The name is used by other components to identify this appender. + * + * @param string $name + */ + function setName($name) + { + // override me + } + + /** + * Configurators call this method to determine if the appender + * requires a layout. + * + *

    If this method returns true, meaning that layout is required, + * then the configurator will configure a layout using the configuration + * information at its disposal. If this method returns false, + * meaning that a layout is not required, then layout configuration will be + * skipped even if there is available layout configuration + * information at the disposal of the configurator.

    + * + *

    In the rather exceptional case, where the appender + * implementation admits a layout but can also work without it, then + * the appender should return true.

    + * + * @return boolean + */ + function requiresLayout() + { + // override me + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerAppenderSkeleton.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerAppenderSkeleton.php (original) +++ vtigercrm/trunk/log4php/LoggerAppenderSkeleton.php Wed May 3 22:07:13 2006 @@ -1,355 +1,355 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerAppender.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); - -/** - * Abstract superclass of the other appenders in the package. - * - * This class provides the code for common functionality, such as - * support for threshold filtering and support for general filters. - * - * @author VxR - * @author Sergio Strampelli - * @version $Revision: 1.1 $ - * @package log4php - * @abstract - */ -class LoggerAppenderSkeleton extends LoggerAppender { - - /** - * @var boolean closed appender flag - */ - var $closed; - - /** - * @var object unused - */ - var $errorHandler; - - /** - * The first filter in the filter chain - * @var LoggerFilter - */ - var $headFilter = null; - - /** - * LoggerLayout for this appender. It can be null if appender has its own layout - * @var LoggerLayout - */ - var $layout = null; - - /** - * @var string Appender name - */ - var $name; - - /** - * The last filter in the filter chain - * @var LoggerFilter - */ - var $tailFilter = null; - - /** - * @var LoggerLevel There is no level threshold filtering by default. - */ - var $threshold = null; - - /** - * @var boolean needs a layout formatting ? - */ - var $requiresLayout = false; - -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ - - /** - * Constructor - * - * @param string $name appender name - */ - function LoggerAppenderSkeleton($name) - { - $this->name = $name; - $this->clearFilters(); - } - - /** - * @param LoggerFilter $newFilter add a new LoggerFilter - * @see LoggerAppender::addFilter() - */ - function addFilter($newFilter) - { - if($this->headFilter === null) { - $this->headFilter = $newFilter; - $this->tailFilter =& $this->headFilter; - } else { - $this->tailFilter->next = $newFilter; - $this->tailFilter =& $this->tailFilter->next; - } - } - - /** - * Derived appenders should override this method if option structure - * requires it. - */ - function activateOptions() - { - - } - - /** - * Subclasses of {@link LoggerAppenderSkeleton} should implement - * this method to perform actual logging. - * - * @param LoggerLoggingEvent $event - * @see doAppend() - * @abstract - */ - function append($event) - { - // override me - } - - /** - * @see LoggerAppender::clearFilters() - */ - function clearFilters() - { - unset($this->headFilter); - unset($this->tailFilter); - $this->headFilter = null; - $this->tailFilter = null; - } - - /** - * @see LoggerAppender::close() - */ - function close() - { - //override me - } - - /** - * Finalize this appender by calling the derived class' close() method. - */ - function finalize() - { - // An appender might be closed then garbage collected. There is no - // point in closing twice. - if ($this->closed) return; - - LoggerLog::debug("LoggerAppenderSkeleton::finalize():name=[{$this->name}]."); - - $this->close(); - } - - /** - * Do not use this method. - * @see LoggerAppender::getErrorHandler() - * @return object - */ - function &getErrorHandler() - { - return $this->errorHandler; - } - - /** - * @see LoggerAppender::getFilter() - * @return Filter - */ - function &getFilter() - { - return $this->headFilter; - } - - /** - * Return the first filter in the filter chain for this Appender. - * The return value may be null if no is filter is set. - * @return Filter - */ - function &getFirstFilter() - { - return $this->headFilter; - } - - /** - * @see LoggerAppender::getLayout() - * @return LoggerLayout - */ - function &getLayout() - { - return $this->layout; - } - - /** - * @see LoggerAppender::getName() - * @return string - */ - function getName() - { - return $this->name; - } - - /** - * Returns this appenders threshold level. - * See the {@link setThreshold()} method for the meaning of this option. - * @return LoggerLevel - */ - function &getThreshold() - { - return $this->threshold; - } - - /** - * Check whether the message level is below the appender's threshold. - * - * - * If there is no threshold set, then the return value is always true. - * @param LoggerLevel $priority - * @return boolean true if priority is greater or equal than threshold - */ - function isAsSevereAsThreshold($priority) - { - if ($this->threshold === null) - return true; - - return $priority->isGreaterOrEqual($this->getThreshold()); - } - - /** - * @see LoggerAppender::doAppend() - * @param LoggerLoggingEvent $event - */ - function doAppend($event) - { - LoggerLog::debug("LoggerAppenderSkeleton::doAppend()"); - - if ($this->closed) { - LoggerLog::debug("LoggerAppenderSkeleton::doAppend() Attempted to append to closed appender named [{$this->name}]."); - return; - } - if(!$this->isAsSevereAsThreshold($event->getLevel())) { - LoggerLog::debug("LoggerAppenderSkeleton::doAppend() event level is less severe than threshold."); - return; - } - - $f = $this->getFirstFilter(); - - while($f !== null) { - switch ($f->decide($event)) { - case LOG4PHP_LOGGER_FILTER_DENY: return; - case LOG4PHP_LOGGER_FILTER_ACCEPT: return $this->append($event); - case LOG4PHP_LOGGER_FILTER_NEUTRAL: $f = $f->next; - } - } - $this->append($event); - } - - - /** - * @see LoggerAppender::requiresLayout() - * @return boolean - */ - function requiresLayout() - { - return $this->requiresLayout; - } - - /** - * @see LoggerAppender::setErrorHandler() - * @param object - */ - function setErrorHandler($errorHandler) - { - if($errorHandler == null) { - // We do not throw exception here since the cause is probably a - // bad config file. - LoggerLog::warn("You have tried to set a null error-handler."); - } else { - $this->errorHandler = $errorHandler; - } - } - - /** - * @see LoggerAppender::setLayout() - * @param LoggerLayout $layout - */ - function setLayout($layout) - { - if ($this->requiresLayout()) - $this->layout = $layout; - } - - /** - * @see LoggerAppender::setName() - * @param string $name - */ - function setName($name) - { - $this->name = $name; - } - - /** - * Set the threshold level of this appender. - * - * @param mixed $threshold can be a {@link LoggerLevel} object or a string. - * @see LoggerOptionConverter::toLevel() - */ - function setThreshold($threshold) - { - if (is_string($threshold)) { - $this->threshold = LoggerOptionConverter::toLevel($threshold, null); - }elseif (is_a($threshold, 'loggerlevel')) { - $this->threshold = $threshold; - } - } - - /** - * Perform actions before object serialization. - * - * Call {@link finalize()} to properly close the appender. - */ - function __sleep() - { - $this->finalize(); - return array_keys(get_object_vars($this)); - } - - /** - * Perform actions after object deserialization. - * - * Call {@link activateOptions()} to properly setup the appender. - */ - function __wakeup() - { - $this->activateOptions(); - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerAppender.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); + +/** + * Abstract superclass of the other appenders in the package. + * + * This class provides the code for common functionality, such as + * support for threshold filtering and support for general filters. + * + * @author VxR + * @author Sergio Strampelli + * @version $Revision: 1.15 $ + * @package log4php + * @abstract + */ +class LoggerAppenderSkeleton extends LoggerAppender { + + /** + * @var boolean closed appender flag + */ + var $closed; + + /** + * @var object unused + */ + var $errorHandler; + + /** + * The first filter in the filter chain + * @var LoggerFilter + */ + var $headFilter = null; + + /** + * LoggerLayout for this appender. It can be null if appender has its own layout + * @var LoggerLayout + */ + var $layout = null; + + /** + * @var string Appender name + */ + var $name; + + /** + * The last filter in the filter chain + * @var LoggerFilter + */ + var $tailFilter = null; + + /** + * @var LoggerLevel There is no level threshold filtering by default. + */ + var $threshold = null; + + /** + * @var boolean needs a layout formatting ? + */ + var $requiresLayout = false; + +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ + + /** + * Constructor + * + * @param string $name appender name + */ + function LoggerAppenderSkeleton($name) + { + $this->name = $name; + $this->clearFilters(); + } + + /** + * @param LoggerFilter $newFilter add a new LoggerFilter + * @see LoggerAppender::addFilter() + */ + function addFilter($newFilter) + { + if($this->headFilter === null) { + $this->headFilter = $newFilter; + $this->tailFilter =& $this->headFilter; + } else { + $this->tailFilter->next = $newFilter; + $this->tailFilter =& $this->tailFilter->next; + } + } + + /** + * Derived appenders should override this method if option structure + * requires it. + */ + function activateOptions() + { + + } + + /** + * Subclasses of {@link LoggerAppenderSkeleton} should implement + * this method to perform actual logging. + * + * @param LoggerLoggingEvent $event + * @see doAppend() + * @abstract + */ + function append($event) + { + // override me + } + + /** + * @see LoggerAppender::clearFilters() + */ + function clearFilters() + { + unset($this->headFilter); + unset($this->tailFilter); + $this->headFilter = null; + $this->tailFilter = null; + } + + /** + * @see LoggerAppender::close() + */ + function close() + { + //override me + } + + /** + * Finalize this appender by calling the derived class' close() method. + */ + function finalize() + { + // An appender might be closed then garbage collected. There is no + // point in closing twice. + if ($this->closed) return; + + LoggerLog::debug("LoggerAppenderSkeleton::finalize():name=[{$this->name}]."); + + $this->close(); + } + + /** + * Do not use this method. + * @see LoggerAppender::getErrorHandler() + * @return object + */ + function &getErrorHandler() + { + return $this->errorHandler; + } + + /** + * @see LoggerAppender::getFilter() + * @return Filter + */ + function &getFilter() + { + return $this->headFilter; + } + + /** + * Return the first filter in the filter chain for this Appender. + * The return value may be null if no is filter is set. + * @return Filter + */ + function &getFirstFilter() + { + return $this->headFilter; + } + + /** + * @see LoggerAppender::getLayout() + * @return LoggerLayout + */ + function &getLayout() + { + return $this->layout; + } + + /** + * @see LoggerAppender::getName() + * @return string + */ + function getName() + { + return $this->name; + } + + /** + * Returns this appenders threshold level. + * See the {@link setThreshold()} method for the meaning of this option. + * @return LoggerLevel + */ + function &getThreshold() + { + return $this->threshold; + } + + /** + * Check whether the message level is below the appender's threshold. + * + * + * If there is no threshold set, then the return value is always true. + * @param LoggerLevel $priority + * @return boolean true if priority is greater or equal than threshold + */ + function isAsSevereAsThreshold($priority) + { + if ($this->threshold === null) + return true; + + return $priority->isGreaterOrEqual($this->getThreshold()); + } + + /** + * @see LoggerAppender::doAppend() + * @param LoggerLoggingEvent $event + */ + function doAppend($event) + { + LoggerLog::debug("LoggerAppenderSkeleton::doAppend()"); + + if ($this->closed) { + LoggerLog::debug("LoggerAppenderSkeleton::doAppend() Attempted to append to closed appender named [{$this->name}]."); + return; + } + if(!$this->isAsSevereAsThreshold($event->getLevel())) { + LoggerLog::debug("LoggerAppenderSkeleton::doAppend() event level is less severe than threshold."); + return; + } + + $f = $this->getFirstFilter(); + + while($f !== null) { + switch ($f->decide($event)) { + case LOG4PHP_LOGGER_FILTER_DENY: return; + case LOG4PHP_LOGGER_FILTER_ACCEPT: return $this->append($event); + case LOG4PHP_LOGGER_FILTER_NEUTRAL: $f = $f->next; + } + } + $this->append($event); + } + + + /** + * @see LoggerAppender::requiresLayout() + * @return boolean + */ + function requiresLayout() + { + return $this->requiresLayout; + } + + /** + * @see LoggerAppender::setErrorHandler() + * @param object + */ + function setErrorHandler($errorHandler) + { + if($errorHandler == null) { + // We do not throw exception here since the cause is probably a + // bad config file. + LoggerLog::warn("You have tried to set a null error-handler."); + } else { + $this->errorHandler = $errorHandler; + } + } + + /** + * @see LoggerAppender::setLayout() + * @param LoggerLayout $layout + */ + function setLayout($layout) + { + if ($this->requiresLayout()) + $this->layout = $layout; + } + + /** + * @see LoggerAppender::setName() + * @param string $name + */ + function setName($name) + { + $this->name = $name; + } + + /** + * Set the threshold level of this appender. + * + * @param mixed $threshold can be a {@link LoggerLevel} object or a string. + * @see LoggerOptionConverter::toLevel() + */ + function setThreshold($threshold) + { + if (is_string($threshold)) { + $this->threshold = LoggerOptionConverter::toLevel($threshold, null); + }elseif (is_a($threshold, 'loggerlevel')) { + $this->threshold = $threshold; + } + } + + /** + * Perform actions before object serialization. + * + * Call {@link finalize()} to properly close the appender. + */ + function __sleep() + { + $this->finalize(); + return array_keys(get_object_vars($this)); + } + + /** + * Perform actions after object deserialization. + * + * Call {@link activateOptions()} to properly setup the appender. + */ + function __wakeup() + { + $this->activateOptions(); + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerBasicConfigurator.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerBasicConfigurator.php (original) +++ vtigercrm/trunk/log4php/LoggerBasicConfigurator.php Wed May 3 22:07:13 2006 @@ -1,80 +1,80 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); -require_once(LOG4PHP_DIR . '/LoggerLayout.php'); -require_once(LOG4PHP_DIR . '/LoggerAppender.php'); -require_once(LOG4PHP_DIR . '/LoggerManager.php'); - -/** - * Use this class to quickly configure the package. - * - *

    For file based configuration see {@link LoggerPropertyConfigurator}. - *

    For XML based configuration see {@link LoggerDOMConfigurator}. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @since 0.5 - */ -class LoggerBasicConfigurator extends LoggerConfigurator { - - function LoggerBasicConfigurator() - { - return; - } - - /** - * Add a {@link LoggerAppenderConsole} that uses - * the {@link LoggerLayoutTTCC} to the root category. - * - * @param string $url not used here - * @static - */ - function configure($url = null) - { - $root =& LoggerManager::getRootLogger(); - - $appender =& LoggerAppender::singleton('A1', 'LoggerAppenderConsole'); - $layout = LoggerLayout::factory('LoggerLayoutTTCC'); - $appender->setLayout($layout); - - $root->addAppender($appender); - } - - /** - * Reset the default hierarchy to its defaut. - * It is equivalent to - * - * LoggerManager::resetConfiguration(); - * - * - * @see LoggerHierarchy::resetConfiguration() - * @static - */ - function resetConfiguration() - { - LoggerManager::resetConfiguration(); - } -} -?> +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); +require_once(LOG4PHP_DIR . '/LoggerLayout.php'); +require_once(LOG4PHP_DIR . '/LoggerAppender.php'); +require_once(LOG4PHP_DIR . '/LoggerManager.php'); + +/** + * Use this class to quickly configure the package. + * + *

    For file based configuration see {@link LoggerPropertyConfigurator}. + *

    For XML based configuration see {@link LoggerDOMConfigurator}. + * + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @since 0.5 + */ +class LoggerBasicConfigurator extends LoggerConfigurator { + + function LoggerBasicConfigurator() + { + return; + } + + /** + * Add a {@link LoggerAppenderConsole} that uses + * the {@link LoggerLayoutTTCC} to the root category. + * + * @param string $url not used here + * @static + */ + function configure($url = null) + { + $root =& LoggerManager::getRootLogger(); + + $appender =& LoggerAppender::singleton('A1', 'LoggerAppenderConsole'); + $layout = LoggerLayout::factory('LoggerLayoutTTCC'); + $appender->setLayout($layout); + + $root->addAppender($appender)); + } + + /** + * Reset the default hierarchy to its defaut. + * It is equivalent to + * + * LoggerManager::resetConfiguration(); + * + * + * @see LoggerHierarchy::resetConfiguration() + * @static + */ + function resetConfiguration() + { + LoggerManager::resetConfiguration(); + } +} +?> Modified: vtigercrm/trunk/log4php/LoggerCategory.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerCategory.php (original) +++ vtigercrm/trunk/log4php/LoggerCategory.php Wed May 3 22:07:13 2006 @@ -1,572 +1,572 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLevel.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php'); - -/** - * This class has been deprecated and replaced by the Logger subclass. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @see Logger - */ -class LoggerCategory { - - /** - * Additivity is set to true by default, that is children inherit the - * appenders of their ancestors by default. - * @var boolean - */ - var $additive = true; - - /** - * @var string fully qualified class name - */ - var $fqcn = 'LoggerCategory'; - - /** - * @var LoggerLevel The assigned level of this category. - */ - var $level = null; - - /** - * @var string name of this category. - */ - var $name = ''; - - /** - * @var Logger The parent of this category. - */ - var $parent = null; - - /** - * @var LoggerHierarchy the object repository - */ - var $repository = null; - - /** - * @var array collection of appenders - * @see LoggerAppender - */ - var $aai = array(); - -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ - - /** - * Constructor. - * - * @param string $name Category name - */ - function LoggerCategory($name) - { - $this->name = $name; - } - - /** - * Add a new Appender to the list of appenders of this Category instance. - * - * @param LoggerAppender $newAppender - */ - function addAppender(&$newAppender) - { - $appenderName = $newAppender->getName(); - $this->aai[$appenderName] =& $newAppender; - } - - /** - * If assertion parameter is false, then logs msg as an error statement. - * - * @param bool $assertion - * @param string $msg message to log - */ - function assertLog($assertion = true, $msg = '') - { - if ($assertion == false) { - $this->error($msg); - } - } - - /** - * Call the appenders in the hierarchy starting at this. - * - * @param LoggerLoggingEvent $event - */ - function callAppenders($event) - { - if (sizeof($this->aai) > 0) { - foreach (array_keys($this->aai) as $appenderName) { - $this->aai[$appenderName]->doAppend($event); - } - } - if ($this->parent != null and $this->getAdditivity()) { - $this->parent->callAppenders($event); - } - } - - /** - * Log a message object with the DEBUG level including the caller. - * - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function debug($message, $caller = null) - { - $debugLevel = LoggerLevel::getLevelDebug(); - if ($this->repository->isDisabled($debugLevel)) { - return; - } - if ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $debugLevel, $message); - } - } - - /** - * Log a message object with the ERROR level including the caller. - * - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function error($message, $caller = null) - { - $errorLevel = LoggerLevel::getLevelError(); - if ($this->repository->isDisabled($errorLevel)) { - return; - } - if ($errorLevel->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $errorLevel, $message); - } - } - - /** - * Deprecated. Please use LoggerManager::exists() instead. - * - * @param string $name - * @see LoggerManager::exists() - * @deprecated - */ - function exists($name) - { - return LoggerManager::exists($name); - } - - /** - * Log a message object with the FATAL level including the caller. - * - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function fatal($message, $caller = null) - { - $fatalLevel = LoggerLevel::getLevelFatal(); - if ($this->repository->isDisabled($fatalLevel)) { - return; - } - if ($fatalLevel->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $fatalLevel, $message); - } - } - - /** - * This method creates a new logging event and logs the event without further checks. - * - * It should not be called directly. Use {@link info()}, {@link debug()}, {@link warn()}, - * {@link error()} and {@link fatal()} wrappers. - * - * @param string $fqcn Fully Qualified Class Name of the Logger - * @param mixed $caller caller object or caller string id - * @param LoggerLevel $level log level - * @param mixed $message message - * @see LoggerLoggingEvent - */ - function forcedLog($fqcn, $caller, $level, $message) - { - // $fqcn = is_object($caller) ? get_class($caller) : (string)$caller; - $this->callAppenders(new LoggerLoggingEvent($fqcn, $this, $level, $message)); - } - - /** - * Get the additivity flag for this Category instance. - * @return boolean - */ - function getAdditivity() - { - return $this->additive; - } - - /** - * Get the appenders contained in this category as an array. - * @return array collection of appenders - */ - function &getAllAppenders() - { - $appenders = array(); - $appenderNames = array_keys($this->aai); - $enumAppenders = sizeof($appenderNames); - for ($i = 0; $i < $enumAppenders; $i++) { - $appenderName = $appenderNames[$i]; - $appenders[] =& $this->aai[$appenderName]; - } - return $appenders; - } - - /** - * Look for the appender named as name. - * @return LoggerAppender - */ - function &getAppender($name) - { - return $this->aai[$name]; - } - - /** - * Please use the {@link getEffectiveLevel()} method instead. - * @deprecated - */ - function getChainedPriority() - { - return $this->getEffectiveLevel(); - } - - /** - * Please use {@link LoggerManager::getCurrentLoggers()} instead. - * @deprecated - */ - function getCurrentCategories() - { - return LoggerManager::getCurrentLoggers(); - } - - /** - * Please use {@link LoggerManager::getLoggerRepository()} instead. - * @deprecated - */ - function &getDefaultHierarchy() - { - return LoggerManager::getLoggerRepository(); - } - - /** - * @deprecated Use {@link getLoggerRepository()} - * @return LoggerHierarchy - */ - function &getHierarchy() - { - return $this->getLoggerRepository(); - } - - /** - * Starting from this category, search the category hierarchy for a non-null level and return it. - * @see LoggerLevel - * @return LoggerLevel or null - */ - function getEffectiveLevel() - { - for($c = $this; $c != null; $c = $c->parent) { - if($c->level !== null) - return $c->level; - } - return null; - } - - /** - * Retrieve a category with named as the name parameter. - * @return Logger - */ - function &getInstance($name) - { - return LoggerManager::getLogger($name); - } - - /** - * Returns the assigned Level, if any, for this Category. - * @return LoggerLevel or null - */ - function getLevel() - { - return $this->level; - } - - /** - * Return the the repository where this Category is attached. - * @return LoggerHierarchy - */ - function &getLoggerRepository() - { - return $this->repository; - } - - /** - * Return the category name. - * @return string - */ - function getName() - { - return $this->name; - } - - /** - * Returns the parent of this category. - * @return Logger - */ - function &getParent() - { - return $this->parent; - } - - /** - * Please use getLevel() instead. - * @deprecated - */ - function getPriority() - { - return $this->getLevel(); - } - - /** - * Return the inherited ResourceBundle for this category. - */ - function getResourceBundle() - { - return; - } - - /** - * Returns the string resource coresponding to key in this category's inherited resource bundle. - */ - function getResourceBundleString($key) - { - return; - } - - /** - * Return the root of the default category hierrachy. - * @return LoggerRoot - */ - function &getRoot() - { - return LoggerManager::getRootLogger(); - } - - /** - * Log a message object with the INFO Level. - * - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function info($message, $caller = null) - { - $infoLevel = LoggerLevel::getLevelInfo(); - if ($this->repository->isDisabled($infoLevel)) { - return; - } - if ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $infoLevel, $message); - } - } - - /** - * Is the appender passed as parameter attached to this category? - * - * @param LoggerAppender $appender - */ - function isAttached($appender) - { - return in_array($appender->getName(), array_keys($this->aai)); - } - - /** - * Check whether this category is enabled for the DEBUG Level. - * @return boolean - */ - function isDebugEnabled() - { - $debugLevel = LoggerLevel::getLevelDebug(); - if ($this->repository->isDisabled($debugLevel)) { - return false; - } - return ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel())); - } - - /** - * Check whether this category is enabled for a given Level passed as parameter. - * - * @param LoggerLevel level - * @return boolean - */ - function isEnabledFor($level) - { - if ($this->repository->isDisabled($level)) { - return false; - } - return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel())); - } - - /** - * Check whether this category is enabled for the info Level. - * @return boolean - * @see LoggerLevel - */ - function isInfoEnabled() - { - $infoLevel = LoggerLevel::getLevelInfo(); - if ($this->repository->isDisabled($infoLevel)) { - return false; - } - return ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel())); - } - - /** - * Log a localized and parameterized message. - */ - function l7dlog($priority, $key, $params, $t) - { - return; - } - - /** - * This generic form is intended to be used by wrappers. - * - * @param LoggerLevel $priority a valid level - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function log($priority, $message, $caller = null) - { - if ($this->repository->isDisabled($priority)) { - return; - } - if ($priority->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $priority, $message); - } - } - - /** - * Remove all previously added appenders from this Category instance. - */ - function removeAllAppenders() - { - $appenderNames = array_keys($this->aai); - $enumAppenders = sizeof($appenderNames); - for ($i = 0; $i < $enumAppenders; $i++) { - $this->removeAppender($appenderNames[$i]); - } - } - - /** - * Remove the appender passed as parameter form the list of appenders. - * - * @param mixed $appender can be an appender name or a {@link LoggerAppender} object - */ - function removeAppender($appender) - { - if (is_a($appender, 'loggerappender')) { - $appender->close(); - unset($this->aai[$appender->getName()]); - } elseif (is_string($appender) and isset($this->aai[$appender])) { - $this->aai[$appender]->close(); - unset($this->aai[$appender]); - } - } - - /** - * Set the additivity flag for this Category instance. - * - * @param boolean $additive - */ - function setAdditivity($additive) - { - $this->additive = (bool)$additive; - } - - /** - * @deprecated Please use {@link setLevel()} instead. - * @see setLevel() - */ - function setPriority($priority) - { - $this->setLevel($priority); - } - - /** - * Only the Hiearchy class can set the hiearchy of a - * category. - * - * @param LoggerHierarchy &$repository - */ - function setHierarchy(&$repository) - { - $this->repository =& $repository; - } - - /** - * Set the level of this Category. - * - * @param LoggerLevel $level a level string or a level costant - */ - function setLevel($level) - { - $this->level = $level; - } - - /** - * Set the resource bundle to be used with localized logging methods - */ - function setResourceBundle($bundle) - { - return; - } - - /** - * @deprecated use {@link LoggerManager::shutdown()} instead. - * @see LoggerManager::shutdown() - */ - function shutdown() - { - LoggerManager::shutdown(); - } - - /** - * Log a message with the WARN level. - * - * @param mixed $message message - * @param mixed $caller caller object or caller string id - */ - function warn($message, $caller = null) - { - $warnLevel = LoggerLevel::getLevelWarn(); - if ($this->repository->isDisabled($warnLevel)) { - return; - } - if ($warnLevel->isGreaterOrEqual($this->getEffectiveLevel())) { - $this->forcedLog($this->fqcn, $caller, $warnLevel, $message); - } - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLevel.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php'); + +/** + * This class has been deprecated and replaced by the Logger subclass. + * + * @author VxR + * @version $Revision: 1.17 $ + * @package log4php + * @see Logger + */ +class LoggerCategory { + + /** + * Additivity is set to true by default, that is children inherit the + * appenders of their ancestors by default. + * @var boolean + */ + var $additive = true; + + /** + * @var string fully qualified class name + */ + var $fqcn = 'LoggerCategory'; + + /** + * @var LoggerLevel The assigned level of this category. + */ + var $level = null; + + /** + * @var string name of this category. + */ + var $name = ''; + + /** + * @var Logger The parent of this category. + */ + var $parent = null; + + /** + * @var LoggerHierarchy the object repository + */ + var $repository = null; + + /** + * @var array collection of appenders + * @see LoggerAppender + */ + var $aai = array(); + +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ + + /** + * Constructor. + * + * @param string $name Category name + */ + function LoggerCategory($name) + { + $this->name = $name; + } + + /** + * Add a new Appender to the list of appenders of this Category instance. + * + * @param LoggerAppender $newAppender + */ + function addAppender(&$newAppender) + { + $appenderName = $newAppender->getName(); + $this->aai[$appenderName] =& $newAppender; + } + + /** + * If assertion parameter is false, then logs msg as an error statement. + * + * @param bool $assertion + * @param string $msg message to log + */ + function assertLog($assertion = true, $msg = '') + { + if ($assertion == false) { + $this->error($msg); + } + } + + /** + * Call the appenders in the hierarchy starting at this. + * + * @param LoggerLoggingEvent $event + */ + function callAppenders($event) + { + if (sizeof($this->aai) > 0) { + foreach (array_keys($this->aai) as $appenderName) { + $this->aai[$appenderName]->doAppend($event); + } + } + if ($this->parent != null and $this->getAdditivity()) { + $this->parent->callAppenders($event); + } + } + + /** + * Log a message object with the DEBUG level including the caller. + * + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function debug($message, $caller = null) + { + $debugLevel = LoggerLevel::getLevelDebug(); + if ($this->repository->isDisabled($debugLevel)) { + return; + } + if ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $debugLevel, $message); + } + } + + /** + * Log a message object with the ERROR level including the caller. + * + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function error($message, $caller = null) + { + $errorLevel = LoggerLevel::getLevelError(); + if ($this->repository->isDisabled($errorLevel)) { + return; + } + if ($errorLevel->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $errorLevel, $message); + } + } + + /** + * Deprecated. Please use LoggerManager::exists() instead. + * + * @param string $name + * @see LoggerManager::exists() + * @deprecated + */ + function exists($name) + { + return LoggerManager::exists($name); + } + + /** + * Log a message object with the FATAL level including the caller. + * + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function fatal($message, $caller = null) + { + $fatalLevel = LoggerLevel::getLevelFatal(); + if ($this->repository->isDisabled($fatalLevel)) { + return; + } + if ($fatalLevel->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $fatalLevel, $message); + } + } + + /** + * This method creates a new logging event and logs the event without further checks. + * + * It should not be called directly. Use {@link info()}, {@link debug()}, {@link warn()}, + * {@link error()} and {@link fatal()} wrappers. + * + * @param string $fqcn Fully Qualified Class Name of the Logger + * @param mixed $caller caller object or caller string id + * @param LoggerLevel $level log level + * @param mixed $message message + * @see LoggerLoggingEvent + */ + function forcedLog($fqcn, $caller, $level, $message) + { + // $fqcn = is_object($caller) ? get_class($caller) : (string)$caller; + $this->callAppenders(new LoggerLoggingEvent($fqcn, $this, $level, $message)); + } + + /** + * Get the additivity flag for this Category instance. + * @return boolean + */ + function getAdditivity() + { + return $this->additive; + } + + /** + * Get the appenders contained in this category as an array. + * @return array collection of appenders + */ + function &getAllAppenders() + { + $appenders = array(); + $appenderNames = array_keys($this->aai); + $enumAppenders = sizeof($appenderNames); + for ($i = 0; $i < $enumAppenders; $i++) { + $appenderName = $appenderNames[$i]; + $appenders[] =& $this->aai[$appenderName]; + } + return $appenders; + } + + /** + * Look for the appender named as name. + * @return LoggerAppender + */ + function &getAppender($name) + { + return $this->aai[$name]; + } + + /** + * Please use the {@link getEffectiveLevel()} method instead. + * @deprecated + */ + function getChainedPriority() + { + return $this->getEffectiveLevel(); + } + + /** + * Please use {@link LoggerManager::getCurrentLoggers()} instead. + * @deprecated + */ + function getCurrentCategories() + { + return LoggerManager::getCurrentLoggers(); + } + + /** + * Please use {@link LoggerManager::getLoggerRepository()} instead. + * @deprecated + */ + function &getDefaultHierarchy() + { + return LoggerManager::getLoggerRepository(); + } + + /** + * @deprecated Use {@link getLoggerRepository()} + * @return LoggerHierarchy + */ + function &getHierarchy() + { + return $this->getLoggerRepository(); + } + + /** + * Starting from this category, search the category hierarchy for a non-null level and return it. + * @see LoggerLevel + * @return LoggerLevel or null + */ + function getEffectiveLevel() + { + for($c = $this; $c != null; $c = $c->parent) { + if($c->level !== null) + return $c->level; + } + return null; + } + + /** + * Retrieve a category with named as the name parameter. + * @return Logger + */ + function &getInstance($name) + { + return LoggerManager::getLogger($name); + } + + /** + * Returns the assigned Level, if any, for this Category. + * @return LoggerLevel or null + */ + function getLevel() + { + return $this->level; + } + + /** + * Return the the repository where this Category is attached. + * @return LoggerHierarchy + */ + function &getLoggerRepository() + { + return $this->repository; + } + + /** + * Return the category name. + * @return string + */ + function getName() + { + return $this->name; + } + + /** + * Returns the parent of this category. + * @return Logger + */ + function &getParent() + { + return $this->parent; + } + + /** + * Please use getLevel() instead. + * @deprecated + */ + function getPriority() + { + return $this->getLevel(); + } + + /** + * Return the inherited ResourceBundle for this category. + */ + function getResourceBundle() + { + return; + } + + /** + * Returns the string resource coresponding to key in this category's inherited resource bundle. + */ + function getResourceBundleString($key) + { + return; + } + + /** + * Return the root of the default category hierrachy. + * @return LoggerRoot + */ + function &getRoot() + { + return LoggerManager::getRootLogger(); + } + + /** + * Log a message object with the INFO Level. + * + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function info($message, $caller = null) + { + $infoLevel = LoggerLevel::getLevelInfo(); + if ($this->repository->isDisabled($infoLevel)) { + return; + } + if ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $infoLevel, $message); + } + } + + /** + * Is the appender passed as parameter attached to this category? + * + * @param LoggerAppender $appender + */ + function isAttached($appender) + { + return in_array($appender->getName(), array_keys($this->aai)); + } + + /** + * Check whether this category is enabled for the DEBUG Level. + * @return boolean + */ + function isDebugEnabled() + { + $debugLevel = LoggerLevel::getLevelDebug(); + if ($this->repository->isDisabled($debugLevel)) { + return false; + } + return ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel())); + } + + /** + * Check whether this category is enabled for a given Level passed as parameter. + * + * @param LoggerLevel level + * @return boolean + */ + function isEnabledFor($level) + { + if ($this->repository->isDisabled($level)) { + return false; + } + return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel())); + } + + /** + * Check whether this category is enabled for the info Level. + * @return boolean + * @see LoggerLevel + */ + function isInfoEnabled() + { + $infoLevel = LoggerLevel::getLevelInfo(); + if ($this->repository->isDisabled($infoLevel)) { + return false; + } + return ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel())); + } + + /** + * Log a localized and parameterized message. + */ + function l7dlog($priority, $key, $params, $t) + { + return; + } + + /** + * This generic form is intended to be used by wrappers. + * + * @param LoggerLevel $priority a valid level + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function log($priority, $message, $caller = null) + { + if ($this->repository->isDisabled($priority)) { + return; + } + if ($priority->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $priority, $message); + } + } + + /** + * Remove all previously added appenders from this Category instance. + */ + function removeAllAppenders() + { + $appenderNames = array_keys($this->aai); + $enumAppenders = sizeof($appenderNames); + for ($i = 0; $i < $enumAppenders; $i++) { + $this->removeAppender($appenderNames[$i]); + } + } + + /** + * Remove the appender passed as parameter form the list of appenders. + * + * @param mixed $appender can be an appender name or a {@link LoggerAppender} object + */ + function removeAppender($appender) + { + if (is_a($appender, 'loggerappender')) { + $appender->close(); + unset($this->aai[$appender->getName()]); + } elseif (is_string($appender) and isset($this->aai[$appender])) { + $this->aai[$appender]->close(); + unset($this->aai[$appender]); + } + } + + /** + * Set the additivity flag for this Category instance. + * + * @param boolean $additive + */ + function setAdditivity($additive) + { + $this->additive = (bool)$additive; + } + + /** + * @deprecated Please use {@link setLevel()} instead. + * @see setLevel() + */ + function setPriority($priority) + { + $this->setLevel($priority); + } + + /** + * Only the Hiearchy class can set the hiearchy of a + * category. + * + * @param LoggerHierarchy &$repository + */ + function setHierarchy(&$repository) + { + $this->repository =& $repository; + } + + /** + * Set the level of this Category. + * + * @param LoggerLevel $level a level string or a level costant + */ + function setLevel($level) + { + $this->level = $level; + } + + /** + * Set the resource bundle to be used with localized logging methods + */ + function setResourceBundle($bundle) + { + return; + } + + /** + * @deprecated use {@link LoggerManager::shutdown()} instead. + * @see LoggerManager::shutdown() + */ + function shutdown() + { + LoggerManager::shutdown(); + } + + /** + * Log a message with the WARN level. + * + * @param mixed $message message + * @param mixed $caller caller object or caller string id + */ + function warn($message, $caller = null) + { + $warnLevel = LoggerLevel::getLevelWarn(); + if ($this->repository->isDisabled($warnLevel)) { + return; + } + if ($warnLevel->isGreaterOrEqual($this->getEffectiveLevel())) { + $this->forcedLog($this->fqcn, $caller, $warnLevel, $message); + } + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerDefaultCategoryFactory.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerDefaultCategoryFactory.php (original) +++ vtigercrm/trunk/log4php/LoggerDefaultCategoryFactory.php Wed May 3 22:07:13 2006 @@ -1,52 +1,52 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/spi/LoggerFactory.php'); -require_once(LOG4PHP_DIR . '/Logger.php'); - -/** - * Creates instances of {@link Logger} with a given name. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @since 0.5 - */ -class LoggerDefaultCategoryFactory extends LoggerFactory { - - function LoggerDefaultCategoryFactory() - { - return; - } - - /** - * @param string $name - * @return Logger - */ - function makeNewLoggerInstance($name) - { - return new Logger($name); - } -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/spi/LoggerFactory.php'); +require_once(LOG4PHP_DIR . '/Logger.php'); + +/** + * Creates instances of {@link Logger} with a given name. + * + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @since 0.5 + */ +class LoggerDefaultCategoryFactory extends LoggerFactory { + + function LoggerDefaultCategoryFactory() + { + return; + } + + /** + * @param string $name + * @return Logger + */ + function makeNewLoggerInstance($name) + { + return new Logger($name); + } +} + ?> Modified: vtigercrm/trunk/log4php/LoggerHierarchy.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerHierarchy.php (original) +++ vtigercrm/trunk/log4php/LoggerHierarchy.php Wed May 3 22:07:13 2006 @@ -1,388 +1,388 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); -require_once(LOG4PHP_DIR . '/LoggerLevel.php'); -require_once(LOG4PHP_DIR . '/LoggerRoot.php'); -require_once(LOG4PHP_DIR . '/or/LoggerRendererMap.php'); -require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php'); - -/** - * This class is specialized in retrieving loggers by name and also maintaining - * the logger hierarchy. - * - *

    The casual user does not have to deal with this class directly.

    - * - *

    The structure of the logger hierarchy is maintained by the - * getLogger method. The hierarchy is such that children link - * to their parent but parents do not have any pointers to their - * children. Moreover, loggers can be instantiated in any order, in - * particular descendant before ancestor.

    - * - *

    In case a descendant is created before a particular ancestor, - * then it creates a provision node for the ancestor and adds itself - * to the provision node. Other descendants of the same ancestor add - * themselves to the previously created provision node.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - */ -class LoggerHierarchy { - - /** - * @var object currently unused - */ - var $defaultFactory; - - /** - * @var boolean activate internal logging - * @see LoggerLog - */ - var $debug = false; - - /** - * @var array hierarchy tree. saves here all loggers - */ - var $ht = array(); - - /** - * @var LoggerRoot - */ - var $root = null; - - /** - * @var LoggerRendererMap - */ - var $rendererMap; - - /** - * @var LoggerLevel main level threshold - */ - var $threshold; - - /** - * @var boolean currently unused - */ - var $emittedNoAppenderWarning = false; - - /** - * @var boolean currently unused - */ - var $emittedNoResourceBundleWarning = false; - - -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ -/* --------------------------------------------------------------------------*/ - - function &singleton() - { - static $instance; - - if (!isset($instance)) - $instance = new LoggerHierarchy(new LoggerRoot()); - return $instance; - } - - /** - * Create a new logger hierarchy. - * @param object $root the root logger - */ - function LoggerHierarchy($root) - { - $this->root =& $root; - // Enable all level levels by default. - $this->setThreshold(LoggerLevel::getLevelAll()); - $this->root->setHierarchy($this); - $this->rendererMap = new LoggerRendererMap(); - $this->defaultFactory = new LoggerDefaultCategoryFactory(); - } - - /** - * Add a HierarchyEventListener event to the repository. - * Not Yet Impl. - */ - function addHierarchyEventListener($listener) - { - return; - } - - /** - * Add an object renderer for a specific class. - * Not Yet Impl. - */ - function addRenderer($classToRender, $or) - { - $this->rendererMap->put($classToRender, $or); - } - - /** - * This call will clear all logger definitions from the internal hashtable. - */ - function clear() - { - $this->ht = array(); - } - - function emitNoAppenderWarning($cat) - { - return; - } - - /** - * Check if the named logger exists in the hierarchy. - * @param string $name - * @return boolean - */ - function exists($name) - { - return in_array($name, array_keys($this->ht)); - } - - function fireAddAppenderEvent($logger, $appender) - { - return; - } - - /** - * @deprecated Please use {@link getCurrentLoggers()} instead. - */ - function &getCurrentCategories() - { - return $this->getCurrentLoggers(); - } - - /** - * Returns all the currently defined categories in this hierarchy as an array. - * @return array - */ - function &getCurrentLoggers() - { - $loggers = array(); - $loggerNames = array_keys($this->ht); - $enumLoggers = sizeof($loggerNames); - for ($i = 0; $i < $enumLoggers; $i++) { - $loggerName = $loggerNames[$i]; - $loggers[] =& $this->ht[$loggerName]; - } - return $loggers; - } - - /** - * Return a new logger instance named as the first parameter using the default factory. - * - * @param string $name logger name - * @param LoggerFactory $factory a {@link LoggerFactory} instance or null - * @return Logger - */ - function &getLogger($name, $factory = null) - { - if ($factory === null) { - return $this->getLoggerByFactory($name, $this->defaultFactory); - } else { - return $this->getLoggerByFactory($name, $factory); - } - } - - /** - * Return a new logger instance named as the first parameter using the default factory. - * - * @param string $name logger name - * @return Logger - * @todo merge with {@link getLogger()} - */ - function &getLoggerByFactory($name, $factory) - { - if (!isset($this->ht[$name])) { - LoggerLog::debug("LoggerHierarchy::getLoggerByFactory():name=[$name]:factory=[".get_class($factory)."] creating a new logger..."); - $this->ht[$name] = $factory->makeNewLoggerInstance($name); - $this->ht[$name]->setHierarchy($this); - $nodes = explode('.', $name); - $firstNode = array_shift($nodes); - if ( $firstNode != $name and isset($this->ht[$firstNode])) { - LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$firstNode]"); - $this->ht[$name]->parent =& $this->ht[$firstNode]; - } else { - LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [root]"); - $this->ht[$name]->parent =& $this->root; - } - if (sizeof($nodes) > 0) { - // find parent node - foreach ($nodes as $node) { - $parentNode = "$firstNode.$node"; - if (isset($this->ht[$parentNode]) and $parentNode != $name) { - LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$parentNode]"); - $this->ht[$name]->parent =& $this->ht[$parentNode]; - } - $firstNode .= ".$node"; - } - } - // update children - /* - $children = array(); - foreach (array_keys($this->ht) as $nodeName) { - if ($nodeName != $name and substr($nodeName, 0, strlen($name)) == $name) { - $children[] = $nodeName; - } - } - */ - } - return $this->ht[$name]; - } - - /** - * @return LoggerRendererMap Get the renderer map for this hierarchy. - */ - function &getRendererMap() - { - return $this->rendererMap; - } - - /** - * @return LoggerRoot Get the root of this hierarchy. - */ - function &getRootLogger() - { - if (!isset($this->root) or $this->root == null) - $this->root = new LoggerRoot(); - return $this->root; - } - - /** - * @return LoggerLevel Returns the threshold Level. - */ - function getThreshold() - { - return $this->threshold; - } - - /** - * This method will return true if this repository is disabled - * for level object passed as parameter and false otherwise. - * @return boolean - */ - function isDisabled($level) - { - return ($this->threshold->level > $level->level); - } - - /** - * @deprecated Deprecated with no replacement. - */ - function overrideAsNeeded($override) - { - return; - } - - /** - * Reset all values contained in this hierarchy instance to their - * default. - * - * This removes all appenders from all categories, sets - * the level of all non-root categories to null, - * sets their additivity flag to true and sets the level - * of the root logger to {@link LOGGER_LEVEL_DEBUG}. Moreover, - * message disabling is set its default "off" value. - * - *

    Existing categories are not removed. They are just reset. - * - *

    This method should be used sparingly and with care as it will - * block all logging until it is completed.

    - */ - function resetConfiguration() - { - $root =& $this->getRootLogger(); - - $root->setLevel(LoggerLevel::getLevelDebug()); - $this->setThreshold(LoggerLevel::getLevelAll()); - $this->shutDown(); - $loggers =& $this->getCurrentLoggers(); - $enumLoggers = sizeof($loggers); - for ($i = 0; $i < $enumLoggers; $i++) { - $loggers[$i]->setLevel(null); - $loggers[$i]->setAdditivity(true); - $loggers[$i]->setResourceBundle(null); - } - $this->rendererMap->clear(); - } - - /** - * @deprecated Deprecated with no replacement. - */ - function setDisableOverride($override) - { - return; - } - - /** - * Used by subclasses to add a renderer to the hierarchy passed as parameter. - * @param string $renderedClass a LoggerRenderer class name - * @param LoggerRenderer $renderer - * - */ - function setRenderer($renderedClass, $renderer) - { - $this->rendererMap->put($renderedClass, $renderer); - } - - /** - * set a new threshold level - * - * @param LoggerLevel $l - */ - function setThreshold($l) - { - if ($l !== null) - $this->threshold = $l; - } - - /** - * Shutting down a hierarchy will safely close and remove - * all appenders in all categories including the root logger. - * - *

    Some appenders such as {@link LoggerSocketAppender} - * need to be closed before the - * application exists. Otherwise, pending logging events might be - * lost. - * - *

    The shutdown method is careful to close nested - * appenders before closing regular appenders. This is allows - * configurations where a regular appender is attached to a logger - * and again to a nested appender. - */ - function shutdown() - { - $this->root->removeAllAppenders(); - $cats =& $this->getCurrentLoggers(); - $enumCats = sizeof($cats); - if ($enumCats > 0) { - for ($i = 0; $i < $enumCats; $i++) { - $cats[$i]->removeAllAppenders(); - } - } - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); +require_once(LOG4PHP_DIR . '/LoggerLevel.php'); +require_once(LOG4PHP_DIR . '/LoggerRoot.php'); +require_once(LOG4PHP_DIR . '/or/LoggerRendererMap.php'); +require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php'); + +/** + * This class is specialized in retrieving loggers by name and also maintaining + * the logger hierarchy. + * + *

    The casual user does not have to deal with this class directly.

    + * + *

    The structure of the logger hierarchy is maintained by the + * getLogger method. The hierarchy is such that children link + * to their parent but parents do not have any pointers to their + * children. Moreover, loggers can be instantiated in any order, in + * particular descendant before ancestor.

    + * + *

    In case a descendant is created before a particular ancestor, + * then it creates a provision node for the ancestor and adds itself + * to the provision node. Other descendants of the same ancestor add + * themselves to the previously created provision node.

    + * + * @author VxR + * @version $Revision: 1.20 $ + * @package log4php + */ +class LoggerHierarchy { + + /** + * @var object currently unused + */ + var $defaultFactory; + + /** + * @var boolean activate internal logging + * @see LoggerLog + */ + var $debug = false; + + /** + * @var array hierarchy tree. saves here all loggers + */ + var $ht = array(); + + /** + * @var LoggerRoot + */ + var $root = null; + + /** + * @var LoggerRendererMap + */ + var $rendererMap; + + /** + * @var LoggerLevel main level threshold + */ + var $threshold; + + /** + * @var boolean currently unused + */ + var $emittedNoAppenderWarning = false; + + /** + * @var boolean currently unused + */ + var $emittedNoResourceBundleWarning = false; + + +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------*/ + + function &singleton() + { + static $instance; + + if (!isset($instance)) + $instance = new LoggerHierarchy(new LoggerRoot()); + return $instance; + } + + /** + * Create a new logger hierarchy. + * @param object $root the root logger + */ + function LoggerHierarchy($root) + { + $this->root =& $root; + // Enable all level levels by default. + $this->setThreshold(LoggerLevel::getLevelAll()); + $this->root->setHierarchy($this); + $this->rendererMap = new LoggerRendererMap(); + $this->defaultFactory = new LoggerDefaultCategoryFactory(); + } + + /** + * Add a HierarchyEventListener event to the repository. + * Not Yet Impl. + */ + function addHierarchyEventListener($listener) + { + return; + } + + /** + * Add an object renderer for a specific class. + * Not Yet Impl. + */ + function addRenderer($classToRender, $or) + { + $this->rendererMap->put($classToRender, $or); + } + + /** + * This call will clear all logger definitions from the internal hashtable. + */ + function clear() + { + $this->ht = array(); + } + + function emitNoAppenderWarning($cat) + { + return; + } + + /** + * Check if the named logger exists in the hierarchy. + * @param string $name + * @return boolean + */ + function exists($name) + { + return in_array($name, array_keys($this->ht)); + } + + function fireAddAppenderEvent($logger, $appender) + { + return; + } + + /** + * @deprecated Please use {@link getCurrentLoggers()} instead. + */ + function &getCurrentCategories() + { + return $this->getCurrentLoggers(); + } + + /** + * Returns all the currently defined categories in this hierarchy as an array. + * @return array + */ + function &getCurrentLoggers() + { + $loggers = array(); + $loggerNames = array_keys($this->ht); + $enumLoggers = sizeof($loggerNames); + for ($i = 0; $i < $enumLoggers; $i++) { + $loggerName = $loggerNames[$i]; + $loggers[] =& $this->ht[$loggerName]; + } + return $loggers; + } + + /** + * Return a new logger instance named as the first parameter using the default factory. + * + * @param string $name logger name + * @param LoggerFactory $factory a {@link LoggerFactory} instance or null + * @return Logger + */ + function &getLogger($name, $factory = null) + { + if ($factory === null) { + return $this->getLoggerByFactory($name, $this->defaultFactory); + } else { + return $this->getLoggerByFactory($name, $factory); + } + } + + /** + * Return a new logger instance named as the first parameter using the default factory. + * + * @param string $name logger name + * @return Logger + * @todo merge with {@link getLogger()} + */ + function &getLoggerByFactory($name, $factory) + { + if (!isset($this->ht[$name])) { + LoggerLog::debug("LoggerHierarchy::getLoggerByFactory():name=[$name]:factory=[".get_class($factory)."] creating a new logger..."); + $this->ht[$name] = $factory->makeNewLoggerInstance($name); + $this->ht[$name]->setHierarchy($this); + $nodes = explode('.', $name); + $firstNode = array_shift($nodes); + if ( $firstNode != $name and isset($this->ht[$firstNode])) { + LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$firstNode]"); + $this->ht[$name]->parent =& $this->ht[$firstNode]; + } else { + LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [root]"); + $this->ht[$name]->parent =& $this->root; + } + if (sizeof($nodes) > 0) { + // find parent node + foreach ($nodes as $node) { + $parentNode = "$firstNode.$node"; + if (isset($this->ht[$parentNode]) and $parentNode != $name) { + LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$parentNode]"); + $this->ht[$name]->parent =& $this->ht[$parentNode]; + } + $firstNode .= ".$node"; + } + } + // update children + /* + $children = array(); + foreach (array_keys($this->ht) as $nodeName) { + if ($nodeName != $name and substr($nodeName, 0, strlen($name)) == $name) { + $children[] = $nodeName; + } + } + */ + } + return $this->ht[$name]; + } + + /** + * @return LoggerRendererMap Get the renderer map for this hierarchy. + */ + function &getRendererMap() + { + return $this->rendererMap; + } + + /** + * @return LoggerRoot Get the root of this hierarchy. + */ + function &getRootLogger() + { + if (!isset($this->root) or $this->root == null) + $this->root = new LoggerRoot(); + return $this->root; + } + + /** + * @return LoggerLevel Returns the threshold Level. + */ + function getThreshold() + { + return $this->threshold; + } + + /** + * This method will return true if this repository is disabled + * for level object passed as parameter and false otherwise. + * @return boolean + */ + function isDisabled($level) + { + return ($this->threshold->level > $level->level); + } + + /** + * @deprecated Deprecated with no replacement. + */ + function overrideAsNeeded($override) + { + return; + } + + /** + * Reset all values contained in this hierarchy instance to their + * default. + * + * This removes all appenders from all categories, sets + * the level of all non-root categories to null, + * sets their additivity flag to true and sets the level + * of the root logger to {@link LOGGER_LEVEL_DEBUG}. Moreover, + * message disabling is set its default "off" value. + * + *

    Existing categories are not removed. They are just reset. + * + *

    This method should be used sparingly and with care as it will + * block all logging until it is completed.

    + */ + function resetConfiguration() + { + $root =& $this->getRootLogger(); + + $root->setLevel(LoggerLevel::getLevelDebug()); + $this->setThreshold(LoggerLevel::getLevelAll()); + $this->shutDown(); + $loggers =& $this->getCurrentLoggers(); + $enumLoggers = sizeof($loggers); + for ($i = 0; $i < $enumLoggers; $i++) { + $loggers[$i]->setLevel(null); + $loggers[$i]->setAdditivity(true); + $loggers[$i]->setResourceBundle(null); + } + $this->rendererMap->clear(); + } + + /** + * @deprecated Deprecated with no replacement. + */ + function setDisableOverride($override) + { + return; + } + + /** + * Used by subclasses to add a renderer to the hierarchy passed as parameter. + * @param string $renderedClass a LoggerRenderer class name + * @param LoggerRenderer $renderer + * + */ + function setRenderer($renderedClass, $renderer) + { + $this->rendererMap->put($renderedClass, $renderer); + } + + /** + * set a new threshold level + * + * @param LoggerLevel $l + */ + function setThreshold($l) + { + if ($l !== null) + $this->threshold = $l; + } + + /** + * Shutting down a hierarchy will safely close and remove + * all appenders in all categories including the root logger. + * + *

    Some appenders such as {@link LoggerSocketAppender} + * need to be closed before the + * application exists. Otherwise, pending logging events might be + * lost. + * + *

    The shutdown method is careful to close nested + * appenders before closing regular appenders. This is allows + * configurations where a regular appender is attached to a logger + * and again to a nested appender. + */ + function shutdown() + { + $this->root->removeAllAppenders(); + $cats =& $this->getCurrentLoggers(); + $enumCats = sizeof($cats); + if ($enumCats > 0) { + for ($i = 0; $i < $enumCats; $i++) { + $cats[$i]->removeAllAppenders(); + } + } + } +} ?> Modified: vtigercrm/trunk/log4php/LoggerLayout.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerLayout.php (original) +++ vtigercrm/trunk/log4php/LoggerLayout.php Wed May 3 22:07:13 2006 @@ -1,98 +1,98 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - * Extend this abstract class to create your own log layout format. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @abstract - */ -class LoggerLayout { - - /** - * Creates LoggerLayout instances with the given class name. - * - * @param string $class - * @return LoggerLayout - */ - function factory($class) - { - if (!empty($class)) { - $class = basename($class); - if (!class_exists($class)) - @include_once(LOG4PHP_DIR . "/layouts/{$class}.php"); - if (class_exists($class)) - return new $class(); - } - return null; - } - - /** - * Override this method - */ - function activateOptions() - { - // override; - } - - /** - * Override this method to create your own layout format. - * - * @param LoggerLoggingEvent - * @return string - */ - function format($event) - { - return $event->getRenderedMessage(); - } - - /** - * Returns the content type output by this layout. - * @return string - */ - function getContentType() - { - return "text/plain"; - } - - /** - * Returns the footer for the layout format. - * @return string - */ - function getFooter() - { - return null; - } - - /** - * Returns the header for the layout format. - * @return string - */ - function getHeader() - { - return null; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + * Extend this abstract class to create your own log layout format. + * + * @author VxR + * @version $Revision: 1.10 $ + * @package log4php + * @abstract + */ +class LoggerLayout { + + /** + * Creates LoggerLayout instances with the given class name. + * + * @param string $class + * @return LoggerLayout + */ + function factory($class) + { + if (!empty($class)) { + $class = basename($class); + if (!class_exists($class)) + @include_once(LOG4PHP_DIR . "/layouts/{$class}.php"); + if (class_exists($class)) + return new $class(); + } + return null; + } + + /** + * Override this method + */ + function activateOptions() + { + // override; + } + + /** + * Override this method to create your own layout format. + * + * @param LoggerLoggingEvent + * @return string + */ + function format($event) + { + return $event->getRenderedMessage(); + } + + /** + * Returns the content type output by this layout. + * @return string + */ + function getContentType() + { + return "text/plain"; + } + + /** + * Returns the footer for the layout format. + * @return string + */ + function getFooter() + { + return null; + } + + /** + * Returns the header for the layout format. + * @return string + */ + function getHeader() + { + return null; + } +} ?> Modified: vtigercrm/trunk/log4php/LoggerLevel.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerLevel.php (original) +++ vtigercrm/trunk/log4php/LoggerLevel.php Wed May 3 22:07:13 2006 @@ -1,264 +1,264 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -define('LOG4PHP_LEVEL_OFF_INT', 2147483647); -define('LOG4PHP_LEVEL_FATAL_INT', 50000); -define('LOG4PHP_LEVEL_ERROR_INT', 40000); -define('LOG4PHP_LEVEL_WARN_INT', 30000); -define('LOG4PHP_LEVEL_INFO_INT', 20000); -define('LOG4PHP_LEVEL_DEBUG_INT', 10000); -define('LOG4PHP_LEVEL_ALL_INT', -2147483648); - -/** - * Defines the minimum set of levels recognized by the system, that is - * OFF, FATAL, ERROR, - * WARN, INFODEBUG and - * ALL. - * - *

    The LoggerLevel class may be subclassed to define a larger - * level set.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @since 0.5 - */ -class LoggerLevel { - - /** - * @var integer - */ - var $level; - - /** - * @var string - */ - var $levelStr; - - /** - * @var integer - */ - var $syslogEquivalent; - - /** - * Constructor - * - * @param integer $level - * @param string $levelStr - * @param integer $syslogEquivalent - */ - function LoggerLevel($level, $levelStr, $syslogEquivalent) - { - $this->level = $level; - $this->levelStr = $levelStr; - $this->syslogEquivalent = $syslogEquivalent; - } - - /** - * Two priorities are equal if their level fields are equal. - * - * @param object $o - * @return boolean - */ - function equals($o) - { - if (is_a($o, 'loggerlevel')) { - return ($this->level == $o->level); - } else { - return false; - } - } - - /** - * Returns an Off Level - * @static - * @return LoggerLevel - */ - function &getLevelOff() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_OFF_INT, 'OFF', 0); - return $level; - } - - /** - * Returns a Fatal Level - * @static - * @return LoggerLevel - */ - function &getLevelFatal() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0); - return $level; - } - - /** - * Returns an Error Level - * @static - * @return LoggerLevel - */ - function &getLevelError() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3); - return $level; - } - - /** - * Returns a Warn Level - * @static - * @return LoggerLevel - */ - function &getLevelWarn() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_WARN_INT, 'WARN', 4); - return $level; - } - - /** - * Returns an Info Level - * @static - * @return LoggerLevel - */ - function &getLevelInfo() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_INFO_INT, 'INFO', 6); - return $level; - } - - /** - * Returns a Debug Level - * @static - * @return LoggerLevel - */ - function &getLevelDebug() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7); - return $level; - } - - /** - * Returns an All Level - * @static - * @return LoggerLevel - */ - function &getLevelAll() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ALL_INT, 'ALL', 7); - return $level; - } - - /** - * Return the syslog equivalent of this priority as an integer. - * @final - * @return integer - */ - function getSyslogEquivalent() - { - return $this->syslogEquivalent; - } - - /** - * Returns true if this level has a higher or equal - * level than the level passed as argument, false - * otherwise. - * - *

    You should think twice before overriding the default - * implementation of isGreaterOrEqual method. - * - * @param LoggerLevel $r - * @return boolean - */ - function isGreaterOrEqual($r) - { - return $this->level >= $r->level; - } - - /** - * Returns the string representation of this priority. - * @return string - * @final - */ - function toString() - { - return $this->levelStr; - } - - /** - * Returns the integer representation of this level. - * @return integer - */ - function toInt() - { - return $this->level; - } - - /** - * Convert the string passed as argument to a level. If the - * conversion fails, then this method returns a DEBUG Level. - * - * @param mixed $arg - * @param LoggerLevel $default - * @static - */ - function &toLevel($arg, $defaultLevel = null) - { - if ($defaultLevel === null) { - return LoggerLevel::toLevel($arg, LoggerLevel::getLevelDebug()); - } else { - if (is_int($arg)) { - switch($arg) { - case LOG4PHP_LEVEL_ALL_INT: return LoggerLevel::getLevelAll(); - case LOG4PHP_LEVEL_DEBUG_INT: return LoggerLevel::getLevelDebug(); - case LOG4PHP_LEVEL_INFO_INT: return LoggerLevel::getLevelInfo(); - case LOG4PHP_LEVEL_WARN_INT: return LoggerLevel::getLevelWarn(); - case LOG4PHP_LEVEL_ERROR_INT: return LoggerLevel::getLevelError(); - case LOG4PHP_LEVEL_FATAL_INT: return LoggerLevel::getLevelFatal(); - case LOG4PHP_LEVEL_OFF_INT: return LoggerLevel::getLevelOff(); - default: return $defaultLevel; - } - } else { - switch(strtoupper($arg)) { - case 'ALL': return LoggerLevel::getLevelAll(); - case 'DEBUG': return LoggerLevel::getLevelDebug(); - case 'INFO': return LoggerLevel::getLevelInfo(); - case 'WARN': return LoggerLevel::getLevelWarn(); - case 'ERROR': return LoggerLevel::getLevelError(); - case 'FATAL': return LoggerLevel::getLevelFatal(); - case 'OFF': return LoggerLevel::getLevelOff(); - default: return $defaultLevel; - } - } - } - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +define('LOG4PHP_LEVEL_OFF_INT', 2147483647); +define('LOG4PHP_LEVEL_FATAL_INT', 50000); +define('LOG4PHP_LEVEL_ERROR_INT', 40000); +define('LOG4PHP_LEVEL_WARN_INT', 30000); +define('LOG4PHP_LEVEL_INFO_INT', 20000); +define('LOG4PHP_LEVEL_DEBUG_INT', 10000); +define('LOG4PHP_LEVEL_ALL_INT', -2147483648); + +/** + * Defines the minimum set of levels recognized by the system, that is + * OFF, FATAL, ERROR, + * WARN, INFODEBUG and + * ALL. + * + *

    The LoggerLevel class may be subclassed to define a larger + * level set.

    + * + * @author VxR + * @version $Revision: 1.11 $ + * @package log4php + * @since 0.5 + */ +class LoggerLevel { + + /** + * @var integer + */ + var $level; + + /** + * @var string + */ + var $levelStr; + + /** + * @var integer + */ + var $syslogEquivalent; + + /** + * Constructor + * + * @param integer $level + * @param string $levelStr + * @param integer $syslogEquivalent + */ + function LoggerLevel($level, $levelStr, $syslogEquivalent) + { + $this->level = $level; + $this->levelStr = $levelStr; + $this->syslogEquivalent = $syslogEquivalent; + } + + /** + * Two priorities are equal if their level fields are equal. + * + * @param object $o + * @return boolean + */ + function equals($o) + { + if (is_a($o, 'loggerlevel')) { + return ($this->level == $o->level); + } else { + return false; + } + } + + /** + * Returns an Off Level + * @static + * @return LoggerLevel + */ + function &getLevelOff() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_OFF_INT, 'OFF', 0); + return $level; + } + + /** + * Returns a Fatal Level + * @static + * @return LoggerLevel + */ + function &getLevelFatal() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0); + return $level; + } + + /** + * Returns an Error Level + * @static + * @return LoggerLevel + */ + function &getLevelError() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3); + return $level; + } + + /** + * Returns a Warn Level + * @static + * @return LoggerLevel + */ + function &getLevelWarn() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_WARN_INT, 'WARN', 4); + return $level; + } + + /** + * Returns an Info Level + * @static + * @return LoggerLevel + */ + function &getLevelInfo() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_INFO_INT, 'INFO', 6); + return $level; + } + + /** + * Returns a Debug Level + * @static + * @return LoggerLevel + */ + function &getLevelDebug() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7); + return $level; + } + + /** + * Returns an All Level + * @static + * @return LoggerLevel + */ + function &getLevelAll() + { + static $level; + if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ALL_INT, 'ALL', 7); + return $level; + } + + /** + * Return the syslog equivalent of this priority as an integer. + * @final + * @return integer + */ + function getSyslogEquivalent() + { + return $this->syslogEquivalent; + } + + /** + * Returns true if this level has a higher or equal + * level than the level passed as argument, false + * otherwise. + * + *

    You should think twice before overriding the default + * implementation of isGreaterOrEqual method. + * + * @param LoggerLevel $r + * @return boolean + */ + function isGreaterOrEqual($r) + { + return $this->level >= $r->level; + } + + /** + * Returns the string representation of this priority. + * @return string + * @final + */ + function toString() + { + return $this->levelStr; + } + + /** + * Returns the integer representation of this level. + * @return integer + */ + function toInt() + { + return $this->level; + } + + /** + * Convert the string passed as argument to a level. If the + * conversion fails, then this method returns a DEBUG Level. + * + * @param mixed $arg + * @param LoggerLevel $default + * @static + */ + function &toLevel($arg, $defaultLevel = null) + { + if ($defaultLevel === null) { + return LoggerLevel::toLevel($arg, LoggerLevel::getLevelDebug()); + } else { + if (is_int($arg)) { + switch($arg) { + case LOG4PHP_LEVEL_ALL_INT: return LoggerLevel::getLevelAll(); + case LOG4PHP_LEVEL_DEBUG_INT: return LoggerLevel::getLevelDebug(); + case LOG4PHP_LEVEL_INFO_INT: return LoggerLevel::getLevelInfo(); + case LOG4PHP_LEVEL_WARN_INT: return LoggerLevel::getLevelWarn(); + case LOG4PHP_LEVEL_ERROR_INT: return LoggerLevel::getLevelError(); + case LOG4PHP_LEVEL_FATAL_INT: return LoggerLevel::getLevelFatal(); + case LOG4PHP_LEVEL_OFF_INT: return LoggerLevel::getLevelOff(); + default: return $defaultLevel; + } + } else { + switch(strtoupper($arg)) { + case 'ALL': return LoggerLevel::getLevelAll(); + case 'DEBUG': return LoggerLevel::getLevelDebug(); + case 'INFO': return LoggerLevel::getLevelInfo(); + case 'WARN': return LoggerLevel::getLevelWarn(); + case 'ERROR': return LoggerLevel::getLevelError(); + case 'FATAL': return LoggerLevel::getLevelFatal(); + case 'OFF': return LoggerLevel::getLevelOff(); + default: return $defaultLevel; + } + } + } + } +} ?> Modified: vtigercrm/trunk/log4php/LoggerLog.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerLog.php (original) +++ vtigercrm/trunk/log4php/LoggerLog.php Wed May 3 22:07:13 2006 @@ -1,99 +1,99 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - * Helper class for internal logging - * - *

    It uses php {@link PHP_MANUAL#trigger_error trigger_error()} function - * to output messages.

    - *

    You need to recode methods to output messages in a different way.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - */ -class LoggerLog { - - /** - * Log if debug is enabled. - * - * Log using php {@link PHP_MANUAL#trigger_error trigger_error()} function - * with E_USER_NOTICE level by default. - * - * @param string $message log message - * @param integer $errLevel level to log - * @static - */ - function log($message, $errLevel = E_USER_NOTICE) - { - if (LoggerLog::internalDebugging()) - trigger_error($message, $errLevel); - } - - function internalDebugging($value = null) - { - static $debug = false; - - if (is_bool($value)) - $debug = $value; - return $debug; - } - - /** - * Report a debug message. - * - * @param string $message log message - * @static - * @since 0.3 - */ - function debug($message) - { - LoggerLog::log($message, E_USER_NOTICE); - } - - /** - * Report an error message. - * - * @param string $message log message - * @static - * @since 0.3 - */ - function error($message) - { - trigger_error($message, E_USER_ERROR); - } - - /** - * Report a warning message. - * - * @param string $message log message - * @static - * @since 0.3 - */ - function warn($message) - { - trigger_error($message, E_USER_WARNING); - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + * Helper class for internal logging + * + *

    It uses php {@link PHP_MANUAL#trigger_error trigger_error()} function + * to output messages.

    + *

    You need to recode methods to output messages in a different way.

    + * + * @author VxR + * @version $Revision: 1.9 $ + * @package log4php + */ +class LoggerLog { + + /** + * Log if debug is enabled. + * + * Log using php {@link PHP_MANUAL#trigger_error trigger_error()} function + * with E_USER_NOTICE level by default. + * + * @param string $message log message + * @param integer $errLevel level to log + * @static + */ + function log($message, $errLevel = E_USER_NOTICE) + { + if (LoggerLog::internalDebugging()) + trigger_error($message, $errLevel); + } + + function internalDebugging($value = null) + { + static $debug = false; + + if (is_bool($value)) + $debug = $value; + return $debug; + } + + /** + * Report a debug message. + * + * @param string $message log message + * @static + * @since 0.3 + */ + function debug($message) + { + LoggerLog::log($message, E_USER_NOTICE); + } + + /** + * Report an error message. + * + * @param string $message log message + * @static + * @since 0.3 + */ + function error($message) + { + trigger_error($message, E_USER_ERROR); + } + + /** + * Report a warning message. + * + * @param string $message log message + * @static + * @since 0.3 + */ + function warn($message) + { + trigger_error($message, E_USER_WARNING); + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerMDC.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerMDC.php (original) +++ vtigercrm/trunk/log4php/LoggerMDC.php Wed May 3 22:07:13 2006 @@ -1,129 +1,129 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - - -define('LOGGER_MDC_HT_SIZE', 7); - -/** - * This is the global repository of user mappings - */ -$GLOBALS['log4php.LoggerMDC.ht'] = array(); - -/** - * The LoggerMDC class is similar to the {@link LoggerNDC} class except that it is - * based on a map instead of a stack. It provides mapped diagnostic contexts. - * - * A Mapped Diagnostic Context, or - * MDC in short, is an instrument for distinguishing interleaved log - * output from different sources. Log output is typically interleaved - * when a server handles multiple clients near-simultaneously. - * - *

    The MDC is managed on a per thread basis. - * - * @author VxR - * @version $Revision: 1.1 $ - * @since 0.3 - * @package log4php - */ -class LoggerMDC { - - /** - * Put a context value as identified with the key parameter into the current thread's - * context map. - * - *

    If the current thread does not have a context map it is - * created as a side effect.

    - * - *

    Note that you cannot put more than {@link LOGGER_MDC_HT_SIZE} keys.

    - * - * @param string $key the key - * @param string $value the value - * @static - */ - function put($key, $value) - { - if ( sizeof($GLOBALS['log4php.LoggerMDC.ht']) < LOGGER_MDC_HT_SIZE ) - $GLOBALS['log4php.LoggerMDC.ht'][$key] = $value; - } - - /** - * Get the context identified by the key parameter. - * - *

    You can use special key identifiers to map values in - * PHP $_SERVER and $_ENV vars. Just put a 'server.' or 'env.' - * followed by the var name you want to refer.

    - * - *

    This method has no side effects.

    - * - * @param string $key - * @return string - * @static - */ - function get($key) - { - LoggerLog::debug("LoggerMDC::get() key='$key'"); - - if (!empty($key)) { - if (strpos($key, 'server.') === 0) { - $varName = substr($key, 7); - - LoggerLog::debug("LoggerMDC::get() a _SERVER[$varName] is requested."); - - return $_SERVER[$varName]; - } elseif (strpos($key, 'env.') === 0) { - - $varName = substr($key, 4); - - LoggerLog::debug("LoggerMDC::get() a _ENV[$varName] is requested."); - - return $_ENV[$varName]; - } elseif (isset($GLOBALS['log4php.LoggerMDC.ht'][$key])) { - - LoggerLog::debug("LoggerMDC::get() a user key is requested."); - - return $GLOBALS['log4php.LoggerMDC.ht'][$key]; - } - } - return ''; - } - - /** - * Remove the the context identified by the key parameter. - * - * It only affects user mappings. - * - * @param string $key - * @return string - * @static - */ - function remove($key) - { - unset($GLOBALS['log4php.LoggerMDC.ht'][$key]); - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + + +define('LOGGER_MDC_HT_SIZE', 7); + +/** + * This is the global repository of user mappings + */ +$GLOBALS['log4php.LoggerMDC.ht'] = array(); + +/** + * The LoggerMDC class is similar to the {@link LoggerNDC} class except that it is + * based on a map instead of a stack. It provides mapped diagnostic contexts. + * + * A Mapped Diagnostic Context, or + * MDC in short, is an instrument for distinguishing interleaved log + * output from different sources. Log output is typically interleaved + * when a server handles multiple clients near-simultaneously. + * + *

    The MDC is managed on a per thread basis. + * + * @author VxR + * @version $Revision: 1.4 $ + * @since 0.3 + * @package log4php + */ +class LoggerMDC { + + /** + * Put a context value as identified with the key parameter into the current thread's + * context map. + * + *

    If the current thread does not have a context map it is + * created as a side effect.

    + * + *

    Note that you cannot put more than {@link LOGGER_MDC_HT_SIZE} keys.

    + * + * @param string $key the key + * @param string $value the value + * @static + */ + function put($key, $value) + { + if ( sizeof($GLOBALS['log4php.LoggerMDC.ht']) < LOGGER_MDC_HT_SIZE ) + $GLOBALS['log4php.LoggerMDC.ht'][$key] = $value; + } + + /** + * Get the context identified by the key parameter. + * + *

    You can use special key identifiers to map values in + * PHP $_SERVER and $_ENV vars. Just put a 'server.' or 'env.' + * followed by the var name you want to refer.

    + * + *

    This method has no side effects.

    + * + * @param string $key + * @return string + * @static + */ + function get($key) + { + LoggerLog::debug("LoggerMDC::get() key='$key'"); + + if (!empty($key)) { + if (strpos($key, 'server.') === 0) { + $varName = substr($key, 7); + + LoggerLog::debug("LoggerMDC::get() a _SERVER[$varName] is requested."); + + return $_SERVER[$varName]; + } elseif (strpos($key, 'env.') === 0) { + + $varName = substr($key, 4); + + LoggerLog::debug("LoggerMDC::get() a _ENV[$varName] is requested."); + + return $_ENV[$varName]; + } elseif (isset($GLOBALS['log4php.LoggerMDC.ht'][$key])) { + + LoggerLog::debug("LoggerMDC::get() a user key is requested."); + + return $GLOBALS['log4php.LoggerMDC.ht'][$key]; + } + } + return ''; + } + + /** + * Remove the the context identified by the key parameter. + * + * It only affects user mappings. + * + * @param string $key + * @return string + * @static + */ + function remove($key) + { + unset($GLOBALS['log4php.LoggerMDC.ht'][$key]); + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerManager.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerManager.php (original) +++ vtigercrm/trunk/log4php/LoggerManager.php Wed May 3 22:07:13 2006 @@ -1,262 +1,262 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * LOG4PHP_DIR points to the log4php root directory. - * - * If not defined it will be set automatically when the first package classfile - * is included - * - * @var string - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/LoggerHierarchy.php'); - -/** - * Use the LoggerManager to get Logger instances. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @see Logger - * @todo create a configurator selector - */ -class LoggerManager { - - /** - * check if a given logger exists. - * - * @param string $name logger name - * @static - * @return boolean - */ - function exists($name) - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->exists($name); - } - - /** - * Returns an array this whole Logger instances. - * - * @static - * @see Logger - * @return array - */ - function getCurrentLoggers() - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->getCurrentLoggers(); - } - - /** - * Returns the root logger. - * - * @static - * @return object - * @see LoggerRoot - */ - function &getRootLogger() - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->getRootLogger(); - } - - /** - * Returns the specified Logger. - * - * @param string $name logger name - * @param LoggerFactory $factory a {@link LoggerFactory} instance or null - * @static - * @return Logger - */ - function &getLogger($name, $factory = null) - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->getLogger($name, $factory); - } - - /** - * Returns the LoggerHierarchy. - * - * @static - * @return LoggerHierarchy - */ - function &getLoggerRepository() - { - return LoggerHierarchy::singleton(); - } - - - /** - * Destroy loggers object tree. - * - * @static - * @return boolean - */ - function resetConfiguration() - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->resetConfiguration(); - } - - /** - * Does nothing. - * @static - */ - function setRepositorySelector($selector, $guard) - { - return; - } - - /** - * Safely close all appenders. - * @static - */ - function shutdown() - { - $repository =& LoggerManager::getLoggerRepository(); - return $repository->shutdown(); - } -} - -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- - -if (!defined('LOG4PHP_DEFAULT_INIT_OVERRIDE')) { - if (isset($_ENV['log4php.defaultInitOverride'])) { - /** - * @ignore - */ - define('LOG4PHP_DEFAULT_INIT_OVERRIDE', - LoggerOptionConverter::toBoolean($_ENV['log4php.defaultInitOverride'], false) - ); - } elseif (isset($GLOBALS['log4php.defaultInitOverride'])) { - /** - * @ignore - */ - define('LOG4PHP_DEFAULT_INIT_OVERRIDE', - LoggerOptionConverter::toBoolean($GLOBALS['log4php.defaultInitOverride'], false) - ); - } else { - /** - * Controls init execution - * - * With this constant users can skip the default init procedure that is - * called when this file is included. - * - *

    If it is not user defined, log4php tries to autoconfigure using (in order):

    - * - * - the $_ENV['log4php.defaultInitOverride'] variable. - * - the $GLOBALS['log4php.defaultInitOverride'] global variable. - * - defaults to false - * - * @var boolean - */ - define('LOG4PHP_DEFAULT_INIT_OVERRIDE', false); - } -} - -if (!defined('LOG4PHP_CONFIGURATION')) { - if (isset($_ENV['log4php.configuration'])) { - /** - * @ignore - */ - define('LOG4PHP_CONFIGURATION', trim($_ENV['log4php.configuration'])); - } else { - /** - * Configuration file. - * - *

    This constant tells configurator classes where the configuration - * file is located.

    - *

    If not set by user, log4php tries to set it automatically using - * (in order):

    - * - * - the $_ENV['log4php.configuration'] enviroment variable. - * - defaults to 'log4php.properties'. - * - * @var string - */ - define('LOG4PHP_CONFIGURATION', 'log4php.properties'); - } -} - -if (!defined('LOG4PHP_CONFIGURATOR_CLASS')) { - if ( strtolower(substr( LOG4PHP_CONFIGURATION, -4 )) == '.xml') { - /** - * @ignore - */ - define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR . '/xml/LoggerDOMConfigurator'); - } else { - /** - * Holds the configurator class name. - * - *

    This constant is set with the fullname (path included but non the - * .php extension) of the configurator class that init procedure will use.

    - *

    If not set by user, log4php tries to set it automatically.

    - *

    If {@link LOG4PHP_CONFIGURATION} has '.xml' extension set the - * constants to '{@link LOG4PHP_DIR}/xml/{@link LoggerDOMConfigurator}'.

    - *

    Otherwise set the constants to - * '{@link LOG4PHP_DIR}/{@link LoggerPropertyConfigurator}'.

    - * - *

    Security Note: classfile pointed by this constant will be brutally - * included with a: - * @include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php");

    - * - * @var string - */ - define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR . '/LoggerPropertyConfigurator'); - } -} - -if (!LOG4PHP_DEFAULT_INIT_OVERRIDE) { - if (!LoggerManagerDefaultInit()) - LoggerLog::warn("LOG4PHP main() Default Init failed."); -} - -/** - * Default init procedure. - * - *

    This procedure tries to configure the {@link LoggerHierarchy} using the - * configurator class defined via {@link LOG4PHP_CONFIGURATOR_CLASS} that tries - * to load the configurator file defined in {@link LOG4PHP_CONFIGURATION}. - * If something goes wrong a warn is raised.

    - *

    Users can skip this procedure using {@link LOG4PHP_DEFAULT_INIT_OVERRIDE} - * constant.

    - * - * @return boolean - */ -function LoggerManagerDefaultInit() -{ - $configuratorClass = basename(LOG4PHP_CONFIGURATOR_CLASS); - if (!class_exists($configuratorClass)) { - @include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php"); - } - if (class_exists($configuratorClass)) { - - return call_user_func(array($configuratorClass, 'configure'), LOG4PHP_CONFIGURATION); - - } else { - LoggerLog::warn("LoggerManagerDefaultInit() Configurator '{$configuratorClass}' doesnt exists"); - return false; - } -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * LOG4PHP_DIR points to the log4php root directory. + * + * If not defined it will be set automatically when the first package classfile + * is included + * + * @var string + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/LoggerHierarchy.php'); + +/** + * Use the LoggerManager to get Logger instances. + * + * @author VxR + * @version $Revision: 1.18 $ + * @package log4php + * @see Logger + * @todo create a configurator selector + */ +class LoggerManager { + + /** + * check if a given logger exists. + * + * @param string $name logger name + * @static + * @return boolean + */ + function exists($name) + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->exists($name); + } + + /** + * Returns an array this whole Logger instances. + * + * @static + * @see Logger + * @return array + */ + function getCurrentLoggers() + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->getCurrentLoggers(); + } + + /** + * Returns the root logger. + * + * @static + * @return object + * @see LoggerRoot + */ + function &getRootLogger() + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->getRootLogger(); + } + + /** + * Returns the specified Logger. + * + * @param string $name logger name + * @param LoggerFactory $factory a {@link LoggerFactory} instance or null + * @static + * @return Logger + */ + function &getLogger($name, $factory = null) + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->getLogger($name, $factory); + } + + /** + * Returns the LoggerHierarchy. + * + * @static + * @return LoggerHierarchy + */ + function &getLoggerRepository() + { + return LoggerHierarchy::singleton(); + } + + + /** + * Destroy loggers object tree. + * + * @static + * @return boolean + */ + function resetConfiguration() + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->resetConfiguration(); + } + + /** + * Does nothing. + * @static + */ + function setRepositorySelector($selector, $guard) + { + return; + } + + /** + * Safely close all appenders. + * @static + */ + function shutdown() + { + $repository =& LoggerManager::getLoggerRepository(); + return $repository->shutdown(); + } +} + +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- + +if (!defined('LOG4PHP_DEFAULT_INIT_OVERRIDE')) { + if (isset($_ENV['log4php.defaultInitOverride'])) { + /** + * @ignore + */ + define('LOG4PHP_DEFAULT_INIT_OVERRIDE', + LoggerOptionConverter::toBoolean($_ENV['log4php.defaultInitOverride'], false) + ); + } elseif (isset($GLOBALS['log4php.defaultInitOverride'])) { + /** + * @ignore + */ + define('LOG4PHP_DEFAULT_INIT_OVERRIDE', + LoggerOptionConverter::toBoolean($GLOBALS['log4php.defaultInitOverride'], false) + ); + } else { + /** + * Controls init execution + * + * With this constant users can skip the default init procedure that is + * called when this file is included. + * + *

    If it is not user defined, log4php tries to autoconfigure using (in order):

    + * + * - the $_ENV['log4php.defaultInitOverride'] variable. + * - the $GLOBALS['log4php.defaultInitOverride'] global variable. + * - defaults to false + * + * @var boolean + */ + define('LOG4PHP_DEFAULT_INIT_OVERRIDE', false); + } +} + +if (!defined('LOG4PHP_CONFIGURATION')) { + if (isset($_ENV['log4php.configuration'])) { + /** + * @ignore + */ + define('LOG4PHP_CONFIGURATION', trim($_ENV['log4php.configuration'])); + } else { + /** + * Configuration file. + * + *

    This constant tells configurator classes where the configuration + * file is located.

    + *

    If not set by user, log4php tries to set it automatically using + * (in order):

    + * + * - the $_ENV['log4php.configuration'] enviroment variable. + * - defaults to 'log4php.properties'. + * + * @var string + */ + define('LOG4PHP_CONFIGURATION', 'log4php.properties'); + } +} + +if (!defined('LOG4PHP_CONFIGURATOR_CLASS')) { + if ( strtolower(substr( LOG4PHP_CONFIGURATION, -4 )) == '.xml') { + /** + * @ignore + */ + define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR . '/xml/LoggerDOMConfigurator'); + } else { + /** + * Holds the configurator class name. + * + *

    This constant is set with the fullname (path included but non the + * .php extension) of the configurator class that init procedure will use.

    + *

    If not set by user, log4php tries to set it automatically.

    + *

    If {@link LOG4PHP_CONFIGURATION} has '.xml' extension set the + * constants to '{@link LOG4PHP_DIR}/xml/{@link LoggerDOMConfigurator}'.

    + *

    Otherwise set the constants to + * '{@link LOG4PHP_DIR}/{@link LoggerPropertyConfigurator}'.

    + * + *

    Security Note: classfile pointed by this constant will be brutally + * included with a: + * @include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php");

    + * + * @var string + */ + define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR . '/LoggerPropertyConfigurator'); + } +} + +if (!LOG4PHP_DEFAULT_INIT_OVERRIDE) { + if (!LoggerManagerDefaultInit()) + LoggerLog::warn("LOG4PHP main() Default Init failed."); +} + +/** + * Default init procedure. + * + *

    This procedure tries to configure the {@link LoggerHierarchy} using the + * configurator class defined via {@link LOG4PHP_CONFIGURATOR_CLASS} that tries + * to load the configurator file defined in {@link LOG4PHP_CONFIGURATION}. + * If something goes wrong a warn is raised.

    + *

    Users can skip this procedure using {@link LOG4PHP_DEFAULT_INIT_OVERRIDE} + * constant.

    + * + * @return boolean + */ +function LoggerManagerDefaultInit() +{ + $configuratorClass = basename(LOG4PHP_CONFIGURATOR_CLASS); + if (!class_exists($configuratorClass)) { + @include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php"); + } + if (class_exists($configuratorClass)) { + + return call_user_func(array($configuratorClass, 'configure'), LOG4PHP_CONFIGURATION); + + } else { + LoggerLog::warn("LoggerManagerDefaultInit() Configurator '{$configuratorClass}' doesnt exists"); + return false; + } +} + ?> Modified: vtigercrm/trunk/log4php/LoggerNDC.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerNDC.php (original) +++ vtigercrm/trunk/log4php/LoggerNDC.php Wed May 3 22:07:13 2006 @@ -1,240 +1,240 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -define('LOGGER_NDC_HT_SIZE', 7); - -/** - * This is the global repository of NDC stack - */ -$GLOBALS['log4php.LoggerNDC.ht'] = array(); - -/** - * This is the max depth of NDC stack - */ -$GLOBALS['log4php.LoggerNDC.maxDepth'] = LOGGER_NDC_HT_SIZE; - - -/** - * The NDC class implements nested diagnostic contexts as - * defined by Neil Harrison in the article "Patterns for Logging - * Diagnostic Messages" part of the book "Pattern Languages of - * Program Design 3" edited by Martin et al. - * - *

    A Nested Diagnostic Context, or NDC in short, is an instrument - * to distinguish interleaved log output from different sources. Log - * output is typically interleaved when a server handles multiple - * clients near-simultaneously. - * - *

    Interleaved log output can still be meaningful if each log entry - * from different contexts had a distinctive stamp. This is where NDCs - * come into play. - * - *

    Note that NDCs are managed on a per thread - * basis. NDC operations such as {@link push()}, {@link pop()}, - * {@link clear()}, {@link getDepth()} and {@link setMaxDepth()} - * affect the NDC of the current thread only. NDCs of other - * threads remain unaffected. - * - *

    For example, a servlet can build a per client request NDC - * consisting the clients host name and other information contained in - * the the request. Cookies are another source of distinctive - * information. To build an NDC one uses the {@link push()} - * operation.

    - * - * Simply put, - * - * - Contexts can be nested. - * - When entering a context, call - * LoggerNDC::push() - * As a side effect, if there is no nested diagnostic context for the - * current thread, this method will create it. - * - When leaving a context, call - * LoggerNDC::pop() - * - When exiting a thread make sure to call {@link remove()} - * - *

    There is no penalty for forgetting to match each - * push operation with a corresponding pop, - * except the obvious mismatch between the real application context - * and the context set in the NDC.

    - * - *

    If configured to do so, {@link LoggerPatternLayout} and {@link LoggerLayoutTTCC} - * instances automatically retrieve the nested diagnostic - * context for the current thread without any user intervention. - * Hence, even if a servlet is serving multiple clients - * simultaneously, the logs emanating from the same code (belonging to - * the same category) can still be distinguished because each client - * request will have a different NDC tag.

    - * - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @since 0.3 - */ -class LoggerNDC { - - /** - * Clear any nested diagnostic information if any. This method is - * useful in cases where the same thread can be potentially used - * over and over in different unrelated contexts. - * - *

    This method is equivalent to calling the {@link setMaxDepth()} - * method with a zero maxDepth argument. - * - * @static - */ - function clear() - { - LoggerLog::debug("LoggerNDC::clear()"); - - $GLOBALS['log4php.LoggerNDC.ht'] = array(); - } - - /** - * Never use this method directly, use the {@link LoggerLoggingEvent::getNDC()} method instead. - * @static - * @return array - */ - function get() - { - LoggerLog::debug("LoggerNDC::get()"); - - return $GLOBALS['log4php.LoggerNDC.ht']; - } - - /** - * Get the current nesting depth of this diagnostic context. - * - * @see setMaxDepth() - * @return integer - * @static - */ - function getDepth() - { - LoggerLog::debug("LoggerNDC::getDepth()"); - - return sizeof($GLOBALS['log4php.LoggerNDC.ht']); - } - - /** - * Clients should call this method before leaving a diagnostic - * context. - * - *

    The returned value is the value that was pushed last. If no - * context is available, then the empty string "" is returned.

    - * - * @return string The innermost diagnostic context. - * @static - */ - function pop() - { - LoggerLog::debug("LoggerNDC::pop()"); - - if (sizeof($GLOBALS['log4php.LoggerNDC.ht']) > 0) { - return array_pop($GLOBALS['log4php.LoggerNDC.ht']); - } else { - return ''; - } - } - - /** - * Looks at the last diagnostic context at the top of this NDC - * without removing it. - * - *

    The returned value is the value that was pushed last. If no - * context is available, then the empty string "" is returned.

    - * @return string The innermost diagnostic context. - * @static - */ - function peek() - { - LoggerLog::debug("LoggerNDC::peek()"); - - if (sizeof($GLOBALS['log4php.LoggerNDC.ht']) > 0) { - return end($GLOBALS['log4php.LoggerNDC.ht']); - } else { - return ''; - } - } - - /** - * Push new diagnostic context information for the current thread. - * - *

    The contents of the message parameter is - * determined solely by the client. - * - * @param string $message The new diagnostic context information. - * @static - */ - function push($message) - { - LoggerLog::debug("LoggerNDC::push()"); - - array_push($GLOBALS['log4php.LoggerNDC.ht'], (string)$message); - } - - /** - * Remove the diagnostic context for this thread. - * @static - */ - function remove() - { - LoggerLog::debug("LoggerNDC::remove()"); - - LoggerNDC::clear(); - } - - /** - * Set maximum depth of this diagnostic context. If the current - * depth is smaller or equal to maxDepth, then no - * action is taken. - * - *

    This method is a convenient alternative to multiple - * {@link pop()} calls. Moreover, it is often the case that at - * the end of complex call sequences, the depth of the NDC is - * unpredictable. The {@link setMaxDepth()} method circumvents - * this problem. - * - * @param integer $maxDepth - * @see getDepth() - * @static - */ - function setMaxDepth($maxDepth) - { - LoggerLog::debug("LoggerNDC::setMaxDepth() maxDepth='$maxDepth'"); - - $maxDepth = (int)$maxDepth; - if ($maxDepth <= LOGGER_NDC_HT_SIZE) { - if (LoggerNDC::getDepth() > $maxDepth) { - $GLOBALS['log4php.LoggerNDC.ht'] = array_slice($GLOBALS['log4php.LoggerNDC.ht'], $maxDepth); - } - $GLOBALS['log4php.LoggerNDC.maxDepth'] = $maxDepth; - } - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +define('LOGGER_NDC_HT_SIZE', 7); + +/** + * This is the global repository of NDC stack + */ +$GLOBALS['log4php.LoggerNDC.ht'] = array(); + +/** + * This is the max depth of NDC stack + */ +$GLOBALS['log4php.LoggerNDC.maxDepth'] = LOGGER_NDC_HT_SIZE; + + +/** + * The NDC class implements nested diagnostic contexts as + * defined by Neil Harrison in the article "Patterns for Logging + * Diagnostic Messages" part of the book "Pattern Languages of + * Program Design 3" edited by Martin et al. + * + *

    A Nested Diagnostic Context, or NDC in short, is an instrument + * to distinguish interleaved log output from different sources. Log + * output is typically interleaved when a server handles multiple + * clients near-simultaneously. + * + *

    Interleaved log output can still be meaningful if each log entry + * from different contexts had a distinctive stamp. This is where NDCs + * come into play. + * + *

    Note that NDCs are managed on a per thread + * basis. NDC operations such as {@link push()}, {@link pop()}, + * {@link clear()}, {@link getDepth()} and {@link setMaxDepth()} + * affect the NDC of the current thread only. NDCs of other + * threads remain unaffected. + * + *

    For example, a servlet can build a per client request NDC + * consisting the clients host name and other information contained in + * the the request. Cookies are another source of distinctive + * information. To build an NDC one uses the {@link push()} + * operation.

    + * + * Simply put, + * + * - Contexts can be nested. + * - When entering a context, call + * LoggerNDC::push() + * As a side effect, if there is no nested diagnostic context for the + * current thread, this method will create it. + * - When leaving a context, call + * LoggerNDC::pop() + * - When exiting a thread make sure to call {@link remove()} + * + *

    There is no penalty for forgetting to match each + * push operation with a corresponding pop, + * except the obvious mismatch between the real application context + * and the context set in the NDC.

    + * + *

    If configured to do so, {@link LoggerPatternLayout} and {@link LoggerLayoutTTCC} + * instances automatically retrieve the nested diagnostic + * context for the current thread without any user intervention. + * Hence, even if a servlet is serving multiple clients + * simultaneously, the logs emanating from the same code (belonging to + * the same category) can still be distinguished because each client + * request will have a different NDC tag.

    + * + * + * @author VxR + * @version $Revision: 1.5 $ + * @package log4php + * @since 0.3 + */ +class LoggerNDC { + + /** + * Clear any nested diagnostic information if any. This method is + * useful in cases where the same thread can be potentially used + * over and over in different unrelated contexts. + * + *

    This method is equivalent to calling the {@link setMaxDepth()} + * method with a zero maxDepth argument. + * + * @static + */ + function clear() + { + LoggerLog::debug("LoggerNDC::clear()"); + + $GLOBALS['log4php.LoggerNDC.ht'] = array(); + } + + /** + * Never use this method directly, use the {@link LoggerLoggingEvent::getNDC()} method instead. + * @static + * @return array + */ + function get() + { + LoggerLog::debug("LoggerNDC::get()"); + + return $GLOBALS['log4php.LoggerNDC.ht']; + } + + /** + * Get the current nesting depth of this diagnostic context. + * + * @see setMaxDepth() + * @return integer + * @static + */ + function getDepth() + { + LoggerLog::debug("LoggerNDC::getDepth()"); + + return sizeof($GLOBALS['log4php.LoggerNDC.ht']); + } + + /** + * Clients should call this method before leaving a diagnostic + * context. + * + *

    The returned value is the value that was pushed last. If no + * context is available, then the empty string "" is returned.

    + * + * @return string The innermost diagnostic context. + * @static + */ + function pop() + { + LoggerLog::debug("LoggerNDC::pop()"); + + if (sizeof($GLOBALS['log4php.LoggerNDC.ht']) > 0) { + return array_pop($GLOBALS['log4php.LoggerNDC.ht']); + } else { + return ''; + } + } + + /** + * Looks at the last diagnostic context at the top of this NDC + * without removing it. + * + *

    The returned value is the value that was pushed last. If no + * context is available, then the empty string "" is returned.

    + * @return string The innermost diagnostic context. + * @static + */ + function peek() + { + LoggerLog::debug("LoggerNDC::peek()"); + + if (sizeof($GLOBALS['log4php.LoggerNDC.ht']) > 0) { + return end($GLOBALS['log4php.LoggerNDC.ht']); + } else { + return ''; + } + } + + /** + * Push new diagnostic context information for the current thread. + * + *

    The contents of the message parameter is + * determined solely by the client. + * + * @param string $message The new diagnostic context information. + * @static + */ + function push($message) + { + LoggerLog::debug("LoggerNDC::push()"); + + array_push($GLOBALS['log4php.LoggerNDC.ht'], (string)$message); + } + + /** + * Remove the diagnostic context for this thread. + * @static + */ + function remove() + { + LoggerLog::debug("LoggerNDC::remove()"); + + LoggerNDC::clear(); + } + + /** + * Set maximum depth of this diagnostic context. If the current + * depth is smaller or equal to maxDepth, then no + * action is taken. + * + *

    This method is a convenient alternative to multiple + * {@link pop()} calls. Moreover, it is often the case that at + * the end of complex call sequences, the depth of the NDC is + * unpredictable. The {@link setMaxDepth()} method circumvents + * this problem. + * + * @param integer $maxDepth + * @see getDepth() + * @static + */ + function setMaxDepth($maxDepth) + { + LoggerLog::debug("LoggerNDC::setMaxDepth() maxDepth='$maxDepth'"); + + $maxDepth = (int)$maxDepth; + if ($maxDepth <= LOGGER_NDC_HT_SIZE) { + if (LoggerNDC::getDepth() > $maxDepth) { + $GLOBALS['log4php.LoggerNDC.ht'] = array_slice($GLOBALS['log4php.LoggerNDC.ht'], $maxDepth); + } + $GLOBALS['log4php.LoggerNDC.maxDepth'] = $maxDepth; + } + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerPropertyConfigurator.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerPropertyConfigurator.php (original) +++ vtigercrm/trunk/log4php/LoggerPropertyConfigurator.php Wed May 3 22:07:13 2006 @@ -1,654 +1,650 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/config/LoggerPropertySetter.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); -require_once(LOG4PHP_DIR . '/or/LoggerRendererMap.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); -require_once(LOG4PHP_DIR . '/LoggerAppender.php'); -require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php'); -require_once(LOG4PHP_DIR . '/LoggerLayout.php'); -require_once(LOG4PHP_DIR . '/LoggerLevel.php'); -require_once(LOG4PHP_DIR . '/LoggerManager.php'); - -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX', "log4php.category."); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX', "log4php.logger."); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX', "log4php.factory"); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX', "log4php.additivity."); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX', "log4php.rootCategory"); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX', "log4php.rootLogger"); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_APPENDER_PREFIX', "log4php.appender."); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX', "log4php.renderer."); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX', "log4php.threshold"); - -/** - * Key for specifying the {@link LoggerFactory}. - */ -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY', "log4php.loggerFactory"); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY', "log4php.debug"); -define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME', "root"); - - - -/** - * Allows the configuration of log4php from an external file. - * - * See {@link doConfigure()} for the expected format. - * - *

    It is sometimes useful to see how log4php is reading configuration - * files. You can enable log4php internal logging by defining the - * log4php.debug variable.

    - * - *

    The LoggerPropertyConfigurator does not handle the - * advanced configuration features supported by the {@link LoggerDOMConfigurator} - * such as support for {@link LoggerFilter}, - custom {@link LoggerErrorHandlers}, nested appenders such as the - {@link Logger AsyncAppender}, - * etc. - * - *

    All option values admit variable substitution. The - * syntax of variable substitution is similar to that of Unix - * shells. The string between an opening "${" and - * closing "}" is interpreted as a key. The value of - * the substituted variable can be defined as a system property or in - * the configuration file itself. The value of the key is first - * searched in the defined constants, in the enviroments variables - * and if not found there, it is - * then searched in the configuration file being parsed. The - * corresponding value replaces the ${variableName} sequence.

    - *

    For example, if $_ENV['home'] env var is set to - * /home/xyz, then every occurrence of the sequence - * ${home} will be interpreted as - * /home/xyz. See {@link LoggerOptionConverter::getSystemProperty()} - * for details.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @since 0.5 - */ -class LoggerPropertyConfigurator extends LoggerConfigurator { - - /** - * @var LoggerFactory - */ - var $loggerFactory = null; - - /** - * Constructor - */ - function LoggerPropertyConfigurator() - { - $this->loggerFactory = new LoggerDefaultCategoryFactory(); - } - - /** - * Configure the default repository using the resource pointed by url. - * Url is any valid resurce as defined in {@link PHP_MANUAL#file} function. - * Note that the resource will be search with use_include_path parameter - * set to "1". - * - * @param string $url - * @return boolean configuration result - * @static - */ - function configure($url = '') - { - $configurator = new LoggerPropertyConfigurator(); - $repository =& LoggerManager::getLoggerRepository(); - return $configurator->doConfigure($url, $repository); - } - - /** - * Read configuration from a file. - * - *

    The function {@link PHP_MANUAL#parse_ini_file} is used to read the - * file.

    - * - * The existing configuration is not cleared nor reset. - * If you require a different behavior, then call - * {@link LoggerManager::resetConfiguration()} - * method before calling {@link doConfigure()}. - * - *

    The configuration file consists of statements in the format - * key=value. The syntax of different configuration - * elements are discussed below. - * - *

    Repository-wide threshold

    - * - *

    The repository-wide threshold filters logging requests by level - * regardless of logger. The syntax is: - * - *

    -     * log4php.threshold=[level]
    -     * 
    - * - *

    The level value can consist of the string values OFF, FATAL, - * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A - * custom level value can be specified in the form - * level#classname. By default the repository-wide threshold is set - * to the lowest possible value, namely the level ALL. - *

    - * - * - *

    Appender configuration

    - * - *

    Appender configuration syntax is:

    - *
    -     * ; For appender named appenderName, set its class.
    -     * ; Note: The appender name can contain dots.
    -     * log4php.appender.appenderName=name_of_appender_class
    -     * 
    -     * ; Set appender specific options.
    -     * 
    -     * log4php.appender.appenderName.option1=value1
    -     * log4php.appender.appenderName.optionN=valueN
    -     * 
    - * - * For each named appender you can configure its {@link LoggerLayout}. The - * syntax for configuring an appender's layout is: - *
    -     * log4php.appender.appenderName.layout=name_of_layout_class
    -     * log4php.appender.appenderName.layout.option1=value1
    -     *  ....
    -     * log4php.appender.appenderName.layout.optionN=valueN
    -     * 
    - * - *

    Configuring loggers

    - * - *

    The syntax for configuring the root logger is: - *

    -     * log4php.rootLogger=[level], appenderName, appenderName, ...
    -     * 
    - * - *

    This syntax means that an optional level can be - * supplied followed by appender names separated by commas. - * - *

    The level value can consist of the string values OFF, FATAL, - * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A - * custom level value can be specified in the form

    - * - *
    level#classname
    - * - *

    If a level value is specified, then the root level is set - * to the corresponding level. If no level value is specified, - * then the root level remains untouched. - * - *

    The root logger can be assigned multiple appenders. - * - *

    Each appenderName (separated by commas) will be added to - * the root logger. The named appender is defined using the - * appender syntax defined above. - * - *

    For non-root categories the syntax is almost the same: - *

    -     * log4php.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ...
    -     * 
    - * - *

    The meaning of the optional level value is discussed above - * in relation to the root logger. In addition however, the value - * INHERITED can be specified meaning that the named logger should - * inherit its level from the logger hierarchy.

    - * - *

    If no level value is supplied, then the level of the - * named logger remains untouched.

    - * - *

    By default categories inherit their level from the - * hierarchy. However, if you set the level of a logger and later - * decide that that logger should inherit its level, then you should - * specify INHERITED as the value for the level value. NULL is a - * synonym for INHERITED.

    - * - *

    Similar to the root logger syntax, each appenderName - * (separated by commas) will be attached to the named logger.

    - * - *

    See the appender additivity rule in the user manual for - * the meaning of the additivity flag. - * - *

    ObjectRenderers

    - * - *

    You can customize the way message objects of a given type are - * converted to String before being logged. This is done by - * specifying a {@link LoggerObjectRenderer} - * for the object type would like to customize.

    - * - *

    The syntax is: - * - *

    -     * log4php.renderer.name_of_rendered_class=name_of_rendering.class
    -     * 
    - * - * As in, - *
    -     * log4php.renderer.myFruit=myFruitRenderer
    -     * 
    - * - *

    Logger Factories

    - * - * The usage of custom logger factories is discouraged and no longer - * documented. - * - *

    Example

    - * - *

    An example configuration is given below. Other configuration - * file examples are given in the tests folder. - * - *

    -     * ; Set options for appender named "A1".
    -     * ; Appender "A1" will be a SyslogAppender
    -     * log4php.appender.A1=SyslogAppender
    -     * 
    -     * ; The syslog daemon resides on www.abc.net
    -     * log4php.appender.A1.SyslogHost=www.abc.net
    -     * 
    -     * ; A1's layout is a LoggerPatternLayout, using the conversion pattern
    -     * ; %r %-5p %c{2} %M.%L %x - %m%n. Thus, the log output will
    -     * ; include the relative time since the start of the application in
    -     * ; milliseconds, followed by the level of the log request,
    -     * ; followed by the two rightmost components of the logger name,
    -     * ; followed by the callers method name, followed by the line number,
    -     * ; the nested disgnostic context and finally the message itself.
    -     * ; Refer to the documentation of LoggerPatternLayout} for further information
    -     * ; on the syntax of the ConversionPattern key.
    -     * log4php.appender.A1.layout=LoggerPatternLayout
    -     * log4php.appender.A1.layout.ConversionPattern="%-4r %-5p %c{2} %M.%L %x - %m%n"
    -     * 
    -     * ; Set options for appender named "A2"
    -     * ; A2 should be a LoggerAppenderRollingFile, with maximum file size of 10 MB
    -     * ; using at most one backup file. A2's layout is TTCC, using the
    -     * ; ISO8061 date format with context printing enabled.
    -     * log4php.appender.A2=LoggerAppenderRollingFile
    -     * log4php.appender.A2.MaxFileSize=10MB
    -     * log4php.appender.A2.MaxBackupIndex=1
    -     * log4php.appender.A2.layout=LoggerLayoutTTCC
    -     * log4php.appender.A2.layout.ContextPrinting="true"
    -     * log4php.appender.A2.layout.DateFormat="%c"
    -     * 
    -     * ; Root logger set to DEBUG using the A2 appender defined above.
    -     * log4php.rootLogger=DEBUG, A2
    -     * 
    -     * ; Logger definitions:
    -     * ; The SECURITY logger inherits is level from root. However, it's output
    -     * ; will go to A1 appender defined above. It's additivity is non-cumulative.
    -     * log4php.logger.SECURITY=INHERIT, A1
    -     * log4php.additivity.SECURITY=false
    -     * 
    -     * ; Only warnings or above will be logged for the logger "SECURITY.access".
    -     * ; Output will go to A1.
    -     * log4php.logger.SECURITY.access=WARN
    -     * 
    -     * 
    -     * ; The logger "class.of.the.day" inherits its level from the
    -     * ; logger hierarchy.  Output will go to the appender's of the root
    -     * ; logger, A2 in this case.
    -     * log4php.logger.class.of.the.day=INHERIT
    -     * 
    - * - *

    Refer to the setOption method in each Appender and - * Layout for class specific options.

    - * - *

    Use the ";" character at the - * beginning of a line for comments.

    - * - * @param string $url The name of the configuration file where the - * configuration information is stored. - * @param LoggerHierarchy &$repository the repository to apply the configuration - */ - function doConfigure($url, &$repository) - { - $properties = @parse_ini_file($url); - if ($properties === false) { - LoggerLog::warn("LoggerPropertyConfigurator::doConfigure() cannot load '$url' configuration."); - return false; - } - return $this->doConfigureProperties($properties, $repository); - } - - - /** - * Read configuration options from properties. - * - * @see doConfigure(). - * @param array $properties - * @param LoggerHierarchy &$hierarchy - */ - function doConfigureProperties($properties, &$hierarchy) - { - if(array_key_exists(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY, $properties)) - $value = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY]; - - if (!empty($value)) { - LoggerLog::internalDebugging(LoggerOptionConverter::toBoolean($value, LoggerLog::internalDebugging())); - } - - $thresholdStr = null; - if(array_key_exists(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX, $properties)) - $thresholdStr = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX]; - $hierarchy->setThreshold(LoggerOptionConverter::toLevel($thresholdStr, LoggerLevel::getLevelAll())); - - $this->configureRootCategory($properties, $hierarchy); - $this->configureLoggerFactory($properties); - $this->parseCatsAndRenderers($properties, $hierarchy); - - LoggerLog::debug("LoggerPropertyConfigurator::doConfigureProperties() Finished configuring."); - - return true; - } - - // -------------------------------------------------------------------------- - // Internal stuff - // -------------------------------------------------------------------------- - - /** - * Check the provided Properties object for a - * {@link LoggerFactory} entry specified by - * {@link LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY}. - * - * If such an entry exists, an attempt is made to create an instance using - * the default constructor. - * This instance is used for subsequent Category creations - * within this configurator. - * - * @see parseCatsAndRenderers() - * @param array $props array of properties - */ - function configureLoggerFactory($props) - { - if(array_key_exists(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY, $props)) - $factoryFqcn = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY]; - if(!empty($factoryFqcn)) { - $factoryClassName = basename($factoryFqcn); - LoggerLog::debug( - "LoggerPropertyConfigurator::configureLoggerFactory() Trying to load factory [" . - $factoryClassName . - "]." - ); - - if (!class_exists($factoryClassName)) - @include_once("{$factoryFqcn}.php"); - if (class_exists($factoryClassName)) { - $loggerFactory = new $factoryClassName(); - } else { - LoggerLog::debug( - "LoggerPropertyConfigurator::configureLoggerFactory() Unable to load factory [" . - $factoryClassName . - "]. Using default." - ); - $loggerFactory = $this->loggerFactory; - } - - LoggerLog::debug( - "LoggerPropertyConfigurator::configureLoggerFactory() ". - "Setting properties for category factory [" . get_class($loggerFactory) . "]." - ); - - LoggerPropertySetter::setPropertiesByObject($loggerFactory, $props, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX . "."); - } - } - - /** - * @param array $props array of properties - * @param LoggerHierarchy &$hierarchy - */ - function configureRootCategory($props, &$hierarchy) - { - $effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX; - $value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX]; - - if(empty($value)) { - $value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX]; - $effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX; - } - - if (empty($value)) { - LoggerLog::debug( - "LoggerPropertyConfigurator::configureRootCategory() ". - "Could not find root logger information. Is this OK?" - ); - } else { - $root =& $hierarchy->getRootLogger(); - // synchronized(root) { - $this->parseCategory( - $props, - $root, - $effectivePrefix, - LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME, - $value - ); - // } - } - } - - /** - * Parse non-root elements, such non-root categories and renderers. - * - * @param array $props array of properties - * @param LoggerHierarchy &$hierarchy - */ - function parseCatsAndRenderers($props, &$hierarchy) - { - while(list($key,$value) = each($props)) { - if( strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0 or - strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) { - if(strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0) { - $loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX)); - } elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) { - $loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX)); - } - $logger =& $hierarchy->getLogger($loggerName, $this->loggerFactory); - // synchronized(logger) { - $this->parseCategory($props, $logger, $key, $loggerName, $value); - $this->parseAdditivityForLogger($props, $logger, $loggerName); - // } - } elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX) === 0) { - $renderedClass = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX)); - $renderingClass = $value; - if (method_exists($hierarchy, 'addrenderer')) { - LoggerRendererMap::addRenderer($hierarchy, $renderedClass, $renderingClass); - } - } - } - } - - /** - * Parse the additivity option for a non-root category. - * - * @param array $props array of properties - * @param Logger &$cat - * @param string $loggerName - */ - function parseAdditivityForLogger($props, &$cat, $loggerName) - { - $value = LoggerOptionConverter::findAndSubst( - LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName, - $props - ); - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAdditivityForLogger() ". - "Handling " . LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName . "=[{$value}]" - ); - // touch additivity only if necessary - if(!empty($value)) { - $additivity = LoggerOptionConverter::toBoolean($value, true); - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAdditivityForLogger() ". - "Setting additivity for [{$loggerName}] to [{$additivity}]" - ); - $cat->setAdditivity($additivity); - } - } - - /** - * This method must work for the root category as well. - * - * @param array $props array of properties - * @param Logger &$logger - * @param string $optionKey - * @param string $loggerName - * @param string $value - * @return Logger - */ - function &parseCategory($props, &$logger, $optionKey, $loggerName, $value) - { - LoggerLog::debug( - "LoggerPropertyConfigurator::parseCategory() ". - "Parsing for [{$loggerName}] with value=[{$value}]." - ); - - // We must skip over ',' but not white space - $st = explode(',', $value); - - // If value is not in the form ", appender.." or "", then we should set - // the level of the loggeregory. - - if(!(@$value{0} == ',' || empty($value))) { - // just to be on the safe side... - if(sizeof($st) == 0) - return; - - $levelStr = current($st); - LoggerLog::debug( - "LoggerPropertyConfigurator::parseCategory() ". - "Level token is [$levelStr]." - ); - - // If the level value is inherited, set category level value to - // null. We also check that the user has not specified inherited for the - // root category. - if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) { - if ($loggerName == LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME) { - LoggerLog::warn( - "LoggerPropertyConfigurator::parseCategory() ". - "The root logger cannot be set to null." - ); - } else { - $logger->setLevel(null); - } - } else { - $logger->setLevel(LoggerOptionConverter::toLevel($levelStr, LoggerLevel::getLevelDebug())); - } - } - - // Begin by removing all existing appenders. - $logger->removeAllAppenders(); - while($appenderName = next($st)) { - $appenderName = trim($appenderName); - if(empty($appenderName)) - continue; - LoggerLog::debug( - "LoggerPropertyConfigurator::parseCategory() ". - "Parsing appender named [{$appenderName}]." - ); - $appender =& $this->parseAppender($props, $appenderName); - if($appender !== null) { - $logger->addAppender($appender); - } - } - } - - /** - * @param array $props array of properties - * @param string $appenderName - * @return LoggerAppender - */ - function &parseAppender($props, $appenderName) - { - $appender =& LoggerAppender::singleton($appenderName); - if($appender !== null) { - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAppender() ". - "Appender [{$appenderName}] was already parsed." - ); - return $appender; - } - // Appender was not previously initialized. - $prefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_APPENDER_PREFIX . $appenderName; - $layoutPrefix = $prefix . ".layout"; - $appenderClass = @$props[$prefix]; - if (!empty($appenderClass)) { - $appender =& LoggerAppender::singleton($appenderName, $appenderClass); - if($appender === null) { - LoggerLog::warn( - "LoggerPropertyConfigurator::parseAppender() ". - "Could not instantiate appender named [$appenderName]." - ); - return null; - } - } else { - LoggerLog::warn( - "LoggerPropertyConfigurator::parseAppender() ". - "Could not instantiate appender named [$appenderName] with null className." - ); - return null; - } - - $appender->setName($appenderName); - if( $appender->requiresLayout() ) { - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAppender() ". - "Parsing layout section for [$appenderName]." - ); - $layoutClass = @$props[$layoutPrefix]; - $layoutClass = LoggerOptionConverter::substVars($layoutClass, $props); - if (empty($layoutClass)) { - LoggerLog::warn( - "LoggerPropertyConfigurator::parseAppender() ". - "layout class is empty in '$layoutPrefix'. Using Simple layout" - ); - $layout = LoggerLayout::factory('LoggerLayoutSimple'); - } else { - $layout = LoggerLayout::factory($layoutClass); - - if($layout === null) { - LoggerLog::warn( - "LoggerPropertyConfigurator::parseAppender() ". - "cannot create layout '$layoutClass'. Using Simple layout" - ); - $layout = LoggerLayout::factory('LoggerLayoutSimple'); - } - } - - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAppender() ". - "Parsing layout options for [$appenderName]." - ); - LoggerPropertySetter::setPropertiesByObject($layout, $props, $layoutPrefix . "."); - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAppender() ". - "End Parsing layout options for [$appenderName]." - ); - $appender->setLayout($layout); - - } - LoggerPropertySetter::setPropertiesByObject($appender, $props, $prefix . "."); - LoggerLog::debug( - "LoggerPropertyConfigurator::parseAppender() ". - "Parsed [{$appenderName}] options." - ); - return $appender; - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/config/LoggerPropertySetter.php'); +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); +require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); +require_once(LOG4PHP_DIR . '/or/LoggerRendererMap.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); +require_once(LOG4PHP_DIR . '/LoggerAppender.php'); +require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php'); +require_once(LOG4PHP_DIR . '/LoggerLayout.php'); +require_once(LOG4PHP_DIR . '/LoggerLevel.php'); +require_once(LOG4PHP_DIR . '/LoggerManager.php'); + +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX', "log4php.category."); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX', "log4php.logger."); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX', "log4php.factory"); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX', "log4php.additivity."); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX', "log4php.rootCategory"); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX', "log4php.rootLogger"); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_APPENDER_PREFIX', "log4php.appender."); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX', "log4php.renderer."); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX', "log4php.threshold"); + +/** + * Key for specifying the {@link LoggerFactory}. + */ +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY', "log4php.loggerFactory"); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY', "log4php.debug"); +define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME', "root"); + + + +/** + * Allows the configuration of log4php from an external file. + * + * See {@link doConfigure()} for the expected format. + * + *

    It is sometimes useful to see how log4php is reading configuration + * files. You can enable log4php internal logging by defining the + * log4php.debug variable.

    + * + *

    The LoggerPropertyConfigurator does not handle the + * advanced configuration features supported by the {@link LoggerDOMConfigurator} + * such as support for {@link LoggerFilter}, + custom {@link LoggerErrorHandlers}, nested appenders such as the + {@link Logger AsyncAppender}, + * etc. + * + *

    All option values admit variable substitution. The + * syntax of variable substitution is similar to that of Unix + * shells. The string between an opening "${" and + * closing "}" is interpreted as a key. The value of + * the substituted variable can be defined as a system property or in + * the configuration file itself. The value of the key is first + * searched in the defined constants, in the enviroments variables + * and if not found there, it is + * then searched in the configuration file being parsed. The + * corresponding value replaces the ${variableName} sequence.

    + *

    For example, if $_ENV['home'] env var is set to + * /home/xyz, then every occurrence of the sequence + * ${home} will be interpreted as + * /home/xyz. See {@link LoggerOptionConverter::getSystemProperty()} + * for details.

    + * + * @author VxR + * @version $Revision: 1.6 $ + * @package log4php + * @since 0.5 + */ +class LoggerPropertyConfigurator extends LoggerConfigurator { + + /** + * @var LoggerFactory + */ + var $loggerFactory = null; + + /** + * Constructor + */ + function LoggerPropertyConfigurator() + { + $this->loggerFactory = new LoggerDefaultCategoryFactory(); + } + + /** + * Configure the default repository using the resource pointed by url. + * Url is any valid resurce as defined in {@link PHP_MANUAL#file} function. + * Note that the resource will be search with use_include_path parameter + * set to "1". + * + * @param string $url + * @return boolean configuration result + * @static + */ + function configure($url = '') + { + $configurator = new LoggerPropertyConfigurator(); + $repository =& LoggerManager::getLoggerRepository(); + return $configurator->doConfigure($url, $repository); + } + + /** + * Read configuration from a file. + * + *

    The function {@link PHP_MANUAL#parse_ini_file} is used to read the + * file.

    + * + * The existing configuration is not cleared nor reset. + * If you require a different behavior, then call + * {@link LoggerManager::resetConfiguration()} + * method before calling {@link doConfigure()}. + * + *

    The configuration file consists of statements in the format + * key=value. The syntax of different configuration + * elements are discussed below. + * + *

    Repository-wide threshold

    + * + *

    The repository-wide threshold filters logging requests by level + * regardless of logger. The syntax is: + * + *

    +     * log4php.threshold=[level]
    +     * 
    + * + *

    The level value can consist of the string values OFF, FATAL, + * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A + * custom level value can be specified in the form + * level#classname. By default the repository-wide threshold is set + * to the lowest possible value, namely the level ALL. + *

    + * + * + *

    Appender configuration

    + * + *

    Appender configuration syntax is:

    + *
    +     * ; For appender named appenderName, set its class.
    +     * ; Note: The appender name can contain dots.
    +     * log4php.appender.appenderName=name_of_appender_class
    +     * 
    +     * ; Set appender specific options.
    +     * 
    +     * log4php.appender.appenderName.option1=value1
    +     * log4php.appender.appenderName.optionN=valueN
    +     * 
    + * + * For each named appender you can configure its {@link LoggerLayout}. The + * syntax for configuring an appender's layout is: + *
    +     * log4php.appender.appenderName.layout=name_of_layout_class
    +     * log4php.appender.appenderName.layout.option1=value1
    +     *  ....
    +     * log4php.appender.appenderName.layout.optionN=valueN
    +     * 
    + * + *

    Configuring loggers

    + * + *

    The syntax for configuring the root logger is: + *

    +     * log4php.rootLogger=[level], appenderName, appenderName, ...
    +     * 
    + * + *

    This syntax means that an optional level can be + * supplied followed by appender names separated by commas. + * + *

    The level value can consist of the string values OFF, FATAL, + * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A + * custom level value can be specified in the form

    + * + *
    level#classname
    + * + *

    If a level value is specified, then the root level is set + * to the corresponding level. If no level value is specified, + * then the root level remains untouched. + * + *

    The root logger can be assigned multiple appenders. + * + *

    Each appenderName (separated by commas) will be added to + * the root logger. The named appender is defined using the + * appender syntax defined above. + * + *

    For non-root categories the syntax is almost the same: + *

    +     * log4php.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ...
    +     * 
    + * + *

    The meaning of the optional level value is discussed above + * in relation to the root logger. In addition however, the value + * INHERITED can be specified meaning that the named logger should + * inherit its level from the logger hierarchy.

    + * + *

    If no level value is supplied, then the level of the + * named logger remains untouched.

    + * + *

    By default categories inherit their level from the + * hierarchy. However, if you set the level of a logger and later + * decide that that logger should inherit its level, then you should + * specify INHERITED as the value for the level value. NULL is a + * synonym for INHERITED.

    + * + *

    Similar to the root logger syntax, each appenderName + * (separated by commas) will be attached to the named logger.

    + * + *

    See the appender additivity rule in the user manual for + * the meaning of the additivity flag. + * + *

    ObjectRenderers

    + * + *

    You can customize the way message objects of a given type are + * converted to String before being logged. This is done by + * specifying a {@link LoggerObjectRenderer} + * for the object type would like to customize.

    + * + *

    The syntax is: + * + *

    +     * log4php.renderer.name_of_rendered_class=name_of_rendering.class
    +     * 
    + * + * As in, + *
    +     * log4php.renderer.myFruit=myFruitRenderer
    +     * 
    + * + *

    Logger Factories

    + * + * The usage of custom logger factories is discouraged and no longer + * documented. + * + *

    Example

    + * + *

    An example configuration is given below. Other configuration + * file examples are given in the tests folder. + * + *

    +     * ; Set options for appender named "A1".
    +     * ; Appender "A1" will be a SyslogAppender
    +     * log4php.appender.A1=SyslogAppender
    +     * 
    +     * ; The syslog daemon resides on www.abc.net
    +     * log4php.appender.A1.SyslogHost=www.abc.net
    +     * 
    +     * ; A1's layout is a LoggerPatternLayout, using the conversion pattern
    +     * ; %r %-5p %c{2} %M.%L %x - %m%n. Thus, the log output will
    +     * ; include the relative time since the start of the application in
    +     * ; milliseconds, followed by the level of the log request,
    +     * ; followed by the two rightmost components of the logger name,
    +     * ; followed by the callers method name, followed by the line number,
    +     * ; the nested disgnostic context and finally the message itself.
    +     * ; Refer to the documentation of LoggerPatternLayout} for further information
    +     * ; on the syntax of the ConversionPattern key.
    +     * log4php.appender.A1.layout=LoggerPatternLayout
    +     * log4php.appender.A1.layout.ConversionPattern="%-4r %-5p %c{2} %M.%L %x - %m%n"
    +     * 
    +     * ; Set options for appender named "A2"
    +     * ; A2 should be a LoggerAppenderRollingFile, with maximum file size of 10 MB
    +     * ; using at most one backup file. A2's layout is TTCC, using the
    +     * ; ISO8061 date format with context printing enabled.
    +     * log4php.appender.A2=LoggerAppenderRollingFile
    +     * log4php.appender.A2.MaxFileSize=10MB
    +     * log4php.appender.A2.MaxBackupIndex=1
    +     * log4php.appender.A2.layout=LoggerLayoutTTCC
    +     * log4php.appender.A2.layout.ContextPrinting="true"
    +     * log4php.appender.A2.layout.DateFormat="%c"
    +     * 
    +     * ; Root logger set to DEBUG using the A2 appender defined above.
    +     * log4php.rootLogger=DEBUG, A2
    +     * 
    +     * ; Logger definitions:
    +     * ; The SECURITY logger inherits is level from root. However, it's output
    +     * ; will go to A1 appender defined above. It's additivity is non-cumulative.
    +     * log4php.logger.SECURITY=INHERIT, A1
    +     * log4php.additivity.SECURITY=false
    +     * 
    +     * ; Only warnings or above will be logged for the logger "SECURITY.access".
    +     * ; Output will go to A1.
    +     * log4php.logger.SECURITY.access=WARN
    +     * 
    +     * 
    +     * ; The logger "class.of.the.day" inherits its level from the
    +     * ; logger hierarchy.  Output will go to the appender's of the root
    +     * ; logger, A2 in this case.
    +     * log4php.logger.class.of.the.day=INHERIT
    +     * 
    + * + *

    Refer to the setOption method in each Appender and + * Layout for class specific options.

    + * + *

    Use the ";" character at the + * beginning of a line for comments.

    + * + * @param string $url The name of the configuration file where the + * configuration information is stored. + * @param LoggerHierarchy &$repository the repository to apply the configuration + */ + function doConfigure($url, &$repository) + { + $properties = @parse_ini_file($url); + if ($properties === false) { + LoggerLog::warn("LoggerPropertyConfigurator::doConfigure() cannot load '$url' configuration."); + return false; + } + return $this->doConfigureProperties($properties, $repository); + } + + + /** + * Read configuration options from properties. + * + * @see doConfigure(). + * @param array $properties + * @param LoggerHierarchy &$hierarchy + */ + function doConfigureProperties($properties, &$hierarchy) + { + $value = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY]; + + if (!empty($value)) { + LoggerLog::internalDebugging(LoggerOptionConverter::toBoolean($value, LoggerLog::internalDebugging())); + } + + $thresholdStr = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX]; + $hierarchy->setThreshold(LoggerOptionConverter::toLevel($thresholdStr, LoggerLevel::getLevelAll())); + + $this->configureRootCategory($properties, $hierarchy); + $this->configureLoggerFactory($properties); + $this->parseCatsAndRenderers($properties, $hierarchy); + + LoggerLog::debug("LoggerPropertyConfigurator::doConfigureProperties() Finished configuring."); + + return true; + } + + // -------------------------------------------------------------------------- + // Internal stuff + // -------------------------------------------------------------------------- + + /** + * Check the provided Properties object for a + * {@link LoggerFactory} entry specified by + * {@link LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY}. + * + * If such an entry exists, an attempt is made to create an instance using + * the default constructor. + * This instance is used for subsequent Category creations + * within this configurator. + * + * @see parseCatsAndRenderers() + * @param array $props array of properties + */ + function configureLoggerFactory($props) + { + $factoryFqcn = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY]; + if(!empty($factoryFqcn)) { + $factoryClassName = basename($factoryFqcn); + LoggerLog::debug( + "LoggerPropertyConfigurator::configureLoggerFactory() Trying to load factory [" . + $factoryClassName . + "]." + ); + + if (!class_exists($factoryClassName)) + @include_once("{$factoryFqcn}.php"); + if (class_exists($factoryClassName)) { + $loggerFactory = new $factoryClassName(); + } else { + LoggerLog::debug( + "LoggerPropertyConfigurator::configureLoggerFactory() Unable to load factory [" . + $factoryClassName . + "]. Using default." + ); + $loggerFactory = $this->loggerFactory; + } + + LoggerLog::debug( + "LoggerPropertyConfigurator::configureLoggerFactory() ". + "Setting properties for category factory [" . get_class($loggerFactory) . "]." + ); + + LoggerPropertySetter::setPropertiesByObject($loggerFactory, $props, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX . "."); + } + } + + /** + * @param array $props array of properties + * @param LoggerHierarchy &$hierarchy + */ + function configureRootCategory($props, &$hierarchy) + { + $effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX; + $value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX]; + + if(empty($value)) { + $value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX]; + $effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX; + } + + if (empty($value)) { + LoggerLog::debug( + "LoggerPropertyConfigurator::configureRootCategory() ". + "Could not find root logger information. Is this OK?" + ); + } else { + $root =& $hierarchy->getRootLogger(); + // synchronized(root) { + $this->parseCategory( + $props, + $root, + $effectivePrefix, + LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME, + $value + ); + // } + } + } + + /** + * Parse non-root elements, such non-root categories and renderers. + * + * @param array $props array of properties + * @param LoggerHierarchy &$hierarchy + */ + function parseCatsAndRenderers($props, &$hierarchy) + { + while(list($key,$value) = each($props)) { + if( strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0 or + strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) { + if(strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0) { + $loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX)); + } elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) { + $loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX)); + } + $logger =& $hierarchy->getLogger($loggerName, $this->loggerFactory); + // synchronized(logger) { + $this->parseCategory($props, $logger, $key, $loggerName, $value); + $this->parseAdditivityForLogger($props, $logger, $loggerName); + // } + } elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX) === 0) { + $renderedClass = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX)); + $renderingClass = $value; + if (method_exists($hierarchy, 'addrenderer')) { + LoggerRendererMap::addRenderer($hierarchy, $renderedClass, $renderingClass); + } + } + } + } + + /** + * Parse the additivity option for a non-root category. + * + * @param array $props array of properties + * @param Logger &$cat + * @param string $loggerName + */ + function parseAdditivityForLogger($props, &$cat, $loggerName) + { + $value = LoggerOptionConverter::findAndSubst( + LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName, + $props + ); + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAdditivityForLogger() ". + "Handling " . LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName . "=[{$value}]" + ); + // touch additivity only if necessary + if(!empty($value)) { + $additivity = LoggerOptionConverter::toBoolean($value, true); + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAdditivityForLogger() ". + "Setting additivity for [{$loggerName}] to [{$additivity}]" + ); + $cat->setAdditivity($additivity); + } + } + + /** + * This method must work for the root category as well. + * + * @param array $props array of properties + * @param Logger &$logger + * @param string $optionKey + * @param string $loggerName + * @param string $value + * @return Logger + */ + function &parseCategory($props, &$logger, $optionKey, $loggerName, $value) + { + LoggerLog::debug( + "LoggerPropertyConfigurator::parseCategory() ". + "Parsing for [{$loggerName}] with value=[{$value}]." + ); + + // We must skip over ',' but not white space + $st = explode(',', $value); + + // If value is not in the form ", appender.." or "", then we should set + // the level of the loggeregory. + + if(!(@$value{0} == ',' || empty($value))) { + // just to be on the safe side... + if(sizeof($st) == 0) + return; + + $levelStr = current($st); + LoggerLog::debug( + "LoggerPropertyConfigurator::parseCategory() ". + "Level token is [$levelStr]." + ); + + // If the level value is inherited, set category level value to + // null. We also check that the user has not specified inherited for the + // root category. + if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) { + if ($loggerName == LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME) { + LoggerLog::warn( + "LoggerPropertyConfigurator::parseCategory() ". + "The root logger cannot be set to null." + ); + } else { + $logger->setLevel(null); + } + } else { + $logger->setLevel(LoggerOptionConverter::toLevel($levelStr, LoggerLevel::getLevelDebug())); + } + } + + // Begin by removing all existing appenders. + $logger->removeAllAppenders(); + while($appenderName = next($st)) { + $appenderName = trim($appenderName); + if(empty($appenderName)) + continue; + LoggerLog::debug( + "LoggerPropertyConfigurator::parseCategory() ". + "Parsing appender named [{$appenderName}]." + ); + $appender =& $this->parseAppender($props, $appenderName); + if($appender !== null) { + $logger->addAppender($appender); + } + } + } + + /** + * @param array $props array of properties + * @param string $appenderName + * @return LoggerAppender + */ + function &parseAppender($props, $appenderName) + { + $appender =& LoggerAppender::singleton($appenderName); + if($appender !== null) { + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAppender() ". + "Appender [{$appenderName}] was already parsed." + ); + return $appender; + } + // Appender was not previously initialized. + $prefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_APPENDER_PREFIX . $appenderName; + $layoutPrefix = $prefix . ".layout"; + $appenderClass = @$props[$prefix]; + if (!empty($appenderClass)) { + $appender =& LoggerAppender::singleton($appenderName, $appenderClass); + if($appender === null) { + LoggerLog::warn( + "LoggerPropertyConfigurator::parseAppender() ". + "Could not instantiate appender named [$appenderName]." + ); + return null; + } + } else { + LoggerLog::warn( + "LoggerPropertyConfigurator::parseAppender() ". + "Could not instantiate appender named [$appenderName] with null className." + ); + return null; + } + + $appender->setName($appenderName); + if( $appender->requiresLayout() ) { + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAppender() ". + "Parsing layout section for [$appenderName]." + ); + $layoutClass = @$props[$layoutPrefix]; + $layoutClass = LoggerOptionConverter::substVars($layoutClass, $props); + if (empty($layoutClass)) { + LoggerLog::warn( + "LoggerPropertyConfigurator::parseAppender() ". + "layout class is empty in '$layoutPrefix'. Using Simple layout" + ); + $layout = LoggerLayout::factory('LoggerLayoutSimple'); + } else { + $layout = LoggerLayout::factory($layoutClass); + + if($layout === null) { + LoggerLog::warn( + "LoggerPropertyConfigurator::parseAppender() ". + "cannot create layout '$layoutClass'. Using Simple layout" + ); + $layout = LoggerLayout::factory('LoggerLayoutSimple'); + } + } + + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAppender() ". + "Parsing layout options for [$appenderName]." + ); + LoggerPropertySetter::setPropertiesByObject($layout, $props, $layoutPrefix . "."); + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAppender() ". + "End Parsing layout options for [$appenderName]." + ); + $appender->setLayout($layout); + + } + LoggerPropertySetter::setPropertiesByObject($appender, $props, $prefix . "."); + LoggerLog::debug( + "LoggerPropertyConfigurator::parseAppender() ". + "Parsed [{$appenderName}] options." + ); + return $appender; + } + +} ?> Modified: vtigercrm/trunk/log4php/LoggerRoot.php ============================================================================== --- vtigercrm/trunk/log4php/LoggerRoot.php (original) +++ vtigercrm/trunk/log4php/LoggerRoot.php Wed May 3 22:07:13 2006 @@ -1,101 +1,101 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - */ -require_once(LOG4PHP_DIR . '/Logger.php'); -require_once(LOG4PHP_DIR . '/LoggerLevel.php'); - -/** - * The root logger. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @see Logger - */ -class LoggerRoot extends Logger { - - /** - * @var string name of logger - */ - var $name = 'root'; - - /** - * @var object must be null for LoggerRoot - */ - var $parent = null; - - - /** - * Constructor - * - * @param integer $level initial log level - */ - function LoggerRoot($level = null) - { - $this->Logger($this->name); - if ($level == null) - $level = LoggerLevel::getLevelAll(); - $this->setLevel($level); - } - - /** - * @return integer the level - */ - function getChainedLevel() - { - return $this->level; - } - - /** - * Setting a null value to the level of the root category may have catastrophic results. - * @param LoggerLevel $level - */ - function setLevel($level) - { - $this->level = $level; - } - - /** - * Please use setLevel() instead. - * @param LoggerLevel $level - * @deprecated - */ - function setPriority($level) - { - $this->setLevel($level); - } - - /** - * Always returns false. - * Because LoggerRoot has no parents, it returns false. - * @param Logger $parent - * @return boolean - */ - function setParent($parent) - { - return false; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + */ +require_once(LOG4PHP_DIR . '/Logger.php'); +require_once(LOG4PHP_DIR . '/LoggerLevel.php'); + +/** + * The root logger. + * + * @author VxR + * @version $Revision: 1.9 $ + * @package log4php + * @see Logger + */ +class LoggerRoot extends Logger { + + /** + * @var string name of logger + */ + var $name = 'root'; + + /** + * @var object must be null for LoggerRoot + */ + var $parent = null; + + + /** + * Constructor + * + * @param integer $level initial log level + */ + function LoggerRoot($level = null) + { + $this->Logger($this->name); + if ($level == null) + $level = LoggerLevel::getLevelAll(); + $this->setLevel($level); + } + + /** + * @return integer the level + */ + function getChainedLevel() + { + return $this->level; + } + + /** + * Setting a null value to the level of the root category may have catastrophic results. + * @param LoggerLevel $level + */ + function setLevel($level) + { + $this->level = $level; + } + + /** + * Please use setLevel() instead. + * @param LoggerLevel $level + * @deprecated + */ + function setPriority($level) + { + $this->setLevel($level); + } + + /** + * Always returns false. + * Because LoggerRoot has no parents, it returns false. + * @param Logger $parent + * @return boolean + */ + function setParent($parent) + { + return false; + } +} ?> From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 00:09:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:09:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5731 - in /vtigercrm/trunk/log4php/config: LoggerPropertyGetter.php LoggerPropertySetter.php Message-ID: <20060504040945.6EFB9709F1E@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:09:40 2006 New Revision: 5731 Log: log4php latest version has been updated Modified: vtigercrm/trunk/log4php/config/LoggerPropertyGetter.php vtigercrm/trunk/log4php/config/LoggerPropertySetter.php Modified: vtigercrm/trunk/log4php/config/LoggerPropertyGetter.php ============================================================================== --- vtigercrm/trunk/log4php/config/LoggerPropertyGetter.php (original) +++ vtigercrm/trunk/log4php/config/LoggerPropertyGetter.php Wed May 3 22:09:40 2006 @@ -1,37 +1,37 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage config - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage config - * @since 0.5 - * @todo Ehm... try to guess... - */ -class LoggerPropertyGetter { - -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage config + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @subpackage config + * @since 0.5 + * @todo Ehm... try to guess... + */ +class LoggerPropertyGetter { + +} + ?> Modified: vtigercrm/trunk/log4php/config/LoggerPropertySetter.php ============================================================================== --- vtigercrm/trunk/log4php/config/LoggerPropertySetter.php (original) +++ vtigercrm/trunk/log4php/config/LoggerPropertySetter.php Wed May 3 22:09:40 2006 @@ -1,161 +1,161 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage config - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/LoggerLog.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); - -/** - * General purpose Object property setter. Clients repeatedly invokes - * {@link setProperty()} in order to invoke setters - * on the Object specified in the constructor. - * - * Usage: - * - * $ps = new LoggerPropertySetter($anObject); - * $ps->set("name", "Joe"); - * $ps->set("age", 32); - * $ps->set("isMale", true); - * - * will cause the invocations - * - * $anObject->setName("Joe"); - * $anObject->setAge(32); - * $anObject->setMale(true) - * - * if such methods exist. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage config - * @since 0.5 - */ -class LoggerPropertySetter { - - /** - * @var object the target object - * @access private - */ - var $obj; - - /** - * Create a new LoggerPropertySetter for the specified Object. - * This is done in prepartion for invoking {@link setProperty()} - * one or more times. - * @param object &$obj the object for which to set properties - */ - function LoggerPropertySetter(&$obj) - { - $this->obj =& $obj; - } - - /** - * Set the properties of an object passed as a parameter in one - * go. The properties are parsed relative to a - * prefix. - * - * @param object &$obj The object to configure. - * @param array $properties An array containing keys and values. - * @param string $prefix Only keys having the specified prefix will be set. - * @static - */ - function setPropertiesByObject(&$obj, $properties, $prefix) - { - $pSetter = new LoggerPropertySetter($obj); - return $pSetter->setProperties($properties, $prefix); - } - - - /** - * Set the properites for the object that match the - * prefix passed as parameter. - * - * @param array $properties An array containing keys and values. - * @param string $prefix Only keys having the specified prefix will be set. - */ - function setProperties($properties, $prefix) - { - LoggerLog::debug("LoggerOptionConverter::setProperties():prefix=[{$prefix}]"); - - $len = strlen($prefix); - while (list($key,) = each($properties)) { - if (strpos($key, $prefix) === 0) { - if (strpos($key, '.', ($len + 1)) > 0) - continue; - $value = LoggerOptionConverter::findAndSubst($key, $properties); - $key = substr($key, $len); - if ($key == 'layout' and is_a($this->obj, 'loggerappender')) { - continue; - } - $this->setProperty($key, $value); - } - } - $this->activate(); - } - - /** - * Set a property on this PropertySetter's Object. If successful, this - * method will invoke a setter method on the underlying Object. The - * setter is the one for the specified property name and the value is - * determined partly from the setter argument type and partly from the - * value specified in the call to this method. - * - *

    If the setter expects a String no conversion is necessary. - * If it expects an int, then an attempt is made to convert 'value' - * to an int using new Integer(value). If the setter expects a boolean, - * the conversion is by new Boolean(value). - * - * @param string $name name of the property - * @param string $value String value of the property - */ - function setProperty($name, $value) - { - LoggerLog::debug("LoggerOptionConverter::setProperty():name=[{$name}]:value=[{$value}]"); - - if ($value === null) return; - - $method = "set" . ucfirst($name); - - if (!method_exists($this->obj, $method)) { - LoggerLog::warn( - "LoggerOptionConverter::setProperty() No such setter method for [{$name}] property in " . - get_class($this->obj) . "." - ); - } else { - return call_user_func(array(&$this->obj, $method), $value); - } - } - - function activate() - { - LoggerLog::debug("LoggerOptionConverter::activate()"); - - if (method_exists($this->obj, 'activateoptions')) { - return call_user_func(array(&$this->obj, 'activateoptions')); - } else { - LoggerLog::debug("LoggerOptionConverter::activate() Nothing to activate."); - } - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage config + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +require_once(LOG4PHP_DIR . '/LoggerLog.php'); +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); + +/** + * General purpose Object property setter. Clients repeatedly invokes + * {@link setProperty()} in order to invoke setters + * on the Object specified in the constructor. + * + * Usage: + * + * $ps = new LoggerPropertySetter($anObject); + * $ps->set("name", "Joe"); + * $ps->set("age", 32); + * $ps->set("isMale", true); + * + * will cause the invocations + * + * $anObject->setName("Joe"); + * $anObject->setAge(32); + * $anObject->setMale(true) + * + * if such methods exist. + * + * @author VxR + * @version $Revision: 1.4 $ + * @package log4php + * @subpackage config + * @since 0.5 + */ +class LoggerPropertySetter { + + /** + * @var object the target object + * @access private + */ + var $obj; + + /** + * Create a new LoggerPropertySetter for the specified Object. + * This is done in prepartion for invoking {@link setProperty()} + * one or more times. + * @param object &$obj the object for which to set properties + */ + function LoggerPropertySetter(&$obj) + { + $this->obj =& $obj; + } + + /** + * Set the properties of an object passed as a parameter in one + * go. The properties are parsed relative to a + * prefix. + * + * @param object &$obj The object to configure. + * @param array $properties An array containing keys and values. + * @param string $prefix Only keys having the specified prefix will be set. + * @static + */ + function setPropertiesByObject(&$obj, $properties, $prefix) + { + $pSetter = new LoggerPropertySetter($obj); + return $pSetter->setProperties($properties, $prefix); + } + + + /** + * Set the properites for the object that match the + * prefix passed as parameter. + * + * @param array $properties An array containing keys and values. + * @param string $prefix Only keys having the specified prefix will be set. + */ + function setProperties($properties, $prefix) + { + LoggerLog::debug("LoggerOptionConverter::setProperties():prefix=[{$prefix}]"); + + $len = strlen($prefix); + while (list($key,) = each($properties)) { + if (strpos($key, $prefix) === 0) { + if (strpos($key, '.', ($len + 1)) > 0) + continue; + $value = LoggerOptionConverter::findAndSubst($key, $properties); + $key = substr($key, $len); + if ($key == 'layout' and is_a($this->obj, 'loggerappender')) { + continue; + } + $this->setProperty($key, $value); + } + } + $this->activate(); + } + + /** + * Set a property on this PropertySetter's Object. If successful, this + * method will invoke a setter method on the underlying Object. The + * setter is the one for the specified property name and the value is + * determined partly from the setter argument type and partly from the + * value specified in the call to this method. + * + *

    If the setter expects a String no conversion is necessary. + * If it expects an int, then an attempt is made to convert 'value' + * to an int using new Integer(value). If the setter expects a boolean, + * the conversion is by new Boolean(value). + * + * @param string $name name of the property + * @param string $value String value of the property + */ + function setProperty($name, $value) + { + LoggerLog::debug("LoggerOptionConverter::setProperty():name=[{$name}]:value=[{$value}]"); + + if ($value === null) return; + + $method = "set" . ucfirst($name); + + if (!method_exists($this->obj, $method)) { + LoggerLog::warn( + "LoggerOptionConverter::setProperty() No such setter method for [{$name}] property in " . + get_class($this->obj) . "." + ); + } else { + return call_user_func(array(&$this->obj, $method), $value); + } + } + + function activate() + { + LoggerLog::debug("LoggerOptionConverter::activate()"); + + if (method_exists($this->obj, 'activateoptions')) { + return call_user_func(array(&$this->obj, 'activateoptions')); + } else { + LoggerLog::debug("LoggerOptionConverter::activate() Nothing to activate."); + } + } +} ?> From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 00:11:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:11:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5732 - in /vtigercrm/trunk/log4php/helpers: LoggerFormattingInfo.php LoggerOptionConverter.php LoggerPatternConverter.php LoggerPatternParser.php LoggerTransform.php Message-ID: <20060504041130.E8499709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:11:21 2006 New Revision: 5732 Log: log4php latest version has been updated Modified: vtigercrm/trunk/log4php/helpers/LoggerFormattingInfo.php vtigercrm/trunk/log4php/helpers/LoggerOptionConverter.php vtigercrm/trunk/log4php/helpers/LoggerPatternConverter.php vtigercrm/trunk/log4php/helpers/LoggerPatternParser.php vtigercrm/trunk/log4php/helpers/LoggerTransform.php Modified: vtigercrm/trunk/log4php/helpers/LoggerFormattingInfo.php ============================================================================== --- vtigercrm/trunk/log4php/helpers/LoggerFormattingInfo.php (original) +++ vtigercrm/trunk/log4php/helpers/LoggerFormattingInfo.php Wed May 3 22:11:21 2006 @@ -1,61 +1,61 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage helpers - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -/** - * This class encapsulates the information obtained when parsing - * formatting modifiers in conversion modifiers. - * - * @author VxR - * @package log4php - * @subpackage spi - * @since 0.3 - */ -class LoggerFormattingInfo { - - var $min = -1; - var $max = 0x7FFFFFFF; - var $leftAlign = false; - - /** - * Constructor - */ - function LoggerFormattingInfo() {} - - function reset() - { - $this->min = -1; - $this->max = 0x7FFFFFFF; - $this->leftAlign = false; - } - - function dump() - { - LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}"); - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage helpers + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +/** + * This class encapsulates the information obtained when parsing + * formatting modifiers in conversion modifiers. + * + * @author VxR + * @package log4php + * @subpackage spi + * @since 0.3 + */ +class LoggerFormattingInfo { + + var $min = -1; + var $max = 0x7FFFFFFF; + var $leftAlign = false; + + /** + * Constructor + */ + function LoggerFormattingInfo() {} + + function reset() + { + $this->min = -1; + $this->max = 0x7FFFFFFF; + $this->leftAlign = false; + } + + function dump() + { + LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}"); + } +} ?> Modified: vtigercrm/trunk/log4php/helpers/LoggerOptionConverter.php ============================================================================== --- vtigercrm/trunk/log4php/helpers/LoggerOptionConverter.php (original) +++ vtigercrm/trunk/log4php/helpers/LoggerOptionConverter.php Wed May 3 22:11:21 2006 @@ -1,350 +1,350 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage helpers - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/LoggerLevel.php'); - -define('LOG4PHP_OPTION_CONVERTER_DELIM_START', '${'); -define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP', '}'); -define('LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN', 2); -define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN', 1); - -/** - * A convenience class to convert property values to specific types. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage helpers - * @static - * @since 0.5 - */ -class LoggerOptionConverter { - - /** - * OptionConverter is a static class. - */ - function OptionConverter() - { - return; - } - - /** - * @param array $l - * @param array $r - * @return array - * - * @static - */ - function concatanateArrays($l, $r) - { - return array_merge($l, $r); - } - - /** - * Read a predefined var. - * - * It returns a value referenced by $key using this search criteria: - * - if $key is a constant then return it. Else - * - if $key is set in $_ENV then return it. Else - * - return $def. - * - * @param string $key The key to search for. - * @param string $def The default value to return. - * @return string the string value of the system property, or the default - * value if there is no property with that key. - * - * @static - */ - function getSystemProperty($key, $def) - { - LoggerLog::debug("LoggerOptionConverter::getSystemProperty():key=[{$key}]:def=[{$def}]."); - - if (defined($key)) { - return (string)constant($key); - } elseif (isset($_ENV[$key])) { - return (string)$_ENV[$key]; - } else { - return $def; - } - } - - /** - * If $value is true, then true is - * returned. If $value is false, then - * true is returned. Otherwise, $default is - * returned. - * - *

    Case of value is unimportant.

    - * - * @param string $value - * @param boolean $default - * @return boolean - * - * @static - */ - function toBoolean($value, $default) - { - if($value === null) - return $default; - if ($value == 1) - return true; - $trimmedVal = strtolower(trim($value)); - if ("true" == $trimmedVal or "yes" == $trimmedVal) - return true; - if ("false" == $trimmedVal) - return false; - return $default; - } - - /** - * @param string $value - * @param integer $default - * @return integer - * @static - */ - function toInt($value, $default) - { - $value = trim($value); - if (is_numeric($value)) { - return (int)$value; - } else { - return $default; - } - } - - /** - * Converts a standard or custom priority level to a Level - * object. - * - *

    If $value is of form "level#full_file_classname", - * where full_file_classname means the class filename with path - * but without php extension, then the specified class' toLevel() method - * is called to process the specified level string; if no '#' - * character is present, then the default {@link LoggerLevel} - * class is used to process the level value.

    - * - *

    As a special case, if the $value parameter is - * equal to the string "NULL", then the value null will - * be returned.

    - * - *

    If any error occurs while converting the value to a level, - * the $defaultValue parameter, which may be - * null, is returned.

    - * - *

    Case of $value is insignificant for the level level, but is - * significant for the class name part, if present.

    - * - * @param string $value - * @param LoggerLevel $defaultValue - * @return LoggerLevel a {@link LoggerLevel} or null - * @static - */ - function toLevel($value, $defaultValue) - { - if($value === null) - return $defaultValue; - - $hashIndex = strpos($value, '#'); - if ($hashIndex === false) { - if("NULL" == strtoupper($value)) { - return null; - } else { - // no class name specified : use standard Level class - return LoggerLevel::toLevel($value, $defaultValue); - } - } - - $result = $defaultValue; - - $clazz = substr($value, ($hashIndex + 1)); - $levelName = substr($value, 0, $hashIndex); - - // This is degenerate case but you never know. - if("NULL" == strtoupper($levelName)) { - return null; - } - - LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}]:pri=[{$levelName}]"); - - if (!class_exists($clazz)) - @include_once("{$clazz}.php"); - - $clazz = basename($clazz); - - if (class_exists($clazz)) { - $result = @call_user_func(array($clazz, 'toLevel'), $value, $defaultValue); - if (!is_a($result, 'loggerlevel')) { - LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}] cannot call toLevel(). Returning default."); - $result = $defaultValue; - } - } else { - LoggerLog::warn("LoggerOptionConverter::toLevel() class '{$clazz}' doesnt exists."); - } - return $result; - } - - /** - * @param string $value - * @param float $default - * @return float - * - * @static - */ - function toFileSize($value, $default) - { - if ($value === null) - return $default; - - $s = strtoupper(trim($value)); - $multiplier = (float)1; - if(($index = strpos($s, 'KB')) !== false) { - $multiplier = 1024; - $s = substr($s, 0, $index); - } elseif(($index = strpos($s, 'MB')) !== false) { - $multiplier = 1024 * 1024; - $s = substr($s, 0, $index); - } elseif(($index = strpos($s, 'GB')) !== false) { - $multiplier = 1024 * 1024 * 1024; - $s = substr($s, 0, $index); - } - if(is_numeric($s)) { - return (float)$s * $multiplier; - } else { - LoggerLog::warn("LoggerOptionConverter::toFileSize() [{$s}] is not in proper form."); - } - return $default; - } - - /** - * Find the value corresponding to $key in - * $props. Then perform variable substitution on the - * found value. - * - * @param string $key - * @param array $props - * @return string - * - * @static - */ - function findAndSubst($key, $props) - { - $value = @$props[$key]; - if(empty($value)) { - return null; - } - return LoggerOptionConverter::substVars($value, $props); - } - - /** - * Perform variable substitution in string $val from the - * values of keys found with the {@link getSystemProperty()} method. - * - *

    The variable substitution delimeters are ${ and }. - * - *

    For example, if the "MY_CONSTANT" contains "value", then - * the call - * - * $s = LoggerOptionConverter::substituteVars("Value of key is ${MY_CONSTANT}."); - * - * will set the variable $s to "Value of key is value.".

    - * - *

    If no value could be found for the specified key, then the - * $props parameter is searched, if the value could not - * be found there, then substitution defaults to the empty string.

    - * - *

    For example, if {@link getSystemProperty()} cannot find any value for the key - * "inexistentKey", then the call - * - * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]"); - * - * will set $s to "Value of inexistentKey is []".

    - * - *

    A warn is thrown if $val contains a start delimeter "${" - * which is not balanced by a stop delimeter "}" and an empty string is returned.

    - * - * @log4j-author Avy Sharell - * - * @param string $val The string on which variable substitution is performed. - * @param array $props - * @return string - * - * @static - */ - function substVars($val, $props = null) - { - LoggerLog::debug("LoggerOptionConverter::substVars():val=[{$val}]"); - - $sbuf = ''; - $i = 0; - while(true) { - $j = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_START, $i); - if ($j === false) { - LoggerLog::debug("LoggerOptionConverter::substVars() no more variables"); - // no more variables - if ($i == 0) { // this is a simple string - LoggerLog::debug("LoggerOptionConverter::substVars() simple string"); - return $val; - } else { // add the tail string which contails no variables and return the result. - $sbuf .= substr($val, $i); - LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]. Returning sbuf"); - return $sbuf; - } - } else { - - $sbuf .= substr($val, $i, $j-$i); - LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]:i={$i}:j={$j}."); - $k = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_STOP, $j); - if ($k === false) { - LoggerLog::warn( - "LoggerOptionConverter::substVars() " . - "'{$val}' has no closing brace. Opening brace at position {$j}." - ); - return ''; - } else { - $j += LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN; - $key = substr($val, $j, $k - $j); - // first try in System properties - $replacement = LoggerOptionConverter::getSystemProperty($key, null); - // then try props parameter - if($replacement == null and $props !== null) { - $replacement = @$props[$key]; - } - - if(!empty($replacement)) { - // Do variable substitution on the replacement string - // such that we can solve "Hello ${x2}" as "Hello p1" - // the where the properties are - // x1=p1 - // x2=${x1} - $recursiveReplacement = LoggerOptionConverter::substVars($replacement, $props); - $sbuf .= $recursiveReplacement; - } - $i = $k + LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN; - } - } - } - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage helpers + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +require_once(LOG4PHP_DIR . '/LoggerLevel.php'); + +define('LOG4PHP_OPTION_CONVERTER_DELIM_START', '${'); +define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP', '}'); +define('LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN', 2); +define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN', 1); + +/** + * A convenience class to convert property values to specific types. + * + * @author VxR + * @version $Revision: 1.6 $ + * @package log4php + * @subpackage helpers + * @static + * @since 0.5 + */ +class LoggerOptionConverter { + + /** + * OptionConverter is a static class. + */ + function OptionConverter() + { + return; + } + + /** + * @param array $l + * @param array $r + * @return array + * + * @static + */ + function concatanateArrays($l, $r) + { + return array_merge($l, $r); + } + + /** + * Read a predefined var. + * + * It returns a value referenced by $key using this search criteria: + * - if $key is a constant then return it. Else + * - if $key is set in $_ENV then return it. Else + * - return $def. + * + * @param string $key The key to search for. + * @param string $def The default value to return. + * @return string the string value of the system property, or the default + * value if there is no property with that key. + * + * @static + */ + function getSystemProperty($key, $def) + { + LoggerLog::debug("LoggerOptionConverter::getSystemProperty():key=[{$key}]:def=[{$def}]."); + + if (defined($key)) { + return (string)constant($key); + } elseif (isset($_ENV[$key])) { + return (string)$_ENV[$key]; + } else { + return $def; + } + } + + /** + * If $value is true, then true is + * returned. If $value is false, then + * true is returned. Otherwise, $default is + * returned. + * + *

    Case of value is unimportant.

    + * + * @param string $value + * @param boolean $default + * @return boolean + * + * @static + */ + function toBoolean($value, $default) + { + if($value === null) + return $default; + if ($value == 1) + return true; + $trimmedVal = strtolower(trim($value)); + if ("true" == $trimmedVal or "yes" == $trimmedVal) + return true; + if ("false" == $trimmedVal) + return false; + return $default; + } + + /** + * @param string $value + * @param integer $default + * @return integer + * @static + */ + function toInt($value, $default) + { + $value = trim($value); + if (is_numeric($value)) { + return (int)$value; + } else { + return $default; + } + } + + /** + * Converts a standard or custom priority level to a Level + * object. + * + *

    If $value is of form "level#full_file_classname", + * where full_file_classname means the class filename with path + * but without php extension, then the specified class' toLevel() method + * is called to process the specified level string; if no '#' + * character is present, then the default {@link LoggerLevel} + * class is used to process the level value.

    + * + *

    As a special case, if the $value parameter is + * equal to the string "NULL", then the value null will + * be returned.

    + * + *

    If any error occurs while converting the value to a level, + * the $defaultValue parameter, which may be + * null, is returned.

    + * + *

    Case of $value is insignificant for the level level, but is + * significant for the class name part, if present.

    + * + * @param string $value + * @param LoggerLevel $defaultValue + * @return LoggerLevel a {@link LoggerLevel} or null + * @static + */ + function toLevel($value, $defaultValue) + { + if($value === null) + return $defaultValue; + + $hashIndex = strpos($value, '#'); + if ($hashIndex === false) { + if("NULL" == strtoupper($value)) { + return null; + } else { + // no class name specified : use standard Level class + return LoggerLevel::toLevel($value, $defaultValue); + } + } + + $result = $defaultValue; + + $clazz = substr($value, ($hashIndex + 1)); + $levelName = substr($value, 0, $hashIndex); + + // This is degenerate case but you never know. + if("NULL" == strtoupper($levelName)) { + return null; + } + + LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}]:pri=[{$levelName}]"); + + if (!class_exists($clazz)) + @include_once("{$clazz}.php"); + + $clazz = basename($clazz); + + if (class_exists($clazz)) { + $result = @call_user_func(array($clazz, 'toLevel'), $value, $defaultValue); + if (!is_a($result, 'loggerlevel')) { + LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}] cannot call toLevel(). Returning default."); + $result = $defaultValue; + } + } else { + LoggerLog::warn("LoggerOptionConverter::toLevel() class '{$clazz}' doesnt exists."); + } + return $result; + } + + /** + * @param string $value + * @param float $default + * @return float + * + * @static + */ + function toFileSize($value, $default) + { + if ($value === null) + return $default; + + $s = strtoupper(trim($value)); + $multiplier = (float)1; + if(($index = strpos($s, 'KB')) !== false) { + $multiplier = 1024; + $s = substr($s, 0, $index); + } elseif(($index = strpos($s, 'MB')) !== false) { + $multiplier = 1024 * 1024; + $s = substr($s, 0, $index); + } elseif(($index = strpos($s, 'GB')) !== false) { + $multiplier = 1024 * 1024 * 1024; + $s = substr($s, 0, $index); + } + if(is_numeric($s)) { + return (float)$s * $multiplier; + } else { + LoggerLog::warn("LoggerOptionConverter::toFileSize() [{$s}] is not in proper form."); + } + return $default; + } + + /** + * Find the value corresponding to $key in + * $props. Then perform variable substitution on the + * found value. + * + * @param string $key + * @param array $props + * @return string + * + * @static + */ + function findAndSubst($key, $props) + { + $value = @$props[$key]; + if(empty($value)) { + return null; + } + return LoggerOptionConverter::substVars($value, $props); + } + + /** + * Perform variable substitution in string $val from the + * values of keys found with the {@link getSystemProperty()} method. + * + *

    The variable substitution delimeters are ${ and }. + * + *

    For example, if the "MY_CONSTANT" contains "value", then + * the call + * + * $s = LoggerOptionConverter::substituteVars("Value of key is ${MY_CONSTANT}."); + * + * will set the variable $s to "Value of key is value.".

    + * + *

    If no value could be found for the specified key, then the + * $props parameter is searched, if the value could not + * be found there, then substitution defaults to the empty string.

    + * + *

    For example, if {@link getSystemProperty()} cannot find any value for the key + * "inexistentKey", then the call + * + * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]"); + * + * will set $s to "Value of inexistentKey is []".

    + * + *

    A warn is thrown if $val contains a start delimeter "${" + * which is not balanced by a stop delimeter "}" and an empty string is returned.

    + * + * @log4j-author Avy Sharell + * + * @param string $val The string on which variable substitution is performed. + * @param array $props + * @return string + * + * @static + */ + function substVars($val, $props = null) + { + LoggerLog::debug("LoggerOptionConverter::substVars():val=[{$val}]"); + + $sbuf = ''; + $i = 0; + while(true) { + $j = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_START, $i); + if ($j === false) { + LoggerLog::debug("LoggerOptionConverter::substVars() no more variables"); + // no more variables + if ($i == 0) { // this is a simple string + LoggerLog::debug("LoggerOptionConverter::substVars() simple string"); + return $val; + } else { // add the tail string which contails no variables and return the result. + $sbuf .= substr($val, $i); + LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]. Returning sbuf"); + return $sbuf; + } + } else { + + $sbuf .= substr($val, $i, $j-$i); + LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]:i={$i}:j={$j}."); + $k = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_STOP, $j); + if ($k === false) { + LoggerLog::warn( + "LoggerOptionConverter::substVars() " . + "'{$val}' has no closing brace. Opening brace at position {$j}." + ); + return ''; + } else { + $j += LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN; + $key = substr($val, $j, $k - $j); + // first try in System properties + $replacement = LoggerOptionConverter::getSystemProperty($key, null); + // then try props parameter + if($replacement == null and $props !== null) { + $replacement = @$props[$key]; + } + + if(!empty($replacement)) { + // Do variable substitution on the replacement string + // such that we can solve "Hello ${x2}" as "Hello p1" + // the where the properties are + // x1=p1 + // x2=${x1} + $recursiveReplacement = LoggerOptionConverter::substVars($replacement, $props); + $sbuf .= $recursiveReplacement; + } + $i = $k + LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN; + } + } + } + } + +} ?> Modified: vtigercrm/trunk/log4php/helpers/LoggerPatternConverter.php ============================================================================== --- vtigercrm/trunk/log4php/helpers/LoggerPatternConverter.php (original) +++ vtigercrm/trunk/log4php/helpers/LoggerPatternConverter.php Wed May 3 22:11:21 2006 @@ -1,504 +1,504 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage helpers - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -/** - * Array for fast space padding - * Used by {@link LoggerPatternConverter::spacePad()}. - */ -$GLOBALS['log4php.LoggerPatternConverter.spaces'] = array(" ", " ", " ", " ", //1,2,4,8 spaces - " ", // 16 spaces - " " ); // 32 spaces - -/** - * LoggerPatternConverter is an abstract class that provides the formatting - * functionality that derived classes need. - * - *

    Conversion specifiers in a conversion patterns are parsed to - * individual PatternConverters. Each of which is responsible for - * converting a logging event in a converter specific manner.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage helpers - * @abstract - * @since 0.3 - */ -class LoggerPatternConverter { - - /** - * @var LoggerPatternConverter next converter in converter chain - */ - var $next = null; - - var $min = -1; - var $max = 0x7FFFFFFF; - var $leftAlign = false; - - /** - * Constructor - * - * @param LoggerFormattingInfo $fi - */ - function LoggerPatternConverter($fi = null) - { - if ($fi !== null) { - $this->min = $fi->min; - $this->max = $fi->max; - $this->leftAlign = $fi->leftAlign; - } - } - - /** - * Derived pattern converters must override this method in order to - * convert conversion specifiers in the correct way. - * - * @param LoggerLoggingEvent $event - */ - function convert($event) {} - - /** - * A template method for formatting in a converter specific way. - * - * @param string &$sbuf string buffer - * @param LoggerLoggingEvent $e - */ - function format(&$sbuf, $e) - { - LoggerLog::debug("LoggerPatternConverter::format() sbuf='$sbuf'"); - - $s = $this->convert($e); - - LoggerLog::debug("LoggerPatternConverter::format() converted event is '$s'"); - - - if($s == null or empty($s)) { - if(0 < $this->min) - $this->spacePad($sbuf, $this->min); - return; - } - - $len = strlen($s); - - if($len > $this->max) { - $sbuf .= substr($s , 0, ($len - $this->max)); - } elseif($len < $this->min) { - if($this->leftAlign) { - $sbuf .= $s; - $this->spacePad($sbuf, ($this->min - $len)); - } else { - $this->spacePad($sbuf, ($this->min - $len)); - $sbuf .= $s; - } - } else { - $sbuf .= $s; - } - } - - - /** - * Fast space padding method. - * - * @param string &$sbuf string buffer - * @param integer $length pad length - * - * @todo reimplement using PHP string functions - */ - function spacePad(&$sbuf, $length) - { - LoggerLog::debug("LoggerPatternConverter::spacePad() sbuf='$sbuf' len='$length'"); - - while($length >= 32) { - $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5]; - $length -= 32; - } - - for($i = 4; $i >= 0; $i--) { - if(($length & (1<<$i)) != 0) { - $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i]; - } - } - - // $sbuf = str_pad($sbuf, $length); - } -} - -// --------------------------------------------------------------------- -// PatternConverters -// --------------------------------------------------------------------- - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerBasicPatternConverter extends LoggerPatternConverter { - - /** - * @var integer - */ - var $type; - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $type - */ - function LoggerBasicPatternConverter($formattingInfo, $type) - { - LoggerLog::debug("LoggerBasicPatternConverter::LoggerBasicPatternConverter() type='$type'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->type = $type; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - switch($this->type) { - case LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER: - $timeStamp = $event->getTimeStamp(); - $startTime = LoggerLoggingEvent::getStartTime(); - return (string)(int)($timeStamp * 1000 - $startTime * 1000); - - case LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER: - return $event->getThreadName(); - - case LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER: - $level = $event->getLevel(); - return $level->toString(); - - case LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER: - return $event->getNDC(); - - case LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER: - return $event->getRenderedMessage(); - - default: - return ''; - } - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerLiteralPatternConverter extends LoggerPatternConverter { - - /** - * @var string - */ - var $literal; - - /** - * Constructor - * - * @param string $value - */ - function LoggerLiteralPatternConverter($value) - { - LoggerLog::debug("LoggerLiteralPatternConverter::LoggerLiteralPatternConverter() value='$value'"); - - $this->literal = $value; - } - - /** - * @param string &$sbuf - * @param LoggerLoggingEvent $event - */ - function format(&$sbuf, $event) - { - $sbuf .= $this->literal; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - return $this->literal; - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerDatePatternConverter extends LoggerPatternConverter { - - /** - * @var string - */ - var $df; - - /** - * Constructor - * - * @param string $formattingInfo - * @param string $df - */ - function LoggerDatePatternConverter($formattingInfo, $df) - { - LoggerLog::debug("LoggerDatePatternConverter::LoggerDatePatternConverter() dateFormat='$df'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->df = $df; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - $timeStamp = $event->getTimeStamp(); - $usecs = round(($timeStamp - (int)$timeStamp) * 1000); - $this->df = str_replace("\u", "u", ereg_replace("[^\\]u", sprintf(',%03d', $usecs), $this->df)); - - return date($this->df, $event->getTimeStamp()); - - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerMDCPatternConverter extends LoggerPatternConverter { - - /** - * @var string - */ - var $key; - - /** - * Constructor - * - * @param string $formattingInfo - * @param string $key - */ - function LoggerMDCPatternConverter($formattingInfo, $key) - { - LoggerLog::debug("LoggerMDCPatternConverter::LoggerMDCPatternConverter() key='$key'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->key = $key; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - return $event->getMDC($this->key); - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerLocationPatternConverter extends LoggerPatternConverter { - - /** - * @var integer - */ - var $type; - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $type - */ - function LoggerLocationPatternConverter($formattingInfo, $type) - { - LoggerLog::debug("LoggerLocationPatternConverter::LoggerLocationPatternConverter() type='$type'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->type = $type; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - $locationInfo = $event->getLocationInformation(); - switch($this->type) { - case LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER: - return $locationInfo->fullInfo; - case LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER: - return $locationInfo->getMethodName(); - case LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER: - return $locationInfo->getLineNumber(); - case LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER: - return $locationInfo->getFileName(); - default: - return ''; - } - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - * @abstract - */ -class LoggerNamedPatternConverter extends LoggerPatternConverter { - - /** - * @var integer - */ - var $precision; - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $precision - */ - function LoggerNamedPatternConverter($formattingInfo, $precision) - { - LoggerLog::debug("LoggerNamedPatternConverter::LoggerNamedPatternConverter() precision='$precision'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->precision = $precision; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - * @abstract - */ - function getFullyQualifiedName($event) - { - // abstract - return; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - $n = $this->getFullyQualifiedName($event); - if ($this->precision <= 0) { - return $n; - } else { - $len = strlen($n); - - // We substract 1 from 'len' when assigning to 'end' to avoid out of - // bounds exception in return r.substring(end+1, len). This can happen if - // precision is 1 and the category name ends with a dot. - $end = $len -1 ; - for($i = $this->precision; $i > 0; $i--) { - $end = strrpos(substr($n, 0, ($end - 1)), '.'); - if ($end == false) - return $n; - } - return substr($n, ($end + 1), $len); - } - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerClassNamePatternConverter extends LoggerNamedPatternConverter { - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $precision - */ - function LoggerClassNamePatternConverter($formattingInfo, $precision) - { - LoggerLog::debug("LoggerClassNamePatternConverter::LoggerClassNamePatternConverter() precision='$precision'"); - - $this->LoggerNamedPatternConverter($formattingInfo, $precision); - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function getFullyQualifiedName($event) - { - return $event->fqcn; - } -} - -/** - * @author VxR - * @package log4php - * @subpackage helpers - */ -class LoggerCategoryPatternConverter extends LoggerNamedPatternConverter { - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $precision - */ - function LoggerCategoryPatternConverter($formattingInfo, $precision) - { - LoggerLog::debug("LoggerCategoryPatternConverter::LoggerCategoryPatternConverter() precision='$precision'"); - - $this->LoggerNamedPatternConverter($formattingInfo, $precision); - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function getFullyQualifiedName($event) - { - return $event->getLoggerName(); - } -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage helpers + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +/** + * Array for fast space padding + * Used by {@link LoggerPatternConverter::spacePad()}. + */ +$GLOBALS['log4php.LoggerPatternConverter.spaces'] = array(" ", " ", " ", " ", //1,2,4,8 spaces + " ", // 16 spaces + " " ); // 32 spaces + +/** + * LoggerPatternConverter is an abstract class that provides the formatting + * functionality that derived classes need. + * + *

    Conversion specifiers in a conversion patterns are parsed to + * individual PatternConverters. Each of which is responsible for + * converting a logging event in a converter specific manner.

    + * + * @author VxR + * @version $Revision: 1.13 $ + * @package log4php + * @subpackage helpers + * @abstract + * @since 0.3 + */ +class LoggerPatternConverter { + + /** + * @var LoggerPatternConverter next converter in converter chain + */ + var $next = null; + + var $min = -1; + var $max = 0x7FFFFFFF; + var $leftAlign = false; + + /** + * Constructor + * + * @param LoggerFormattingInfo $fi + */ + function LoggerPatternConverter($fi = null) + { + if ($fi !== null) { + $this->min = $fi->min; + $this->max = $fi->max; + $this->leftAlign = $fi->leftAlign; + } + } + + /** + * Derived pattern converters must override this method in order to + * convert conversion specifiers in the correct way. + * + * @param LoggerLoggingEvent $event + */ + function convert($event) {} + + /** + * A template method for formatting in a converter specific way. + * + * @param string &$sbuf string buffer + * @param LoggerLoggingEvent $e + */ + function format(&$sbuf, $e) + { + LoggerLog::debug("LoggerPatternConverter::format() sbuf='$sbuf'"); + + $s = $this->convert($e); + + LoggerLog::debug("LoggerPatternConverter::format() converted event is '$s'"); + + + if($s == null or empty($s)) { + if(0 < $this->min) + $this->spacePad($sbuf, $this->min); + return; + } + + $len = strlen($s); + + if($len > $this->max) { + $sbuf .= substr($s , 0, ($len - $this->max)); + } elseif($len < $this->min) { + if($this->leftAlign) { + $sbuf .= $s; + $this->spacePad($sbuf, ($this->min - $len)); + } else { + $this->spacePad($sbuf, ($this->min - $len)); + $sbuf .= $s; + } + } else { + $sbuf .= $s; + } + } + + + /** + * Fast space padding method. + * + * @param string &$sbuf string buffer + * @param integer $length pad length + * + * @todo reimplement using PHP string functions + */ + function spacePad(&$sbuf, $length) + { + LoggerLog::debug("LoggerPatternConverter::spacePad() sbuf='$sbuf' len='$length'"); + + while($length >= 32) { + $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5]; + $length -= 32; + } + + for($i = 4; $i >= 0; $i--) { + if(($length & (1<<$i)) != 0) { + $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i]; + } + } + + // $sbuf = str_pad($sbuf, $length); + } +} + +// --------------------------------------------------------------------- +// PatternConverters +// --------------------------------------------------------------------- + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerBasicPatternConverter extends LoggerPatternConverter { + + /** + * @var integer + */ + var $type; + + /** + * Constructor + * + * @param string $formattingInfo + * @param integer $type + */ + function LoggerBasicPatternConverter($formattingInfo, $type) + { + LoggerLog::debug("LoggerBasicPatternConverter::LoggerBasicPatternConverter() type='$type'"); + + $this->LoggerPatternConverter($formattingInfo); + $this->type = $type; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + switch($this->type) { + case LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER: + $timeStamp = $event->getTimeStamp(); + $startTime = LoggerLoggingEvent::getStartTime(); + return (string)(int)($timeStamp * 1000 - $startTime * 1000); + + case LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER: + return $event->getThreadName(); + + case LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER: + $level = $event->getLevel(); + return $level->toString(); + + case LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER: + return $event->getNDC(); + + case LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER: + return $event->getRenderedMessage(); + + default: + return ''; + } + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerLiteralPatternConverter extends LoggerPatternConverter { + + /** + * @var string + */ + var $literal; + + /** + * Constructor + * + * @param string $value + */ + function LoggerLiteralPatternConverter($value) + { + LoggerLog::debug("LoggerLiteralPatternConverter::LoggerLiteralPatternConverter() value='$value'"); + + $this->literal = $value; + } + + /** + * @param string &$sbuf + * @param LoggerLoggingEvent $event + */ + function format(&$sbuf, $event) + { + $sbuf .= $this->literal; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + return $this->literal; + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerDatePatternConverter extends LoggerPatternConverter { + + /** + * @var string + */ + var $df; + + /** + * Constructor + * + * @param string $formattingInfo + * @param string $df + */ + function LoggerDatePatternConverter($formattingInfo, $df) + { + LoggerLog::debug("LoggerDatePatternConverter::LoggerDatePatternConverter() dateFormat='$df'"); + + $this->LoggerPatternConverter($formattingInfo); + $this->df = $df; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + $timeStamp = $event->getTimeStamp(); + $usecs = round(($timeStamp - (int)$timeStamp) * 1000); + $this->df = str_replace("\u", "u", ereg_replace("[^\\]u", sprintf(',%03d', $usecs), $this->df)); + + return date($this->df, $event->getTimeStamp()); + + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerMDCPatternConverter extends LoggerPatternConverter { + + /** + * @var string + */ + var $key; + + /** + * Constructor + * + * @param string $formattingInfo + * @param string $key + */ + function LoggerMDCPatternConverter($formattingInfo, $key) + { + LoggerLog::debug("LoggerMDCPatternConverter::LoggerMDCPatternConverter() key='$key'"); + + $this->LoggerPatternConverter($formattingInfo); + $this->key = $key; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + return $event->getMDC($this->key); + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerLocationPatternConverter extends LoggerPatternConverter { + + /** + * @var integer + */ + var $type; + + /** + * Constructor + * + * @param string $formattingInfo + * @param integer $type + */ + function LoggerLocationPatternConverter($formattingInfo, $type) + { + LoggerLog::debug("LoggerLocationPatternConverter::LoggerLocationPatternConverter() type='$type'"); + + $this->LoggerPatternConverter($formattingInfo); + $this->type = $type; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + $locationInfo = $event->getLocationInformation(); + switch($this->type) { + case LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER: + return $locationInfo->fullInfo; + case LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER: + return $locationInfo->getMethodName(); + case LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER: + return $locationInfo->getLineNumber(); + case LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER: + return $locationInfo->getFileName(); + default: + return ''; + } + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + * @abstract + */ +class LoggerNamedPatternConverter extends LoggerPatternConverter { + + /** + * @var integer + */ + var $precision; + + /** + * Constructor + * + * @param string $formattingInfo + * @param integer $precision + */ + function LoggerNamedPatternConverter($formattingInfo, $precision) + { + LoggerLog::debug("LoggerNamedPatternConverter::LoggerNamedPatternConverter() precision='$precision'"); + + $this->LoggerPatternConverter($formattingInfo); + $this->precision = $precision; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + * @abstract + */ + function getFullyQualifiedName($event) + { + // abstract + return; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) + { + $n = $this->getFullyQualifiedName($event); + if ($this->precision <= 0) { + return $n; + } else { + $len = strlen($n); + + // We substract 1 from 'len' when assigning to 'end' to avoid out of + // bounds exception in return r.substring(end+1, len). This can happen if + // precision is 1 and the category name ends with a dot. + $end = $len -1 ; + for($i = $this->precision; $i > 0; $i--) { + $end = strrpos(substr($n, 0, ($end - 1)), '.'); + if ($end == false) + return $n; + } + return substr($n, ($end + 1), $len); + } + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerClassNamePatternConverter extends LoggerNamedPatternConverter { + + /** + * Constructor + * + * @param string $formattingInfo + * @param integer $precision + */ + function LoggerClassNamePatternConverter($formattingInfo, $precision) + { + LoggerLog::debug("LoggerClassNamePatternConverter::LoggerClassNamePatternConverter() precision='$precision'"); + + $this->LoggerNamedPatternConverter($formattingInfo, $precision); + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function getFullyQualifiedName($event) + { + return $event->fqcn; + } +} + +/** + * @author VxR + * @package log4php + * @subpackage helpers + */ +class LoggerCategoryPatternConverter extends LoggerNamedPatternConverter { + + /** + * Constructor + * + * @param string $formattingInfo + * @param integer $precision + */ + function LoggerCategoryPatternConverter($formattingInfo, $precision) + { + LoggerLog::debug("LoggerCategoryPatternConverter::LoggerCategoryPatternConverter() precision='$precision'"); + + $this->LoggerNamedPatternConverter($formattingInfo, $precision); + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function getFullyQualifiedName($event) + { + return $event->getLoggerName(); + } +} + ?> Modified: vtigercrm/trunk/log4php/helpers/LoggerPatternParser.php ============================================================================== --- vtigercrm/trunk/log4php/helpers/LoggerPatternParser.php (original) +++ vtigercrm/trunk/log4php/helpers/LoggerPatternParser.php Wed May 3 22:11:21 2006 @@ -1,419 +1,419 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage helpers - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -if (!defined('LOG4PHP_LINE_SEP')) { - if (substr(php_uname(), 0, 7) == "Windows") { - /** - * @ignore - */ - define('LOG4PHP_LINE_SEP', "\r\n"); - } else { - /** - * @ignore - */ - define('LOG4PHP_LINE_SEP', "\n"); - } -} - -/** - */ -require_once(LOG4PHP_DIR . '/helpers/LoggerFormattingInfo.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerPatternConverter.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -define('LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR', '%'); - -define('LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE', 0); -define('LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE', 1); -define('LOG4PHP_LOGGER_PATTERN_PARSER_MINUS_STATE', 2); -define('LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE', 3); -define('LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE', 4); -define('LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE', 5); - -define('LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER', 1000); -define('LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER', 1001); -define('LOG4PHP_LOGGER_PATTERN_PARSER_CLASS_LOCATION_CONVERTER', 1002); -define('LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER', 1003); -define('LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER', 1004); - -define('LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER', 2000); -define('LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER', 2001); -define('LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER', 2002); -define('LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER', 2003); -define('LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER', 2004); - -define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601', 'Y-m-d H:i:s,u'); -define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE', 'H:i:s'); -define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE', 'd M Y H:i:s,u'); - -/** - * Most of the work of the {@link LoggerPatternLayout} class - * is delegated to the {@link LoggerPatternParser} class. - * - *

    It is this class that parses conversion patterns and creates - * a chained list of {@link LoggerPatternConverter} converters.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage helpers - * - * @since 0.3 - */ -class LoggerPatternParser { - - var $state; - var $currentLiteral; - var $patternLength; - var $i; - - /** - * @var LoggerPatternConverter - */ - var $head = null; - - /** - * @var LoggerPatternConverter - */ - var $tail = null; - - /** - * @var LoggerFormattingInfo - */ - var $formattingInfo; - - /** - * @var string pattern to parse - */ - var $pattern; - - /** - * Constructor - * - * @param string $pattern - */ - function LoggerPatternParser($pattern) - { - LoggerLog::debug("LoggerPatternParser::LoggerPatternParser() pattern='$pattern'"); - - $this->pattern = $pattern; - $this->patternLength = strlen($pattern); - $this->formattingInfo = new LoggerFormattingInfo(); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - } - - /** - * @param LoggerPatternConverter $pc - */ - function addToList($pc) - { - // LoggerLog::debug("LoggerPatternParser::addToList()"); - - if($this->head == null) { - $this->head = $pc; - $this->tail =& $this->head; - } else { - $this->tail->next = $pc; - $this->tail =& $this->tail->next; - } - } - - /** - * @return string - */ - function extractOption() - { - if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) { - $end = strpos($this->pattern, '}' , $this->i); - if ($end !== false) { - $r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1)); - $this->i= $end + 1; - return $r; - } - } - return null; - } - - /** - * The option is expected to be in decimal and positive. In case of - * error, zero is returned. - */ - function extractPrecisionOption() - { - $opt = $this->extractOption(); - $r = 0; - if ($opt !== null) { - if (is_numeric($opt)) { - $r = (int)$opt; - if($r <= 0) { - LoggerLog::warn("Precision option ({$opt}) isn't a positive integer."); - $r = 0; - } - } else { - LoggerLog::warn("Category option \"{$opt}\" not a decimal integer."); - } - } - return $r; - } - - function parse() - { - LoggerLog::debug("LoggerPatternParser::parse()"); - - $c = ''; - $this->i = 0; - $this->currentLiteral = ''; - while ($this->i < $this->patternLength) { - $c = $this->pattern{$this->i++}; -// LoggerLog::debug("LoggerPatternParser::parse() char is now '$c' and currentLiteral is '{$this->currentLiteral}'"); - switch($this->state) { - case LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE'"); - // In literal state, the last char is always a literal. - if($this->i == $this->patternLength) { - $this->currentLiteral .= $c; - continue; - } - if($c == LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR) { - // LoggerLog::debug("LoggerPatternParser::parse() char is an escape char"); - // peek at the next char. - switch($this->pattern{$this->i}) { - case LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR: - // LoggerLog::debug("LoggerPatternParser::parse() next char is an escape char"); - $this->currentLiteral .= $c; - $this->i++; // move pointer - break; - case 'n': - // LoggerLog::debug("LoggerPatternParser::parse() next char is 'n'"); - $this->currentLiteral .= LOG4PHP_LINE_SEP; - $this->i++; // move pointer - break; - default: - if(strlen($this->currentLiteral) != 0) { - $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral)); - LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\"."); - } - $this->currentLiteral = $c; - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE; - $this->formattingInfo->reset(); - } - } else { - $this->currentLiteral .= $c; - } - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE'"); - $this->currentLiteral .= $c; - switch($c) { - case '-': - $this->formattingInfo->leftAlign = true; - break; - case '.': - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE; - break; - default: - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->min = ord($c) - ord('0'); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE; - } else { - $this->finalizeConverter($c); - } - } // switch - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE'"); - $this->currentLiteral .= $c; - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord(c) - ord('0')); - } elseif ($c == '.') { - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE; - } else { - $this->finalizeConverter($c); - } - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE'"); - $this->currentLiteral .= $c; - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->max = ord($c) - ord('0'); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE; - } else { - LoggerLog::warn("LoggerPatternParser::parse() Error occured in position {$this->i}. Was expecting digit, instead got char \"{$c}\"."); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - } - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE'"); - $this->currentLiteral .= $c; - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0')); - } else { - $this->finalizeConverter($c); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - } - break; - } // switch - } // while - if(strlen($this->currentLiteral) != 0) { - $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral)); - // LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\"."); - } - return $this->head; - } - - function finalizeConverter($c) - { - LoggerLog::debug("LoggerPatternParser::finalizeConverter() with char '$c'"); - - $pc = null; - switch($c) { - case 'c': - $pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption()); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() CATEGORY converter."); - // $this->formattingInfo->dump(); - $this->currentLiteral = ''; - break; - case 'C': - $pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption()); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() CLASSNAME converter."); - //$this->formattingInfo->dump(); - $this->currentLiteral = ''; - break; - case 'd': - $dateFormatStr = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT; - $dOpt = $this->extractOption(); - - if($dOpt !== null) - $dateFormatStr = $dOpt; - - if ($dateFormatStr == 'ISO8601') { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; - } elseif($dateFormatStr == 'ABSOLUTE') { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE; - } elseif($dateFormatStr == 'DATE') { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE; - } else { - $df = $dateFormatStr; - if ($df == null) { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; - } - } - $pc = new LoggerDatePatternConverter($this->formattingInfo, $df); - $this->currentLiteral = ''; - break; - case 'F': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() File name converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'l': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() Location converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'L': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() LINE NUMBER converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'm': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() MESSAGE converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'M': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER); - //LogLog.debug("METHOD converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'p': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER); - //LogLog.debug("LEVEL converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'r': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() RELATIVE TIME converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 't': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() THREAD converter."); - //formattingInfo.dump(); - $this->currentLiteral = ''; - break; - case 'u': - if($this->i < $this->patternLength) { - $cNext = $this->pattern{$this->i}; - if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) { - $pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0'))); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() USER converter [{$cNext}]."); - // formattingInfo.dump(); - $this->currentLiteral = ''; - $this->i++; - } else { - LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char '{$cNext}' at position {$this->i}."); - } - } - break; - case 'x': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() NDC converter."); - $this->currentLiteral = ''; - break; - - case 'X': - $xOpt = $this->extractOption(); - $pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() MDC converter."); - $this->currentLiteral = ''; - break; - default: - LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char [$c] at position {$this->i} in conversion pattern."); - $pc = new LoggerLiteralPatternConverter($this->currentLiteral); - $this->currentLiteral = ''; - } - $this->addConverter($pc); - } - - function addConverter($pc) - { - $this->currentLiteral = ''; - // Add the pattern converter to the list. - $this->addToList($pc); - // Next pattern is assumed to be a literal. - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - // Reset formatting info - $this->formattingInfo->reset(); - } -} - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage helpers + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +if (!defined('LOG4PHP_LINE_SEP')) { + if (substr(php_uname(), 0, 7) == "Windows") { + /** + * @ignore + */ + define('LOG4PHP_LINE_SEP', "\r\n"); + } else { + /** + * @ignore + */ + define('LOG4PHP_LINE_SEP', "\n"); + } +} + +/** + */ +require_once(LOG4PHP_DIR . '/helpers/LoggerFormattingInfo.php'); +require_once(LOG4PHP_DIR . '/helpers/LoggerPatternConverter.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +define('LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR', '%'); + +define('LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE', 0); +define('LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE', 1); +define('LOG4PHP_LOGGER_PATTERN_PARSER_MINUS_STATE', 2); +define('LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE', 3); +define('LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE', 4); +define('LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE', 5); + +define('LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER', 1000); +define('LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER', 1001); +define('LOG4PHP_LOGGER_PATTERN_PARSER_CLASS_LOCATION_CONVERTER', 1002); +define('LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER', 1003); +define('LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER', 1004); + +define('LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER', 2000); +define('LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER', 2001); +define('LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER', 2002); +define('LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER', 2003); +define('LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER', 2004); + +define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601', 'Y-m-d H:i:s,u'); +define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE', 'H:i:s'); +define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE', 'd M Y H:i:s,u'); + +/** + * Most of the work of the {@link LoggerPatternLayout} class + * is delegated to the {@link LoggerPatternParser} class. + * + *

    It is this class that parses conversion patterns and creates + * a chained list of {@link LoggerPatternConverter} converters.

    + * + * @author VxR + * @version $Revision: 1.10 $ + * @package log4php + * @subpackage helpers + * + * @since 0.3 + */ +class LoggerPatternParser { + + var $state; + var $currentLiteral; + var $patternLength; + var $i; + + /** + * @var LoggerPatternConverter + */ + var $head = null; + + /** + * @var LoggerPatternConverter + */ + var $tail = null; + + /** + * @var LoggerFormattingInfo + */ + var $formattingInfo; + + /** + * @var string pattern to parse + */ + var $pattern; + + /** + * Constructor + * + * @param string $pattern + */ + function LoggerPatternParser($pattern) + { + LoggerLog::debug("LoggerPatternParser::LoggerPatternParser() pattern='$pattern'"); + + $this->pattern = $pattern; + $this->patternLength = strlen($pattern); + $this->formattingInfo = new LoggerFormattingInfo(); + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; + } + + /** + * @param LoggerPatternConverter $pc + */ + function addToList($pc) + { + // LoggerLog::debug("LoggerPatternParser::addToList()"); + + if($this->head == null) { + $this->head = $pc; + $this->tail =& $this->head; + } else { + $this->tail->next = $pc; + $this->tail =& $this->tail->next; + } + } + + /** + * @return string + */ + function extractOption() + { + if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) { + $end = strpos($this->pattern, '}' , $this->i); + if ($end !== false) { + $r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1)); + $this->i= $end + 1; + return $r; + } + } + return null; + } + + /** + * The option is expected to be in decimal and positive. In case of + * error, zero is returned. + */ + function extractPrecisionOption() + { + $opt = $this->extractOption(); + $r = 0; + if ($opt !== null) { + if (is_numeric($opt)) { + $r = (int)$opt; + if($r <= 0) { + LoggerLog::warn("Precision option ({$opt}) isn't a positive integer."); + $r = 0; + } + } else { + LoggerLog::warn("Category option \"{$opt}\" not a decimal integer."); + } + } + return $r; + } + + function parse() + { + LoggerLog::debug("LoggerPatternParser::parse()"); + + $c = ''; + $this->i = 0; + $this->currentLiteral = ''; + while ($this->i < $this->patternLength) { + $c = $this->pattern{$this->i++}; +// LoggerLog::debug("LoggerPatternParser::parse() char is now '$c' and currentLiteral is '{$this->currentLiteral}'"); + switch($this->state) { + case LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE: + // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE'"); + // In literal state, the last char is always a literal From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 00:13:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:13:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5733 - in /vtigercrm/trunk/log4php/layouts: LoggerLayoutHtml.php LoggerLayoutSimple.php LoggerLayoutTTCC.php LoggerPatternLayout.php LoggerXmlLayout.php Message-ID: <20060504041310.EEF70709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:13:02 2006 New Revision: 5733 Log: log4php latest version has been update Modified: vtigercrm/trunk/log4php/layouts/LoggerLayoutHtml.php vtigercrm/trunk/log4php/layouts/LoggerLayoutSimple.php vtigercrm/trunk/log4php/layouts/LoggerLayoutTTCC.php vtigercrm/trunk/log4php/layouts/LoggerPatternLayout.php vtigercrm/trunk/log4php/layouts/LoggerXmlLayout.php Modified: vtigercrm/trunk/log4php/layouts/LoggerLayoutHtml.php ============================================================================== --- vtigercrm/trunk/log4php/layouts/LoggerLayoutHtml.php (original) +++ vtigercrm/trunk/log4php/layouts/LoggerLayoutHtml.php Wed May 3 22:13:02 2006 @@ -1,256 +1,256 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage layouts - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -if (!defined('LOG4PHP_LINE_SEP')) { - if (substr(php_uname(), 0, 7) == "Windows") { - /** - * @ignore - */ - define('LOG4PHP_LINE_SEP', "\r\n"); - } else { - /** - * @ignore - */ - define('LOG4PHP_LINE_SEP', "\n"); - } -} - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLayout.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php'); - -/** - * This layout outputs events in a HTML table. - * - * Parameters are: {@link $title}, {@link $locationInfo}. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage layouts - */ -class LoggerLayoutHtml extends LoggerLayout { - - /** - * The LocationInfo option takes a boolean value. By - * default, it is set to false which means there will be no location - * information output by this layout. If the the option is set to - * true, then the file name and line number of the statement - * at the origin of the log statement will be output. - * - *

    If you are embedding this layout within a {@link LoggerAppenderMail} - * or a {@link LoggerAppenderMailEvent} then make sure to set the - * LocationInfo option of that appender as well. - * @var boolean - */ - var $locationInfo = false; - - /** - * The Title option takes a String value. This option sets the - * document title of the generated HTML document. - * Defaults to 'Log4php Log Messages'. - * @var string - */ - var $title = "Log4php Log Messages"; - - /** - * Constructor - */ - function LoggerLayoutHtml() - { - return; - } - - /** - * The LocationInfo option takes a boolean value. By - * default, it is set to false which means there will be no location - * information output by this layout. If the the option is set to - * true, then the file name and line number of the statement - * at the origin of the log statement will be output. - * - *

    If you are embedding this layout within a {@link LoggerAppenderMail} - * or a {@link LoggerAppenderMailEvent} then make sure to set the - * LocationInfo option of that appender as well. - */ - function setLocationInfo($flag) - { - if (is_bool($flag)) { - $this->locationInfo = $flag; - } else { - $this->locationInfo = (bool)(strtolower($flag) == 'true'); - } - } - - /** - * Returns the current value of the LocationInfo option. - */ - function getLocationInfo() - { - return $this->locationInfo; - } - - /** - * The Title option takes a String value. This option sets the - * document title of the generated HTML document. - * Defaults to 'Log4php Log Messages'. - */ - function setTitle($title) - { - $this->title = $title; - } - - /** - * @return string Returns the current value of the Title option. - */ - function getTitle() - { - return $this->title; - } - - /** - * @return string Returns the content type output by this layout, i.e "text/html". - */ - function getContentType() - { - return "text/html"; - } - - /** - * No options to activate. - */ - function activateOptions() - { - return true; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function format($event) - { - $sbuf = LOG4PHP_LINE_SEP . "

    " . LOG4PHP_LINE_SEP; - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - if ($this->locationInfo) { - $locInfo = $event->getLocationInformation(); - $sbuf .= "" . LOG4PHP_LINE_SEP; - } - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - $sbuf .= "" . LOG4PHP_LINE_SEP; - - if ($event->getNDC() != null) { - $sbuf .= "" . LOG4PHP_LINE_SEP; - } - - return $sbuf; - } - - /** - * @return string Returns appropriate HTML headers. - */ - function getHeader() - { - $sbuf = "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . $this->title . "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "
    " . LOG4PHP_LINE_SEP; - $sbuf .= "Log session start time " . strftime('%c', time()) . "
    " . LOG4PHP_LINE_SEP; - $sbuf .= "
    " . LOG4PHP_LINE_SEP; - $sbuf .= "
    {$MOD.LBL_USER_MANAGEMENT}{$MOD.LBL_FIELD_ORDERING_DESC}
    {$MOD.LBL_FIELD_ORDERING}
     
    {$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}
    {$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.LBL_INVENTORY_NOTIFICATIONS}
    +{$MOD.INVENTORYNOTIFICATION}
     
    {$MOD.LBL_INVENTORY_NOTIFICATIONS}
    -{$MOD.INVENTORYNOTIFICATION}
    {$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
    +
    {$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
    {$MOD.INVENTORYTERMSANDCONDITIONS}
       
      {$MOD.LBL_SETTINGS} - > {$MOD.LBL_USER_MANAGEMENT} + > {$MOD.LBL_USER_MANAGEMENT} > Users
    {$MOD.LBL_SETTINGS} - > {$MOD.LBL_USER_MANAGEMENT} + > {$MOD.LBL_USER_MANAGEMENT} > User
    *{$UMOD.LBL_EMAIL}{$EMAIL1} {$EMAIL1}  *{$UMOD.LBL_STATUS} {$STATUS} 
    - @@ -55,6 +54,7 @@ +
    '; -else { -$i=1; - // Main loop to create listview entries +$listview_entries = array(); + +if($numEmails <= 0) + $listview_entries[0][] = ''; +else { +$i=1; + // Main loop to create listview entries while ($i<$c) { $num = $mails[$start_message]->msgno; // TODO: scan the current db tables to find a @@ -256,24 +256,26 @@ // 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)) $flags.=' '; elseif (preg_match("/^fw:/i",$mails[$start_message]->subject)) $flags.=' '; else - $flags.=' '; - - // Add to Vtiger + $flags.=' '; + + // Add to Vtiger if($mails[$start_message]->flagged) $flags.=''; else $flags.=''; - $tmp=imap_mime_header_decode($mails[$start_message]->from); - $from = $tmp[0]->text; - $listview_entries[$num] = array(); + $tmp=imap_mime_header_decode($mails[$start_message]->from); + $from = $tmp[0]->text; + $listview_entries[$num] = array(); $listview_entries[$num][] = $flags.""; @@ -307,14 +309,14 @@
     
    From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 04:04:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 08:04:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5694 - /vtigercrm/trunk/modules/Users/Save.php Message-ID: <20060503080443.A1595702F5F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 02:04:39 2006 New Revision: 5694 Log: Modified the verification while save users Modified: vtigercrm/trunk/modules/Users/Save.php Modified: vtigercrm/trunk/modules/Users/Save.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Wed May 3 04:08:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 08:08:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23284=3A_?= =?utf-8?q?Email_field_not_validated?= In-Reply-To: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> References: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> Message-ID: <085.fb184bd6ddc53d502f460bac5b80ac59@vtiger.fosslabs.com> #284: Email field not validated ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Users Email Validation ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: jerrydgeorge => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 04:09:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 08:09:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23284=3A_?= =?utf-8?q?Email_field_not_validated?= In-Reply-To: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> References: <076.8958de9cd73803ee58879a56b01fa34a@vtiger.fosslabs.com> Message-ID: <085.e106151417391687b442495904e8264a@vtiger.fosslabs.com> #284: Email field not validated ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Users Email Validation ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - The other email id is validated and the field label rectified. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 04:12:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 08:12:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23382=3A_?= =?utf-8?q?No_validation_when_user_data_edited?= In-Reply-To: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> References: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> Message-ID: <085.0452cb3ca6d5ff36f892f4a99c1bd07f@vtiger.fosslabs.com> #382: No validation when user data edited ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User update ------------------------+--------------------------------------------------- Changes (by ahmed): * owner: jerrydgeorge => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 3 04:13:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 08:13:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23382=3A_?= =?utf-8?q?No_validation_when_user_data_edited?= In-Reply-To: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> References: <076.eadf7fb20abbf73be16f9e9f05ec9131@vtiger.fosslabs.com> Message-ID: <085.c7be37f91a599aa2c09a06d39b9db252@vtiger.fosslabs.com> #382: No validation when user data edited ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: User update ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Validated done for Edit View in Users & My Preferences -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 04:52:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 08:52:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5695 - /vtigercrm/trunk/modules/Import/ImportButton.php Message-ID: <20060503085238.96978702F46@vtiger.fosslabs.com> Author: don Date: Wed May 3 02:52:34 2006 New Revision: 5695 Log: Removed the calling of permitted actions from session Modified: vtigercrm/trunk/modules/Import/ImportButton.php Modified: vtigercrm/trunk/modules/Import/ImportButton.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportButton.php (original) +++ vtigercrm/trunk/modules/Import/ImportButton.php Wed May 3 02:52:34 2006 @@ -20,7 +20,8 @@ --> - '.$display.' ##############'); - fetchPermissionData($module,$action); } else { From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 07:06:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 11:06:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5707 - /vtigercrm/trunk/modules/Users/listemailtemplates.php Message-ID: <20060503110631.DC94E702FD0@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 05:06:26 2006 New Revision: 5707 Log: Logs made proper for email templates listview - ahmed Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php ============================================================================== --- vtigercrm/trunk/modules/Users/listemailtemplates.php (original) +++ vtigercrm/trunk/modules/Users/listemailtemplates.php Wed May 3 05:06:26 2006 @@ -12,7 +12,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); - + +global $adb; +global $log; + +$log->info("Inside Email Templates List View"); + $sql = "select * from emailtemplates order by templateid DESC"; $result = $adb->query($sql); $temprow = $adb->fetch_array($result); @@ -49,6 +54,9 @@ $return_data[]=$templatearray; $cnt++; }while($temprow = $adb->fetch_array($result)); + +$log->info("Exiting Email Templates List View"); + $smarty->assign("TEMPLATES",$return_data); $smarty->display("ListEmailTemplates.tpl"); From vtiger-tickets at vtiger.fosslabs.com Wed May 3 07:07:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 11:07:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23603=3A_?= =?utf-8?q?no_logs_in_Fatal_mode?= In-Reply-To: <076.ea316911c5925862f169d538f823dc5f@vtiger.fosslabs.com> References: <076.ea316911c5925862f169d538f823dc5f@vtiger.fosslabs.com> Message-ID: <085.48a035ff3602540982156197e2b1b19d@vtiger.fosslabs.com> #603: no logs in Fatal mode --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed - proper logging done -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 07:25:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 11:25:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5708 - /vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Message-ID: <20060503112549.29583702FBF@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 05:25:44 2006 New Revision: 5708 Log: Logs made proper for email templates detailview - ahmed Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/detailviewemailtemplate.php (original) +++ vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Wed May 3 05:25:44 2006 @@ -12,7 +12,8 @@ require_once('data/Tracker.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/database/PearDatabase.php'); - +global $adb; +global $log; global $mod_strings; global $app_strings; global $current_language; @@ -20,6 +21,8 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); + +$log->info("Inside Email Template Detail View"); $smarty = new vtigerCRM_smarty; @@ -33,6 +36,7 @@ if(isset($_REQUEST['templateid']) && $_REQUEST['templateid']!='') { + $log->info("The templateid is set"); $tempid = $_REQUEST['templateid']; $sql = "select * from emailtemplates where templateid=".$tempid; $result = $adb->query($sql); From vtiger-tickets at vtiger.fosslabs.com Wed May 3 07:40:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 11:40:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23602=3A_?= =?utf-8?q?logs_in_emailtemplates?= In-Reply-To: <076.2924c9ae82ec9c46cc83995ee9586603@vtiger.fosslabs.com> References: <076.2924c9ae82ec9c46cc83995ee9586603@vtiger.fosslabs.com> Message-ID: <085.a4c63d1816acbdc84d7b8ae454d95fa4@vtiger.fosslabs.com> #602: logs in emailtemplates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Logs made proper -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 07:59:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 11:59:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5709 - in /vtigercrm/trunk/Smarty/templates: Emails.tpl Webmails.tpl Message-ID: <20060503115924.89B1A702FD6@vtiger.fosslabs.com> Author: richie Date: Wed May 3 05:59:17 2006 New Revision: 5709 Log: links provided Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl vtigercrm/trunk/Smarty/templates/Webmails.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Wed May 3 05:59:17 2006 @@ -24,16 +24,16 @@ {literal} function DeleteEmail(id) { - if(confirm("Are you sure you want to delete ?")) - { - show("status"); - var ajaxObj = new Ajax(ajaxDelResponse); - var urlstring ="module=Users&action=massdelete&return_module=Emails&idlist="+id; - ajaxObj.process("index.php?",urlstring); - } - else - { - return false; + if(confirm("Are you sure you want to delete ?")) + { + show("status"); + var ajaxObj = new Ajax(ajaxDelResponse); + var urlstring ="module=Users&action=massdelete&return_module=Emails&idlist="+id; + ajaxObj.process("index.php?",urlstring); + } + else + { + return false; } } function ajaxDelResponse(response) @@ -76,11 +76,11 @@
    -  Compose +  Compose -  Settings +  Settings
    @@ -96,7 +96,7 @@  All Mails
    •    - Inbox  + Inbox 
    •    Sent  Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Wed May 3 05:59:17 2006 @@ -33,7 +33,7 @@
    -  Settings +  Settings From vtiger-tickets at vtiger.fosslabs.com Wed May 3 08:00:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 03 May 2006 12:00:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23608=3A_?= =?utf-8?q?logs_in_mailmerge_templates?= In-Reply-To: <076.4d57a93c446723ad6c722eec13be7eb1@vtiger.fosslabs.com> References: <076.4d57a93c446723ad6c722eec13be7eb1@vtiger.fosslabs.com> Message-ID: <085.f216b1eebeb07120c30a33aa4647b42e@vtiger.fosslabs.com> #608: logs in mailmerge templates --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Loggind made proper -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 3 08:01:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 03 May 2006 12:01:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5710 - in /vtigercrm/trunk/modules/Webmails: DetailView.php EditView.php ListView.php body.php Message-ID: <20060503120101.084F6702FD6@vtiger.fosslabs.com> Author: richie Date: Wed May 3 06:00:54 2006 New Revision: 5710 Log: mbox construction changed to older format. Commented out the javascript in body.php as it was repeatedly invoking the page due to which the system would crash frequently Modified: vtigercrm/trunk/modules/Webmails/DetailView.php vtigercrm/trunk/modules/Webmails/EditView.php vtigercrm/trunk/modules/Webmails/ListView.php vtigercrm/trunk/modules/Webmails/body.php Modified: vtigercrm/trunk/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/DetailView.php (original) +++ vtigercrm/trunk/modules/Webmails/DetailView.php Wed May 3 06:00:54 2006 @@ -1,92 +1,92 @@ -fetch_array($mailInfo); - -$login_username= $temprow["mail_username"]; -$secretkey=$temprow["mail_password"]; -$imapServerAddress=$temprow["mail_servername"]; -$start_message=$_REQUEST["start_message"]; -$box_refresh=$temprow["box_refresh"]; -$mails_per_page=$temprow["mails_per_page"]; -$mail_protocol=$temprow["mail_protocol"]; -$ssltype=$temprow["ssltype"]; -$sslmeth=$temprow["sslmeth"]; - -if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} -global $mbox; -$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); - +fetch_array($mailInfo); +$login_username= $temprow["mail_username"]; +$secretkey=$temprow["mail_password"]; +$imapServerAddress=$temprow["mail_servername"]; +$start_message=$_REQUEST["start_message"]; +$box_refresh=$temprow["box_refresh"]; +$mails_per_page=$temprow["mails_per_page"]; +$mail_protocol=$temprow["mail_protocol"]; +$ssltype=$temprow["ssltype"]; +$sslmeth=$temprow["sslmeth"]; + +if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} +global $mbox; +//$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); +$mbox = @imap_open('{'.$imapServerAddress.'/'.$mail_protocol.'}'.$mailbox, $login_username, $secretkey) or die("Connection to server failed with: ".imap_last_error()) + +echo ' after in DetailView '; $email = new Webmail($mbox, $mailid); $from = $email->from; -$subject=$email->subject; -$date=$email->date; - -$to = $email->to_name[0]." <".$email->to[0].">"; -for($l=1;$lto);$l++) { - $to .= "; ".$email->to_name[$l]." <".$email->to[$l].">"; -} -$cc_list = $email->cc_list_name[0]." <".$email->cc_list[0].">"; -for($l=1;$lcc_list);$l++) { - $cc_list .= "; ".$email->cc_list_name[$l]." <".$email->cc_list[$l].">"; -} -$bcc_list = $email->bcc_list_name[0]." <".$email->bcc_list[0].">"; -for($l=1;$lbcc_list);$l++) { - $bcc_list .= "; ".$email->bcc_list_name[$l]." <".$email->bcc_list[$l].">"; +$subject=$email->subject; +$date=$email->date; + +$to = $email->to_name[0]." <".$email->to[0].">"; +for($l=1;$lto);$l++) { + $to .= "; ".$email->to_name[$l]." <".$email->to[$l].">"; +} +$cc_list = $email->cc_list_name[0]." <".$email->cc_list[0].">"; +for($l=1;$lcc_list);$l++) { + $cc_list .= "; ".$email->cc_list_name[$l]." <".$email->cc_list[$l].">"; +} +$bcc_list = $email->bcc_list_name[0]." <".$email->bcc_list[0].">"; +for($l=1;$lbcc_list);$l++) { + $bcc_list .= "; ".$email->bcc_list_name[$l]." <".$email->bcc_list[$l].">"; } $reply_to = $from." <".$email->reply_to[0].">"; for($l=1;$lreply_to);$l++) { $reply_to .= "; ".$email->reply_to_name[$l]." <".$email->reply_to[$l].">"; } - -$email->loadMail(); -$body = $email->body; -$attachments=$email->attachments; -$inline=$email->inline; - -$atL="Attachments"; -$at="None"; -$atd=""; -$cnt=1; -if($attachments || $inline) { - $at=''; - for($i=0;$i 25) - $fname=substr($attachments[$i]["filename"],0,25)."..."; - else - $fname=$attachments[$i]["filename"]; - - $filesize = $attachments[$i]["filesize"]." bytes"; - if($attachments[$i]["filesize"] > 1000000) - $filesize= substr((($attachments[$i]["filesize"]/1024)/1024),0,5)." megabytes"; - elseif ($attachments[$i]["filesize"] > 1024) - $filesize= substr(($attachments[$i]["filesize"]/1024),0,5)." kilobytes"; - - $at.=" "; - $cnt++; - } - for($i=0;$i".$inline[$i]["filename"].""; - $cnt++; - } - $at.="
    ".$cnt.") ".$fname."
    ".$filesize."
    "; - $tmp = (count($inline)+count($attachments)); - $atL= $tmp." Attachment(s)"; + +$email->loadMail(); +$body = $email->body; +$attachments=$email->attachments; +$inline=$email->inline; + +$atL="Attachments"; +$at="None"; +$atd=""; +$cnt=1; +if($attachments || $inline) { + $at=''; + for($i=0;$i 25) + $fname=substr($attachments[$i]["filename"],0,25)."..."; + else + $fname=$attachments[$i]["filename"]; + + $filesize = $attachments[$i]["filesize"]." bytes"; + if($attachments[$i]["filesize"] > 1000000) + $filesize= substr((($attachments[$i]["filesize"]/1024)/1024),0,5)." megabytes"; + elseif ($attachments[$i]["filesize"] > 1024) + $filesize= substr(($attachments[$i]["filesize"]/1024),0,5)." kilobytes"; + + $at.=" "; + $cnt++; + } + for($i=0;$i".$inline[$i]["filename"].""; + $cnt++; + } + $at.="
    ".$cnt.") ".$fname."
    ".$filesize."
    "; + $tmp = (count($inline)+count($attachments)); + $atL= $tmp." Attachment(s)"; ?> -'index.php?module=Webmails&action=index','LBL_WEBMAILS_TITLE'=>'index.php?module=Webmailsaction=index'); - -$sec_arr = array('index.php?module=Emails&action=index'=>'Emails ','index.php?module=Webmails&action=index'=>'Webmails'); -echo '
    '; - -$focus = new Email(); -$smarty = new vtigerCRM_Smarty(); - -if($_REQUEST['upload_error'] == true) -{ - echo '
    The selected file has no data or a invalid file.
    '; -} - -//Email Error handling -if($_REQUEST['mail_error'] != '') -{ - require_once("modules/Emails/mail.php"); - echo parseEmailErrorString($_REQUEST['mail_error']); -} - - -global $theme; - -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -$disp_view = getView($focus->mode); -$smarty->assign("MODULE","Webmails"); -$smarty->assign("SINGLE_MOD","Webmails"); - -$tmp_theme = $theme; -$msgData=''; -global $mbox; - -//WEBMAIL FUNCTIONS -define('SM_PATH','modules/Webmails/'); -require_once(SM_PATH . 'Webmail.php'); -require_once('include/utils/UserInfoUtil.php'); - -$mailInfo = getMailServerInfo($current_user); -$temprow = $adb->fetch_array($mailInfo); -$login_username= $temprow["mail_username"]; -$secretkey=$temprow["mail_password"]; -$imapServerAddress=$temprow["mail_servername"]; -$start_message=$_REQUEST["start_message"]; -$box_refresh=$temprow["box_refresh"]; -$mails_per_page=$temprow["mails_per_page"]; -$mail_protocol=$temprow["mail_protocol"]; -$ssltype=$temprow["ssltype"]; -$sslmeth=$temprow["sslmeth"]; - -$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); + +global $log; +global $app_strings; +global $app_list_strings; +global $mod_strings; +global $current_user; + +$submenu = array('LBL_EMAILS_TITLE'=>'index.php?module=Webmails&action=index','LBL_WEBMAILS_TITLE'=>'index.php?module=Webmailsaction=index'); + +$sec_arr = array('index.php?module=Emails&action=index'=>'Emails ','index.php?module=Webmails&action=index'=>'Webmails'); +echo '
    '; + +$focus = new Email(); +$smarty = new vtigerCRM_Smarty(); + +if($_REQUEST['upload_error'] == true) +{ + echo '
    The selected file has no data or a invalid file.
    '; +} + +//Email Error handling +if($_REQUEST['mail_error'] != '') +{ + require_once("modules/Emails/mail.php"); + echo parseEmailErrorString($_REQUEST['mail_error']); +} + + +global $theme; + +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$disp_view = getView($focus->mode); +$smarty->assign("MODULE","Webmails"); +$smarty->assign("SINGLE_MOD","Webmails"); + +$tmp_theme = $theme; +$msgData=''; +global $mbox; + +//WEBMAIL FUNCTIONS +define('SM_PATH','modules/Webmails/'); +require_once(SM_PATH . 'Webmail.php'); +require_once('include/utils/UserInfoUtil.php'); + +$mailInfo = getMailServerInfo($current_user); +$temprow = $adb->fetch_array($mailInfo); +$login_username= $temprow["mail_username"]; +$secretkey=$temprow["mail_password"]; +$imapServerAddress=$temprow["mail_servername"]; +$start_message=$_REQUEST["start_message"]; +$box_refresh=$temprow["box_refresh"]; +$mails_per_page=$temprow["mails_per_page"]; +$mail_protocol=$temprow["mail_protocol"]; +$ssltype=$temprow["ssltype"]; +$sslmeth=$temprow["sslmeth"]; + +//$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed"); +$mbox = @imap_open('{'.$imapServerAddress.'/'.$mail_protocol.'}'.$mailbox, $login_username, $secretkey) or die("Connection to server failed with: ".imap_last_error()); $webmail = new Webmail($mbox,$mailid); -$webmail->loadMail(); -$focus->column_fields['description'] = strip_tags($webmail->body); -$focus->column_fields['subject'] = $webmail->subject; -for($i=0;$ireply_to);$i++) { - $reply_to .= $webmail->reply_to[$i].";"; -} -for($i=0;$ito);$i++) { - $to .= $webmail->to[$i].";"; -} -for($i=0;$icc_list);$i++) { - $cc .= $webmail->cc_list[$i].";"; -} -for($i=0;$ibcc_list);$i++) { - $bcc .= $webmail->bcc_list[$i].";"; -} - -$body = "



    In reply to the message sent by "; -$body .= $webmail->fromname." < ".$webmail->from." > on ".$webmail->date.":
    "; -$body .= "
    ".$webmail->body."
    "; - -$theme = $tmp_theme; - -//get Email Information -$ddate = date("Y-m-d"); -$dtime = date("h:m"); -if($_REQUEST["reply"] == "all") +$webmail->loadMail(); +$focus->column_fields['description'] = strip_tags($webmail->body); +$focus->column_fields['subject'] = $webmail->subject; +for($i=0;$ireply_to);$i++) { + $reply_to .= $webmail->reply_to[$i].";"; +} +for($i=0;$ito);$i++) { + $to .= $webmail->to[$i].";"; +} +for($i=0;$icc_list);$i++) { + $cc .= $webmail->cc_list[$i].";"; +} +for($i=0;$ibcc_list);$i++) { + $bcc .= $webmail->bcc_list[$i].";"; +} + +$body = "



    In reply to the message sent by "; +$body .= $webmail->fromname." < ".$webmail->from." > on ".$webmail->date.":
    "; +$body .= "
    ".$webmail->body."
    "; + +$theme = $tmp_theme; + +//get Email Information +$ddate = date("Y-m-d"); +$dtime = date("h:m"); +if($_REQUEST["reply"] == "all") $tmp = $reply_to."".$to; -else - $tmp = $reply_to; - - -$block["Email Information"][0][] = array(array(6),array("Date & Time Sent:"),array("date_start"),array(array($ddate=>$dtime),array("%Y-%m-%d"=>"yyyy-mm-dd 24:00"))); -$block["Email Information"][0][] = array(array(53),array("Assigned To:"),array("assigned_user_id"),array(array(1=>array($current_user->user_name=>"selected")))); - -$block["Email Information"][1][] = array(array(21),array("To:"),array("to_list"),array($tmp)); -$block["Email Information"][1][] = array(array(21),array("CC:"),array("cc_list"),array($cc)); - -$block["Email Information"][3][] = array(array(1),array("Subject:"),array("subject"),array($webmail->subject)); - -$block["Email Information"][3][] = array(array(1),array("BCC:"),array("bcc_list"),array($bcc)); -$block["Email Information"][4][] = array(array(19),array("Body :"),array("email_body"),array($body)); - -//$block["Email Information"][2][0] = array(array(357),array(array("Disabled"=>"selected")),array("parent_id"),array($tmp),array()); -//echo '
    ';print_r($block);echo '


    '; -$smarty->assign("BLOCKS",$block); - -//$smarty->assign("BLOCKS",getBlocks("Emails",$disp_view,$mode,$focus->column_fields)); -//echo '
    ';print_r(getBlocks("Emails",$disp_view,$mode,$focus->column_fields));echo '
    '; -$smarty->assign("OP_MODE",$disp_view); - -$disp_view = getView($focus->mode); - -//needed when creating a new email with default values passed in -if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) -{ - $focus->contact_name = $_REQUEST['contact_name']; -} -if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) -{ - $focus->contact_id = $_REQUEST['contact_id']; -} -if (isset($_REQUEST['parent_name']) && is_null($focus->parent_name)) -{ - $focus->parent_name = $_REQUEST['parent_name']; -} -if (isset($_REQUEST['parent_id']) && is_null($focus->parent_id)) -{ - $focus->parent_id = $_REQUEST['parent_id']; -} -if (isset($_REQUEST['parent_type'])) -{ - $focus->parent_type = $_REQUEST['parent_type']; -} -if (isset($_REQUEST['filename']) && $_REQUEST['isDuplicate'] != 'true') -{ - $focus->filename = $_REQUEST['filename']; -} -elseif (is_null($focus->parent_type)) -{ - $focus->parent_type = $app_list_strings['record_type_default_key']; -} - -$log->info("Email detail view"); - -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); +else + $tmp = $reply_to; + + +$block["Email Information"][0][] = array(array(6),array("Date & Time Sent:"),array("date_start"),array(array($ddate=>$dtime),array("%Y-%m-%d"=>"yyyy-mm-dd 24:00"))); +$block["Email Information"][0][] = array(array(53),array("Assigned To:"),array("assigned_user_id"),array(array(1=>array($current_user->user_name=>"selected")))); + +$block["Email Information"][1][] = array(array(21),array("To:"),array("to_list"),array($tmp)); +$block["Email Information"][1][] = array(array(21),array("CC:"),array("cc_list"),array($cc)); + +$block["Email Information"][3][] = array(array(1),array("Subject:"),array("subject"),array($webmail->subject)); + +$block["Email Information"][3][] = array(array(1),array("BCC:"),array("bcc_list"),array($bcc)); +$block["Email Information"][4][] = array(array(19),array("Body :"),array("email_body"),array($body)); + +//$block["Email Information"][2][0] = array(array(357),array(array("Disabled"=>"selected")),array("parent_id"),array($tmp),array()); +//echo '
    ';print_r($block);echo '


    '; +$smarty->assign("BLOCKS",$block); + +//$smarty->assign("BLOCKS",getBlocks("Emails",$disp_view,$mode,$focus->column_fields)); +//echo '
    ';print_r(getBlocks("Emails",$disp_view,$mode,$focus->column_fields));echo '
    '; +$smarty->assign("OP_MODE",$disp_view); + +$disp_view = getView($focus->mode); + +//needed when creating a new email with default values passed in +if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) +{ + $focus->contact_name = $_REQUEST['contact_name']; +} +if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) +{ + $focus->contact_id = $_REQUEST['contact_id']; +} +if (isset($_REQUEST['parent_name']) && is_null($focus->parent_name)) +{ + $focus->parent_name = $_REQUEST['parent_name']; +} +if (isset($_REQUEST['parent_id']) && is_null($focus->parent_id)) +{ + $focus->parent_id = $_REQUEST['parent_id']; +} +if (isset($_REQUEST['parent_type'])) +{ + $focus->parent_type = $_REQUEST['parent_type']; +} +if (isset($_REQUEST['filename']) && $_REQUEST['isDuplicate'] != 'true') +{ + $focus->filename = $_REQUEST['filename']; +} +elseif (is_null($focus->parent_type)) +{ + $focus->parent_type = $app_list_strings['record_type_default_key']; +} + +$log->info("Email detail view"); + +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); ?> name)) $smarty->assign("NAME", $focus->name); -else $smarty->assign("NAME", ""); - -if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); -else $smarty->assign("RETURN_MODULE",'Emails'); -if(isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); -else $smarty->assign("RETURN_ACTION",'index'); -if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); -if (isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); - - -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); -$smarty->assign("ID", $focus->id); -//$smarty->assign("ENTITY_ID", $_REQUEST["record"]); -$smarty->assign("ENTITY_TYPE",$_REQUEST["email_directing_module"]); -$tabid = getTabid("Webmails"); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); -$smarty->display("salesEditView.tpl"); -?> +if (isset($focus->name)) $smarty->assign("NAME", $focus->name); +else $smarty->assign("NAME", ""); + +if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); +else $smarty->assign("RETURN_MODULE",'Emails'); +if(isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); +else $smarty->assign("RETURN_ACTION",'index'); +if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); +if (isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); + + +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); +$smarty->assign("ID", $focus->id); +//$smarty->assign("ENTITY_ID", $_REQUEST["record"]); +$smarty->assign("ENTITY_TYPE",$_REQUEST["email_directing_module"]); +$tabid = getTabid("Webmails"); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); +$smarty->display("salesEditView.tpl"); +?> Modified: vtigercrm/trunk/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/ListView.php (original) +++ vtigercrm/trunk/modules/Webmails/ListView.php Wed May 3 06:00:54 2006 @@ -40,32 +40,32 @@ ); } -num_rows($mailInfo) < 1) { echo "

    Please configure your mail settings

    "; exit(); } -$temprow = $adb->fetch_array($mailInfo); -$login_username= $temprow["mail_username"]; -$secretkey=$temprow["mail_password"]; -$imapServerAddress=$temprow["mail_servername"]; -$box_refresh=$temprow["box_refresh"]; -$mails_per_page=$temprow["mails_per_page"]; -$mail_protocol=$temprow["mail_protocol"]; -$ssltype=$temprow["ssltype"]; -$sslmeth=$temprow["sslmeth"]; +$temprow = $adb->fetch_array($mailInfo); +$login_username= $temprow["mail_username"]; +$secretkey=$temprow["mail_password"]; +$imapServerAddress=$temprow["mail_servername"]; +$box_refresh=$temprow["box_refresh"]; +$mails_per_page=$temprow["mails_per_page"]; +$mail_protocol=$temprow["mail_protocol"]; +$ssltype=$temprow["ssltype"]; +$sslmeth=$temprow["sslmeth"]; $account_name=$temprow["account_name"]; $show_hidden=$_REQUEST["show_hidden"]; ?> @@ -76,8 +76,8 @@ "; $listview_header = array("Info","Subject","Date","From","Del"); -$listview_entries = array(); - -if($numEmails <= 0) - $listview_entries[0][] = '
    No Emails In This FolderNo Emails In This Folder
            
    Check for new e-Mails        Check for new e-Mails                           '; -$navigationOutput .= $boxes; -$navigationOutput .= '                        Viewing Messages: '.($start_message+$c).' to '.$start_message.' ('.$numEmails.' Total)                           '; +$navigationOutput .= $boxes; +$navigationOutput .= '                        Viewing Messages: '.($start_message+$c).' to '.$start_message.' ('.$numEmails.' Total)  
    {$APP.LBL_REQUIRED_SYMBOL}Email's per Page Email's per Page  
    "; - - $eventTime = (float)$event->getTimeStamp(); - $eventStartTime = (float)LoggerLoggingEvent::getStartTime(); - $sbuf .= number_format(($eventTime - $eventStartTime) * 1000, 0, '', ''); - $sbuf .= "getThreadName() . " thread\">"; - $sbuf .= $event->getThreadName(); - $sbuf .= ""; - - $level = $event->getLevel(); - - if ($level->equals(LoggerLevel::getLevelDebug())) { - $sbuf .= ""; - $sbuf .= $level->toString(); - $sbuf .= ""; - }elseif($level->equals(LoggerLevel::getLevelWarn())) { - $sbuf .= ""; - $sbuf .= $level->toString(); - $sbuf .= ""; - } else { - $sbuf .= $level->toString(); - } - $sbuf .= "getLoggerName(), ENT_QUOTES) . " category\">"; - $sbuf .= htmlentities($event->getLoggerName(), ENT_QUOTES); - $sbuf .= ""; - $sbuf .= htmlentities($locInfo->getFileName(), ENT_QUOTES). ':' . $locInfo->getLineNumber(); - $sbuf .= ""; - $sbuf .= htmlentities($event->getRenderedMessage(), ENT_QUOTES); - $sbuf .= "
    "; - $sbuf .= "NDC: " . htmlentities($event->getNDC(), ENT_QUOTES); - $sbuf .= "
    " . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - if ($this->locationInfo) - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - $sbuf .= "" . LOG4PHP_LINE_SEP; - - return $sbuf; - } - - /** - * @return string Returns the appropriate HTML footers. - */ - function getFooter() - { - $sbuf = "
    TimeThreadLevelCategoryFile:LineMessage
    " . LOG4PHP_LINE_SEP; - $sbuf .= "
    " . LOG4PHP_LINE_SEP; - $sbuf .= ""; - - return $sbuf; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage layouts + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +if (!defined('LOG4PHP_LINE_SEP')) { + if (substr(php_uname(), 0, 7) == "Windows") { + /** + * @ignore + */ + define('LOG4PHP_LINE_SEP', "\r\n"); + } else { + /** + * @ignore + */ + define('LOG4PHP_LINE_SEP', "\n"); + } +} + +/** + */ +require_once(LOG4PHP_DIR . '/LoggerLayout.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php'); + +/** + * This layout outputs events in a HTML table. + * + * Parameters are: {@link $title}, {@link $locationInfo}. + * + * @author VxR + * @version $Revision: 1.14 $ + * @package log4php + * @subpackage layouts + */ +class LoggerLayoutHtml extends LoggerLayout { + + /** + * The LocationInfo option takes a boolean value. By + * default, it is set to false which means there will be no location + * information output by this layout. If the the option is set to + * true, then the file name and line number of the statement + * at the origin of the log statement will be output. + * + *

    If you are embedding this layout within a {@link LoggerAppenderMail} + * or a {@link LoggerAppenderMailEvent} then make sure to set the + * LocationInfo option of that appender as well. + * @var boolean + */ + var $locationInfo = false; + + /** + * The Title option takes a String value. This option sets the + * document title of the generated HTML document. + * Defaults to 'Log4php Log Messages'. + * @var string + */ + var $title = "Log4php Log Messages"; + + /** + * Constructor + */ + function LoggerLayoutHtml() + { + return; + } + + /** + * The LocationInfo option takes a boolean value. By + * default, it is set to false which means there will be no location + * information output by this layout. If the the option is set to + * true, then the file name and line number of the statement + * at the origin of the log statement will be output. + * + *

    If you are embedding this layout within a {@link LoggerAppenderMail} + * or a {@link LoggerAppenderMailEvent} then make sure to set the + * LocationInfo option of that appender as well. + */ + function setLocationInfo($flag) + { + if (is_bool($flag)) { + $this->locationInfo = $flag; + } else { + $this->locationInfo = (bool)(strtolower($flag) == 'true'); + } + } + + /** + * Returns the current value of the LocationInfo option. + */ + function getLocationInfo() + { + return $this->locationInfo; + } + + /** + * The Title option takes a String value. This option sets the + * document title of the generated HTML document. + * Defaults to 'Log4php Log Messages'. + */ + function setTitle($title) + { + $this->title = $title; + } + + /** + * @return string Returns the current value of the Title option From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 00:14:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:14:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5734 - in /vtigercrm/trunk/log4php/or: LoggerDefaultRenderer.php LoggerObjectRenderer.php LoggerRendererMap.php Message-ID: <20060504041442.4C7F8709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:14:36 2006 New Revision: 5734 Log: log4php latest version has been update Modified: vtigercrm/trunk/log4php/or/LoggerDefaultRenderer.php vtigercrm/trunk/log4php/or/LoggerObjectRenderer.php vtigercrm/trunk/log4php/or/LoggerRendererMap.php Modified: vtigercrm/trunk/log4php/or/LoggerDefaultRenderer.php ============================================================================== --- vtigercrm/trunk/log4php/or/LoggerDefaultRenderer.php (original) +++ vtigercrm/trunk/log4php/or/LoggerDefaultRenderer.php Wed May 3 22:14:36 2006 @@ -1,58 +1,58 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage or - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); - -/** - * The default Renderer renders objects by type casting - * - * @author VxR - * @package log4php - * @subpackage or - * @since 0.3 - */ -class LoggerDefaultRenderer extends LoggerObjectRenderer{ - - /** - * Constructor - */ - function LoggerDefaultRenderer() - { - return; - } - - /** - * Render objects by type casting - * - * @param mixed $o the object to render - * @return string - */ - function doRender($o) - { - return var_export($o, true); - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage or + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); + +/** + * The default Renderer renders objects by type casting + * + * @author VxR + * @package log4php + * @subpackage or + * @since 0.3 + */ +class LoggerDefaultRenderer extends LoggerObjectRenderer{ + + /** + * Constructor + */ + function LoggerDefaultRenderer() + { + return; + } + + /** + * Render objects by type casting + * + * @param mixed $o the object to render + * @return string + */ + function doRender($o) + { + return var_export($o, true); + } +} ?> Modified: vtigercrm/trunk/log4php/or/LoggerObjectRenderer.php ============================================================================== --- vtigercrm/trunk/log4php/or/LoggerObjectRenderer.php (original) +++ vtigercrm/trunk/log4php/or/LoggerObjectRenderer.php Wed May 3 22:14:36 2006 @@ -1,63 +1,63 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage or - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - * Subclass this abstract class in order to render objects as strings. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage or - * @abstract - * @since 0.3 - */ -class LoggerObjectRenderer { - - /** - * @param string $class classname - * @return LoggerObjectRenderer create LoggerObjectRenderer instances - */ - function factory($class) - { - if (!empty($class)) { - $class = basename($class); - @include_once(LOG4PHP_DIR . "/or/{$class}.php"); - if (class_exists($class)) { - return new $class(); - } - } - return null; - } - - /** - * Render the entity passed as parameter as a String. - * @param mixed $o entity to render - * @return string - */ - function doRender($o) - { - // abstract - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage or + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + * Subclass this abstract class in order to render objects as strings. + * + * @author VxR + * @version $Revision: 1.3 $ + * @package log4php + * @subpackage or + * @abstract + * @since 0.3 + */ +class LoggerObjectRenderer { + + /** + * @param string $class classname + * @return LoggerObjectRenderer create LoggerObjectRenderer instances + */ + function factory($class) + { + if (!empty($class)) { + $class = basename($class); + @include_once(LOG4PHP_DIR . "/or/{$class}.php"); + if (class_exists($class)) { + return new $class(); + } + } + return null; + } + + /** + * Render the entity passed as parameter as a String. + * @param mixed $o entity to render + * @return string + */ + function doRender($o) + { + // abstract + } +} ?> Modified: vtigercrm/trunk/log4php/or/LoggerRendererMap.php ============================================================================== --- vtigercrm/trunk/log4php/or/LoggerRendererMap.php (original) +++ vtigercrm/trunk/log4php/or/LoggerRendererMap.php Wed May 3 22:14:36 2006 @@ -1,184 +1,184 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage or - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/or/LoggerDefaultRenderer.php'); -require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -/** - * Map class objects to an {@link LoggerObjectRenderer}. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage or - * @since 0.3 - */ -class LoggerRendererMap { - - /** - * @var array - */ - var $map; - - /** - * @var LoggerDefaultRenderer - */ - var $defaultRenderer; - - /** - * Constructor - */ - function LoggerRendererMap() - { - $this->map = array(); - $this->defaultRenderer = new LoggerDefaultRenderer(); - } - - /** - * Add a renderer to a hierarchy passed as parameter. - * Note that hierarchy must implement getRendererMap() and setRenderer() methods. - * - * @param LoggerHierarchy &$repository a logger repository. - * @param string &$renderedClassName - * @param string &$renderingClassName - * @static - */ - function addRenderer(&$repository, $renderedClassName, $renderingClassName) - { - LoggerLog::debug("LoggerRendererMap::addRenderer() Rendering class: [{$renderingClassName}], Rendered class: [{$renderedClassName}]."); - $renderer = LoggerObjectRenderer::factory($renderingClassName); - if($renderer == null) { - LoggerLog::warn("LoggerRendererMap::addRenderer() Could not instantiate renderer [{$renderingClassName}]."); - return; - } else { - $repository->setRenderer($renderedClassName, $renderer); - } - } - - - /** - * Find the appropriate renderer for the class type of the - * o parameter. - * - * This is accomplished by calling the {@link getByObject()} - * method if o is object or using {@link LoggerDefaultRenderer}. - * Once a renderer is found, it is applied on the object o and - * the result is returned as a string. - * - * @param mixed $o - * @return string - */ - function findAndRender($o) - { - if($o == null) { - return null; - } else { - if (is_object($o)) { - $renderer = $this->getByObject($o); - if ($renderer !== null) { - return $renderer->doRender($o); - } else { - return null; - } - } else { - $renderer = $this->defaultRenderer; - return $renderer->doRender($o); - } - } - } - - /** - * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the - * class of the object parameter. - * - * @param mixed $o - * @return string - */ - function &getByObject($o) - { - return ($o == null) ? null : $this->getByClassName(get_class($o)); - } - - - /** - * Search the parents of clazz for a renderer. - * - * The renderer closest in the hierarchy will be returned. If no - * renderers could be found, then the default renderer is returned. - * - * @param string $class - * @return LoggerObjectRenderer - */ - function &getByClassName($class) - { - $r = null; - for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) { - if (isset($this->map[$c])) { - return $this->map[$c]; - } - } - return $this->defaultRenderer; - } - - /** - * @return LoggerDefaultRenderer - */ - function &getDefaultRenderer() - { - return $this->defaultRenderer; - } - - - function clear() - { - $this->map = array(); - } - - /** - * Register a {@link LoggerObjectRenderer} for clazz. - * @param string $class - * @param LoggerObjectRenderer $or - */ - function put($class, $or) - { - $this->map[strtolower($class)] = $or; - } - - /** - * @param string $class - * @return boolean - */ - function rendererExists($class) - { - $class = basename($class); - if (!class_exists($class)) { - @include_once(LOG4PHP_DIR ."/or/{$class}.php"); - } - return class_exists($class); - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage or + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/or/LoggerDefaultRenderer.php'); +require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +/** + * Map class objects to an {@link LoggerObjectRenderer}. + * + * @author VxR + * @version $Revision: 1.4 $ + * @package log4php + * @subpackage or + * @since 0.3 + */ +class LoggerRendererMap { + + /** + * @var array + */ + var $map; + + /** + * @var LoggerDefaultRenderer + */ + var $defaultRenderer; + + /** + * Constructor + */ + function LoggerRendererMap() + { + $this->map = array(); + $this->defaultRenderer = new LoggerDefaultRenderer(); + } + + /** + * Add a renderer to a hierarchy passed as parameter. + * Note that hierarchy must implement getRendererMap() and setRenderer() methods. + * + * @param LoggerHierarchy &$repository a logger repository. + * @param string &$renderedClassName + * @param string &$renderingClassName + * @static + */ + function addRenderer(&$repository, $renderedClassName, $renderingClassName) + { + LoggerLog::debug("LoggerRendererMap::addRenderer() Rendering class: [{$renderingClassName}], Rendered class: [{$renderedClassName}]."); + $renderer = LoggerObjectRenderer::factory($renderingClassName); + if($renderer == null) { + LoggerLog::warn("LoggerRendererMap::addRenderer() Could not instantiate renderer [{$renderingClassName}]."); + return; + } else { + $repository->setRenderer($renderedClassName, $renderer); + } + } + + + /** + * Find the appropriate renderer for the class type of the + * o parameter. + * + * This is accomplished by calling the {@link getByObject()} + * method if o is object or using {@link LoggerDefaultRenderer}. + * Once a renderer is found, it is applied on the object o and + * the result is returned as a string. + * + * @param mixed $o + * @return string + */ + function findAndRender($o) + { + if($o == null) { + return null; + } else { + if (is_object($o)) { + $renderer = $this->getByObject($o); + if ($renderer !== null) { + return $renderer->doRender($o); + } else { + return null; + } + } else { + $renderer = $this->defaultRenderer; + return $renderer->doRender($o); + } + } + } + + /** + * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the + * class of the object parameter. + * + * @param mixed $o + * @return string + */ + function &getByObject($o) + { + return ($o == null) ? null : $this->getByClassName(get_class($o)); + } + + + /** + * Search the parents of clazz for a renderer. + * + * The renderer closest in the hierarchy will be returned. If no + * renderers could be found, then the default renderer is returned. + * + * @param string $class + * @return LoggerObjectRenderer + */ + function &getByClassName($class) + { + $r = null; + for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) { + if (isset($this->map[$c])) { + return $this->map[$c]; + } + } + return $this->defaultRenderer; + } + + /** + * @return LoggerDefaultRenderer + */ + function &getDefaultRenderer() + { + return $this->defaultRenderer; + } + + + function clear() + { + $this->map = array(); + } + + /** + * Register a {@link LoggerObjectRenderer} for clazz. + * @param string $class + * @param LoggerObjectRenderer $or + */ + function put($class, $or) + { + $this->map[strtolower($class)] = $or; + } + + /** + * @param string $class + * @return boolean + */ + function rendererExists($class) + { + $class = basename($class); + if (!class_exists($class)) { + @include_once(LOG4PHP_DIR ."/or/{$class}.php"); + } + return class_exists($class); + } +} ?> From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 00:16:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:16:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5735 - in /vtigercrm/trunk/log4php/spi: LoggerConfigurator.php LoggerFactory.php LoggerFilter.php LoggerLocationInfo.php LoggerLoggingEvent.php Message-ID: <20060504041643.9C772709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:16:34 2006 New Revision: 5735 Log: log4php latest version has been update Modified: vtigercrm/trunk/log4php/spi/LoggerConfigurator.php vtigercrm/trunk/log4php/spi/LoggerFactory.php vtigercrm/trunk/log4php/spi/LoggerFilter.php vtigercrm/trunk/log4php/spi/LoggerLocationInfo.php vtigercrm/trunk/log4php/spi/LoggerLoggingEvent.php Modified: vtigercrm/trunk/log4php/spi/LoggerConfigurator.php ============================================================================== --- vtigercrm/trunk/log4php/spi/LoggerConfigurator.php (original) +++ vtigercrm/trunk/log4php/spi/LoggerConfigurator.php Wed May 3 22:16:34 2006 @@ -1,65 +1,65 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage spi - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -/** - * Special level value signifying inherited behaviour. The current - * value of this string constant is inherited. - * {@link LOG4PHP_LOGGER_CONFIGURATOR_NULL} is a synonym. - */ -define('LOG4PHP_LOGGER_CONFIGURATOR_INHERITED', 'inherited'); - -/** - * Special level signifying inherited behaviour, same as - * {@link LOG4PHP_LOGGER_CONFIGURATOR_INHERITED}. - * The current value of this string constant is null. - */ -define('LOG4PHP_LOGGER_CONFIGURATOR_NULL', 'null'); - -/** - * Implemented by classes capable of configuring log4php using a URL. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage spi - * @since 0.5 - * @abstract - */ -class LoggerConfigurator { - - /** - * Interpret a resource pointed by a url and configure accordingly. - * - * The configuration is done relative to the repository - * parameter. - * - * @param string $url The URL to parse - * @param LoggerHierarchy &$repository The hierarchy to operation upon. - */ - function doConfigure($url, &$repository) - { - return; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage spi + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +/** + * Special level value signifying inherited behaviour. The current + * value of this string constant is inherited. + * {@link LOG4PHP_LOGGER_CONFIGURATOR_NULL} is a synonym. + */ +define('LOG4PHP_LOGGER_CONFIGURATOR_INHERITED', 'inherited'); + +/** + * Special level signifying inherited behaviour, same as + * {@link LOG4PHP_LOGGER_CONFIGURATOR_INHERITED}. + * The current value of this string constant is null. + */ +define('LOG4PHP_LOGGER_CONFIGURATOR_NULL', 'null'); + +/** + * Implemented by classes capable of configuring log4php using a URL. + * + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @subpackage spi + * @since 0.5 + * @abstract + */ +class LoggerConfigurator { + + /** + * Interpret a resource pointed by a url and configure accordingly. + * + * The configuration is done relative to the repository + * parameter. + * + * @param string $url The URL to parse + * @param LoggerHierarchy &$repository The hierarchy to operation upon. + */ + function doConfigure($url, &$repository) + { + return; + } +} ?> Modified: vtigercrm/trunk/log4php/spi/LoggerFactory.php ============================================================================== --- vtigercrm/trunk/log4php/spi/LoggerFactory.php (original) +++ vtigercrm/trunk/log4php/spi/LoggerFactory.php Wed May 3 22:16:34 2006 @@ -1,52 +1,52 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage spi - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); - -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - -/** - * Extend and implement this abstract class to create new instances of - * {@link Logger} or a sub-class of {@link Logger}. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage spi - * @since 0.5 - * @abstract - */ -class LoggerFactory { - - /** - * @abstract - * @param string $name - * @return Logger - */ - function makeNewLoggerInstance($name) - { - LoggerLog::warn("LoggerFactory:: makeNewLoggerInstance() is abstract."); - return null; - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage spi + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__)); + +require_once(LOG4PHP_DIR . '/LoggerLog.php'); + +/** + * Extend and implement this abstract class to create new instances of + * {@link Logger} or a sub-class of {@link Logger}. + * + * @author VxR + * @version $Revision: 1.3 $ + * @package log4php + * @subpackage spi + * @since 0.5 + * @abstract + */ +class LoggerFactory { + + /** + * @abstract + * @param string $name + * @return Logger + */ + function makeNewLoggerInstance($name) + { + LoggerLog::warn("LoggerFactory:: makeNewLoggerInstance() is abstract."); + return null; + } + +} ?> Modified: vtigercrm/trunk/log4php/spi/LoggerFilter.php ============================================================================== --- vtigercrm/trunk/log4php/spi/LoggerFilter.php (original) +++ vtigercrm/trunk/log4php/spi/LoggerFilter.php Wed May 3 22:16:34 2006 @@ -1,113 +1,113 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage spi - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - * The log event must be logged immediately without consulting with - * the remaining filters, if any, in the chain. - */ -define('LOG4PHP_LOGGER_FILTER_ACCEPT', 1); - -/** - * This filter is neutral with respect to the log event. The - * remaining filters, if any, should be consulted for a final decision. - */ -define('LOG4PHP_LOGGER_FILTER_NEUTRAL', 0); - -/** - * The log event must be dropped immediately without consulting - * with the remaining filters, if any, in the chain. - */ -define('LOG4PHP_LOGGER_FILTER_DENY', -1); - -/** - * Users should extend this class to implement customized logging - * event filtering. Note that {@link LoggerCategory} and {@link LoggerAppenderSkeleton}, - * the parent class of all standard - * appenders, have built-in filtering rules. It is suggested that you - * first use and understand the built-in rules before rushing to write - * your own custom filters. - * - *

    This abstract class assumes and also imposes that filters be - * organized in a linear chain. The {@link #decide - * decide(LoggerLoggingEvent)} method of each filter is called sequentially, - * in the order of their addition to the chain. - * - *

    The {@link decide()} method must return one - * of the integer constants {@link LOG4PHP_LOG4PHP_LOGGER_FILTER_DENY}, - * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_ACCEPT}. - * - *

    If the value {@link LOG4PHP_LOGGER_FILTER_DENY} is returned, then the log event is - * dropped immediately without consulting with the remaining - * filters. - * - *

    If the value {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned, then the next filter - * in the chain is consulted. If there are no more filters in the - * chain, then the log event is logged. Thus, in the presence of no - * filters, the default behaviour is to log all logging events. - * - *

    If the value {@link LOG4PHP_LOGGER_FILTER_ACCEPT} is returned, then the log - * event is logged without consulting the remaining filters. - * - *

    The philosophy of log4php filters is largely inspired from the - * Linux ipchains. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage spi - */ -class LoggerFilter { - - /** - * @var LoggerFilter Points to the next {@link LoggerFilter} in the filter chain. - */ - var $next; - - /** - * Usually filters options become active when set. We provide a - * default do-nothing implementation for convenience. - */ - function activateOptions() - { - return; - } - - /** - * Decide what to do. - *

    If the decision is {@link LOG4PHP_LOGGER_FILTER_DENY}, then the event will be - * dropped. If the decision is {@link LOG4PHP_LOGGER_FILTER_NEUTRAL}, then the next - * filter, if any, will be invoked. If the decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} then - * the event will be logged without consulting with other filters in - * the chain. - * - * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to decide upon. - * @return integer {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_DENY}|{@link LOG4PHP_LOGGER_FILTER_ACCEPT} - */ - function decide($event) - { - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage spi + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + * The log event must be logged immediately without consulting with + * the remaining filters, if any, in the chain. + */ +define('LOG4PHP_LOGGER_FILTER_ACCEPT', 1); + +/** + * This filter is neutral with respect to the log event. The + * remaining filters, if any, should be consulted for a final decision. + */ +define('LOG4PHP_LOGGER_FILTER_NEUTRAL', 0); + +/** + * The log event must be dropped immediately without consulting + * with the remaining filters, if any, in the chain. + */ +define('LOG4PHP_LOGGER_FILTER_DENY', -1); + +/** + * Users should extend this class to implement customized logging + * event filtering. Note that {@link LoggerCategory} and {@link LoggerAppenderSkeleton}, + * the parent class of all standard + * appenders, have built-in filtering rules. It is suggested that you + * first use and understand the built-in rules before rushing to write + * your own custom filters. + * + *

    This abstract class assumes and also imposes that filters be + * organized in a linear chain. The {@link #decide + * decide(LoggerLoggingEvent)} method of each filter is called sequentially, + * in the order of their addition to the chain. + * + *

    The {@link decide()} method must return one + * of the integer constants {@link LOG4PHP_LOG4PHP_LOGGER_FILTER_DENY}, + * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_ACCEPT}. + * + *

    If the value {@link LOG4PHP_LOGGER_FILTER_DENY} is returned, then the log event is + * dropped immediately without consulting with the remaining + * filters. + * + *

    If the value {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned, then the next filter + * in the chain is consulted. If there are no more filters in the + * chain, then the log event is logged. Thus, in the presence of no + * filters, the default behaviour is to log all logging events. + * + *

    If the value {@link LOG4PHP_LOGGER_FILTER_ACCEPT} is returned, then the log + * event is logged without consulting the remaining filters. + * + *

    The philosophy of log4php filters is largely inspired from the + * Linux ipchains. + * + * @author VxR + * @version $Revision: 1.4 $ + * @package log4php + * @subpackage spi + */ +class LoggerFilter { + + /** + * @var LoggerFilter Points to the next {@link LoggerFilter} in the filter chain. + */ + var $next; + + /** + * Usually filters options become active when set. We provide a + * default do-nothing implementation for convenience. + */ + function activateOptions() + { + return; + } + + /** + * Decide what to do. + *

    If the decision is {@link LOG4PHP_LOGGER_FILTER_DENY}, then the event will be + * dropped. If the decision is {@link LOG4PHP_LOGGER_FILTER_NEUTRAL}, then the next + * filter, if any, will be invoked. If the decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} then + * the event will be logged without consulting with other filters in + * the chain. + * + * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to decide upon. + * @return integer {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_DENY}|{@link LOG4PHP_LOGGER_FILTER_ACCEPT} + */ + function decide($event) + { + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + } + +} ?> Modified: vtigercrm/trunk/log4php/spi/LoggerLocationInfo.php ============================================================================== --- vtigercrm/trunk/log4php/spi/LoggerLocationInfo.php (original) +++ vtigercrm/trunk/log4php/spi/LoggerLocationInfo.php Wed May 3 22:16:34 2006 @@ -1,116 +1,116 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage spi - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - * When location information is not available the constant - * NA is returned. Current value of this string - * constant is ?. - */ -define('LOG4PHP_LOGGER_LOCATION_INFO_NA', 'NA'); - -/** - * The internal representation of caller location information. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage spi - * @since 0.3 - */ -class LoggerLocationInfo { - - /** - * @var string Caller's line number. - */ - var $lineNumber = null; - - /** - * @var string Caller's file name. - */ - var $fileName = null; - - /** - * @var string Caller's fully qualified class name. - */ - var $className = null; - - /** - * @var string Caller's method name. - */ - var $methodName = null; - - /** - * @var string - */ - var $fullInfo = null; - - /** - * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}. - * - * @param array $trace - * @param mixed $caller - */ - function LoggerLocationInfo($trace, $fqcn = null) - { - $this->lineNumber = isset($trace['line']) ? $trace['line'] : null; - $this->fileName = isset($trace['file']) ? $trace['file'] : null; - $this->className = isset($trace['class']) ? $trace['class'] : null; - $this->methodName = isset($trace['function']) ? $trace['function'] : null; - - $this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . - '(' . $this->getFileName() . ':' . $this->getLineNumber() . ')'; - } - - function getClassName() - { - return ($this->className === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->className; - } - - /** - * Return the file name of the caller. - *

    This information is not always available. - */ - function getFileName() - { - return ($this->fileName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->fileName; - } - - /** - * Returns the line number of the caller. - *

    This information is not always available. - */ - function getLineNumber() - { - return ($this->lineNumber === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->lineNumber; - } - - /** - * Returns the method name of the caller. - */ - function getMethodName() - { - return ($this->methodName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->methodName; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage spi + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + * When location information is not available the constant + * NA is returned. Current value of this string + * constant is ?. + */ +define('LOG4PHP_LOGGER_LOCATION_INFO_NA', 'NA'); + +/** + * The internal representation of caller location information. + * + * @author VxR + * @version $Revision: 1.5 $ + * @package log4php + * @subpackage spi + * @since 0.3 + */ +class LoggerLocationInfo { + + /** + * @var string Caller's line number. + */ + var $lineNumber = null; + + /** + * @var string Caller's file name. + */ + var $fileName = null; + + /** + * @var string Caller's fully qualified class name. + */ + var $className = null; + + /** + * @var string Caller's method name. + */ + var $methodName = null; + + /** + * @var string + */ + var $fullInfo = null; + + /** + * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}. + * + * @param array $trace + * @param mixed $caller + */ + function LoggerLocationInfo($trace, $fqcn = null) + { + $this->lineNumber = isset($trace['line']) ? $trace['line'] : null; + $this->fileName = isset($trace['file']) ? $trace['file'] : null; + $this->className = isset($trace['class']) ? $trace['class'] : null; + $this->methodName = isset($trace['function']) ? $trace['function'] : null; + + $this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . + '(' . $this->getFileName() . ':' . $this->getLineNumber() . ')'; + } + + function getClassName() + { + return ($this->className === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->className; + } + + /** + * Return the file name of the caller. + *

    This information is not always available. + */ + function getFileName() + { + return ($this->fileName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->fileName; + } + + /** + * Returns the line number of the caller. + *

    This information is not always available. + */ + function getLineNumber() + { + return ($this->lineNumber === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->lineNumber; + } + + /** + * Returns the method name of the caller. + */ + function getMethodName() + { + return ($this->methodName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->methodName; + } +} ?> Modified: vtigercrm/trunk/log4php/spi/LoggerLoggingEvent.php ============================================================================== --- vtigercrm/trunk/log4php/spi/LoggerLoggingEvent.php (original) +++ vtigercrm/trunk/log4php/spi/LoggerLoggingEvent.php Wed May 3 22:16:34 2006 @@ -1,384 +1,384 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage spi - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/spi/LoggerLocationInfo.php'); -require_once(LOG4PHP_DIR . '/LoggerManager.php'); -require_once(LOG4PHP_DIR . '/LoggerMDC.php'); -require_once(LOG4PHP_DIR . '/LoggerNDC.php'); - -/** - * The internal representation of logging event. - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage spi - */ -class LoggerLoggingEvent { - - /** - * @var string Fully Qualified Class Name of the calling category class. - */ - var $fqcn; - - /** - * @var Logger reference - */ - var $logger = null; - - /** - * The category (logger) name. - * This field will be marked as private in future - * releases. Please do not access it directly. - * Use the {@link getLoggerName()} method instead. - * @deprecated - */ - var $categoryName; - - /** - * Level of logging event. - *

    This field should not be accessed directly. You shoud use the - * {@link getLevel()} method instead. - * - * @deprecated - * @var LoggerLevel - */ - var $level; - - /** - * @var string The nested diagnostic context (NDC) of logging event. - */ - var $ndc; - - /** - * Have we tried to do an NDC lookup? If we did, there is no need - * to do it again. Note that its value is always false when - * serialized. Thus, a receiving SocketNode will never use it's own - * (incorrect) NDC. See also writeObject method. - * @var boolean - */ - var $ndcLookupRequired = true; - - /** - * Have we tried to do an MDC lookup? If we did, there is no need - * to do it again. Note that its value is always false when - * serialized. See also the getMDC and getMDCCopy methods. - * @var boolean - */ - var $mdcCopyLookupRequired = true; - - /** - * @var mixed The application supplied message of logging event. - */ - var $message; - - /** - * The application supplied message rendered through the log4php - * objet rendering mechanism. At present renderedMessage == message. - * @var string - */ - var $renderedMessage; - - /** - * The name of thread in which this logging event was generated. - * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} - * @var mixed - */ - var $threadName = null; - - /** - * The number of seconds elapsed from 1/1/1970 until logging event - * was created plus microseconds if available. - * @var float - */ - var $timeStamp; - - /** - * @var LoggerLocationInfo Location information for the caller. - */ - var $locationInfo = null; - - // Serialization - /* - var $serialVersionUID = -868428216207166145L; - var $PARAM_ARRAY = array(); - var $TO_LEVEL = "toLevel"; - var $TO_LEVEL_PARAMS = null; - var $methodCache = array(); // use a tiny table - */ - - /** - * Instantiate a LoggingEvent from the supplied parameters. - * - *

    Except {@link $timeStamp} all the other fields of - * LoggerLoggingEvent are filled when actually needed. - * - * @param string $fqcn name of the caller class. - * @param mixed &$logger The {@link Logger} category of this event or the logger name. - * @param LoggerLevel $priority The level of this event. - * @param mixed $message The message of this event. - * @param integer $timeStamp the timestamp of this logging event. - */ - function LoggerLoggingEvent($fqcn, &$logger, $priority, $message, $timeStamp = null) - { - $this->fqcn = $fqcn; - if (is_a($logger, 'logger')) { - $this->logger =& $logger; - $this->categoryName = $logger->getName(); - } else { - $this->categoryName = (string)$logger; - } - $this->level = $priority; - $this->message = $message; - if ($timeStamp !== null and is_float($timeStamp)) { - $this->timeStamp = $timeStamp; - } else { - if (function_exists('microtime')) { - list($usecs, $secs) = explode(' ', microtime()); - $this->timeStamp = ((float)$usecs + (float)$secs); - } else { - $this->timeStamp = time(); - } - } - } - - /** - * Set the location information for this logging event. The collected - * information is cached for future use. - * - *

    This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists) - * to collect informations about caller.

    - *

    It only recognize informations generated by {@link Logger} and its subclasses.

    - * @return LoggerLocationInfo - */ - function getLocationInformation() - { - if($this->locationInfo === null) { - - $locationInfo = array(); - - if (function_exists('debug_backtrace')) { - $trace = debug_backtrace(); - $prevHop = null; - // make a downsearch to identify the caller - $hop = array_pop($trace); - while ($hop !== null) { - $className = @$hop['class']; - if ( !empty($className) and ($className == 'logger' or get_parent_class($className) == 'logger') ) { - $locationInfo['line'] = $hop['line']; - $locationInfo['file'] = $hop['file']; - break; - } - $prevHop = $hop; - $hop = array_pop($trace); - } - $locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main'; - if (isset($prevHop['function']) and - $prevHop['function'] !== 'include' and - $prevHop['function'] !== 'include_once' and - $prevHop['function'] !== 'require' and - $prevHop['function'] !== 'require_once') { - - $locationInfo['function'] = $prevHop['function']; - } else { - $locationInfo['function'] = 'main'; - } - } - - $this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn); - } - return $this->locationInfo; - } - - /** - * Return the level of this event. Use this form instead of directly - * accessing the {@link $level} field. - * @return LoggerLevel - */ - function getLevel() - { - return $this->level; - } - - /** - * Return the name of the logger. Use this form instead of directly - * accessing the {@link $categoryName} field. - * @return string - */ - function getLoggerName() - { - return $this->categoryName; - } - - /** - * Return the message for this logging event. - * - *

    Before serialization, the returned object is the message - * passed by the user to generate the logging event. After - * serialization, the returned value equals the String form of the - * message possibly after object rendering. - * @return mixed - */ - function getMessage() - { - if($this->message !== null) { - return $this->message; - } else { - return $this->getRenderedMessage(); - } - } - - /** - * This method returns the NDC for this event. It will return the - * correct content even if the event was generated in a different - * thread or even on a different machine. The {@link LoggerNDC::get()} method - * should never be called directly. - * @return string - */ - function getNDC() - { - if ($this->ndcLookupRequired) { - $this->ndcLookupRequired = false; - $this->ndc = implode(' ',LoggerNDC::get()); - } - return $this->ndc; - } - - - /** - * Returns the the context corresponding to the key - * parameter. - * @return string - */ - function getMDC($key) - { - return LoggerMDC::get($key); - } - - /** - * Render message. - * @return string - */ - function getRenderedMessage() - { - if($this->renderedMessage === null and $this->message !== null) { - if (is_string($this->message)) { - $this->renderedMessage = $this->message; - } else { - if ($this->logger !== null) { - $repository =& $this->logger->getLoggerRepository(); - } else { - $repository =& LoggerManager::getLoggerRepository(); - } - if (method_exists($repository, 'getrenderermap')) { - $rendererMap =& $repository->getRendererMap(); - $this->renderedMessage= $rendererMap->findAndRender($this->message); - } else { - $this->renderedMessage = (string)$this->message; - } - } - } - return $this->renderedMessage; - } - - /** - * Returns the time when the application started, in seconds - * elapsed since 01.01.1970 plus microseconds if available. - * - * @return float - * @static - */ - function getStartTime() - { - static $startTime; - - if (!isset($startTime)) { - if (function_exists('microtime')) { - list($usec, $sec) = explode(' ', microtime()); - $startTime = ((float)$usec + (float)$sec); - } else { - $startTime = time(); - } - } - return $startTime; - } - - /** - * @return float - */ - function getTimeStamp() - { - return $this->timeStamp; - } - - /** - * @return mixed - */ - function getThreadName() - { - if ($this->threadName === null) - $this->threadName = (string)getmypid(); - return $this->threadName; - } - - /** - * @return mixed null - */ - function getThrowableInformation() - { - return null; - } - - /** - * Serialize this object - * @return string - */ - function toString() - { - serialize($this); - } - - /** - * Avoid serialization of the {@link $logger} object - */ - function __sleep() - { - return array( - 'fqcn','categoryName', - 'level', - 'ndc','ndcLookupRequired', - 'message','renderedMessage', - 'threadName', - 'timestamp', - 'locationInfo' - ); - } - -} - -LoggerLoggingEvent::getStartTime(); - +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage spi + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/spi/LoggerLocationInfo.php'); +require_once(LOG4PHP_DIR . '/LoggerManager.php'); +require_once(LOG4PHP_DIR . '/LoggerMDC.php'); +require_once(LOG4PHP_DIR . '/LoggerNDC.php'); + +/** + * The internal representation of logging event. + * + * @author VxR + * @version $Revision: 1.16 $ + * @package log4php + * @subpackage spi + */ +class LoggerLoggingEvent { + + /** + * @var string Fully Qualified Class Name of the calling category class From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 00:18:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:18:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5736 - in /vtigercrm/trunk/log4php/varia: LoggerDenyAllFilter.php LoggerLevelMatchFilter.php LoggerLevelRangeFilter.php LoggerStringMatchFilter.php Message-ID: <20060504041843.670C8709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:18:30 2006 New Revision: 5736 Log: log4php latest version has been update Modified: vtigercrm/trunk/log4php/varia/LoggerDenyAllFilter.php vtigercrm/trunk/log4php/varia/LoggerLevelMatchFilter.php vtigercrm/trunk/log4php/varia/LoggerLevelRangeFilter.php vtigercrm/trunk/log4php/varia/LoggerStringMatchFilter.php Modified: vtigercrm/trunk/log4php/varia/LoggerDenyAllFilter.php ============================================================================== --- vtigercrm/trunk/log4php/varia/LoggerDenyAllFilter.php (original) +++ vtigercrm/trunk/log4php/varia/LoggerDenyAllFilter.php Wed May 3 22:18:30 2006 @@ -1,57 +1,57 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage varia - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); - -/** - * This filter drops all logging events. - * - *

    You can add this filter to the end of a filter chain to - * switch from the default "accept all unless instructed otherwise" - * filtering behaviour to a "deny all unless instructed otherwise" - * behaviour.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage varia - * @since 0.3 - */ -class LoggerDenyAllFilter extends LoggerFilter { - - /** - * Always returns the integer constant {@link LOG4PHP_LOGGER_FILTER_DENY} - * regardless of the {@link LoggerLoggingEvent} parameter. - * - * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to filter. - * @return LOG4PHP_LOGGER_FILTER_DENY Always returns {@link LOG4PHP_LOGGER_FILTER_DENY} - */ - function decide($event) - { - return LOG4PHP_LOGGER_FILTER_DENY; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage varia + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); + +/** + * This filter drops all logging events. + * + *

    You can add this filter to the end of a filter chain to + * switch from the default "accept all unless instructed otherwise" + * filtering behaviour to a "deny all unless instructed otherwise" + * behaviour.

    + * + * @author VxR + * @version $Revision: 1.4 $ + * @package log4php + * @subpackage varia + * @since 0.3 + */ +class LoggerDenyAllFilter extends LoggerFilter { + + /** + * Always returns the integer constant {@link LOG4PHP_LOGGER_FILTER_DENY} + * regardless of the {@link LoggerLoggingEvent} parameter. + * + * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to filter. + * @return LOG4PHP_LOGGER_FILTER_DENY Always returns {@link LOG4PHP_LOGGER_FILTER_DENY} + */ + function decide($event) + { + return LOG4PHP_LOGGER_FILTER_DENY; + } +} ?> Modified: vtigercrm/trunk/log4php/varia/LoggerLevelMatchFilter.php ============================================================================== --- vtigercrm/trunk/log4php/varia/LoggerLevelMatchFilter.php (original) +++ vtigercrm/trunk/log4php/varia/LoggerLevelMatchFilter.php Wed May 3 22:18:30 2006 @@ -1,119 +1,119 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage varia - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); - -/** - * This is a very simple filter based on level matching. - * - *

    The filter admits two options LevelToMatch and - * AcceptOnMatch. If there is an exact match between the value - * of the LevelToMatch option and the level of the - * {@link LoggerLoggingEvent}, then the {@link decide()} method returns - * {@link LOG4PHP_LOGGER_FILTER_ACCEPT} in case the AcceptOnMatch - * option value is set to true, if it is false then - * {@link LOG4PHP_LOGGER_FILTER_DENY} is returned. If there is no match, - * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage varia - * @since 0.6 - */ -class LoggerLevelMatchFilter extends LoggerFilter { - - /** - * @var boolean - */ - var $acceptOnMatch = true; - - /** - * @var LoggerLevel - */ - var $levelToMatch; - - /** - * @return boolean - */ - function getAcceptOnMatch() - { - return $this->acceptOnMatch; - } - - /** - * @param boolean $acceptOnMatch - */ - function setAcceptOnMatch($acceptOnMatch) - { - $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); - } - - /** - * @return LoggerLevel - */ - function getLevelToMatch() - { - return $this->levelToMatch; - } - - /** - * @param string $l the level to match - */ - function setLevelToMatch($l) - { - $this->levelToMatch = LoggerOptionConverter::toLevel($l, null); - } - - /** - * Return the decision of this filter. - * - * Returns {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} if the LevelToMatch - * option is not set or if there is not match. Otherwise, if there is a - * match, then the returned decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} if the - * AcceptOnMatch property is set to true. The - * returned decision is {@link LOG4PHP_LOGGER_FILTER_DENY} if the - * AcceptOnMatch property is set to false. - * - * @param LoggerLoggingEvent $event - * @return integer - */ - function decide($event) - { - if($this->levelToMatch === null) - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - - if ($this->levelToMatch->equals($event->getLevel())) { - return $this->getAcceptOnMatch() ? - LOG4PHP_LOGGER_FILTER_ACCEPT : - LOG4PHP_LOGGER_FILTER_DENY; - } else { - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage varia + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); + +/** + * This is a very simple filter based on level matching. + * + *

    The filter admits two options LevelToMatch and + * AcceptOnMatch. If there is an exact match between the value + * of the LevelToMatch option and the level of the + * {@link LoggerLoggingEvent}, then the {@link decide()} method returns + * {@link LOG4PHP_LOGGER_FILTER_ACCEPT} in case the AcceptOnMatch + * option value is set to true, if it is false then + * {@link LOG4PHP_LOGGER_FILTER_DENY} is returned. If there is no match, + * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned.

    + * + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @subpackage varia + * @since 0.6 + */ +class LoggerLevelMatchFilter extends LoggerFilter { + + /** + * @var boolean + */ + var $acceptOnMatch = true; + + /** + * @var LoggerLevel + */ + var $levelToMatch; + + /** + * @return boolean + */ + function getAcceptOnMatch() + { + return $this->acceptOnMatch; + } + + /** + * @param boolean $acceptOnMatch + */ + function setAcceptOnMatch($acceptOnMatch) + { + $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); + } + + /** + * @return LoggerLevel + */ + function getLevelToMatch() + { + return $this->levelToMatch; + } + + /** + * @param string $l the level to match + */ + function setLevelToMatch($l) + { + $this->levelToMatch = LoggerOptionConverter::toLevel($l, null); + } + + /** + * Return the decision of this filter. + * + * Returns {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} if the LevelToMatch + * option is not set or if there is not match. Otherwise, if there is a + * match, then the returned decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} if the + * AcceptOnMatch property is set to true. The + * returned decision is {@link LOG4PHP_LOGGER_FILTER_DENY} if the + * AcceptOnMatch property is set to false. + * + * @param LoggerLoggingEvent $event + * @return integer + */ + function decide($event) + { + if($this->levelToMatch === null) + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + + if ($this->levelToMatch->equals($event->getLevel())) { + return $this->getAcceptOnMatch() ? + LOG4PHP_LOGGER_FILTER_ACCEPT : + LOG4PHP_LOGGER_FILTER_DENY; + } else { + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + } + } +} ?> Modified: vtigercrm/trunk/log4php/varia/LoggerLevelRangeFilter.php ============================================================================== --- vtigercrm/trunk/log4php/varia/LoggerLevelRangeFilter.php (original) +++ vtigercrm/trunk/log4php/varia/LoggerLevelRangeFilter.php Wed May 3 22:18:30 2006 @@ -1,168 +1,168 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage varia - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); - -/** - * This is a very simple filter based on level matching, which can be - * used to reject messages with priorities outside a certain range. - * - *

    The filter admits three options LevelMin, LevelMax - * and AcceptOnMatch.

    - * - *

    If the level of the {@link LoggerLoggingEvent} is not between Min and Max - * (inclusive), then {@link LOG4PHP_LOGGER_FILTER_DENY} is returned.

    - * - *

    If the Logging event level is within the specified range, then if - * AcceptOnMatch is true, - * {@link LOG4PHP_LOGGER_FILTER_ACCEPT} is returned, and if - * AcceptOnMatch is false, - * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned.

    - * - *

    If LevelMin is not defined, then there is no - * minimum acceptable level (ie a level is never rejected for - * being too "low"/unimportant). If LevelMax is not - * defined, then there is no maximum acceptable level (ie a - * level is never rejected for beeing too "high"/important).

    - * - *

    Refer to the {@link LoggerAppenderSkeleton::setThreshold()} method - * available to all appenders extending {@link LoggerAppenderSkeleton} - * for a more convenient way to filter out events by level.

    - * - * @log4j-class org.apache.log4j.varia.LevelRangeFilter - * @log4j-author Simon Kitching - * @log4j-author based on code by Ceki Gülcü - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage varia - * @since 0.6 - */ -class LoggerLevelRangeFilter extends LoggerFilter { - - /** - * @var boolean - */ - var $acceptOnMatch = true; - - /** - * @var LoggerLevel - */ - var $levelMin; - - /** - * @var LoggerLevel - */ - var $levelMax; - - /** - * @return boolean - */ - function getAcceptOnMatch() - { - return $this->acceptOnMatch; - } - - /** - * @param boolean $acceptOnMatch - */ - function setAcceptOnMatch($acceptOnMatch) - { - $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); - } - - /** - * @return LoggerLevel - */ - function getLevelMin() - { - return $this->levelMin; - } - - /** - * @param string $l the level min to match - */ - function setLevelMin($l) - { - $this->levelMin = LoggerOptionConverter::toLevel($l, null); - } - - /** - * @return LoggerLevel - */ - function getLevelMax() - { - return $this->levelMax; - } - - /** - * @param string $l the level max to match - */ - function setLevelMax($l) - { - $this->levelMax = LoggerOptionConverter::toLevel($l, null); - } - - /** - * Return the decision of this filter. - * - * @param LoggerLoggingEvent $event - * @return integer - */ - function decide($event) - { - $level = $event->getLevel(); - - if($this->levelMin !== null) { - if ($level->isGreaterOrEqual($this->levelMin) == false) { - // level of event is less than minimum - return LOG4PHP_LOGGER_FILTER_DENY; - } - } - - if($this->levelMax !== null) { - if ($level->toInt() > $this->levelMax->toInt()) { - // level of event is greater than maximum - // Alas, there is no Level.isGreater method. and using - // a combo of isGreaterOrEqual && !Equal seems worse than - // checking the int values of the level objects.. - return LOG4PHP_LOGGER_FILTER_DENY; - } - } - - if ($this->getAcceptOnMatch()) { - // this filter set up to bypass later filters and always return - // accept if level in range - return LOG4PHP_LOGGER_FILTER_ACCEPT; - } else { - // event is ok for this filter; allow later filters to have a look.. - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage varia + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); + +/** + * This is a very simple filter based on level matching, which can be + * used to reject messages with priorities outside a certain range. + * + *

    The filter admits three options LevelMin, LevelMax + * and AcceptOnMatch.

    + * + *

    If the level of the {@link LoggerLoggingEvent} is not between Min and Max + * (inclusive), then {@link LOG4PHP_LOGGER_FILTER_DENY} is returned.

    + * + *

    If the Logging event level is within the specified range, then if + * AcceptOnMatch is true, + * {@link LOG4PHP_LOGGER_FILTER_ACCEPT} is returned, and if + * AcceptOnMatch is false, + * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned.

    + * + *

    If LevelMin is not defined, then there is no + * minimum acceptable level (ie a level is never rejected for + * being too "low"/unimportant). If LevelMax is not + * defined, then there is no maximum acceptable level (ie a + * level is never rejected for beeing too "high"/important).

    + * + *

    Refer to the {@link LoggerAppenderSkeleton::setThreshold()} method + * available to all appenders extending {@link LoggerAppenderSkeleton} + * for a more convenient way to filter out events by level.

    + * + * @log4j-class org.apache.log4j.varia.LevelRangeFilter + * @log4j-author Simon Kitching + * @log4j-author based on code by Ceki Gülcü + * + * @author VxR + * @version $Revision: 1.2 $ + * @package log4php + * @subpackage varia + * @since 0.6 + */ +class LoggerLevelRangeFilter extends LoggerFilter { + + /** + * @var boolean + */ + var $acceptOnMatch = true; + + /** + * @var LoggerLevel + */ + var $levelMin; + + /** + * @var LoggerLevel + */ + var $levelMax; + + /** + * @return boolean + */ + function getAcceptOnMatch() + { + return $this->acceptOnMatch; + } + + /** + * @param boolean $acceptOnMatch + */ + function setAcceptOnMatch($acceptOnMatch) + { + $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); + } + + /** + * @return LoggerLevel + */ + function getLevelMin() + { + return $this->levelMin; + } + + /** + * @param string $l the level min to match + */ + function setLevelMin($l) + { + $this->levelMin = LoggerOptionConverter::toLevel($l, null); + } + + /** + * @return LoggerLevel + */ + function getLevelMax() + { + return $this->levelMax; + } + + /** + * @param string $l the level max to match + */ + function setLevelMax($l) + { + $this->levelMax = LoggerOptionConverter::toLevel($l, null); + } + + /** + * Return the decision of this filter. + * + * @param LoggerLoggingEvent $event + * @return integer + */ + function decide($event) + { + $level = $event->getLevel(); + + if($this->levelMin !== null) { + if ($level->isGreaterOrEqual($this->levelMin) == false) { + // level of event is less than minimum + return LOG4PHP_LOGGER_FILTER_DENY; + } + } + + if($this->levelMax !== null) { + if ($level->toInt() > $this->levelMax->toInt()) { + // level of event is greater than maximum + // Alas, there is no Level.isGreater method. and using + // a combo of isGreaterOrEqual && !Equal seems worse than + // checking the int values of the level objects.. + return LOG4PHP_LOGGER_FILTER_DENY; + } + } + + if ($this->getAcceptOnMatch()) { + // this filter set up to bypass later filters and always return + // accept if level in range + return LOG4PHP_LOGGER_FILTER_ACCEPT; + } else { + // event is ok for this filter; allow later filters to have a look.. + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + } + } +} ?> Modified: vtigercrm/trunk/log4php/varia/LoggerStringMatchFilter.php ============================================================================== --- vtigercrm/trunk/log4php/varia/LoggerStringMatchFilter.php (original) +++ vtigercrm/trunk/log4php/varia/LoggerStringMatchFilter.php Wed May 3 22:18:30 2006 @@ -1,108 +1,108 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage varia - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -/** - */ -require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); - -/** - * This is a very simple filter based on string matching. - * - *

    The filter admits two options {@link $stringToMatch} and - * {@link $acceptOnMatch}. If there is a match (using {@link PHP_MANUAL#strpos} - * between the value of the {@link $stringToMatch} option and the message - * of the {@link LoggerLoggingEvent}, - * then the {@link decide()} method returns {@link LOG4PHP_LOGGER_FILTER_ACCEPT} if - * the AcceptOnMatch option value is true, if it is false then - * {@link LOG4PHP_LOGGER_FILTER_DENY} is returned. If there is no match, {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} - * is returned.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage varia - * @since 0.3 - */ -class LoggerStringMatchFilter extends LoggerFilter { - - /** - * @var boolean - */ - var $acceptOnMatch = true; - - /** - * @var string - */ - var $stringToMatch = null; - - /** - * @return boolean - */ - function getAcceptOnMatch() - { - return $this->acceptOnMatch; - } - - /** - * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false') - */ - function setAcceptOnMatch($acceptOnMatch) - { - $this->acceptOnMatch = is_bool($acceptOnMatch) ? - $acceptOnMatch : - (bool)(strtolower($acceptOnMatch) == 'true'); - } - - /** - * @return string - */ - function getStringToMatch() - { - return $this->stringToMatch; - } - - /** - * @param string $s the string to match - */ - function setStringToMatch($s) - { - $this->stringToMatch = $s; - } - - /** - * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match. - */ - function decide($event) - { - $msg = $event->getRenderedMessage(); - - if($msg === null or $this->stringToMatch === null) - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - if( strpos($msg, $this->stringToMatch) !== false ) { - return ($this->acceptOnMatch) ? LOG4PHP_LOGGER_FILTER_ACCEPT : LOG4PHP_LOGGER_FILTER_DENY ; - } - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage varia + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +/** + */ +require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php'); + +/** + * This is a very simple filter based on string matching. + * + *

    The filter admits two options {@link $stringToMatch} and + * {@link $acceptOnMatch}. If there is a match (using {@link PHP_MANUAL#strpos} + * between the value of the {@link $stringToMatch} option and the message + * of the {@link LoggerLoggingEvent}, + * then the {@link decide()} method returns {@link LOG4PHP_LOGGER_FILTER_ACCEPT} if + * the AcceptOnMatch option value is true, if it is false then + * {@link LOG4PHP_LOGGER_FILTER_DENY} is returned. If there is no match, {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} + * is returned.

    + * + * @author VxR + * @version $Revision: 1.4 $ + * @package log4php + * @subpackage varia + * @since 0.3 + */ +class LoggerStringMatchFilter extends LoggerFilter { + + /** + * @var boolean + */ + var $acceptOnMatch = true; + + /** + * @var string + */ + var $stringToMatch = null; + + /** + * @return boolean + */ + function getAcceptOnMatch() + { + return $this->acceptOnMatch; + } + + /** + * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false') + */ + function setAcceptOnMatch($acceptOnMatch) + { + $this->acceptOnMatch = is_bool($acceptOnMatch) ? + $acceptOnMatch : + (bool)(strtolower($acceptOnMatch) == 'true'); + } + + /** + * @return string + */ + function getStringToMatch() + { + return $this->stringToMatch; + } + + /** + * @param string $s the string to match + */ + function setStringToMatch($s) + { + $this->stringToMatch = $s; + } + + /** + * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match. + */ + function decide($event) + { + $msg = $event->getRenderedMessage(); + + if($msg === null or $this->stringToMatch === null) + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + if( strpos($msg, $this->stringToMatch) !== false ) { + return ($this->acceptOnMatch) ? LOG4PHP_LOGGER_FILTER_ACCEPT : LOG4PHP_LOGGER_FILTER_DENY ; + } + return LOG4PHP_LOGGER_FILTER_NEUTRAL; + } +} ?> From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 00:19:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 04:19:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5737 - /vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php Message-ID: <20060504041959.69FA9709F1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 3 22:19:54 2006 New Revision: 5737 Log: log4php latest version has been update Modified: vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php Modified: vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php ============================================================================== --- vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php (original) +++ vtigercrm/trunk/log4php/xml/LoggerDOMConfigurator.php Wed May 3 22:19:54 2006 @@ -1,609 +1,609 @@ -This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    - *

    Design, strategies and part of the methods documentation are developed by log4j team - * (Ceki G?lc? as log4j project founder and - * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    - * - *

    PHP port, extensions and modifications by VxR. All rights reserved.
    - * For more information, please see {@link http://www.vxr.it/log4php/}.

    - * - *

    This software is published under the terms of the LGPL License - * a copy of which has been included with this distribution in the LICENSE file.

    - * - * @package log4php - * @subpackage xml - */ - -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); -require_once(LOG4PHP_DIR . '/LoggerAppender.php'); -require_once(LOG4PHP_DIR . '/LoggerLayout.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); -require_once(LOG4PHP_DIR . '/LoggerManager.php'); - -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE', 1000); -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE', 1010); -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE', 1020); -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE', 1030); -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE', 1040); - -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_FILENAME', './log4php.xml'); - -/** - * @var string the default configuration document - */ -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION', -' - - - - - - - - -'); - -/** - * @var string the elements namespace - */ -define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS', 'HTTP://WWW.VXR.IT/LOG4PHP/'); - -/** - * Use this class to initialize the log4php environment using expat parser. - * - *

    Read the log4php.dtd included in the documentation directory. Note that - * php parser does not validate the document.

    - * - *

    Sometimes it is useful to see how log4php is reading configuration - * files. You can enable log4php internal logging by setting the debug - * attribute in the log4php:configuration element. As in - *

    - * <log4php:configuration debug="true" xmlns:log4php="http://www.vxr.it/log4php/">
    - * ...
    - * </log4php:configuration>
    - * 
    - * - *

    There are sample XML files included in the package under tests/ - * subdirectories.

    - * - * @author VxR - * @version $Revision: 1.1 $ - * @package log4php - * @subpackage xml - * @since 0.4 - */ -class LoggerDOMConfigurator extends LoggerConfigurator { - - /** - * @var LoggerHierarchy - */ - var $repository; - - /** - * @var array state stack - */ - var $state; - - /** - * @var Logger parsed Logger - */ - var $logger; - - /** - * @var LoggerAppender parsed LoggerAppender - */ - var $appender; - - /** - * @var LoggerFilter parsed LoggerFilter - */ - var $filter; - - /** - * @var LoggerLayout parsed LoggerLayout - */ - var $layout; - - /** - * Constructor - */ - function LoggerDOMConfigurator() - { - $this->state = array(); - $this->logger = null; - $this->appender = null; - $this->filter = null; - $this->layout = null; - } - - /** - * Configure the default repository using the resource pointed by url. - * Url is any valid resurce as defined in {@link PHP_MANUAL#file} function. - * Note that the resource will be search with use_include_path parameter - * set to "1". - * - * @param string $url - * @static - */ - function configure($url = '') - { - $configurator = new LoggerDOMConfigurator(); - $repository =& LoggerManager::getLoggerRepository(); - return $configurator->doConfigure($url, $repository); - } - - /** - * Configure the given repository using the resource pointed by url. - * Url is any valid resurce as defined in {@link PHP_MANUAL#file} function. - * Note that the resource will be search with use_include_path parameter - * set to "1". - * - * @param string $url - * @param LoggerHierarchy &$repository - */ - function doConfigure($url = '', &$repository) - { - $xmlData = ''; - if (!empty($url)) - $xmlData = implode('', file($url, 1)); - return $this->doConfigureByString($xmlData, $repository); - } - - /** - * Configure the given repository using the configuration written in xmlData. - * Do not call this method directly. Use {@link doConfigure()} instead. - * @param string $xmlData - * @param LoggerHierarchy &$repository - */ - function doConfigureByString($xmlData, &$repository) - { - return $this->parse($xmlData, $repository); - } - - /** - * @param LoggerHierarchy &$repository - */ - function doConfigureDefault(&$repository) - { - return $this->doConfigureByString(LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION, $repository); - } - - /** - * @param string $xmlData - */ - function parse($xmlData, &$repository) - { - // LoggerManager::resetConfiguration(); - $this->repository =& $repository; - - $parser = xml_parser_create_ns(); - - xml_set_object($parser, &$this); - xml_set_element_handler($parser, "tagOpen", "tagClose"); - - $result = xml_parse($parser, $xmlData, true); - if (!$result) { - $errorCode = xml_get_error_code($parser); - $errorStr = xml_error_string($errorCode); - $errorLine = xml_get_current_line_number($parser); - LoggerLog::warn( - "LoggerDOMConfigurator::parse() ". - "Parsing error [{$errorCode}] {$errorStr}, line {$errorLine}" - ); - $this->repository->resetConfiguration(); - } else { - xml_parser_free($parser); - } - return $result; - } - - /** - * @param mixed $parser - * @param string $tag - * @param array $attribs - * - * @todo In 'LOGGER' case find a better way to detect 'getLogger()' method - */ - function tagOpen($parser, $tag, $attribs) - { - switch ($tag) { - - case 'CONFIGURATION' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION': - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() CONFIGURATION"); - - if (isset($attribs['THRESHOLD'])) { - - $this->repository->setThreshold( - LoggerOptionConverter::toLevel( - $this->subst($attribs['THRESHOLD']), - $this->repository->getThreshold() - ) - ); - } - if (isset($attribs['DEBUG'])) { - $debug = LoggerOptionConverter::toBoolean($this->subst($attribs['DEBUG']), LoggerLog::internalDebugging()); - $this->repository->debug = $debug; - LoggerLog::internalDebugging($debug); - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LOG4PHP:CONFIGURATION. Internal Debug turned ".($debug ? 'on':'off')); - - } - break; - - case 'APPENDER' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER': - - unset($this->appender); - $this->appender = null; - - $name = $this->subst(@$attribs['NAME']); - $class = $this->subst(@$attribs['CLASS']); - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen():tag=[$tag]:name=[$name]:class=[$class]"); - - $this->appender =& LoggerAppender::singleton($name, $class); - if ($this->appender === null) { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER cannot instantiate appender '$name'"); - } - $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE; - break; - - case 'APPENDER_REF' : - case 'APPENDER-REF' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER_REF': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER-REF': - - - if (isset($attribs['REF']) and !empty($attribs['REF'])) { - $appenderName = $this->subst($attribs['REF']); - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref='$appenderName'"); - - $appender =& LoggerAppender::singleton($appenderName); - if ($appender !== null) { - switch (end($this->state)) { - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE: - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE: - $this->logger->addAppender($appender); - break; - } - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref '$appenderName' points to a null appender"); - } - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref not set or empty"); - } - break; - - case 'FILTER' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER': - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() FILTER"); - - unset($this->filter); - $this->filter = null; - - $filterName = basename($this->subst(@$attribs['CLASS'])); - if (!empty($filterName)) { - if (!class_exists($filterName)) { - @include_once(LOG4PHP_DIR . "/varia/{$filterName}.php"); - } - if (class_exists($filterName)) { - $this->filter = new $filterName(); - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER. class '$filterName' doesnt exist"); - } - $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE; - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER filter name cannot be empty"); - } - break; - - case 'LAYOUT': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT': - - $class = @$attribs['CLASS']; - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LAYOUT class='{$class}'"); - - $this->layout = LoggerLayout::factory($this->subst($class)); - if ($this->layout === null) - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LAYOUT unable to instanciate class='{$class}'"); - - $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE; - break; - - case 'LOGGER': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER': - - // $this->logger is assigned by reference. - // Only '$this->logger=null;' destroys referenced object - unset($this->logger); - $this->logger = null; - - $loggerName = $this->subst(@$attribs['NAME']); - if (!empty($loggerName)) { - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LOGGER. name='$loggerName'"); - - $class = $this->subst(@$attribs['CLASS']); - if (empty($class)) { - $this->logger =& $this->repository->getLogger($loggerName); - } else { - $className = basename($class); - if (!class_exists($className)) - @include_once("{$class}.php"); - if (!class_exists($className)) { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() LOGGER. ". - "cannot find '$className'." - ); - } else { - - if (in_array('getlogger', get_class_methods($className))) { - $this->logger =& call_user_func(array($className, 'getlogger'), $loggerName); - } else { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() LOGGER. ". - "class '$className' doesnt implement 'getLogger()' method." - ); - } - } - } - if ($this->logger !== null and isset($attribs['ADDITIVITY'])) { - $additivity = LoggerOptionConverter::toBoolean($this->subst($attribs['ADDITIVITY']), true); - $this->logger->setAdditivity($additivity); - } - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LOGGER. Attribute 'name' is not set or is empty."); - } - $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE;; - break; - - case 'LEVEL': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LEVEL': - case 'PRIORITY': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PRIORITY': - - if (!isset($attribs['VALUE'])) { - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL value not set"); - break; - } - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL value={$attribs['VALUE']}"); - - if ($this->logger === null) { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL. parent logger is null"); - break; - } - - switch (end($this->state)) { - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE: - $this->logger->setLevel( - LoggerOptionConverter::toLevel( - $this->subst($attribs['VALUE']), - $this->logger->getLevel() - ) - ); - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL root level is now '{$attribs['VALUE']}' "); - break; - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE: - $this->logger->setLevel( - LoggerOptionConverter::toLevel( - $this->subst($attribs['VALUE']), - $this->logger->getLevel() - ) - ); - break; - default: - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL state '{$this->state}' not allowed here"); - } - break; - - case 'PARAM': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PARAM': - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() PARAM"); - - if (!isset($attribs['NAME'])) { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() PARAM. ". - "attribute 'name' not defined." - ); - break; - } - if (!isset($attribs['VALUE'])) { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() PARAM. ". - "attribute 'value' not defined." - ); - break; - } - - switch (end($this->state)) { - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE: - if ($this->appender !== null) { - $this->setter($this->appender, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE'])); - } else { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() PARAM. ". - " trying to set property to a null appender." - ); - } - break; - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE: - if ($this->layout !== null) { - $this->setter($this->layout, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE'])); - } else { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() PARAM. ". - " trying to set property to a null layout." - ); - } - break; - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE: - if ($this->filter !== null) { - $this->setter($this->filter, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE'])); - } else { - LoggerLog::warn( - "LoggerDOMConfigurator::tagOpen() PARAM. ". - " trying to set property to a null filter." - ); - } - break; - default: - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() PARAM state '{$this->state}' not allowed here"); - } - break; - - case 'RENDERER': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':RENDERER': - - $renderedClass = $this->subst(@$attribs['RENDEREDCLASS']); - $renderingClass = $this->subst(@$attribs['RENDERINGCLASS']); - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() RENDERER renderedClass='$renderedClass' renderingClass='$renderingClass'"); - - if (!empty($renderedClass) and !empty($renderingClass)) { - $renderer = LoggerObjectRenderer::factory($renderingClass); - if ($renderer === null) { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() RENDERER cannot instantiate '$renderingClass'"); - } else { - $this->repository->setRenderer($renderedClass, $renderer); - } - } else { - LoggerLog::warn("LoggerDOMConfigurator::tagOpen() RENDERER renderedClass or renderingClass is empty"); - } - break; - - case 'ROOT': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT': - - LoggerLog::debug("LoggerDOMConfigurator::tagOpen() ROOT"); - - $this->logger =& LoggerManager::getRootLogger(); - - $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE; - break; - - } - - } - - - /** - * @param mixed $parser - * @param string $tag - */ - function tagClose($parser, $tag) - { - switch ($tag) { - - case 'CONFIGURATION' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() CONFIGURATION"); - break; - - case 'APPENDER' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() APPENDER"); - - if ($this->appender !== null) { - if ($this->appender->requiresLayout() and $this->appender->layout === null) { - $appenderName = $this->appender->getName(); - LoggerLog::warn( - "LoggerDOMConfigurator::tagClose() APPENDER. ". - "'$appenderName' requires a layout that is not defined. ". - "Using a simple layout" - ); - $this->appender->setLayout(LoggerLayout::factory('LoggerLayoutSimple')); - } - $this->appender->activateOptions(); - } - array_pop($this->state); - break; - - case 'FILTER' : - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() FILTER"); - - if ($this->filter !== null) { - $this->filter->activateOptions(); - $this->appender->addFilter($this->filter); - $this->filter = null; - } - array_pop($this->state); - break; - - case 'LAYOUT': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() LAYOUT"); - - if ($this->appender !== null and $this->layout !== null and $this->appender->requiresLayout()) { - $this->layout->activateOptions(); - $this->appender->setLayout($this->layout); - $this->layout = null; - } - array_pop($this->state); - break; - - case 'LOGGER': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() LOGGER"); - - array_pop($this->state); - break; - - case 'ROOT': - case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT': - - LoggerLog::debug("LoggerDOMConfigurator::tagClose() ROOT"); - - array_pop($this->state); - break; - } - } - - /** - * @param object $object - * @param string $name - * @param mixed $value - */ - function setter(&$object, $name, $value) - { - if (empty($name)) { - LoggerLog::debug("LoggerDOMConfigurator::setter() 'name' param cannot be empty"); - return false; - } - $methodName = 'set'.ucfirst($name); - if (method_exists($object, $methodName)) { - LoggerLog::debug("LoggerDOMConfigurator::setter() Calling ".get_class($object)."::{$methodName}({$value})"); - return call_user_func(array(&$object, $methodName), $value); - } else { - LoggerLog::warn("LoggerDOMConfigurator::setter() ".get_class($object)."::{$methodName}() does not exists"); - return false; - } - } - - function subst($value) - { - return LoggerOptionConverter::substVars($value); - } - -} +This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).

    + *

    Design, strategies and part of the methods documentation are developed by log4j team + * (Ceki G?lc? as log4j project founder and + * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).

    + * + *

    PHP port, extensions and modifications by VxR. All rights reserved.
    + * For more information, please see {@link http://www.vxr.it/log4php/}.

    + * + *

    This software is published under the terms of the LGPL License + * a copy of which has been included with this distribution in the LICENSE file.

    + * + * @package log4php + * @subpackage xml + */ + +/** + * @ignore + */ +if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); + +require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); +require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php'); +require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php'); +require_once(LOG4PHP_DIR . '/LoggerAppender.php'); +require_once(LOG4PHP_DIR . '/LoggerLayout.php'); +require_once(LOG4PHP_DIR . '/LoggerLog.php'); +require_once(LOG4PHP_DIR . '/LoggerManager.php'); + +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE', 1000); +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE', 1010); +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE', 1020); +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE', 1030); +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE', 1040); + +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_FILENAME', './log4php.xml'); + +/** + * @var string the default configuration document + */ +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION', +' + + + + + + + + +'); + +/** + * @var string the elements namespace + */ +define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS', 'HTTP://WWW.VXR.IT/LOG4PHP/'); + +/** + * Use this class to initialize the log4php environment using expat parser From vtiger-tickets at vtiger.fosslabs.com Thu May 4 00:24:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 04:24:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23277=3A_?= =?utf-8?q?Create_New_Ticket_Error?= In-Reply-To: <076.a16680abbe7e676034a699a2d73d9ba1@vtiger.fosslabs.com> References: <076.a16680abbe7e676034a699a2d73d9ba1@vtiger.fosslabs.com> Message-ID: <085.d830ce31b8f3e3477da97397ac549966@vtiger.fosslabs.com> #277: Create New Ticket Error ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => invalid * status: assigned => closed Comment: This is not an error. when create or edit the ticket notification mail will be sent to the assigned to user and to the parent(contact or account). when we have not configured the mail server or the user doesnot have email id these messages will be shown. This is expected behaviour. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 01:12:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 05:12:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23314=3A_?= =?utf-8?q?Send_Mail_Error?= In-Reply-To: <076.e5bca6e3a669f482cc6bea329d21616f@vtiger.fosslabs.com> References: <076.e5bca6e3a669f482cc6bea329d21616f@vtiger.fosslabs.com> Message-ID: <085.aac36f903fbffea3b2b216cc9aa0a131@vtiger.fosslabs.com> #314: Send Mail Error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: sendmail ---------------------------+------------------------------------------------ Changes (by mickie): * resolution: => invalid * status: assigned => closed Comment: when click on sendmail button with a selected account (in a customview)then it is asking to select email or otheremail of the account. This error is not reproduced. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 03:14:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 07:14:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23379=3A_?= =?utf-8?q?Convert_Ticket_as_FAQ_Issues_-_HelpDesk?= In-Reply-To: <076.e5a75db78368710b1013ac9acdcc85ef@vtiger.fosslabs.com> References: <076.e5a75db78368710b1013ac9acdcc85ef@vtiger.fosslabs.com> Message-ID: <085.cb7107edea987081c62181541386e05e@vtiger.fosslabs.com> #379: Convert Ticket as FAQ Issues - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => invalid * status: assigned => closed Comment: This is an expected behaviour. when we convert the ticket as FAQ all the comments, description and solution will be considered as ans answer for the FAQ. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 03:17:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 07:17:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5738 - /vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php Message-ID: <20060504071737.B298A709F87@vtiger.fosslabs.com> Author: saraj Date: Thu May 4 01:17:27 2006 New Revision: 5738 Log: * Modified the Module FAQ to Faq as when get the tabid from tabdata.php file the tabid returns as empty as the file contains the name Faq Modified: vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php Modified: vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php Thu May 4 01:17:27 2006 @@ -31,7 +31,7 @@ $focus->column_fields[$faq_column] = $adb->query_result($res,0,$ticket_column); } -$focus->save("FAQ"); +$focus->save("Faq"); if($focus->id != '') { From vtiger-tickets at vtiger.fosslabs.com Thu May 4 03:22:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 07:22:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23536=3A_?= =?utf-8?q?Ticketsystem_Emails?= In-Reply-To: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> References: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> Message-ID: <085.328ebe13275f1455bfba4eddb40c09be@vtiger.fosslabs.com> #536: Ticketsystem Emails -----------------------------+---------------------------------------------- Reporter: anonymous | Owner: mickie Type: enhancement | Status: assigned Priority: major | Milestone: Component: customerportal | Version: 5.0.0 Resolution: | Keywords: Ticket mail -----------------------------+---------------------------------------------- Comment (by mickie): i agree that the email id is displayed in ticket comments. But the ticket can be only viewable by the crm user or the customer (customerportal user). How can others view this ticket and how can they spam? Please let me know if i am wrong. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 04:30:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 08:30:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23755=3A_?= =?utf-8?q?Image_Graph_implementation_for_4=2E2=2E5_jpgraph_replacement?= Message-ID: <076.48939851ba2c8a6f490b5e0d7b8c550b@vtiger.fosslabs.com> #755: Image Graph implementation for 4.2.5 jpgraph replacement ---------------------------------+------------------------------------------ Reporter: jacquemesm | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: Image Graph jpgraph | ---------------------------------+------------------------------------------ Installation : {{{ suppress jpgraph folder unzip attached file. This will create Image folder, include/utils/GraphUtils.php and Pear.php apply the patch file }}} -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 05:58:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 09:58:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5739 - /vtigercrm/trunk/Smarty/libs/Smarty.class.php Message-ID: <20060504095841.CD8DF709E8B@vtiger.fosslabs.com> Author: saraj Date: Thu May 4 03:58:36 2006 New Revision: 5739 Log: Modified = true; - Ahmed Modified: vtigercrm/trunk/Smarty/libs/Smarty.class.php Modified: vtigercrm/trunk/Smarty/libs/Smarty.class.php ============================================================================== --- vtigercrm/trunk/Smarty/libs/Smarty.class.php (original) +++ vtigercrm/trunk/Smarty/libs/Smarty.class.php Thu May 4 03:58:36 2006 @@ -138,7 +138,7 @@ * * @var boolean */ - var $compile_check = false; + var $compile_check = true; /** * This forces templates to compile every time. Useful for development From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 09:55:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 13:55:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5740 - /vtigercrm/trunk/index.php Message-ID: <20060504135532.1A729706500@vtiger.fosslabs.com> Author: saraj Date: Thu May 4 07:55:23 2006 New Revision: 5740 Log: licensing contents skipped for changepassword popup Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Thu May 4 07:55:23 2006 @@ -556,7 +556,7 @@ "; echo $copyrightstatement; - if($action != "about_us" && $action != "vtchat") + if($action != "about_us" && $action != "vtchat" && $action != "ChangePassword") { echo ""; echo " + +
    \n"; From vtiger-tickets at vtiger.fosslabs.com Thu May 4 11:23:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 15:23:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23756=3A_?= =?utf-8?q?Option_to_skip_use_of_shipping-address?= Message-ID: <076.3c2c9c5476bb8606fa576a8304f090c1@vtiger.fosslabs.com> #756: Option to skip use of shipping-address ----------------------------------+----------------------------------------- Reporter: hpw at softechmatrix.nl | Owner: developer Type: enhancement | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 4.2.3 Keywords: shipping address | ----------------------------------+----------------------------------------- Currently the shipping-address is mandatory in most places of the system (like orders and invoices). However, many businesses don't 'ship' anything (example: hotels) and don't need a shipping address from their clients. It would be a nice enhancement if we could switch off the use of shipping- addresses altogether. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 14:24:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 18:24:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5741 - in /vtigercrm/trunk: Smarty/templates/ComposeEmail.tpl include/utils/EditViewUtils.php Message-ID: <20060504182445.DEF8F709FB3@vtiger.fosslabs.com> Author: saraj Date: Thu May 4 12:24:38 2006 New Revision: 5741 Log: * Modified to display the entities as red which dont have email id, when use sendmail from entity listview Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Thu May 4 12:24:38 2006 @@ -27,84 +27,93 @@ - + + + {foreach item=row from=$BLOCKS} {foreach item=elements from=$row} {if $elements.2.0 eq 'parent_id'} - + + + + + + + + + + + - - - - - - - - - - - + {elseif $elements.2.0 eq 'subject'} - + - + {elseif $elements.2.0 eq 'filename'} - - + + + + {$elements.3.0} + - + {elseif $elements.2.0 eq 'description'} - + - + {/if} {/foreach} {/foreach} - + - -
    - - - - - - -
     
    -
    + + + + + + +
     
    +
    To : - -   - + + {assign var=str_len value=$elements.3.0|count_characters:true} + {assign var=div_height value="35"} + {if $str_len gt 700} + {assign var=div_height value="50"} + {/if} +
    {$elements.3.0}
    +
    +   + Select  - + +
    Cc : +   +  
    Bcc : +    
    CC: - -   -  
    BCC: -   - -  
    *{$elements.1.0} :
    {$elements.1.0} : - - {$elements.3.0}  
    - +
    -   -   - +   +   +
    +
    Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Thu May 4 12:24:38 2006 @@ -721,7 +721,25 @@ $result=$adb->query($querystr); $temp=$adb->query_result($result,0,'columnname'); $temp1=br2nl($myfocus->column_fields[$temp]); - $parent_name.=$fullname.'<'.$temp1.'>; '; + + //Modified to display the entities in red which don't have email id + if(strlen($temp_parent_name) > 150) + { + $parent_name .= '
    '; + $temp_parent_name = ''; + } + + if($temp1 != '') + { + $parent_name .= $fullname.'<'.$temp1.'>; '; + $temp_parent_name .= $fullname.'<'.$temp1.'>; '; + } + else + { + $parent_name .= "".$fullname.'<'.$temp1.'>; '.""; + $temp_parent_name .= "".$fullname.'<'.$temp1.'>; '.""; + } + } } } From vtiger-tickets at vtiger.fosslabs.com Thu May 4 14:25:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:25:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23114=3A_?= =?utf-8?q?Issue_in_Send_Mail?= In-Reply-To: <076.ddc63533a52d7768a57c17d8f409428d@vtiger.fosslabs.com> References: <076.ddc63533a52d7768a57c17d8f409428d@vtiger.fosslabs.com> Message-ID: <085.47fdc6b2e06c03c772cad07871ac6390@vtiger.fosslabs.com> #114: Issue in Send Mail ------------------------+--------------------------------------------------- Reporter: jeri | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Accounts,Send mail ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This has been fixed as the entity names will be displayed in red which dont have email -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 14:31:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:31:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23444=3A_?= =?utf-8?q?Issue_in_contact_send_mail?= In-Reply-To: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> References: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> Message-ID: <085.a508f193fa5e7a5d2c5533e45e53e12a@vtiger.fosslabs.com> #444: Issue in contact send mail ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This is expected behaviour. when click sendmail from listiview it will ask the user to select any one of the available email because here we can select multiple entities.so the user can decide whether use a single email or all available emails. but when we click sendmail from detailview it will directly go to email editview to create new email to send where the email id will be automatically selected. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 14:31:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:31:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23444=3A_?= =?utf-8?q?Issue_in_contact_send_mail?= In-Reply-To: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> References: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> Message-ID: <085.ab76db464715827345e477ccfe27efd4@vtiger.fosslabs.com> #444: Issue in contact send mail ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: reopened Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: fixed => * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 14:32:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:32:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23444=3A_?= =?utf-8?q?Issue_in_contact_send_mail?= In-Reply-To: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> References: <076.366dde0ad8c1e7681c1cf8c462a32707@vtiger.fosslabs.com> Message-ID: <085.c5966e34293320fe16b4ed8e328d0b77@vtiger.fosslabs.com> #444: Issue in contact send mail ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => invalid * status: reopened => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 14:34:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:34:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2387=3A_C?= =?utf-8?q?all_to_undefined_function_error_when_creating_portal_user?= In-Reply-To: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> References: <076.5ccbf2328eba397e11c342285c9a84f1@vtiger.fosslabs.com> Message-ID: <085.5601d2f5d75dd9ff6c357e88827876a2@vtiger.fosslabs.com> #87: Call to undefined function error when creating portal user ------------------------------------+--------------------------------------- Reporter: james at itextension.com | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: customer portal, contacts ------------------------------------+--------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue has been fixed already and the related file has been checkedin in svn. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 14:38:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 18:38:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23443=3A_?= =?utf-8?q?Issue_in_contact_send_mail?= In-Reply-To: <076.430c5dc35b1c3f501f0bbe602ea65fa9@vtiger.fosslabs.com> References: <076.430c5dc35b1c3f501f0bbe602ea65fa9@vtiger.fosslabs.com> Message-ID: <085.cd92464c57963f95e102312d173744ff@vtiger.fosslabs.com> #443: Issue in contact send mail ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => invalid * status: assigned => closed Comment: when click on sendmail after select a contact from listview goes to the specified page where we can select one of the or all email options which are all avalilable. Not reproduced. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 16:16:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 20:16:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23757=3A_?= =?utf-8?q?Update_to_new_adodb-4=2E81_release?= Message-ID: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> #757: Update to new adodb-4.81 release ------------------------------------+--------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: adodb database package | ------------------------------------+--------------------------------------- There is a new release of adodb-4.81. The changelog seems to have several useful features and fixes. I would like to update the snapshotted adodb in source:vtigercrm/trunk/adodb and source:vtigercrm/branches/4.2/adodb to be zero-diff with the release files of adodb-4.81. I would be comfortable doing this without feedback on source:vtigercrm/branches/4.2 since we have been keeping that snapshot in sync with adodb releases. However, since the trunk's adodb is of indeterminate version, and since I am new to the development cycle on the source:vtigercrm/trunk, I would like someone to weigh in with approval first. The changes in adodb-4.81 are as follows: * This release can cache table metadata (field names, types, and other info such primary keys). It only updates fields that have changed. * Variable ref errors in adodb-ado5.inc.php have been fixed. * There is a Mysqli setcharset fix using method_exists(). * The adodb-perf.inc.php CreateLogTable() code now works for user-defined table names * An error in ibase_blob_open() has been fixed. * This release no longer includes auto_increment fields in replace(). Previous changelogs are available at: http://phplens.com/lens/adodb/docs-adodb.htm#changes -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu May 4 17:50:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 04 May 2006 21:50:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23757=3A_?= =?utf-8?q?Update_to_new_adodb-4=2E81_release?= In-Reply-To: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> References: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> Message-ID: <085.1bf73978993f8d311a1731431fe56488@vtiger.fosslabs.com> #757: Update to new adodb-4.81 release ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: adodb database package ------------------------+--------------------------------------------------- Comment (by jeffk): (In [5742]) refs #757. update adodb-4.72 to adodb-4.81 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 17:50:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 21:50:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5742 - in /vtigercrm/branches/4.2/adodb: ./ datadict/ drivers/ perf/ session/ session/old/ tests/ xsl/ Message-ID: <20060504215025.447245D3B07@vtiger.fosslabs.com> Author: jeffk Date: Thu May 4 15:49:28 2006 New Revision: 5742 Log: refs #757. update adodb-4.72 to adodb-4.81 Added: vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php vtigercrm/branches/4.2/adodb/adodb-xmlschema03.inc.php vtigercrm/branches/4.2/adodb/tests/test-active-record.php vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php vtigercrm/branches/4.2/adodb/xsl/convert-0.1-0.3.xsl vtigercrm/branches/4.2/adodb/xsl/convert-0.2-0.3.xsl vtigercrm/branches/4.2/adodb/xsl/remove-0.3.xsl Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php vtigercrm/branches/4.2/adodb/adodb-error.inc.php vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php vtigercrm/branches/4.2/adodb/adodb-lib.inc.php vtigercrm/branches/4.2/adodb/adodb-pager.inc.php vtigercrm/branches/4.2/adodb/adodb-pear.inc.php vtigercrm/branches/4.2/adodb/adodb-perf.inc.php vtigercrm/branches/4.2/adodb/adodb-php4.inc.php vtigercrm/branches/4.2/adodb/adodb-time.inc.php vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php vtigercrm/branches/4.2/adodb/adodb.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-sapdb.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php vtigercrm/branches/4.2/adodb/pivottable.inc.php vtigercrm/branches/4.2/adodb/rsfilter.inc.php vtigercrm/branches/4.2/adodb/server.php vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php vtigercrm/branches/4.2/adodb/session/adodb-session.php vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php vtigercrm/branches/4.2/adodb/session/old/adodb-session.php vtigercrm/branches/4.2/adodb/tests/benchmark.php vtigercrm/branches/4.2/adodb/tests/client.php vtigercrm/branches/4.2/adodb/tests/test-datadict.php vtigercrm/branches/4.2/adodb/tests/test-php5.php vtigercrm/branches/4.2/adodb/tests/test-xmlschema.php vtigercrm/branches/4.2/adodb/tests/test.php vtigercrm/branches/4.2/adodb/tests/test3.php vtigercrm/branches/4.2/adodb/tests/test4.php vtigercrm/branches/4.2/adodb/tests/test5.php vtigercrm/branches/4.2/adodb/tests/testcache.php vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php vtigercrm/branches/4.2/adodb/tests/testmssql.php vtigercrm/branches/4.2/adodb/tests/testoci8.php vtigercrm/branches/4.2/adodb/tests/testoci8cursor.php vtigercrm/branches/4.2/adodb/tests/testpaging.php vtigercrm/branches/4.2/adodb/tests/testpear.php vtigercrm/branches/4.2/adodb/tests/testsessions.php vtigercrm/branches/4.2/adodb/toexport.inc.php vtigercrm/branches/4.2/adodb/tohtml.inc.php vtigercrm/branches/4.2/adodb/xsl/convert-0.1-0.2.xsl Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php Thu May 4 15:49:28 2006 @@ -8,7 +8,7 @@ /* - V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved. + V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released under both BSD license and Lesser GPL library license. Whenever there is any discrepancy between the two licenses, the BSD license will take precedence. See License.txt. Modified: vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,7 @@ NameQuote($name); } - // temporary for debuging vtiger - GS - - function println($msg) - { - require_once('include/logging.php'); - $log1 =& LoggerManager::getLogger('VT'); - if(is_array($msg)) - { - $log1->fatal("Install ->".print_r($msg,true)); - } - else - { - $log1->fatal("Install ->".$msg); - } - return $msg; - } - - -//---------------- - - // Executes the sql array returned by GetTableSQL and GetIndexSQL function ExecuteSQLArray($sql, $continueOnError = true) { @@ -286,18 +266,10 @@ foreach($sql as $line) { if ($this->debug) $conn->debug = true; - $this->println($line); $ok = $conn->Execute($line); $conn->debug = $saved; if (!$ok) { - $this->println("Table Creation Error: Query Failed"); - $this->println(" "); - if ($this->debug) - { - - $this->println("InstallError: ".$conn->ErrorMsg()); - ADOConnection::outp($conn->ErrorMsg()); - } + if ($this->debug) ADOConnection::outp($conn->ErrorMsg()); if (!$continueOnError) return 0; $rez = 1; } @@ -737,7 +709,7 @@ This function changes/adds new fields to your table. You don't have to know if the col is new or not. It will check on its own. */ - function ChangeTableSQL($tablename, $flds, $tableoptions = false, $forceAlter = false) // GS Fix for constraint impl - forceAlter + function ChangeTableSQL($tablename, $flds, $tableoptions = false) { global $ADODB_FETCH_MODE; @@ -754,7 +726,7 @@ if (isset($savem)) $this->connection->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; - if ( $forceAlter == false && empty($cols)) { // GS Fix for constraint impl + if ( empty($cols)) { return $this->CreateTableSQL($tablename, $flds, $tableoptions); } @@ -806,33 +778,7 @@ } } - // GS Fix for constraint impl -- start - if($forceAlter == false) return $sql; - $sqlarray = array(); - - $alter .= implode(",\n", $sql); - if (sizeof($pkey)>0) { - $alter .= ",\n PRIMARY KEY ("; - $alter .= implode(", ",$pkey).")"; - } - - if (isset($tableoptions['CONSTRAINTS'])) - $alter .= "\n".$tableoptions['CONSTRAINTS']; - - if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) - $alter .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS']; - - if (isset($tableoptions[$this->upperName])) $alter .= $tableoptions[$this->upperName]; - $sqlarray[] = $alter; - - - $taboptions = $this->_Options($tableoptions); - $tsql = $this->_Triggers($this->TableName($tablename),$taboptions); - foreach($tsql as $s) $sqlarray[] = $s; - - // GS Fix for constraint impl -- end - - return $sqlarray; + return $sql; } } // class ?> Modified: vtigercrm/branches/4.2/adodb/adodb-error.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-error.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-error.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ dbms = $dbms; - $this->host = $thisConnection->host; - $this->database = $thisConnection->database; + if ($thisConnection) { + $this->host = $thisConnection->host; + $this->database = $thisConnection->database; + } $this->fn = $fn; $this->msg = $errmsg; Modified: vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php Thu May 4 15:49:28 2006 @@ -1,7 +1,7 @@ Modified: vtigercrm/branches/4.2/adodb/adodb-lib.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-lib.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-lib.inc.php Thu May 4 15:49:28 2006 @@ -7,7 +7,7 @@ $ADODB_INCLUDED_LIB = 1; /* - @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved. + @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved. Released under both BSD license and Lesser GPL library license. Whenever there is any discrepancy between the two licenses, the BSD license will take precedence. See License.txt. @@ -933,19 +933,18 @@ $dbt = $zthis->databaseType; if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType; -/* - if ($inBrowser) { - if ($ss) { - $ss = ''.htmlspecialchars($ss).''; - } - if ($zthis->debug === -1) - ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); - else - ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); - } else { - ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); - } -// */ + if ($inBrowser) { + if ($ss) { + $ss = ''.htmlspecialchars($ss).''; + } + if ($zthis->debug === -1) + ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); + else + ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); + } else { + ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); + } + $qID = $zthis->_query($sql,$inputarr); /* @@ -958,17 +957,6 @@ if ($err = $zthis->ErrorNo()) ADOConnection::outp($err.': '.$emsg); } } else if (!$qID) { - if ($inBrowser) { - if ($ss) { - $ss = ''.htmlspecialchars($ss).''; - } - if ($zthis->debug === -1) - ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); - else - ADOConnection::outp( "
    \n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false); - } else { - ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); - } ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg()); } @@ -1030,4 +1018,4 @@ return $s; } -?> +?> Modified: vtigercrm/branches/4.2/adodb/adodb-pager.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-pager.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-pager.inc.php Thu May 4 15:49:28 2006 @@ -1,7 +1,7 @@ createTableSQL) return false; + $table = $this->table(); + $sql = str_replace('adodb_logsql',$table,$this->createTableSQL); + $savelog = $this->conn->LogSQL(false); - $ok = $this->conn->Execute($this->createTableSQL); + $ok = $this->conn->Execute($sql); $this->conn->LogSQL($savelog); return ($ok) ? true : false; } Modified: vtigercrm/branches/4.2/adodb/adodb-php4.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-php4.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-php4.inc.php Thu May 4 15:49:28 2006 @@ -1,7 +1,7 @@ parent =& $parent; $this->name = $this->prefix($attributes['NAME']); - // GS Fix for constraint impl - if(isset($attributes['ALTER'])) - { - $this->alter = $attributes['ALTER']; - } } /** @@ -329,12 +323,12 @@ if( isset( $this->current_field ) ) { $this->addFieldOpt( $this->current_field, $this->currentElement, $cdata ); } else { - $this->addTableOpt('CONSTRAINTS', $cdata ); // GS Fix for constraint impl + $this->addTableOpt( $cdata ); } break; // Table option case 'OPT': - $this->addTableOpt('mysql', $cdata ); // GS Fix for constraint impl + $this->addTableOpt( $cdata ); break; default: @@ -468,9 +462,8 @@ * @param string $opt Table option * @return array Options */ - function addTableOpt($key, $opt ) { // GS Fix for constraint impl - //$this->opts[] = $opt; - $this->opts[$key] = $opt; + function addTableOpt( $opt ) { + $this->opts[] = $opt; return $this->opts; } @@ -552,7 +545,7 @@ } } - if( empty( $legacy_fields ) && !isset($this->alter)) { // GS Fix for constraint impl + if( empty( $legacy_fields ) ) { // Create the new table $sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts ); logMsg( end( $sql ), 'Generated CreateTableSQL' ); @@ -563,7 +556,7 @@ // Use ChangeTableSQL case 'ALTER': logMsg( 'Generated ChangeTableSQL (ALTERing table)' ); - $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts, $this->alter ); // GS Fix for constraint impl + $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts ); break; case 'REPLACE': logMsg( 'Doing upgrade REPLACE (testing)' ); @@ -2225,4 +2218,4 @@ echo ''; } } -?> +?> Modified: vtigercrm/branches/4.2/adodb/adodb.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb.inc.php Thu May 4 15:49:28 2006 @@ -14,7 +14,7 @@ /** \mainpage - @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. + @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released under both BSD license and Lesser GPL library license. You can choose which license you prefer. @@ -171,7 +171,7 @@ /** * ADODB version as a string. */ - $ADODB_vers = 'V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.'; + $ADODB_vers = 'V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.'; /** * Determines whether recordset->RecordCount() is used. @@ -314,7 +314,6 @@ var $_evalAll = false; var $_affected = false; var $_logsql = false; - /** * Constructor @@ -554,6 +553,7 @@ function q(&$s) { + #if (!empty($this->qNull)) if ($s == 'null') return $s; $s = $this->qstr($s,false); } @@ -747,7 +747,7 @@ $this->_transOK = false; if ($this->debug) ADOConnection::outp("Smart Commit failed"); } else - if (false) ADOConnection::outp("Smart Commit occurred"); + if ($this->debug) ADOConnection::outp("Smart Commit occurred"); } else { $this->_transOK = false; $this->RollbackTrans(); @@ -865,7 +865,7 @@ { if ($this->debug) { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); $this->_queryID = _adodb_debug_execute($this, $sql,$inputarr); } else { $this->_queryID = @$this->_query($sql,$inputarr); @@ -896,7 +896,6 @@ $rs->connection = &$this; // Pablo suggestion $rs->Init(); if (is_array($sql)) $rs->sql = $sql[0]; - //New memory copy of input created here -mikefedyk else $rs->sql = $sql; if ($rs->_numOfRows <= 0) { global $ADODB_COUNTRECS; @@ -1463,7 +1462,7 @@ function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false) { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc); } @@ -1530,7 +1529,7 @@ } global $ADODB_INCLUDED_CSV; - if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php'); + if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php'); $f = $this->_gencachename($sql.serialize($inputarr),false); adodb_write_file($f,''); // is adodb_write_file needed? @@ -1582,7 +1581,7 @@ } global $ADODB_INCLUDED_CSV; - if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php'); + if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php'); $f = $this->_gencachename($sql.serialize($inputarr),false); adodb_write_file($f,''); // is adodb_write_file needed? @@ -1657,7 +1656,7 @@ $sqlparam = $sql; global $ADODB_INCLUDED_CSV; - if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php'); + if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php'); $md5file = $this->_gencachename($sql.serialize($inputarr),true); $err = ''; @@ -1788,7 +1787,7 @@ } //********************************************************// - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force); } @@ -1808,7 +1807,7 @@ $force = $ADODB_FORCE_TYPE; } - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force); } @@ -1958,6 +1957,48 @@ } } + function &GetActiveRecordsClass($class, $table,$whereOrderBy=false,$bindarr=false, $primkeyArr=false) + { + global $_ADODB_ACTIVE_DBS; + + $save = $this->SetFetchMode(ADODB_FETCH_NUM); + if (empty($whereOrderBy)) $whereOrderBy = '1=1'; + $rows = $this->GetAll("select * from ".$table.' WHERE '.$whereOrderBy,$bindarr); + $this->SetFetchMode($save); + + $false = false; + + if ($rows === false) { + return $false; + } + + + if (!isset($_ADODB_ACTIVE_DBS)) { + include(ADODB_DIR.'/adodb-active-record.inc.php'); + } + if (!class_exists($class)) { + ADOConnection::outp("Unknown class $class in GetActiveRcordsClass()"); + return $false; + } + $arr = array(); + foreach($rows as $row) { + + $obj =& new $class($table,$primkeyArr,$this); + if ($obj->ErrorMsg()){ + $this->_errorMsg = $obj->ErrorMsg(); + return $false; + } + $obj->Set($row); + $arr[] =& $obj; + } + return $arr; + } + + function &GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false) + { + $arr =& $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr); + return $arr; + } /** * Close Connection @@ -2022,6 +2063,7 @@ return false; } + /** * @param ttype can either be 'VIEW' or 'TABLE' or false. @@ -2422,7 +2464,7 @@ function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); if ($this->pageExecuteCountRows) $rs =& _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache); else $rs =& _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache); return $rs; @@ -2494,7 +2536,7 @@ //============================================================================================== // DATE AND TIME FUNCTIONS //============================================================================================== - include_once(ADODB_DIR.'/adodb-time.inc.php'); + if (!defined('ADODB_DATE_VERSION')) include(ADODB_DIR.'/adodb-time.inc.php'); //============================================================================================== // CLASS ADORecordSet @@ -2605,7 +2647,7 @@ $size=0, $selectAttr='',$compareFields0=true) { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple, $size, $selectAttr,$compareFields0); } @@ -2632,7 +2674,7 @@ $size=0, $selectAttr='') { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_getmenu_gp($this, $name,$defstr,$blank1stItem,$multiple, $size, $selectAttr,false); } @@ -3147,6 +3189,7 @@ } return $lnumrows; } + /** * @return the current row in the recordset. If at EOF, will return the last row. 0-based. @@ -3878,7 +3921,6 @@ case 'oracle': $drivername = 'oci8'; break; case 'access': if ($perf) $drivername = ''; break; case 'db2' : break; - case 'odbc_db2': $drivername = 'db2'; break; case 'sapdb' : break; default: $drivername = 'generic'; @@ -3911,7 +3953,7 @@ $path = ADODB_DIR."/datadict/datadict-$drivername.inc.php"; if (!file_exists($path)) { - ADOConnection::outp("Database driver '$path' not available"); + ADOConnection::outp("Dictionary driver '$path' not available"); return $false; } include_once($path); @@ -3957,7 +3999,7 @@ function adodb_backtrace($printOrArr=true,$levels=9999) { global $ADODB_INCLUDED_LIB; - if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php'); + if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php'); return _adodb_backtrace($printOrArr,$levels); } Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php (original) +++ vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php Thu May 4 15:49:28 2006 @@ -1,7 +1,7 @@ transCnt += 1; return true; } + function CommitTrans($ok=true) { if (!$ok) return $this->RollbackTrans(); @@ -283,7 +284,9 @@ function ErrorMsg() { + if (!$this->_connectionID) return "No connection established"; $errc = $this->_connectionID->Errors; + if (!$errc) return "No Errors object found"; if ($errc->Count == 0) return ''; $err = $errc->Item($errc->Count-1); return $err->Description; Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ _connectionID; // return rs + + $false = false; + if ($inputarr) { if (!empty($this->charPage)) @@ -236,22 +239,24 @@ $p = false; $rs = $oCmd->Execute(); $e = $dbc->Errors; - if ($dbc->Errors->Count > 0) return false; + if ($dbc->Errors->Count > 0) return $false; return $rs; } $rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option); - if ($dbc->Errors->Count > 0) return false; - if (! $rs) return false; - - if ($rs->State == 0) return true; // 0 = adStateClosed means no records returned - return $rs; + if ($dbc->Errors->Count > 0) return $false; + if (! $rs) return $false; + + if ($rs->State == 0) { + $true = true; + return $true; // 0 = adStateClosed means no records returned + } return $rs; } catch (exception $e) { } - return false; + return $false; } @@ -290,7 +295,9 @@ function ErrorMsg() { + if (!$this->_connectionID) return "No connection established"; $errc = $this->_connectionID->Errors; + if (!$errc) return "No Errors object found"; if ($errc->Count == 0) return ''; $err = $errc->Item($errc->Count-1); return $err->Description; Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ _connectionID, $blob ); $realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet while($string = ibase_blob_get($blobid, 8192)){ $realblob .= $string; Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ compat323 == false && strncasecmp($sql,'sele',4) == 0) { $rs =& $this->SelectLimit($sql,1,-1,$inputarr); if ($rs) { $rs->Close(); @@ -171,7 +172,7 @@ function BeginTrans() { - //if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); + if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver"); } function _affectedrows() @@ -636,8 +637,8 @@ function &GetRowAssoc($upper=true) { - if ($this->fetchMode == MYSQL_ASSOC && !$upper) return $this->fields; - $row =& ADORecordSet::GetRowAssoc($upper); + if ($this->fetchMode == MYSQL_ASSOC && !$upper) $row = $this->fields; + else $row =& ADORecordSet::GetRowAssoc($upper); return $row; } @@ -772,4 +773,4 @@ } -?> +?> Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ _connectionID,'character_set_name')) + if (!method_exists($this->_connectionID,'character_set_name')) return false; $this->charSet = @$this->_connectionID->character_set_name(); @@ -694,7 +694,7 @@ // SetCharSet - switch the client encoding function SetCharSet($charset_name) { - if (!is_callable($this->_connectionID,'set_charset')) + if (!method_exists($this->_connectionID,'set_charset')) return false; if ($this->charSet !== $charset_name) { Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php Thu May 4 15:49:28 2006 @@ -1,7 +1,7 @@ _resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false; Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ $dbType

    "; $db = NewADOConnection($dbType); $dict = NewDataDictionary($db); @@ -21,7 +21,7 @@ if (!$dict) continue; $dict->debug = 1; - $opts = array('REPLACE','mysql' => 'TYPE=INNODB', 'oci8' => 'TABLESPACE USERS'); + $opts = array('REPLACE','mysql' => 'ENGINE=INNODB', 'oci8' => 'TABLESPACE USERS'); /* $flds = array( array('id', 'I', Modified: vtigercrm/branches/4.2/adodb/tests/test-php5.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test-php5.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test-php5.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ Connect('localhost','roots','','northwind'); + $db->Connect('localhost','root','','northwind'); break; case 'mysqli': @@ -74,5 +74,35 @@ } $rs = $db->Execute("select distinct id, firstname,lastname from adoxyz order by id"); -echo "Result=\n",$rs; +echo "Result=\n",$rs,"

    "; + +echo "

    Active Record

    "; +try { + include_once("../adodb-active-record.inc.php"); + class City extends ADOdb_Active_Record{}; + $a = new City(); + +} catch(exception $e){ + echo $e->getMessage(); +} + +try { + + ADOdb_Active_Record::SetDatabaseAdapter($db); + $a = new City(); + + echo "

    Successfully created City()
    "; + var_dump($a->GetPrimaryKeys()); + $a->city = 'Kuala Lumpur'; + $a->Save(); + $a->Update(); + $a->SetPrimaryKeys(array('city')); + $a->country = "M'sia"; + $a->save(); + $a->Delete(); +} catch(exception $e){ + echo $e->getMessage(); +} + +include_once("test-active-record.php"); ?> Modified: vtigercrm/branches/4.2/adodb/tests/test-xmlschema.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test-xmlschema.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test-xmlschema.php Thu May 4 15:49:28 2006 @@ -1,54 +1,54 @@ -Connect( 'localhost', 'root', '', 'schematest' ); - -// To create a schema object and build the query array. -$schema = new adoSchema( $db ); - -// To upgrade an existing schema object, use the following -// To upgrade an existing database to the provided schema, -// uncomment the following line: -#$schema->upgradeSchema(); - -print "SQL to build xmlschema.xml:\n

    ";
    -// Build the SQL array
    -$sql = $schema->ParseSchema( "xmlschema.xml" );
    -
    -print_r( $sql );
    -print "
    \n"; - -// Execute the SQL on the database -//$result = $schema->ExecuteSchema( $sql ); - -// Finally, clean up after the XML parser -// (PHP won't do this for you!) -//$schema->Destroy(); - - - -print "SQL to build xmlschema-mssql.xml:\n
    ";
    -
    -$db2 = ADONewConnection('mssql');
    -$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
    -
    -$db2->Execute("drop table simple_table");
    -
    -$schema = new adoSchema( $db2 );
    -$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
    -
    -print_r( $sql );
    -print "
    \n"; - -$db2->debug=1; - -foreach ($sql as $s) -$db2->Execute($s); +Connect( 'localhost', 'root', '', 'schematest' ); + +// To create a schema object and build the query array. +$schema = new adoSchema( $db ); + +// To upgrade an existing schema object, use the following +// To upgrade an existing database to the provided schema, +// uncomment the following line: +#$schema->upgradeSchema(); + +print "SQL to build xmlschema.xml:\n
    ";
    +// Build the SQL array
    +$sql = $schema->ParseSchema( "xmlschema.xml" );
    +
    +print_r( $sql );
    +print "
    \n"; + +// Execute the SQL on the database +//$result = $schema->ExecuteSchema( $sql ); + +// Finally, clean up after the XML parser +// (PHP won't do this for you!) +//$schema->Destroy(); + + + +print "SQL to build xmlschema-mssql.xml:\n
    ";
    +
    +$db2 = ADONewConnection('mssql');
    +$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
    +
    +$db2->Execute("drop table simple_table");
    +
    +$schema = new adoSchema( $db2 );
    +$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
    +
    +print_r( $sql );
    +print "
    \n"; + +$db2->debug=1; + +foreach ($sql as $s) +$db2->Execute($s); ?> Modified: vtigercrm/branches/4.2/adodb/tests/test.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ "; $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ"); + + if ($rs) print ' 1st line set to **** , Steven selected: '. $rs->GetMenu('menu','Steven','1st:****').'
    '; + else print " Fail
    "; + + + + $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ"); if ($rs) print ' Multiple, Alan selected: '. $rs->GetMenu('menu','Alan',false,true).'
    '; else print " Fail
    "; print '


    '; Modified: vtigercrm/branches/4.2/adodb/tests/test3.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test3.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test3.php Thu May 4 15:49:28 2006 @@ -1,6 +1,6 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Thu May 4 18:08:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 04 May 2006 22:08:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5743 - in /vtigercrm/trunk: Smarty/templates/ImportMap.tpl Smarty/templates/ImportStep1.tpl Smarty/templates/ImportStep2.tpl modules/Import/ImportSteplast.php Message-ID: <20060504220853.982BE5CF3CC@vtiger.fosslabs.com> Author: saraj Date: Thu May 4 16:08:45 2006 New Revision: 5743 Log: * Modified for UI changes and the unwanted tags have been removed and form tags has been put in correct location to avoid the error when click on any buttons Modified: vtigercrm/trunk/Smarty/templates/ImportMap.tpl vtigercrm/trunk/Smarty/templates/ImportStep1.tpl vtigercrm/trunk/Smarty/templates/ImportStep2.tpl vtigercrm/trunk/modules/Import/ImportSteplast.php Modified: vtigercrm/trunk/Smarty/templates/ImportMap.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ImportMap.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ImportMap.tpl Thu May 4 16:08:45 2006 @@ -1,14 +1,27 @@ -{assign var="Firstrow" value=$FIRSTROW} - - {foreach name=iter item=row from=$Firstrow} - {assign var="counter" value=$smarty.foreach.iter.iteration} - {math assign="num" equation="x - y" x=$counter y=1} - - - - {/foreach} -
    - {$SELECTFIELD[$counter]} -
    +{**} +{assign var="Firstrow" value=$FIRSTROW} + + {foreach name=iter item=row from=$Firstrow} + {assign var="counter" value=$smarty.foreach.iter.iteration} + {math assign="num" equation="x - y" x=$counter y=1} + + + + + {/foreach} +
    + {$SELECTFIELD[$counter]} +
    + Modified: vtigercrm/trunk/Smarty/templates/ImportStep1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ImportStep1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ImportStep1.tpl Thu May 4 16:08:45 2006 @@ -1,4 +1,14 @@ - +{**} @@ -6,102 +16,104 @@
    - - - - - - - - - + + + + + + + +
    {$CATEGORY} > {$MODULE}
    {$CATEGORY} > {$MODULE}
    - - - - +
    + + + + +
    - + + + + +
    +
    + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + {* + + + + + + + + + + + + + *} + -
    {$MOD.LBL_MODULE_NAME} {$MODULE}
     
    + {$MOD.LBL_STEP_1}  + {$MOD.LBL_STEP_1_TITLE} +
    + {$MOD.LBL_STEP_1_TEXT} +
     
    File Location : +   +   {$MOD.LBL_HAS_HEADER} +
    Delimeter : +   +
    + Use Data Source : + +  Custom +
      + Pre - Defined +
     
    - - + + + + + + + +
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -{* - - - - - - - - - - - - - - *} - - - - - - - - -
    {$MOD.LBL_MODULE_NAME} {$MODULE}
     
    - {$MOD.LBL_STEP_1}  - {$MOD.LBL_STEP_1_TITLE} -
    {$MOD.LBL_STEP_1_TEXT} -
     
    File Location : -   -   {$MOD.LBL_HAS_HEADER} -
    Delimeter : -   -
    - Use Data Source : - -  Custom -
      - Pre - Defined
     

    - -
     
    -
    - - - -

    + +
     
    + +
    + +
    +
    Modified: vtigercrm/trunk/Smarty/templates/ImportStep2.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ImportStep2.tpl Thu May 4 16:08:45 2006 @@ -1,3 +1,16 @@ +{**} + + {literal} From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 10:39:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:39:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5764 - /vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Message-ID: <20060508143910.2ECE6702FF1@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:39:06 2006 New Revision: 5764 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Mon May 8 08:39:06 2006 @@ -1,3 +1,14 @@ +{**}
    From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 10:39:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:39:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5765 - /vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Message-ID: <20060508143943.838CB719115@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:39:39 2006 New Revision: 5765 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl Mon May 8 08:39:39 2006 @@ -1,3 +1,14 @@ +{**}
    From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 10:42:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:42:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5766 - /vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Message-ID: <20060508144243.03B22719115@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:42:40 2006 New Revision: 5766 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Mon May 8 08:42:40 2006 @@ -1,3 +1,14 @@ +{**}
    From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 10:43:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:43:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5767 - /vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Message-ID: <20060508144309.C32EF71921A@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:43:05 2006 New Revision: 5767 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Mon May 8 08:43:05 2006 @@ -1,3 +1,14 @@ +{**}
    From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 10:47:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:47:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5768 - /vtigercrm/trunk/Smarty/templates/Settings/ Message-ID: <20060508144733.AB99D7192DA@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:47:22 2006 New Revision: 5768 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl Mon May 8 08:47:22 2006 @@ -1,4 +1,14 @@ - +{**}
    Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl Mon May 8 08:47:22 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Mon May 8 08:47:22 2006 @@ -1,4 +1,15 @@ - {$MOD.LBL_PICKLIST_AVAIL} {$MODULE}
    +{**} +{$MOD.LBL_PICKLIST_AVAIL} {$MODULE}
    {$MOD.LBL_PICKLIST_AVAILINFO1} {$MODULE} {$MOD.LBL_PICKLIST_AVAILINFO2}
    From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 10:52:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 08 May 2006 14:52:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5769 - /vtigercrm/trunk/Smarty/templates/ Message-ID: <20060508145214.7887D7191D6@vtiger.fosslabs.com> Author: richie Date: Mon May 8 08:52:01 2006 New Revision: 5769 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/trunk/Smarty/templates/CreateProfile.tpl vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl vtigercrm/trunk/Smarty/templates/EditProfile.tpl vtigercrm/trunk/Smarty/templates/EmailContents.tpl vtigercrm/trunk/Smarty/templates/EmailDetails.tpl vtigercrm/trunk/Smarty/templates/Emails.tpl Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Mon May 8 08:52:01 2006 @@ -1,4 +1,14 @@ - +{**}
    Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Mon May 8 08:52:01 2006 @@ -1,4 +1,14 @@ - +{**}
    Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**} {*//Hidden fields for modules DetailView// *} {if $MODULE eq 'Accounts'} Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/EmailContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EmailContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EmailContents.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Mon May 8 08:52:01 2006 @@ -1,3 +1,14 @@ +{**}
     
    Modified: vtigercrm/trunk/Smarty/templates/FieldAccessindex.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/FieldAccessindex.tpl (original) +++ vtigercrm/trunk/Smarty/templates/FieldAccessindex.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**}
    {include file='SettingsMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/FieldOrderindex.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/FieldOrderindex.tpl (original) +++ vtigercrm/trunk/Smarty/templates/FieldOrderindex.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**}
    {include file='SettingsMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/Importerror.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Importerror.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Importerror.tpl Mon May 8 08:55:31 2006 @@ -1,4 +1,14 @@ - +{**}
    + {$APP.LBL_REQUIRED_SYMBOL} {$CMOD.LBL_NEW_PROFILE_NAME} : @@ -60,9 +61,9 @@ From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 03:42:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 07:42:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5811 - /vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl Message-ID: <20060510074211.80CFF719541@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 01:41:59 2006 New Revision: 5811 Log: i18n done for createprofile1 template file - ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl Wed May 10 01:41:59 2006 @@ -41,8 +41,8 @@
    Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/ListGroup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListGroup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListGroup.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} @@ -93,4 +104,4 @@ {/section} - --> + --> Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} &#&#&#{$ERROR}&#&#&# Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefDetailView.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MyPrefEditView.tpl Mon May 8 08:55:31 2006 @@ -1,3 +1,14 @@ +{**} From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 11:01:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 08 May 2006 15:01:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5771 - /vtigercrm/trunk/Smarty/templates/ Message-ID: <20060508150119.031427192D8@vtiger.fosslabs.com> Author: richie Date: Mon May 8 09:01:03 2006 New Revision: 5771 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl vtigercrm/trunk/Smarty/templates/Organizationindex.tpl vtigercrm/trunk/Smarty/templates/PickListindex.tpl vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl vtigercrm/trunk/Smarty/templates/QuickCreate.tpl vtigercrm/trunk/Smarty/templates/ReportColumns.tpl vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl vtigercrm/trunk/Smarty/templates/ReportContents.tpl vtigercrm/trunk/Smarty/templates/ReportFilters.tpl vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl vtigercrm/trunk/Smarty/templates/ReportsType.tpl vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl vtigercrm/trunk/Smarty/templates/RoleEditView.tpl vtigercrm/trunk/Smarty/templates/Rss.tpl vtigercrm/trunk/Smarty/templates/RssFeeds.tpl Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
    {$LIST_ENTRIES[entries].description} 
    Modified: vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/Organizationindex.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Organizationindex.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Organizationindex.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
    {include file='SettingsMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/PickListindex.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/PickListindex.tpl (original) +++ vtigercrm/trunk/Smarty/templates/PickListindex.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
    {include file='SettingsMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Mon May 8 09:01:03 2006 @@ -1,4 +1,14 @@ - +{**} Modified: vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportColumnsTotal.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/ReportContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportContents.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/ReportFilters.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportFilters.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportFilters.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportGrouping.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} - Modified: vtigercrm/branches/5.0_postgresql_integration/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/install/5createTables.inc.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/install/5createTables.inc.php Tue May 9 19:18:27 2006 @@ -213,6 +213,11 @@ create_tab_data_file(); create_parenttab_data_file(); +// ensure required sequences are created (adodb creates them as needed, but if +// creation occurs within a transaction we get problems +$db->getUniqueID("crmentity"); +$db->getUniqueID("seactivityrel"); + // populate the db with seed data if ($db_populate) { eecho ("Populate seed data into $db_name"); Modified: vtigercrm/branches/5.0_postgresql_integration/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/install/populateSeedData.php Tue May 9 19:18:27 2006 @@ -81,9 +81,9 @@ { $date = ""; $date .= "2006"; - $date .= "/"; + $date .= "-"; $date .= rand(1,9); - $date .= "/"; + $date .= "-"; $date .= rand(1,28); return $date; @@ -758,7 +758,6 @@ //$rand_key = array_rand($s);$contact_key = array_rand($contact_ids); $notes->column_fields["contact_id"] = $contact_ids[$contact_key]; $helpdesk->column_fields["ticket_title"] = $ticket_title_array[$i]; - $helpdesk->column_fields["assigned_user_id"] = $assigned_user_id; $helpdesk->save("HelpDesk"); @@ -779,7 +778,7 @@ $rand_num=array_rand($num_array); $rand_date = & create_date(); - $en=explode("/",$rand_date); + $en=explode("-",$rand_date); if($en[1]<10) $en[1]="0".$en[1]; if($en[2]<10) @@ -847,7 +846,7 @@ } -$adb->query("update crmentity set crmentity.smcreatorid=".$assigned_user_id); +$adb->query("update crmentity set smcreatorid=".$assigned_user_id); $expected_revenue = Array("250000","750000","500000"); $budget_cost = Array("25000","50000","90000"); Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Reports/PopulateReports.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/Reports/PopulateReports.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/Reports/PopulateReports.php Tue May 9 19:18:27 2006 @@ -417,8 +417,8 @@ { global $adb; $sql = "INSERT INTO reportfolder "; - $sql .= "(FOLDERID,FOLDERNAME,DESCRIPTION,STATE) "; - $sql .= "VALUES (null,'".$fldrname."','".$fldrdescription."','SAVED')"; + $sql .= "(FOLDERNAME,DESCRIPTION,STATE) "; + $sql .= "VALUES ('".$fldrname."','".$fldrdescription."','SAVED')"; $result = $adb->query($sql); } Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/LoginHistory.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/Users/LoginHistory.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/LoginHistory.php Tue May 9 19:18:27 2006 @@ -60,7 +60,7 @@ /** Records the Login info */ function user_login(&$usname,&$usip,&$intime) { - $query = "Insert into loginhistory values (null,'$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')"; + $query = "Insert into loginhistory (user_name, user_ip, logout_time, login_time, status) values ('$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')"; $result = $this->db->query($query) or die("MySQL error: ".mysql_error()); Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php Tue May 9 19:18:27 2006 @@ -2062,56 +2062,51 @@ $this->db->query("insert into moduleowners values(".getTabid($mod).",1)"); } //added by jeri for category view from db - $this->db->query("insert into parenttab values - (1,'My Home Page',1,0), - (2,'Marketing',2,0), - (3,'Sales',3,0), - (4,'Support',4,0), - (5,'Analytics',5,0), - (6,'Inventory',6,0), - (7,'Tools',7,0), - (8,'Settings',8,0) - "); - - $this->db->query("insert into parenttabrel values - (1,9,2), - (1,17,3), - (1,10,4), - (1,3,1), - (3,7,1), - (3,6,2), - (3,4,3), - (3,2,4), - (3,20,5), - (3,22,6), - (3,23,7), - (3,14,8), - (3,19,9), - (3,8,10), - (4,13,1), - (4,15,2), - (4,6,3), - (4,4,4), - (4,14,5), - (4,8,6), - (5,1,1), - (5,25,2), - (6,14,1), - (6,18,2), - (6,19,3), - (6,21,4), - (6,22,5), - (6,20,6), - (6,23,7), - (7,24,1), - (7,27,2), - (7,8,3), - (2,26,1), - (2,6,2), - (2,4,3)"); - - - } - + $this->db->query("insert into parenttab values (1,'My Home Page',1,0)"); + $this->db->query("insert into parenttab values (2,'Marketing',2,0)"); + $this->db->query("insert into parenttab values (3,'Sales',3,0)"); + $this->db->query("insert into parenttab values (4,'Support',4,0)"); + $this->db->query("insert into parenttab values (5,'Analytics',5,0)"); + $this->db->query("insert into parenttab values (6,'Inventory',6,0)"); + $this->db->query("insert into parenttab values (7,'Tools',7,0)"); + $this->db->query("insert into parenttab values (8,'Settings',8,0)"); + + $this->db->query("insert into parenttabrel values (1,9,2)"); + $this->db->query("insert into parenttabrel values (1,17,3)"); + $this->db->query("insert into parenttabrel values (1,10,4)"); + $this->db->query("insert into parenttabrel values (1,3,1)"); + $this->db->query("insert into parenttabrel values (3,7,1)"); + $this->db->query("insert into parenttabrel values (3,6,2)"); + $this->db->query("insert into parenttabrel values (3,4,3)"); + $this->db->query("insert into parenttabrel values (3,2,4)"); + $this->db->query("insert into parenttabrel values (3,20,5)"); + $this->db->query("insert into parenttabrel values (3,22,6)"); + $this->db->query("insert into parenttabrel values (3,23,7)"); + $this->db->query("insert into parenttabrel values (3,14,8)"); + $this->db->query("insert into parenttabrel values (3,19,9)"); + $this->db->query("insert into parenttabrel values (3,8,10)"); + $this->db->query("insert into parenttabrel values (4,13,1)"); + $this->db->query("insert into parenttabrel values (4,15,2)"); + $this->db->query("insert into parenttabrel values (4,6,3)"); + $this->db->query("insert into parenttabrel values (4,4,4)"); + $this->db->query("insert into parenttabrel values (4,14,5)"); + $this->db->query("insert into parenttabrel values (4,8,6)"); + $this->db->query("insert into parenttabrel values (5,1,1)"); + $this->db->query("insert into parenttabrel values (5,25,2)"); + $this->db->query("insert into parenttabrel values (6,14,1)"); + $this->db->query("insert into parenttabrel values (6,18,2)"); + $this->db->query("insert into parenttabrel values (6,19,3)"); + $this->db->query("insert into parenttabrel values (6,21,4)"); + $this->db->query("insert into parenttabrel values (6,22,5)"); + $this->db->query("insert into parenttabrel values (6,20,6)"); + $this->db->query("insert into parenttabrel values (6,23,7)"); + $this->db->query("insert into parenttabrel values (7,24,1)"); + $this->db->query("insert into parenttabrel values (7,27,2)"); + $this->db->query("insert into parenttabrel values (7,8,3)"); + $this->db->query("insert into parenttabrel values (2,26,1)"); + $this->db->query("insert into parenttabrel values (2,6,2)"); + $this->db->query("insert into parenttabrel values (2,4,3)"); + + } } ?> Modified: vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml Tue May 9 19:18:27 2006 @@ -752,9 +752,7 @@ - - - + @@ -771,6 +769,7 @@ + @@ -1730,53 +1729,6 @@ Type=InnoDB
    Modified: vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/ReportsType.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsType.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsType.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} @@ -160,10 +160,10 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 11:42:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 15:42:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5804 - /vtigercrm/trunk/modules/Webmails/language/en_us.lang.php Message-ID: <20060509154251.18CAF70A9F1@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 09:42:47 2006 New Revision: 5804 Log: Updated the language file for webmails modules - ahmed Modified: vtigercrm/trunk/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Webmails/language/en_us.lang.php Tue May 9 09:42:47 2006 @@ -1,4 +1,22 @@ 'Emails', 'LBL_MODULE_TITLE'=>'Emails: Home', @@ -14,16 +32,40 @@ 'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.", 'LBL_DATE_SENT'=>'Date Sent:', -'LBL_SUBJECT'=>'Subject:', +'LBL_SUBJECT'=>'Subject :', 'LBL_BODY'=>'Body:', 'LBL_DATE_AND_TIME'=>'Date & Time Sent:', -'LBL_DATE'=>'Date Sent:', +'LBL_DATE'=>'Date :', 'LBL_TIME'=>'Time Sent:', -'LBL_SUBJECT'=>'Subject:', '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'=>'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', +'LBL_EXPUNGE_MAILBOX'=>'Expunge Mailbox', 'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', 'LBL_INVITEE'=>'Recipients', From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:43:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:43:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23331=3A_?= =?utf-8?q?advanced_filter_not_intuitive?= In-Reply-To: <076.96bb670faa496bed07be33cd626927d2@vtiger.fosslabs.com> References: <076.96bb670faa496bed07be33cd626927d2@vtiger.fosslabs.com> Message-ID: <085.9a30c0eebb6e80508d1cc596c8a50cbe@vtiger.fosslabs.com> #331: advanced filter not intuitive ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:44:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:44:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23332=3A_?= =?utf-8?q?From_Validatiion_is_not_supported_for_quick_edit_in_the_Detail_?= =?utf-8?q?View?= In-Reply-To: <076.c356e18081f12c626aa7fcdcb8ca7416@vtiger.fosslabs.com> References: <076.c356e18081f12c626aa7fcdcb8ca7416@vtiger.fosslabs.com> Message-ID: <085.de81f72104d6b75a49a4092466f6bd6a@vtiger.fosslabs.com> #332: From Validatiion is not supported for quick edit in the Detail View ------------------------+--------------------------------------------------- Reporter: don | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:54:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:54:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23344=3A_?= =?utf-8?q?Improper_Send_Mail_UI?= In-Reply-To: <076.490e968fe092049a33de8c47ae8a3e48@vtiger.fosslabs.com> References: <076.490e968fe092049a33de8c47ae8a3e48@vtiger.fosslabs.com> Message-ID: <085.562da2d496397cede51a3bc4183ac57c@vtiger.fosslabs.com> #344: Improper Send Mail UI ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:55:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:55:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23350=3A_?= =?utf-8?q?Fatal_Error_in_Creating_Custom_View_for_HelpDesk?= In-Reply-To: <076.85ae4ededa11be9716ad6ff3d10064c3@vtiger.fosslabs.com> References: <076.85ae4ededa11be9716ad6ff3d10064c3@vtiger.fosslabs.com> Message-ID: <085.1d50626652d6d93a14711072886c5c4a@vtiger.fosslabs.com> #350: Fatal Error in Creating Custom View for HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:56:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:56:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23365=3A_?= =?utf-8?q?Not_able_to_create_a_Email_from_Lead_relates_list?= In-Reply-To: <076.c4107f32501db5f2db2c902fc70e62ab@vtiger.fosslabs.com> References: <076.c4107f32501db5f2db2c902fc70e62ab@vtiger.fosslabs.com> Message-ID: <085.cdf89ffb61aad50304ad1c8b97fbdd07@vtiger.fosslabs.com> #365: Not able to create a Email from Lead relates list ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:56:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:56:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23377=3A_?= =?utf-8?q?Cannot_view_the_Activity_detail_view_from_history?= In-Reply-To: <076.e4b44c6ce056d50d4098c7617ab39316@vtiger.fosslabs.com> References: <076.e4b44c6ce056d50d4098c7617ab39316@vtiger.fosslabs.com> Message-ID: <085.1da925bfb9bd24cf4917c65c9532a330@vtiger.fosslabs.com> #377: Cannot view the Activity detail view from history ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 13:58:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 17:58:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23400=3A_?= =?utf-8?q?message_change_while_using_installed_apache_case?= In-Reply-To: <076.ee0849eeb6352f498966d076015fc27d@vtiger.fosslabs.com> References: <076.ee0849eeb6352f498966d076015fc27d@vtiger.fosslabs.com> Message-ID: <085.3d6bf42de195568b7969bdbfb21332b9@vtiger.fosslabs.com> #400: message change while using installed apache case ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: installation ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 14:00:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 18:00:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23401=3A_?= =?utf-8?q?Issue_Delete_Role?= In-Reply-To: <076.c940b05aa79da5437db8ddb176742e6b@vtiger.fosslabs.com> References: <076.c940b05aa79da5437db8ddb176742e6b@vtiger.fosslabs.com> Message-ID: <085.7be78be280199b4f272c3a5be2c83542@vtiger.fosslabs.com> #401: Issue Delete Role ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 14:39:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 18:39:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23502=3A_?= =?utf-8?q?Cursor_pointer_broken_in_notes_basic_search?= In-Reply-To: <076.0558cc0faba8b25484ce0346df184d1d@vtiger.fosslabs.com> References: <076.0558cc0faba8b25484ce0346df184d1d@vtiger.fosslabs.com> Message-ID: <085.fd34bed5e8eeab597c72d4871a53a7cb@vtiger.fosslabs.com> #502: Cursor pointer broken in notes basic search --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: philip Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: --------------------------------+------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5805]) Search form modified to show search values. Fixes #502 and #200, and refs #502. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 14:39:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 18:39:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23200=3A_?= =?utf-8?q?=22Search_Results=22_Print_Missing_in_List_View?= In-Reply-To: <076.2bbd844f8409e4d40315f251a24550c3@vtiger.fosslabs.com> References: <076.2bbd844f8409e4d40315f251a24550c3@vtiger.fosslabs.com> Message-ID: <085.9444384a2d2a77cfa46acce08975dd36@vtiger.fosslabs.com> #200: "Search Results" Print Missing in List View ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by saraj): * resolution: => fixed * status: new => closed Comment: (In [5805]) Search form modified to show search values. Fixes #502 and #200, and refs #502. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 14:39:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 18:39:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5805 - in /vtigercrm/trunk: Smarty/templates/ListView.tpl include/js/general.js include/utils/SearchUtils.php Message-ID: <20060509183927.751887173D6@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 12:38:58 2006 New Revision: 5805 Log: Search form modified to show search values. Fixes #502 and #200, and refs #502. Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/include/js/general.js vtigercrm/trunk/include/utils/SearchUtils.php Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Tue May 9 12:38:58 2006 @@ -17,7 +17,7 @@ {if $MODULE eq 'Contacts'} -
    +
    {/if} {include file='Buttons_List.tpl'} -
    Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/RssFeeds.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RssFeeds.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RssFeeds.tpl Mon May 8 09:01:03 2006 @@ -1,3 +1,14 @@ +{**}
    Feeds list from : {$TITLE}
    From vtigercrm-commits at vtiger.fosslabs.com Mon May 8 11:03:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 08 May 2006 15:03:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5772 - in /vtigercrm/trunk/Smarty/templates: Settings.tpl SettingsMenu.tpl UserDetailView.tpl UserEditView.tpl UserListView.tpl UserProfile.tpl Webmails.tpl Message-ID: <20060508150306.8D7F67192EB@vtiger.fosslabs.com> Author: richie Date: Mon May 8 09:02:58 2006 New Revision: 5772 Log: Added the vtiger licence text in tpl file. Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/Smarty/templates/UserDetailView.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/Smarty/templates/UserListView.tpl vtigercrm/trunk/Smarty/templates/UserProfile.tpl vtigercrm/trunk/Smarty/templates/Webmails.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**} Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**}
    Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Mon May 8 09:02:58 2006 @@ -1,3 +1,14 @@ +{**}
    From vtiger-tickets at vtiger.fosslabs.com Mon May 8 21:12:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 01:12:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23757=3A_?= =?utf-8?q?Update_to_new_adodb-4=2E81_release?= In-Reply-To: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> References: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> Message-ID: <085.6147e324802470df4f28e482d78eb1b4@vtiger.fosslabs.com> #757: Update to new adodb-4.81 release ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: reopened Priority: minor | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: adodb database package ------------------------+--------------------------------------------------- Changes (by allanbush): * milestone: 5.0.0 => 4.2.4 * version: 5.0.0 => 4.2.4rc3 Comment: These changes should have no effect on migration as the database schema didn't change (other then some constraints and indexes getting new names). It would be nice for distro maintainers to have 4.2.4 changed however I think it's too close to release (in terms of code/testing as I don't know if anyone is ever going to actually release 4.2.4). -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 00:49:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 04:49:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23693=3A_?= =?utf-8?q?Migration_Issues_-_Currency_Module_Non_Functional_-_Settings?= In-Reply-To: <076.c30240612ce8e94bbabb7a239dbf317d@vtiger.fosslabs.com> References: <076.c30240612ce8e94bbabb7a239dbf317d@vtiger.fosslabs.com> Message-ID: <085.d311e4fc3cf368aa764e94a8b215df1f@vtiger.fosslabs.com> #693: Migration Issues - Currency Module Non Functional - Settings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * owner: mangai => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 01:04:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 05:04:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23712=3A_?= =?utf-8?q?Campaign_-_empty_values_in_Expected_Response_column?= In-Reply-To: <076.7541dde002644ee31a61a29067c45262@vtiger.fosslabs.com> References: <076.7541dde002644ee31a61a29067c45262@vtiger.fosslabs.com> Message-ID: <085.3ec58d1c19f79ac9cc8962ccb7ab62f4@vtiger.fosslabs.com> #712: Campaign - empty values in Expected Response column ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Campaigns ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: 'Expected Response' field is not a manditory field.So manditory symbol has been removed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 01:10:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 05:10:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5773 - /vtigercrm/trunk/modules/Migration/language/en_us.lang.php Message-ID: <20060509051000.3B3BA4E8CBC@vtiger.fosslabs.com> Author: don Date: Mon May 8 23:09:55 2006 New Revision: 5773 Log: * Modified the SET_FOREIGN_KEY_CHECKS to SET FOREIGN_KEY_CHECKS Modified: vtigercrm/trunk/modules/Migration/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Migration/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Migration/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Migration/language/en_us.lang.php Mon May 8 23:09:55 2006 @@ -26,8 +26,8 @@ 'LBL_NOTES_LIST2'=>'If Current MySQL Exist in different Machine then enter the (Source) Dump filename with the full Path.', 'LBL_NOTES_DUMP_PROCESS'=>'To take Database dump please execute the following command
    mysqldump --user="mysql_username" --password="mysql-password" -h "hostname" --port="mysql_port" "database_name" > dump_filename -
    add SET_FOREIGN_KEY_CHECKS = 0; -- at the start of the dump file -
    add SET_FOREIGN_KEY_CHECKS = 1; -- at the end of the dump file', +
    add SET FOREIGN_KEY_CHECKS = 0; -- at the start of the dump file +
    add SET FOREIGN_KEY_CHECKS = 1; -- at the end of the dump file', 'LBL_NOTES_LIST3'=>'Give the MySQL path like /home/crm/vtigerCRM4_5/mysql', 'LBL_NOTES_LIST4'=>'Give the Dump filename with full Path like /home/fullpath/4_2_dump.txt', From vtiger-tickets at vtiger.fosslabs.com Tue May 9 01:23:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 05:23:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23750=3A_?= =?utf-8?q?Integrate_code_contributions?= In-Reply-To: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> References: <076.b16a74c382aa688de221822029b26245@vtiger.fosslabs.com> Message-ID: <085.d4a26a069e24965cc75eda042d0c3443@vtiger.fosslabs.com> #750: Integrate code contributions ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: richie Type: defect | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5774]) Turns address information into a link to google maps as per http://forums.vtiger.com/viewtopic.php?t=3143 This is user configurable to either give directions from the users address, the company address or just give the location of the target address. I'm uncertain how this handles international location, we may wish to make the google url configurable at least (maps.google.com vs. maps.google.ca, etc). Refs #750. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 01:23:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 05:23:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5774 - in /vtigercrm/branches/4.2: ./ include/ modules/Users/ modules/Users/language/ schema/ Message-ID: <20060509052322.2FC8A506415@vtiger.fosslabs.com> Author: allanbush Date: Mon May 8 23:22:59 2006 New Revision: 5774 Log: Turns address information into a link to google maps as per http://forums.vtiger.com/viewtopic.php?t=3143 This is user configurable to either give directions from the users address, the company address or just give the location of the target address. I'm uncertain how this handles international location, we may wish to make the google url configurable at least (maps.google.com vs. maps.google.ca, etc). Refs #750. Added: vtigercrm/branches/4.2/mapme.php Modified: vtigercrm/branches/4.2/include/utils.php vtigercrm/branches/4.2/modules/Users/DetailView.html vtigercrm/branches/4.2/modules/Users/DetailView.php vtigercrm/branches/4.2/modules/Users/EditView.html vtigercrm/branches/4.2/modules/Users/EditView.php vtigercrm/branches/4.2/modules/Users/User.php vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Mon May 8 23:22:59 2006 @@ -1768,7 +1768,7 @@ { $col_fields[$fieldname]=nl2br($col_fields[$fieldname]); $custfld .= '
    '; - $custfld .= ''; // Armando LC B'descriptionSpan -> Desc: inserted colspan="3" + $custfld .= ''; // Armando LC B'descriptionSpan -> Desc: inserted colspan="3" } elseif($uitype == 51 || $uitype == 50 || $uitype == 73) { Modified: vtigercrm/branches/4.2/modules/Users/DetailView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Users/DetailView.html (original) +++ vtigercrm/branches/4.2/modules/Users/DetailView.html Mon May 8 23:22:59 2006 @@ -123,6 +123,12 @@ + + + + + + - - - - Modified: vtigercrm/branches/4.2/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/DetailView.php (original) +++ vtigercrm/branches/4.2/modules/Users/DetailView.php Mon May 8 23:22:59 2006 @@ -168,6 +168,7 @@ $xtpl->assign("ADDRESS_POSTALCODE", $focus->address_postalcode); $xtpl->assign("ADDRESS_COUNTRY", $focus->address_country); $xtpl->assign("SIGNATURE", nl2br($focus->signature)); +$xtpl->assign("MAP_START", nl2br($focus->map_source)); $xtpl->parse("user_info"); $xtpl->out("user_info"); Modified: vtigercrm/branches/4.2/modules/Users/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Users/EditView.html (original) +++ vtigercrm/branches/4.2/modules/Users/EditView.html Mon May 8 23:22:59 2006 @@ -162,6 +162,8 @@ + +
    '.$mod_strings[$fieldlabel].':'.$col_fields[$fieldname].''.$col_fields[$fieldname].'{MOD.LBL_USER_ROLE} : {ROLEASSIGNED}
    {MOD.LBL_GROUP_NAME}:{GROUPASSIGNED}{MOD.LBL_MAP_START}:{MAP_START}
    {MOD.LBL_ADDRESS} {ADDRESS_STREET}
    {ADDRESS_CITY} {ADDRESS_STATE}  {ADDRESS_POSTALCODE}
    @@ -130,10 +136,6 @@
    {MOD.LBL_SIGNATURE}: {SIGNATURE}
    {MOD.LBL_GROUP_NAME}:{GROUPASSIGNED}
    {MOD.LBL_NOTES}: {DESCRIPTION}
    {MOD.LBL_COUNTRY} {MOD.LBL_MAP_START}:{MAP_START_OPTIONS}
    Modified: vtigercrm/branches/4.2/modules/Users/EditView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/EditView.php (original) +++ vtigercrm/branches/4.2/modules/Users/EditView.php Mon May 8 23:22:59 2006 @@ -98,6 +98,15 @@ $xtpl->assign("ADDRESS_COUNTRY", $focus->address_country); $xtpl->assign("SIGNATURE", $focus->signature); $xtpl->assign("DESCRIPTION", $focus->description); + +$map_options = array('--None--', 'Home', 'Work'); +$map_start_options = ''; +$xtpl->assign("MAP_START_OPTIONS", $map_start_options); $DATE_FORMAT_SELECT_OPTION = ' + {if $module eq $MODULE_NAME} + + {else} + + {/if} {/foreach} {/if} {/foreach} From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:23:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:23:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23182=3A_?= =?utf-8?q?all_custom_fields_are_of_type_integer?= In-Reply-To: <076.495572d2564db064fa7d20705a8d0250@vtiger.fosslabs.com> References: <076.495572d2564db064fa7d20705a8d0250@vtiger.fosslabs.com> Message-ID: <085.2bec937814d16f8cd6572c9607e873ce@vtiger.fosslabs.com> #182: all custom fields are of type integer ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: custom field ------------------------+--------------------------------------------------- Changes (by don): * priority: blocker => critical * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:24:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:24:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5779 - in /vtigercrm/trunk: Smarty/templates/DetailView.tpl include/utils/ListViewUtils.php modules/SalesOrder/SalesOrder.js Message-ID: <20060509102423.03E75719B5C@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:24:08 2006 New Revision: 5779 Log: * Modified to fix the issue when select sales order from invoice - track issue-287 Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/include/utils/ListViewUtils.php vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue May 9 04:24:08 2006 @@ -338,7 +338,7 @@ {elseif $keyid eq 80} From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:33:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:33:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23256=3A_?= =?utf-8?q?rss_addition_takes_long_time?= In-Reply-To: <076.e36f89d08260315b38015eec83af2fff@vtiger.fosslabs.com> References: <076.e36f89d08260315b38015eec83af2fff@vtiger.fosslabs.com> Message-ID: <085.96ecfddf44f45c33a18dd6eda6ed373e@vtiger.fosslabs.com> #256: rss addition takes long time ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: rss ------------------------+--------------------------------------------------- Changes (by don): * priority: blocker => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:35:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:35:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5785 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060509103511.17E20719BCC@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:35:00 2006 New Revision: 5785 Log: Added Strings in App Level for Header Template - Ahmed Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Tue May 9 04:35:00 2006 @@ -46,9 +46,11 @@ 'LBL_CHARSET'=>'ISO-8859-1', -'LBL_BROWSER_TITLE'=>'vtiger CRM - Commercial Open Source CRM', +'LBL_BROWSER_TITLE'=>'vtiger CRM 5 - Commercial Open Source CRM', 'LBL_MY_ACCOUNT'=>'My Account', + +'LBL_MY_PREFERENCES'=>'My Preferences', 'LBL_ADMIN'=>'Admin', @@ -101,6 +103,8 @@ 'LBL_DELETE_BUTTON_TITLE'=>'Delete [Alt+D]', 'LBL_DELETE_BUTTON'=>'Delete', + +'LBL_FIND_BUTTON'=>'Find', 'LBL_CONVERT_BUTTON_TITLE'=>'Convert [Alt+C]', From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:36:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:36:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5786 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060509103626.CBB7A719BCC@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:36:20 2006 New Revision: 5786 Log: i18n done for Header template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Tue May 9 04:36:20 2006 @@ -85,7 +85,7 @@ From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:37:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:37:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23288=3A_?= =?utf-8?q?Day_View_-_Add_To-do_not_working?= In-Reply-To: <076.5cb82fbfb3bbd516a8e11e12a5f534b8@vtiger.fosslabs.com> References: <076.5cb82fbfb3bbd516a8e11e12a5f534b8@vtiger.fosslabs.com> Message-ID: <085.df6b8dffe3bebeca39e2788e6319d01b@vtiger.fosslabs.com> #288: Day View - Add To-do not working ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:38:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:38:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23301=3A_?= =?utf-8?q?Event_not_displayed_in_Day_View?= In-Reply-To: <076.16c51d0257d0641cf1abc7c0ccaac8fa@vtiger.fosslabs.com> References: <076.16c51d0257d0641cf1abc7c0ccaac8fa@vtiger.fosslabs.com> Message-ID: <085.c1973bf26decf362c253ec5e581e0244@vtiger.fosslabs.com> #301: Event not displayed in Day View ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:38:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:38:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5787 - in /vtigercrm/trunk/themes/blue/images: cal_add.jpg cal_event.jpg cal_hdr.jpg cal_nav.gif cal_next_nav.gif cal_prev_nav.gif cal_sel.jpg cal_title.jpg Message-ID: <20060509103853.18F26621991@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:38:21 2006 New Revision: 5787 Log: images for calendar has been integrated Added: vtigercrm/trunk/themes/blue/images/cal_add.jpg (with props) vtigercrm/trunk/themes/blue/images/cal_event.jpg (with props) vtigercrm/trunk/themes/blue/images/cal_hdr.jpg (with props) vtigercrm/trunk/themes/blue/images/cal_nav.gif (with props) vtigercrm/trunk/themes/blue/images/cal_next_nav.gif (with props) vtigercrm/trunk/themes/blue/images/cal_prev_nav.gif (with props) vtigercrm/trunk/themes/blue/images/cal_sel.jpg (with props) vtigercrm/trunk/themes/blue/images/cal_title.jpg (with props) From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:40:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:40:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23286=3A_?= =?utf-8?q?New_Event_-_Pop-up_Date/Time_not_working?= In-Reply-To: <076.2c96b6359253e6f060b463bdfa5eceff@vtiger.fosslabs.com> References: <076.2c96b6359253e6f060b463bdfa5eceff@vtiger.fosslabs.com> Message-ID: <085.478501b4c3330d0de0f98bd3798453f8@vtiger.fosslabs.com> #286: New Event - Pop-up Date/Time not working ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue has been fixed already. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:44:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:44:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23403=3A_?= =?utf-8?q?using_installed_apache_fails?= In-Reply-To: <076.a338a120bf8c5dcb075333a6d2d2c8dd@vtiger.fosslabs.com> References: <076.a338a120bf8c5dcb075333a6d2d2c8dd@vtiger.fosslabs.com> Message-ID: <085.7f0d72f0a5e52dd1b68524ac6cfaf34e@vtiger.fosslabs.com> #403: using installed apache fails ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: installation ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:46:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:46:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23541=3A_?= =?utf-8?q?quotes_not_adding_to_potentials_related_lists?= In-Reply-To: <076.1b48c23ce877ca31ac00797fc0803bc5@vtiger.fosslabs.com> References: <076.1b48c23ce877ca31ac00797fc0803bc5@vtiger.fosslabs.com> Message-ID: <085.e1fb2c3bc8f01a5b79bf8857cccdff5a@vtiger.fosslabs.com> #541: quotes not adding to potentials related lists ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Related Lists ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:49:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:49:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23736=3A_?= =?utf-8?q?Changing_existing_quote_line_items_causes_improper_subtotal?= In-Reply-To: <076.1175e17764a34c299e4966098111d634@vtiger.fosslabs.com> References: <076.1175e17764a34c299e4966098111d634@vtiger.fosslabs.com> Message-ID: <085.a769ca89a4bc43df7323aaedfbcc7bac@vtiger.fosslabs.com> #736: Changing existing quote line items causes improper subtotal ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: quote ------------------------+--------------------------------------------------- Changes (by don): * priority: blocker => critical * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:58:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:58:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5788 - /vtigercrm/trunk/modules/Settings/DeleteCustomField.php Message-ID: <20060509105822.828A7719DEC@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:58:18 2006 New Revision: 5788 Log: parenttab has been parsed Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/DeleteCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/DeleteCustomField.php Tue May 9 04:58:18 2006 @@ -73,5 +73,5 @@ $deltablequery = 'drop table '.$colName; $adb->query($deltablequery); } -header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module); +header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings"); ?> From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:08:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:08:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23747=3A_?= =?utf-8?q?Handling_=3CNew=3ERecord=3A_Tasks_and_Events?= In-Reply-To: <076.2ad5054a596cd3d9eadad40186d30945@vtiger.fosslabs.com> References: <076.2ad5054a596cd3d9eadad40186d30945@vtiger.fosslabs.com> Message-ID: <085.46bc98c02c611d7e4cc761e04d4cbe56@vtiger.fosslabs.com> #747: Handling Record: Tasks and Events ------------------------+--------------------------------------------------- Reporter: gopal | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:09:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:09:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2379=3A_A?= =?utf-8?q?ddress_inheritance?= In-Reply-To: <076.cc7367ebe2ccb8423599b01e9c951b5c@vtiger.fosslabs.com> References: <076.cc7367ebe2ccb8423599b01e9c951b5c@vtiger.fosslabs.com> Message-ID: <085.2573b9ab3fc562254552ab51cc9125d4@vtiger.fosslabs.com> #79: Address inheritance -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: saraj Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------+-------------------------------------------- Changes (by don): * owner: developer => saraj -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:10:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:10:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23112=3A_?= =?utf-8?q?Issue_in_Editing_Leads?= In-Reply-To: <076.d54b105c64a2b31424bdf842ee2dfd70@vtiger.fosslabs.com> References: <076.d54b105c64a2b31424bdf842ee2dfd70@vtiger.fosslabs.com> Message-ID: <085.eddc06e23e1b6809cfc4f459070b642c@vtiger.fosslabs.com> #112: Issue in Editing Leads ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:13:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:13:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23170=3A_?= =?utf-8?q?loginhistory_screen_old?= In-Reply-To: <076.9aaf0607dd54df7e9b03323b2ad1fd80@vtiger.fosslabs.com> References: <076.9aaf0607dd54df7e9b03323b2ad1fd80@vtiger.fosslabs.com> Message-ID: <085.a26809a91ebfa16b6d8c31fb823a4fae@vtiger.fosslabs.com> #170: loginhistory screen old ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:17:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:17:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5789 - in /vtigercrm/trunk/Smarty/templates: CustomFieldCombo.tpl CustomFieldEntries.tpl CustomFieldList.tpl Message-ID: <20060509111753.A05CC719E86@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:17:48 2006 New Revision: 5789 Log: changes made to fix the issue Added: vtigercrm/trunk/Smarty/templates/CustomFieldCombo.tpl Modified: vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Modified: vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl Tue May 9 05:17:48 2006 @@ -16,12 +16,11 @@ - +
    {$module} {$module} {$module} {$keyval} Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Tue May 9 04:24:08 2006 @@ -1178,8 +1178,12 @@ } $temp_val = str_replace("'",'\"',$temp_val); - - $value = ''.$temp_val.''; + + //Added to avoid the error when select SO from Invoice through AjaxEdit + if($module == 'SalesOrder') + $value = ''.$temp_val.''; + else + $value = ''.$temp_val.''; } elseif($popuptype == "detailview") { Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.js ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.js (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Tue May 9 04:24:08 2006 @@ -14,16 +14,19 @@ window.opener.document.EditView.parent_name.value = product_name; window.opener.document.EditView.parent_id.value = product_id; } -function set_return_specific(product_id, product_name) { - +function set_return_specific(product_id, product_name, mode) { + //getOpenerObj used for DetailView var fldName = getOpenerObj("salesorder_name"); var fldId = getOpenerObj("salesorder_id"); fldName.value = product_name; fldId.value = product_id; - window.opener.document.EditView.action.value = 'EditView'; - window.opener.document.EditView.convertmode.value = 'update_so_val'; - window.opener.document.EditView.submit(); + if(mode != 'DetailView') + { + window.opener.document.EditView.action.value = 'EditView'; + window.opener.document.EditView.convertmode.value = 'update_so_val'; + window.opener.document.EditView.submit(); + } } function set_return_formname_specific(formname, product_id, product_name) { window.opener.document.EditView1.purchaseorder_name.value = product_name; From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:25:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:25:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5780 - in /vtigercrm/trunk/modules/Calendar: Appointment.php Date.php calendarLayout.php Message-ID: <20060509102524.5DD7E719B5C@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:25:13 2006 New Revision: 5780 Log: files integrated for new calendar UI Added: vtigercrm/trunk/modules/Calendar/Appointment.php vtigercrm/trunk/modules/Calendar/Date.php vtigercrm/trunk/modules/Calendar/calendarLayout.php From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:26:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:26:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5781 - in /vtigercrm/trunk/modules/Calendar: Calendar.php CalendarAjax.php Message-ID: <20060509102616.95344621991@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:26:02 2006 New Revision: 5781 Log: files integrated for new calendar UI Added: vtigercrm/trunk/modules/Calendar/Calendar.php vtigercrm/trunk/modules/Calendar/CalendarAjax.php From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:27:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:27:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23287=3A_?= =?utf-8?q?Selecting_Sales_Order_from_Invoice?= In-Reply-To: <076.5477c72183257b6360bcaa69066ebc75@vtiger.fosslabs.com> References: <076.5477c72183257b6360bcaa69066ebc75@vtiger.fosslabs.com> Message-ID: <085.0365200bc0e3cd37b33722e1fb77664d@vtiger.fosslabs.com> #287: Selecting Sales Order from Invoice ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Salesorder popup ---------------------------+------------------------------------------------ Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue and the Popup issue has been fixed and the files checkedin in svn -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:28:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:28:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23183=3A_?= =?utf-8?q?custom_field_settings_fails?= In-Reply-To: <076.ee625b98c37a625b546c40e22641d760@vtiger.fosslabs.com> References: <076.ee625b98c37a625b546c40e22641d760@vtiger.fosslabs.com> Message-ID: <085.82e8b1a0dd4165d737b7204b326fc0f6@vtiger.fosslabs.com> #183: custom field settings fails ------------------------+--------------------------------------------------- Reporter: richie | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: custom field setting ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 06:30:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 10:30:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23186=3A_?= =?utf-8?q?Calendar_pop-up_is_not_working?= In-Reply-To: <076.1eb60a49e607443d60d26a9b056caddb@vtiger.fosslabs.com> References: <076.1eb60a49e607443d60d26a9b056caddb@vtiger.fosslabs.com> Message-ID: <085.67963fb3ecbcb6424d4e8f0c349f461e@vtiger.fosslabs.com> #186: Calendar pop-up is not working ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:30:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:30:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5782 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060509103044.01AA96A8FB6@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:30:35 2006 New Revision: 5782 Log: js functions have been included for new calendar UI Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Tue May 9 04:30:35 2006 @@ -260,3 +260,53 @@ } document.SharingForm.sharedid.value = selectedColStr; } + +function ajaxCalSaveResponse(response) +{ + document.getElementById("hrView_default").style.display = "none"; + document.getElementById("toggleDiv").innerHTML=response.responseText; +} + +function fnRedirect(view,hour,day,month,year){ + var ajaxObj = new Ajax(ajaxCalSaveResponse); + var tagName = document.getElementById('viewBox'); + var OptionData = tagName.options[tagName.selectedIndex].value; + if(OptionData == 'hourview'){ + var urlstring ="module=Calendar&action=CalendarAjax&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&type="+OptionData+"&parenttab=My Home Page&ajax=true"; + } + else if(OptionData == 'listview'){ + var urlstring ="module=Calendar&action=CalendarAjax&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&type="+OptionData+"&parenttab=My Home Page&ajax=true"; + } + ajaxObj.process("index.php?",urlstring); +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:32:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:32:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5783 - /vtigercrm/trunk/modules/Calendar/new_calendar.php Message-ID: <20060509103205.434F6719BCC@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:31:55 2006 New Revision: 5783 Log: changes made for new calendar UI Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/new_calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/new_calendar.php Tue May 9 04:31:55 2006 @@ -1,26 +1,68 @@ - + - - vtiger CRM 5 - Free, Commercial grade Open Source CRM - + $date_data['day'] = $_REQUEST['day']; +} - - +if ( isset($_REQUEST['month'])) +{ + $date_data['month'] = $_REQUEST['month']; +} - +if ( isset($_REQUEST['week'])) +{ + $date_data['week'] = $_REQUEST['week']; +} - - +if ( isset($_REQUEST['year'])) +{ + if ($_REQUEST['year'] > 2037 || $_REQUEST['year'] < 1970) + { + print("Sorry, Year must be between 1970 and 2037"); + exit; + } + $date_data['year'] = $_REQUEST['year']; +} +if(empty($date_data)) +{ + $data_value=date('Y-m-d H:i:s'); + preg_match('/(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})/',$data_value,$value); + $date_data = Array( + 'day'=>$value[3], + 'month'=>$value[2], + 'year'=>$value[1], + 'hour'=>$value[4], + 'min'=>$value[5], + ); + +} +//echo '
    ';print_r($date_data);echo '
    '; +$calendar_arr['calendar'] = new Calendar($mysel,$date_data); +//echo '
    ';print_r($calendar_arr['calendar']);echo '
    '; +if ($mysel == 'day' || $mysel == 'week' || $mysel == 'month') +{ + global $current_user; + $calendar_arr['calendar']->add_Activities($current_user); +} +$calendar_arr['view'] = $mysel; +calendar_layout($calendar_arr); +//echo '
    ';print_r($calendar_arr);echo'
    '; +?> + From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 06:32:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 10:32:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5784 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060509103211.513B7719C4A@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 04:32:01 2006 New Revision: 5784 Log: i18n done for Header template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Tue May 9 04:32:01 2006 @@ -13,7 +13,7 @@ - {$CURRENT_USER} - {$CATEGORY} - {$MODULE_NAME} - vtiger CRM 5 + {$CURRENT_USER} - {$CATEGORY} - {$MODULE_NAME} - {$APP.LBL_BROWSER_TITLE} @@ -38,8 +38,8 @@
    - - + +
    My Preferences Logout ({$CURRENT_USER}) {$APP.LBL_MY_PREFERENCES} {$APP.LBL_LOGOUT} ({$CURRENT_USER})
    - +
    -
    + -
    @@ -51,13 +50,10 @@ Field Mapping allows you to ....
    {/if}
    -{*
    - {include file='CreateCustomField.tpl'} -
    *} Modified: vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Tue May 9 05:17:48 2006 @@ -13,7 +13,6 @@ function ajaxSaveResponse(response) {ldelim} document.getElementById("cfList").innerHTML=response.responseText; - //document.getElementById("test").value=response.responseText; {rdelim} function getCustomFieldList(customField) {ldelim} @@ -44,6 +43,12 @@ ajaxObj.process("index.php?",urlstring); {rdelim} +function CustomFieldMapping() +{ldelim} + document.form.action="index.php?module=Settings&action=LeadCustomFieldMapping"; + document.form.submit(); +{rdelim} +
    @@ -70,27 +75,10 @@ Custom Field Settings
    Create and Manage user defined fields...... - {**} - - - - - - - - - - + {include file="CustomFieldCombo.tpl"} @@ -60,13 +60,13 @@ - + - + @@ -145,13 +145,13 @@
     
    Select Module
      - Select the CRM module to show CustomFields : - -
     
    From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:20:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:20:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23597=3A_?= =?utf-8?q?Could_Not_Delete_Custom_field?= In-Reply-To: <076.9c60b0908294d48b138cbb0101c00ede@vtiger.fosslabs.com> References: <076.9c60b0908294d48b138cbb0101c00ede@vtiger.fosslabs.com> Message-ID: <085.dd98043867dbaf4638395b5150d04db7@vtiger.fosslabs.com> #597: Could Not Delete Custom field ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: This has been fixed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:21:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:21:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23575=3A_?= =?utf-8?q?Slected_module_is_not_displayed?= In-Reply-To: <076.afbb6baa5fe07092c5316e5b81fd684e@vtiger.fosslabs.com> References: <076.afbb6baa5fe07092c5316e5b81fd684e@vtiger.fosslabs.com> Message-ID: <085.613fdf720f61ab32ccad65df6292193e@vtiger.fosslabs.com> #575: Slected module is not displayed ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Custom Field ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: This has been fixed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:21:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:21:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23184=3A_?= =?utf-8?q?can_not_get_webmails?= In-Reply-To: <076.b85ac696b78707a51f9cbe3858f9ec96@vtiger.fosslabs.com> References: <076.b85ac696b78707a51f9cbe3858f9ec96@vtiger.fosslabs.com> Message-ID: <085.00ae14543b7de6dc12c580a43095f12f@vtiger.fosslabs.com> #184: can not get webmails --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: webmail --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:23:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:23:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23191=3A_?= =?utf-8?q?Inbox_link_under_All_Mails_box_is_not_working?= In-Reply-To: <076.d02cb4829d8fb8d82d729087d4ada220@vtiger.fosslabs.com> References: <076.d02cb4829d8fb8d82d729087d4ada220@vtiger.fosslabs.com> Message-ID: <085.24007bc360c1a2f427ba4415ad97a438@vtiger.fosslabs.com> #191: Inbox link under All Mails box is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: webmail inbox --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:28:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:28:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23193=3A_?= =?utf-8?q?Sent_link_under_All_Mails_box_is_not_working?= In-Reply-To: <076.96dd4b6b5a3e60c9a1fa3b5abd5e58eb@vtiger.fosslabs.com> References: <076.96dd4b6b5a3e60c9a1fa3b5abd5e58eb@vtiger.fosslabs.com> Message-ID: <085.f38527f8e4198530e9d48e3373086e81@vtiger.fosslabs.com> #193: Sent link under All Mails box is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: webmail sent list --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:30:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:30:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23196=3A_?= =?utf-8?q?Trash_link_under_All_Mails_box_is_not_working?= In-Reply-To: <076.de81e19fd24df328d9b807a0b1bdf079@vtiger.fosslabs.com> References: <076.de81e19fd24df328d9b807a0b1bdf079@vtiger.fosslabs.com> Message-ID: <085.0b35157ceb0458ce589c54790f2851a7@vtiger.fosslabs.com> #196: Trash link under All Mails box is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: webmails trashlink --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:31:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:31:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23201=3A_?= =?utf-8?q?Click_on_Qualified_Mails_box_is_not_working?= In-Reply-To: <076.07cbf9582595088f4eeecb2683e2a13d@vtiger.fosslabs.com> References: <076.07cbf9582595088f4eeecb2683e2a13d@vtiger.fosslabs.com> Message-ID: <085.3bc10d46f73b1184989fd38cad0b5116@vtiger.fosslabs.com> #201: Click on Qualified Mails box is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: qualified mails --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:33:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:33:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23215=3A_?= =?utf-8?q?Sent_link_under_=27Qualified_Mails=27_Box_is_not_working?= In-Reply-To: <076.39cda209b59e01355da1d06bc0d39dc7@vtiger.fosslabs.com> References: <076.39cda209b59e01355da1d06bc0d39dc7@vtiger.fosslabs.com> Message-ID: <085.8d07870756d20f154dd0a64f7aec8445@vtiger.fosslabs.com> #215: Sent link under 'Qualified Mails' Box is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: email sent list --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:33:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:33:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23218=3A_?= =?utf-8?q?Trash_link_under_=27Qualified_Mails=27_is_not_working?= In-Reply-To: <076.298372623b0f07c5acbf95b0cbb1a263@vtiger.fosslabs.com> References: <076.298372623b0f07c5acbf95b0cbb1a263@vtiger.fosslabs.com> Message-ID: <085.ccc00c7b4506a0ba97fac1b4a26e231a@vtiger.fosslabs.com> #218: Trash link under 'Qualified Mails' is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: email trashed list --------------------------------+------------------------------------------- Changes (by don): * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:34:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:34:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23229=3A_?= =?utf-8?q?Issue_in_All_view?= In-Reply-To: <076.f0a1dd6eeb4bf317ac693fe12fd2eb99@vtiger.fosslabs.com> References: <076.f0a1dd6eeb4bf317ac693fe12fd2eb99@vtiger.fosslabs.com> Message-ID: <085.c5f7a965e35e4f508f16ab6bad273ba5@vtiger.fosslabs.com> #229: Issue in All view ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:39:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:39:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23253=3A_?= =?utf-8?q?=27Related_To=27_field_shows_number_instead_of_name?= In-Reply-To: <076.fa289fb6c058db787dc0b9e33f2d5c16@vtiger.fosslabs.com> References: <076.fa289fb6c058db787dc0b9e33f2d5c16@vtiger.fosslabs.com> Message-ID: <085.1a3ff2188ba18918fc7048736f43fbdd@vtiger.fosslabs.com> #253: 'Related To' field shows number instead of name --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: related to --------------------------------+------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:40:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:40:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23255=3A_?= =?utf-8?q?RSS_ui_not_proper?= In-Reply-To: <076.58432ae9917c5691b29642fe5cc50373@vtiger.fosslabs.com> References: <076.58432ae9917c5691b29642fe5cc50373@vtiger.fosslabs.com> Message-ID: <085.afbb1bbbeb3e3042fb62840da7cd44f6@vtiger.fosslabs.com> #255: RSS ui not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: rss ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:45:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:45:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23260=3A_?= =?utf-8?q?Issue_in_Change_Owner?= In-Reply-To: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com> References: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com> Message-ID: <085.d3972588dde8f9e0c92337c062190212@vtiger.fosslabs.com> #260: Issue in Change Owner ------------------------+--------------------------------------------------- Reporter: don | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:47:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:47:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23289=3A_?= =?utf-8?q?Usability_issue_in_change_owner_and_change_status?= In-Reply-To: <076.28fa78da16a5405b15bb23922a87b24e@vtiger.fosslabs.com> References: <076.28fa78da16a5405b15bb23922a87b24e@vtiger.fosslabs.com> Message-ID: <085.fa831af011ac7dcb8da992205cf0b82a@vtiger.fosslabs.com> #289: Usability issue in change owner and change status ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:47:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:47:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5790 - /vtigercrm/trunk/include/utils/EditViewUtils.php Message-ID: <20060509114743.C275871A278@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:47:33 2006 New Revision: 5790 Log: changes made to fix the issue 699 Modified: vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue May 9 05:47:33 2006 @@ -148,7 +148,7 @@ if($fieldname == 'terms_conditions')//for default Terms & Conditions { - if($focus->mode=='edit') $value=getTermsandConditions(); + $value=getTermsandConditions(); } $editview_label[]=$mod_strings[$fieldlabel]; From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:47:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:47:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5791 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060509114746.C4B7271A277@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:47:37 2006 New Revision: 5791 Log: i18n done for Homepage template - Ahmed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 9 05:47:37 2006 @@ -24,9 +24,9 @@ {if isset($LOGINHISTORY.0)}
    - +="document.getElementById('loginhistory').style.display='none';">{$MOD.LBL_MODIFIED_TIME} {foreach key=label item=detail from=$LOGINHISTORY} @@ -38,7 +38,7 @@
    IDTypeModified By{$MOD.LBL_LOGIN_ID}{$MOD.LBL_TYPE}{$MOD.LBL_MODIFIED_BY}CloseModified Time
    {$detail.crmid}{$detail.setype}{$detail.modifiedby}{$detail.modifiedtime}
    - + @@ -65,18 +65,18 @@ {else} From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 10:20:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 14:20:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5798 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060509142023.67FF55C3713@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 08:20:18 2006 New Revision: 5798 Log: Updated the language file for lis mail server - ahmed Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue May 9 08:20:18 2006 @@ -453,14 +453,23 @@ 'LBL_DISPLAY_NAME'=>'Display Name', 'LBL_MAIL_PROTOCOL'=>'Mail Protocol', 'LBL_LIST_PASSWORD'=>'Password', -'LBL_MAIL_SERVER_NAME'=>'Mail Server Name', +'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP', +'LBL_MAIL_SERVER_SETTINGS'=>'Mail Server Settings', 'LBL_TEST_SETTINGS'=>'Test my account setting immediately', 'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]', 'LBL_TEST_BUTTON_KEY'=>'T', 'LBL_TEST_BUTTON_LABEL'=>'Test my account now!', 'LBL_DEFAULT'=>'Default', 'LBL_IMAP'=>'IMAP', +'LBL_IMAP2'=>'IMAP2', +'LBL_IMAP4'=>'IMAP4', 'LBL_POP'=>'POP', +'LBL_SSL_OPTIONS'=>'SSL Options', +'LBL_TLS'=>'TLS', +'LBL_NO_TLS'=>'No TLS', +'LBL_CERT_VAL'=>'Certificate Validations', +'LBL_VAL_SSL_CERT'=>'Validate SSL Cert', +'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert', 'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration', 'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail', 'LBL_LIST_MAIL_ACCOUNT'=>' List Mail Account', @@ -469,6 +478,18 @@ 'LBL_QUOTE_STAGE'=>'Quote Stage', 'LBL_CARRIER'=>'Carrier', 'LBL_TAXCLASS'=>'Tax Class', +'LBL_MY_DETAILS'=>'My Details', +'LBL_MY_MAIL_SERVER_DET'=>'My Mail Server Details', +'LBL_EMAIL_ID'=>'Email ID', +'LBL_NAME_EXAMPLE'=>'(example : John Fenner)', +'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at mailserver.com)', +'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout', +'LBL_1_MIN'=>'1 minute', +'LBL_2_MIN'=>'2 minutes', +'LBL_3_MIN'=>'3 minutes', +'LBL_4_MIN'=>'4 minutes', +'LBL_5_MIN'=>'5 minutes', +'LBL_EMAILS_PER_PAGE'=>'Emails per Page', //Added for Organization Details (4.2 release) 'LBL_ORGANIZATION_NAME'=>'Company Name', From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 10:22:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 14:22:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5799 - /vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Message-ID: <20060509142259.C89825C3713@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 08:22:56 2006 New Revision: 5799 Log: i18n done for list mail server - ahmed Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Tue May 9 08:22:56 2006 @@ -25,7 +25,7 @@ @@ -33,9 +33,9 @@ {foreach item=elements key=title from=$row} {if $title eq 'Subject'}
    My Home {$MOD.LBL_MY_HOME} @@ -54,12 +54,12 @@ @@ -68,18 +68,18 @@ {else} From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 09:02:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 13:02:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5797 - /vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Message-ID: <20060509130231.4702971A7D4@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 07:02:21 2006 New Revision: 5797 Log: i18n updated for all the buttons in list/edit/detail view - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 9 07:02:21 2006 @@ -24,13 +24,13 @@ {if $CHECK.EditView eq 'yes'} {if $MODULE eq 'Activities'} - + {else} - + {/if} {/if} -
    - + - - + + - +
    Open Calendar...{$APP.LBL_CALENDAR_ALT}Show World Clock...Open Calculator...{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}  Open All Menu...{$APP.LBL_ALL_MENU_ALT}
    @@ -113,14 +113,14 @@ - +
    Leads By Source {$MOD.LBL_LEADS_BY_SOURCE}
    - Total : 340 + {$MOD.LBL_TOTAL}340
    @@ -128,14 +128,14 @@ - +
    Leads By Status {$MOD.LBL_LEADS_BY_STATUS}
    - Total : 340 + {$MOD.LBL_TOTAL}340
    @@ -153,7 +153,7 @@
    - + @@ -172,7 +172,7 @@ From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:48:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:48:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23293=3A_?= =?utf-8?q?Error_in_Duplication_of_Accounts?= In-Reply-To: <076.f1a114ae4c5ca503f4cadd664a8db2b7@vtiger.fosslabs.com> References: <076.f1a114ae4c5ca503f4cadd664a8db2b7@vtiger.fosslabs.com> Message-ID: <085.76d035e1d2c20f6ee4e47260876e13b0@vtiger.fosslabs.com> #293: Error in Duplication of Accounts ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Relatedlists ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:48:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:48:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23699=3A_?= =?utf-8?q?Terms_and_conditions_not_displayed?= In-Reply-To: <076.8ceb39e1fc6b6dce5fd6e37258006294@vtiger.fosslabs.com> References: <076.8ceb39e1fc6b6dce5fd6e37258006294@vtiger.fosslabs.com> Message-ID: <085.eb006db09e3a9ad9047cdedd9af83b87@vtiger.fosslabs.com> #699: Terms and conditions not displayed ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Terms and Condtions ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: This has been fixed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:51:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:51:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5792 - /vtigercrm/trunk/modules/Home/language/en_us.lang.php Message-ID: <20060509115148.C9B5671A279@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:51:38 2006 New Revision: 5792 Log: Update the language file for Home module - Ahmed Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Home/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Home/language/en_us.lang.php Tue May 9 05:51:38 2006 @@ -26,12 +26,27 @@ 'LBL_LIST_ACCOUNT_NAME'=>'Account Name', 'LBL_PHONE'=>'Phone:', 'LBL_EMAIL_ADDRESS'=>'Email:', +'LBL_TOTAL'=>'Total : ', + +'LBL_MY_HOME'=>'My Home', +'LBL_MODIFIED_TIME'=>'Modified Time', +'LBL_LOGIN_ID'=>'ID', +'LBL_MODIFIED_BY'=>'Modified By', +'LBL_TYPE'=>'Type', 'LBL_PIPELINE_FORM_TITLE'=>'My Pipeline', 'ERR_ONE_CHAR'=>'Please enter at least one letter or number for your search ...', 'LBL_OPEN_TASKS'=>'My Open Tasks', + +'LBL_LEADS_BY_SOURCE'=>'Leads By Source', +'LBL_LEADS_BY_STATUS'=>'Leads By Status', + +'LBL_UPCOMING_EVENTS'=>'Upcoming Events', +'LBL_PENDING_EVENTS'=>'Pending Events', + + ); ?> From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:53:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:53:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5793 - /vtigercrm/trunk/modules/Campaigns/DetailView.php Message-ID: <20060509115356.D017171A277@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:53:45 2006 New Revision: 5793 Log: unwanted comma at line no 26 has been removed Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailView.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailView.php Tue May 9 05:53:45 2006 @@ -26,7 +26,7 @@ { $focus->id = ""; } -global $app_strings,$mod_strings,$theme,; +global $app_strings,$mod_strings,$theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 07:54:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 11:54:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5794 - /vtigercrm/trunk/modules/Home/index.php Message-ID: <20060509115412.1303B71A277@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 05:54:02 2006 New Revision: 5794 Log: Update index.php for Home module - Ahmed Modified: vtigercrm/trunk/modules/Home/index.php Modified: vtigercrm/trunk/modules/Home/index.php ============================================================================== --- vtigercrm/trunk/modules/Home/index.php (original) +++ vtigercrm/trunk/modules/Home/index.php Tue May 9 05:54:02 2006 @@ -145,6 +145,7 @@ return $acti_type; } + $query="select tagcloud from users where id=".$current_user->id; $result=$adb->query($query); $tagcloud_js=$adb->query_result($result,0,'tagcloud'); @@ -156,6 +157,8 @@ $t=Date("Ymd"); $smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP",$app_strings); +$smarty->assign("MOD",$mod_strings); $smarty->assign("HOMEDETAILS",$home_values); $smarty->assign("HOMEDEFAULTVIEW",DefHomeView()); $smarty->assign("ACTIVITIES",$activities); From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:58:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:58:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23297=3A_?= =?utf-8?q?Day_View_-_Time_properly_not_displayed?= In-Reply-To: <076.6faf89031af0b3a4e3f0a66825b4c14b@vtiger.fosslabs.com> References: <076.6faf89031af0b3a4e3f0a66825b4c14b@vtiger.fosslabs.com> Message-ID: <085.5b41b6dd1716a674118db1053076417d@vtiger.fosslabs.com> #297: Day View - Time properly not displayed ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:58:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:58:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23309=3A_?= =?utf-8?q?Quotes_by_Accounts_on_drill_down_shows_List_View?= In-Reply-To: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> References: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> Message-ID: <085.85471f9f10c345370807ab48978185a9@vtiger.fosslabs.com> #309: Quotes by Accounts on drill down shows List View ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 07:59:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 11:59:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23311=3A_?= =?utf-8?q?SalesOrder_by_Accounts_on_drilldown_shows_list_view?= In-Reply-To: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com> References: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com> Message-ID: <085.42c7e5b5194c18c59327c22b55f6eca8@vtiger.fosslabs.com> #311: SalesOrder by Accounts on drilldown shows list view ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dashboard ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 08:01:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:01:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23325=3A_?= =?utf-8?q?parenttab_attribut_missing_in_most_of_the_links?= In-Reply-To: <076.af60b9022c8de093954e19042c359d44@vtiger.fosslabs.com> References: <076.af60b9022c8de093954e19042c359d44@vtiger.fosslabs.com> Message-ID: <085.bdf4277647d18920a6c30c47fe296d4d@vtiger.fosslabs.com> #325: parenttab attribut missing in most of the links ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 08:02:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:02:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23326=3A_?= =?utf-8?q?Why_account_reference_in_Custom_View=3F?= In-Reply-To: <076.06719fa2c8cfe743496ac0146090cc68@vtiger.fosslabs.com> References: <076.06719fa2c8cfe743496ac0146090cc68@vtiger.fosslabs.com> Message-ID: <085.55c33b4a61bc4891798ae9dcf064fa98@vtiger.fosslabs.com> #326: Why account reference in Custom View? ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 08:03:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:03:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23327=3A_?= =?utf-8?q?edit_custom_view_not_storing_all_values?= In-Reply-To: <076.b608ede2ea004d9070cb1b70eb3f6ebe@vtiger.fosslabs.com> References: <076.b608ede2ea004d9070cb1b70eb3f6ebe@vtiger.fosslabs.com> Message-ID: <085.df9efb989a72819ef1f1c9e26328fa16@vtiger.fosslabs.com> #327: edit custom view not storing all values ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 08:05:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:05:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23328=3A_?= =?utf-8?q?Duplicate_of_Leads_not_working?= In-Reply-To: <076.0d6a38a1ab29e288c9243566e326d0a4@vtiger.fosslabs.com> References: <076.0d6a38a1ab29e288c9243566e326d0a4@vtiger.fosslabs.com> Message-ID: <085.4c8e265a5970eaeb43198b3731c43ca5@vtiger.fosslabs.com> #328: Duplicate of Leads not working ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 08:05:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 12:05:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5795 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060509120516.3EBBF71A621@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 06:04:57 2006 New Revision: 5795 Log: update the app level lang file - ahmed Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Tue May 9 06:04:57 2006 @@ -423,9 +423,25 @@ 'LBL_ADD_ITEM'=>'Add', - - - +//Added for version 5 + +'LBL_CALENDAR_TITLE'=>'Open Calendar...', +'LBL_CALENDAR_ALT'=>'Open Calendar...', + +'LBL_CALCULATOR_TITLE'=>'Open Calculator...', +'LBL_CALCULATOR_ALT'=>'Open Calculator...', + +'LBL_CLOCK_TITLE'=>'Show World Clock...', +'LBL_CLOCK_ALT'=>'Show World Clock...', + +'LBL_ALL_MENU_TITLE'=>'Open All Menu...', +'LBL_ALL_MENU_ALT'=>'Open All Menu...', + +'LBL_CHAT_TITLE'=>'Chat...', +'LBL_CHAT_ALT'=>'Chat...', + +'LBL_SEARCH_TITLE'=>'Search in ', +'LBL_SEARCH_ALT'=>'Search in ', // Added fields for Related Field Display Informations in Detail View of All Modules From vtiger-tickets at vtiger.fosslabs.com Tue May 9 08:06:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:06:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23329=3A_?= =?utf-8?q?advanced_filter_criteria_not_proper?= In-Reply-To: <076.28b21066b37581172e48c7a90c2763ab@vtiger.fosslabs.com> References: <076.28b21066b37581172e48c7a90c2763ab@vtiger.fosslabs.com> Message-ID: <085.264be03324d6d68720b701a5b7f7a5cf@vtiger.fosslabs.com> #329: advanced filter criteria not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 08:07:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 12:07:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23329=3A_?= =?utf-8?q?advanced_filter_criteria_not_proper?= In-Reply-To: <076.28b21066b37581172e48c7a90c2763ab@vtiger.fosslabs.com> References: <076.28b21066b37581172e48c7a90c2763ab@vtiger.fosslabs.com> Message-ID: <085.e4d000aaf57b677416ea574fdf141a55@vtiger.fosslabs.com> #329: advanced filter criteria not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 09:01:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 13:01:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5796 - /vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Message-ID: <20060509130140.4EDA271A6F3@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 07:01:29 2006 New Revision: 5796 Log: i18n updated for all the buttons in list/edit/detail view - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue May 9 07:01:29 2006 @@ -24,16 +24,16 @@ {if $CHECK.EditView eq 'yes'} {if $MODULE eq 'Activities'} - + {else} - + {/if} {/if} {if $CHECK.index eq 'yes'} - + {/if} -
    Upcoming Events
    23 Events For Today
    {$MOD.LBL_UPCOMING_EVENTS}
    23 Events For Today
    - Pending Events
    + {$MOD.LBL_PENDING_EVENTS}
    7 Events in Past 10 days
     
    Create {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...Create {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...Search in {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...Chat... + {$APP.LBL_CHAT_ALT}
    @@ -43,11 +43,11 @@ - - - + + + - +
    Open Calendar...Show World Clock...Open Calculator...{$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}  Open All Menu...{$APP.LBL_ALL_MENU_ALT}
    {if $CHECK.Import eq 'yes' && $CHECK.Export eq 'yes'} - Import {$MODULE} | - Export {$MODULE} + {$APP.LBL_IMPORT} {$MODULE} | + {$APP.LBL_EXPORT} {$MODULE} {elseif $CHECK.Import eq 'yes' && $CHECK.Export eq 'no'} - Import {$MODULE} + {$APP.LBL_IMPORT} {$MODULE} {elseif $CHECK.Import eq 'no' && $CHECK.Export eq 'yes' } - Export {$MODULE} + {$APP.LBL_EXPORT} {$MODULE} {/if} {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} {if $CHECK.Export eq 'yes'} - Export {$MODULE} + {$APP.LBL_EXPORT} {$MODULE} {/if}
    Create {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...Create {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...Chat... + {$APP.LBL_CHAT_ALT}
    @@ -40,11 +40,11 @@ - - - + + + - +
    Open Calendar...Show World Clock...Open Calculator...{$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}  Open All Menu...{$APP.LBL_ALL_MENU_ALT}
    {if $CHECK.Import eq 'yes' && $CHECK.Export eq 'yes'} - Import {$MODULE} | - Export {$MODULE} + {$APP.LBL_IMPORT} {$MODULE} | + {$APP.LBL_EXPORT} {$MODULE} {elseif $CHECK.Import eq 'yes' && $CHECK.Export eq 'no'} - Import {$MODULE} + {$APP.LBL_IMPORT} {$MODULE} {elseif $CHECK.Import eq 'no' && $CHECK.Export eq 'yes' } - Export {$MODULE} + {$APP.LBL_EXPORT} {$MODULE} {/if} {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} {if $CHECK.Export eq 'yes'} - Export {$MODULE} + {$APP.LBL_EXPORT} {$MODULE} {/if}
    - My Preferences
    + {$APP.LBL_MY_PREFERENCES}


    @@ -45,8 +45,8 @@ - - + + @@ -65,34 +65,34 @@ From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 10:56:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 14:56:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5801 - /vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Message-ID: <20060509145617.70C46709FF6@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 08:56:10 2006 New Revision: 5801 Log: i18n done for emails - ahmed Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Tue May 9 08:56:10 2006 @@ -16,12 +16,12 @@
     My DetailsMy Mail Server Details {$MOD.LBL_MY_DETAILS}{$MOD.LBL_MY_MAIL_SERVER_DET}  
    - + - + - + - + - + - + - + @@ -100,45 +100,45 @@ - + - + +  {$MOD.LBL_NO_TLS} +   {$MOD.LBL_TLS} - + - + - + From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 10:55:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 14:55:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5800 - /vtigercrm/trunk/Smarty/templates/Emails.tpl Message-ID: <20060509145523.060866146F5@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 08:55:19 2006 New Revision: 5800 Log: i18n done for emails - ahmed Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Tue May 9 08:55:19 2006 @@ -60,7 +60,7 @@
    Email ID{$MOD.LBL_EMAIL_ID}
    {$MOD.LBL_DISPLAY_NAME} (example : John Fenner) {$MOD.LBL_NAME_EXAMPLE}
    {$APP.LBL_REQUIRED_SYMBOL} {$MOD.LBL_EMAIL_ADDRESS} ( example : johnfenner at mailserver.com ){$MOD.LBL_EMAIL_EXAMPLE}
     
    Mail Server Settings{$MOD.LBL_MAIL_SERVER_SETTINGS}
    {$APP.LBL_REQUIRED_SYMBOL}Mail Server Name or IP {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_MAIL_SERVER_NAME}  
    {$APP.LBL_REQUIRED_SYMBOL}User Name{$APP.LBL_REQUIRED_SYMBOL}{$APP.LBL_LIST_USER_NAME}  
    {$APP.LBL_REQUIRED_SYMBOL}Password{$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_LIST_PASSWORD}  
     
    Mail Protocol{$MOD.LBL_MAIL_PROTOCOL}  {$MOD.LBL_IMAP}  {$MOD.LBL_POP} -  IMAP2 -  IMAP4 +  {$MOD.LBL_IMAP2} +  {$MOD.LBL_IMAP4}  
    SSL Options {$MOD.LBL_SSL_OPTIONS} -  No TLS -   TLS  
    Certificate Validations {$MOD.LBL_CERT_VAL} -  Validate SSL Cert -  Don't Validate SSL Cert +  {$MOD.LBL_VAL_SSL_CERT} +  {$MOD.LBL_DONOT_VAL_SSL_CERT}  
    Refresh Timeout {$MOD.LBL_REFRESH_TIMEOUT}  
    Email's per Page {$MOD.LBL_EMAILS_PER_PAGE}  
    @@ -83,15 +83,15 @@ @@ -99,40 +99,40 @@ - + - + @@ -141,13 +141,13 @@ -

    - Home> Web Mail + {$CATEGORY} > {$MODULE}
     
    -  Check Mail +  {$MOD.LBL_CHK_MAIL} -  Compose +  {$MOD.LBL_COMPOSE} -  Settings +  {$MOD.LBL_SETTINGS}
    Email Folders {$MOD.LBL_EMAIL_FOLDERS}  Mails {$MOD.LBL_MAILS}
    -  INBOX +  {$MOD.LBL_INBOX}
    -  Sent Mails +  {$MOD.LBL_SENT_MAILS}
    -  Trash +  {$MOD.LBL_TRASH}
      - +   + - Search:   + {$APP.LBL_SEARCH}     - +
    - +
    -   -   -   - +   +   +   +
    - - - + + +
    From :  
    CC :  
    Subject : {$BLOCKS.3.Subject.value}
    {$MOD.LBL_FROM}  
    {$MOD.LBL_CC}  
    {$MOD.LBL_SUBJECT} {$BLOCKS.3.Subject.value}
     
    {elseif $title eq 'Description'} From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 10:59:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 14:59:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5802 - /vtigercrm/trunk/modules/Emails/language/en_us.lang.php Message-ID: <20060509145902.C2594709FFE@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 08:58:58 2006 New Revision: 5802 Log: Updated the language file for emails modules - ahmed Modified: vtigercrm/trunk/modules/Emails/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Emails/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Emails/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Emails/language/en_us.lang.php Tue May 9 08:58:58 2006 @@ -35,7 +35,7 @@ 'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.", 'LBL_DATE_SENT'=>'Date Sent:', -'LBL_SUBJECT'=>'Subject:', +'LBL_SUBJECT'=>'Subject :', 'LBL_BODY'=>'Body:', 'LBL_DATE_AND_TIME'=>'Date & Time Sent:', 'LBL_DATE'=>'Date Sent:', @@ -45,6 +45,26 @@ 'LBL_CONTACT_NAME'=>' Contact Name: ', 'LBL_EMAIL'=>'Email:', 'LBL_COLON'=>':', +'LBL_CHK_MAIL'=>'Check Mail', +'LBL_COMPOSE'=>'Compose', +'LBL_SETTINGS'=>'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 :', 'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', 'LBL_INVITEE'=>'Recipients', From vtiger-tickets at vtiger.fosslabs.com Tue May 9 11:17:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 15:17:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23536=3A_?= =?utf-8?q?Ticketsystem_Emails?= In-Reply-To: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> References: <076.c51ff6414ec289c44df50737baa910d6@vtiger.fosslabs.com> Message-ID: <085.3a3b86154ddb68a8a0bdf1aa3f5eee84@vtiger.fosslabs.com> #536: Ticketsystem Emails -----------------------------+---------------------------------------------- Reporter: anonymous | Owner: mmbrich Type: enhancement | Status: new Priority: major | Milestone: Component: customerportal | Version: 5.0.0 Resolution: | Keywords: Ticket mail -----------------------------+---------------------------------------------- Changes (by mickie): * status: assigned => new * owner: mickie => mmbrich Comment: Thanks for your information. This trac is customized by mmbrich, mfedyk and fathi. so for this any one of these friends can made reply. if you give username then the username will be displayed when you give mailid as username then the mailid will be displayed.so you can give name instead of mailid. May be i am wrong. i will transfer this ticket to mmbrich. he will help you to understand the motivation to make this email id displayed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 11:40:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 09 May 2006 15:40:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5803 - /vtigercrm/trunk/Smarty/templates/Webmails.tpl Message-ID: <20060509154017.B3902709FF7@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 09:40:10 2006 New Revision: 5803 Log: i18n done for webmails - ahmed Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Tue May 9 09:40:10 2006 @@ -36,23 +36,23 @@
    -  Check Mail +  {$MOD.LBL_CHK_MAIL} -  Compose +  {$MOD.LBL_COMPOSE} -  Settings +  {$MOD.LBL_SETTINGS} -  Show Hidden +  {$MOD.LBL_SHOW_HIDDEN} -  Expunge Mailbox +  {$MOD.LBL_EXPUNGE_MAILBOX}
    Email Folders {$MOD.LBL_EMAIL_FOLDERS}  Mails in {$ACCOUNT} > {$MAILBOX} {$MOD.LBL_MAILS} {$ACCOUNT} > {$MAILBOX}
    -  My Mails +  {$MOD.LBL_MY_MAILS}
      @@ -79,22 +79,22 @@

    -  Sent Mails +  {$MOD.LBL_SENT_MAILS}
    -  Trash +  {$MOD.LBL_TRASH} @@ -102,12 +102,12 @@
      -
    {$FOLDER_SELECT}  + {$FOLDER_SELECT}  - Search:   + {$APP.LBL_SEARCH}     - +
    - +
    -   -   -   -   - +   +   +   +   +
      - - - - + + + +
    From : 
    To : 
    Subject
    Date
    {$MOD.LBL_FROM} 
    {$MOD.LBL_TO} 
    {$MOD.LBL_SUBJECT}
    {$MOD.LBL_DATE}
     
     
    +
    @@ -61,119 +83,85 @@
    - -{**} -
    Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Tue May 9 12:38:58 2006 @@ -1236,11 +1236,11 @@ var colthree = row.insertCell(2); - colone.innerHTML=""; - - coltwo.innerHTML=" "; - - colthree.innerHTML=""; + colone.innerHTML=""; + + coltwo.innerHTML=" "; + + colthree.innerHTML=""; } Modified: vtigercrm/trunk/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/SearchUtils.php (original) +++ vtigercrm/trunk/include/utils/SearchUtils.php Tue May 9 12:38:58 2006 @@ -495,7 +495,7 @@ $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,$tab_col)." ".$matchtype; } } - $where=$adv_string."#@@#".$url_string."&searchtype=advance&search_cnt=".$tot_no_criteria."&matchtype=".$_REQUEST['matchtype']; + $where="(".$adv_string.")#@@#".$url_string."&searchtype=advance&search_cnt=".$tot_no_criteria."&matchtype=".$_REQUEST['matchtype']; } else { From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:03:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:03:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23421=3A_?= =?utf-8?q?edit_tab_profile_takes_to_edit_global_privileges?= In-Reply-To: <076.02cb3b9ee9dbafa0f278149d4e7c2f6d@vtiger.fosslabs.com> References: <076.02cb3b9ee9dbafa0f278149d4e7c2f6d@vtiger.fosslabs.com> Message-ID: <085.309e6aea09428bc6d509bf11a6aa4b72@vtiger.fosslabs.com> #421: edit tab profile takes to edit global privileges ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profile ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:04:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:04:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23423=3A_?= =?utf-8?q?edit_standard_privileges_takes_to_edit_global_privileges?= In-Reply-To: <076.d183d57825e0f2e4471317a7770a629d@vtiger.fosslabs.com> References: <076.d183d57825e0f2e4471317a7770a629d@vtiger.fosslabs.com> Message-ID: <085.5dfc60e5af7a4c9442d7aa502cd4673e@vtiger.fosslabs.com> #423: edit standard privileges takes to edit global privileges ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profile ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:05:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:05:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23424=3A_?= =?utf-8?q?even_without_tab_privileges_standard_privileges_can_be_given?= In-Reply-To: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com> References: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com> Message-ID: <085.00c4ffe72415348037f160bfd105e203@vtiger.fosslabs.com> #424: even without tab privileges standard privileges can be given ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profile ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:07:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:07:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23446=3A_?= =?utf-8?q?Issue_in_Contact_without_Accounts?= In-Reply-To: <076.2a6a37d12f81515b920b13fc242c0611@vtiger.fosslabs.com> References: <076.2a6a37d12f81515b920b13fc242c0611@vtiger.fosslabs.com> Message-ID: <085.4b51af3d2ea92f3d24501b69b6df5e4a@vtiger.fosslabs.com> #446: Issue in Contact without Accounts ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:08:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:08:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23448=3A_?= =?utf-8?q?Issue_in_the_display_of_Overdue_Activities?= In-Reply-To: <076.e4c41107075472cbaa297ea1f5a0d8f9@vtiger.fosslabs.com> References: <076.e4c41107075472cbaa297ea1f5a0d8f9@vtiger.fosslabs.com> Message-ID: <085.07b140a1392d5c26828be96b138eef02@vtiger.fosslabs.com> #448: Issue in the display of Overdue Activities ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:08:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:08:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23450=3A_?= =?utf-8?q?Pagination_is_not_supported_for_related_list?= In-Reply-To: <076.4ae1ba069297a58cd7b967357dfd775b@vtiger.fosslabs.com> References: <076.4ae1ba069297a58cd7b967357dfd775b@vtiger.fosslabs.com> Message-ID: <085.10cb1792f03c10b369ae55ae20084002@vtiger.fosslabs.com> #450: Pagination is not supported for related list ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:09:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:09:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23451=3A_?= =?utf-8?q?Sorting_is_not_available_in_related_lists?= In-Reply-To: <076.654fca5baaa382ddaa3e380e3b4026db@vtiger.fosslabs.com> References: <076.654fca5baaa382ddaa3e380e3b4026db@vtiger.fosslabs.com> Message-ID: <085.fe22c8fe4721ab62531e73e703d49af8@vtiger.fosslabs.com> #451: Sorting is not available in related lists ------------------------+--------------------------------------------------- Reporter: don | Owner: saraj Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saraj -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:10:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:10:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23457=3A_?= =?utf-8?q?Inconsistency_in_List_Views?= In-Reply-To: <076.62f80fd69dd6508b4f16ec9faaf586f8@vtiger.fosslabs.com> References: <076.62f80fd69dd6508b4f16ec9faaf586f8@vtiger.fosslabs.com> Message-ID: <085.948420a785aef3bccd9ea39bdb1fa768@vtiger.fosslabs.com> #457: Inconsistency in List Views ------------------------+--------------------------------------------------- Reporter: don | Owner: saraj Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saraj -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:11:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:11:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23486=3A_?= =?utf-8?q?table_indexing_is_not_proper_in_some_tables?= In-Reply-To: <076.54bbc5aa9fb5a6e3cd2310cbda7781d8@vtiger.fosslabs.com> References: <076.54bbc5aa9fb5a6e3cd2310cbda7781d8@vtiger.fosslabs.com> Message-ID: <085.ef80dbc38c53bb79de928d411b9081bd@vtiger.fosslabs.com> #486: table indexing is not proper in some tables ------------------------+--------------------------------------------------- Reporter: don | Owner: don Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:13:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:13:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23519=3A_?= =?utf-8?q?validation_for_notes_quickreate?= In-Reply-To: <076.a1e19f784ca3cb33edb5fa2c87c26e5a@vtiger.fosslabs.com> References: <076.a1e19f784ca3cb33edb5fa2c87c26e5a@vtiger.fosslabs.com> Message-ID: <085.0033047102635960b7ea838a0a3266f0@vtiger.fosslabs.com> #519: validation for notes quickreate --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: --------------------------------+------------------------------------------- Changes (by don): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:14:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:14:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23580=3A_?= =?utf-8?q?Attachment_is_not_duplicated_while_duplicating_Notes?= In-Reply-To: <076.4d406ad81ce5ad272e3113cf23423cdb@vtiger.fosslabs.com> References: <076.4d406ad81ce5ad272e3113cf23423cdb@vtiger.fosslabs.com> Message-ID: <085.778e67a7a7d6dc8e881e21f6eab4ac15@vtiger.fosslabs.com> #580: Attachment is not duplicated while duplicating Notes ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Attachments ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:15:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:15:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23599=3A_?= =?utf-8?q?Profile_Issue?= In-Reply-To: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com> References: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com> Message-ID: <085.cacfc01705228f87f4338a74c1fc5ec1@vtiger.fosslabs.com> #599: Profile Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:16:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:16:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23606=3A_?= =?utf-8?q?issue_in_create_activity_button?= In-Reply-To: <076.585aa73b113c683f3987066758d376a5@vtiger.fosslabs.com> References: <076.585aa73b113c683f3987066758d376a5@vtiger.fosslabs.com> Message-ID: <085.b0c634d312189f4a8286afc13bbd5b91@vtiger.fosslabs.com> #606: issue in create activity button ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:16:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:16:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23609=3A_?= =?utf-8?q?Issue_in_Create_Task?= In-Reply-To: <076.130338c36c34b8ecb011f0bdad013ee6@vtiger.fosslabs.com> References: <076.130338c36c34b8ecb011f0bdad013ee6@vtiger.fosslabs.com> Message-ID: <085.7026c392afef9c8986fd6a118b93f113@vtiger.fosslabs.com> #609: Issue in Create Task ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:18:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:18:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23613=3A_?= =?utf-8?q?Default_Lead_VIew_=2C_Activity_View_in_users_is_of_no_use?= In-Reply-To: <076.2d12500d7d95303f1affcf69a5cf635c@vtiger.fosslabs.com> References: <076.2d12500d7d95303f1affcf69a5cf635c@vtiger.fosslabs.com> Message-ID: <085.d2a092756df632cfd99dde9733a96d66@vtiger.fosslabs.com> #613: Default Lead VIew , Activity View in users is of no use ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Users ---------------------------+------------------------------------------------ Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:19:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:19:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23623=3A_?= =?utf-8?q?Issue_in_Activity_Quick_Edit?= In-Reply-To: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com> References: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com> Message-ID: <085.805f2e8d860267f012156a5a24a644bf@vtiger.fosslabs.com> #623: Issue in Activity Quick Edit ------------------------+--------------------------------------------------- Reporter: don | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:20:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:20:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23678=3A_?= =?utf-8?q?Home_Page_Security_Support_is_not_proper?= In-Reply-To: <076.0108077923a68a13c0fb45ff815a79d5@vtiger.fosslabs.com> References: <076.0108077923a68a13c0fb45ff815a79d5@vtiger.fosslabs.com> Message-ID: <085.acf29ce1c462f4ed7ae29e379867c9c5@vtiger.fosslabs.com> #678: Home Page Security Support is not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: saraj Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Security ---------------------------+------------------------------------------------ Changes (by don): * owner: ahmed => saraj -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:20:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:20:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23680=3A_?= =?utf-8?q?Send_Remainder_in_Events_not_working?= In-Reply-To: <076.25e02cfec13997af4baaacbb0fc391fb@vtiger.fosslabs.com> References: <076.25e02cfec13997af4baaacbb0fc391fb@vtiger.fosslabs.com> Message-ID: <085.03a2f70d8e2b40a2751abd9f99cca56d@vtiger.fosslabs.com> #680: Send Remainder in Events not working ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:21:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:21:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23688=3A_?= =?utf-8?q?Issue_in_Event_User_Related_List?= In-Reply-To: <076.815f18cf3ceaadb29c37d84a50c176c6@vtiger.fosslabs.com> References: <076.815f18cf3ceaadb29c37d84a50c176c6@vtiger.fosslabs.com> Message-ID: <085.ecd92a9e159d4388f787fa5a4b7b8e68@vtiger.fosslabs.com> #688: Issue in Event User Related List ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:25:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:25:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2374=3A_I?= =?utf-8?q?nstallation_Pb_step_4?= In-Reply-To: <076.348c601258368d89f9a0a19c3d89c524@vtiger.fosslabs.com> References: <076.348c601258368d89f9a0a19c3d89c524@vtiger.fosslabs.com> Message-ID: <085.db750e43dccdd0967809df8012897f35@vtiger.fosslabs.com> #74: Installation Pb step 4 ------------------------+--------------------------------------------------- Reporter: oitsuki | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:26:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:26:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2377=3A_A?= =?utf-8?q?dd_accounts_doesn=27t_work_in_detail_view?= In-Reply-To: <076.d541c69836d3e93fc412dae2f6fd0dd8@vtiger.fosslabs.com> References: <076.d541c69836d3e93fc412dae2f6fd0dd8@vtiger.fosslabs.com> Message-ID: <085.1d64fbce75749b10931fe4b422799827@vtiger.fosslabs.com> #77: Add accounts doesn't work in detail view -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------+-------------------------------------------- Changes (by don): * status: assigned => new * owner: richie => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:26:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:26:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2378=3A_I?= =?utf-8?q?nput_tab_field_order_for_contacts?= In-Reply-To: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> References: <076.29f680660699a95123ad31091918c40c@vtiger.fosslabs.com> Message-ID: <085.79211502112ccda369279f13945be51b@vtiger.fosslabs.com> #78: Input tab field order for contacts ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:29:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:29:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2380=3A_B?= =?utf-8?q?lock_=27Custom_information=27_for_accounts?= In-Reply-To: <076.a9588a24eea5812b218bd55fd917354f@vtiger.fosslabs.com> References: <076.a9588a24eea5812b218bd55fd917354f@vtiger.fosslabs.com> Message-ID: <085.a0e46c777826f98ee9a2bcf94f92945a@vtiger.fosslabs.com> #80: Block 'Custom information' for accounts -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: -------------------------------+-------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:29:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:29:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2381=3A_?= =?utf-8?q?=22Available_Merge_Fields=22_does_not_work_in_the_email_templat?= =?utf-8?q?es_=28adding_a_merge_field_to_a_template_does_not_result_in_tha?= =?utf-8?q?t_field_being_merged=29?= In-Reply-To: <076.247dfccd0d5a7f69c4c5016ef5f5c24b@vtiger.fosslabs.com> References: <076.247dfccd0d5a7f69c4c5016ef5f5c24b@vtiger.fosslabs.com> Message-ID: <085.59b87836d129459f8a9a7a5fe7936559@vtiger.fosslabs.com> #81: "Available Merge Fields" does not work in the email templates (adding a merge field to a template does not result in that field being merged) ------------------------------------+--------------------------------------- Reporter: scott at crazycolour.com | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: merge fields not available in email template ------------------------------------+--------------------------------------- Changes (by don): * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:30:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:30:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2398=3A_C?= =?utf-8?q?annot_add_a_new_product?= In-Reply-To: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> References: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> Message-ID: <085.f82b9738e30204a6c83f900b6e1704c4@vtiger.fosslabs.com> #98: Cannot add a new product --------------------------------+------------------------------------------- Reporter: Robgsem at yahoo.com | Owner: mickie Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:31:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:31:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2399=3A_v?= =?utf-8?q?alidation_is_not_working_for_Notes_module?= In-Reply-To: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> References: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> Message-ID: <085.ce317561703a5da1fe00dca74c6fd08f@vtiger.fosslabs.com> #99: validation is not working for Notes module ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:32:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:32:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2398=3A_C?= =?utf-8?q?annot_add_a_new_product?= In-Reply-To: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> References: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> Message-ID: <085.e12435264eb4cd9166a453445cdae805@vtiger.fosslabs.com> #98: Cannot add a new product --------------------------------+------------------------------------------- Reporter: Robgsem at yahoo.com | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:33:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:33:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23103=3A_?= =?utf-8?q?can_not_add_more_than_one_user_in_email_Related_list?= In-Reply-To: <076.ed4dabd5b24748c2fb1fded49054925e@vtiger.fosslabs.com> References: <076.ed4dabd5b24748c2fb1fded49054925e@vtiger.fosslabs.com> Message-ID: <085.111ca42953491fc036e8f4b800f86058@vtiger.fosslabs.com> #103: can not add more than one user in email Related list --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: more than one user --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:34:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:34:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23105=3A_?= =?utf-8?q?can_not_add_contact_to_email_from_its_related_list?= In-Reply-To: <076.db585632c9a7d390b1cb92cb9ba47588@vtiger.fosslabs.com> References: <076.db585632c9a7d390b1cb92cb9ba47588@vtiger.fosslabs.com> Message-ID: <085.417b503551295c4ceaaeda5a13c15a58@vtiger.fosslabs.com> #105: can not add contact to email from its related list --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: add contact to email --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:34:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:34:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23104=3A_?= =?utf-8?q?Issue_in_Sorting_in_List_View?= In-Reply-To: <076.513762e4d30ae169b1cf83fd27c6741a@vtiger.fosslabs.com> References: <076.513762e4d30ae169b1cf83fd27c6741a@vtiger.fosslabs.com> Message-ID: <085.5ee11b4615631700f6fc0163a74bd52a@vtiger.fosslabs.com> #104: Issue in Sorting in List View ------------------------------+--------------------------------------------- Reporter: jeri at vtiger.com | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------------+--------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:36:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:36:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23107=3A_?= =?utf-8?q?Not_able_to_sort_the_website_field_in_Leads_list_view?= In-Reply-To: <076.dde3052d0273fcdae95df35eccddf5b3@vtiger.fosslabs.com> References: <076.dde3052d0273fcdae95df35eccddf5b3@vtiger.fosslabs.com> Message-ID: <085.2b1ccf278fd926a18d3f820ab135c7ec@vtiger.fosslabs.com> #107: Not able to sort the website field in Leads list view ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:36:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:36:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23108=3A_?= =?utf-8?q?can_not_add_note_to_email?= In-Reply-To: <076.1c4a7f4e3a8840da54efba22fa0a520e@vtiger.fosslabs.com> References: <076.1c4a7f4e3a8840da54efba22fa0a520e@vtiger.fosslabs.com> Message-ID: <085.2ffe0178dd4fafe4157226743e776cc6@vtiger.fosslabs.com> #108: can not add note to email --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: note from email RL --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:38:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:38:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23111=3A_?= =?utf-8?q?Issue_in_Custom_View?= In-Reply-To: <076.8a38ba8d8b8c6591ed04e5404e2b8606@vtiger.fosslabs.com> References: <076.8a38ba8d8b8c6591ed04e5404e2b8606@vtiger.fosslabs.com> Message-ID: <085.37210e5cbe4d798e85cee7bdf3624767@vtiger.fosslabs.com> #111: Issue in Custom View ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:38:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:38:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23115=3A_?= =?utf-8?q?check_mail_link_is_not_working?= In-Reply-To: <076.b5686ee083b27123b84b47398780e288@vtiger.fosslabs.com> References: <076.b5686ee083b27123b84b47398780e288@vtiger.fosslabs.com> Message-ID: <085.3c18aefb9d9b332d5662d897570ea996@vtiger.fosslabs.com> #115: check mail link is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: checkmail link --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:40:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:40:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23117=3A_?= =?utf-8?q?issue_in_Page_navigation?= In-Reply-To: <076.6c2b56e976313ee3444368c0830c47ae@vtiger.fosslabs.com> References: <076.6c2b56e976313ee3444368c0830c47ae@vtiger.fosslabs.com> Message-ID: <085.5c47ac45baf3c13c359a059df6f5f79f@vtiger.fosslabs.com> #117: issue in Page navigation ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: pagination ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:40:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:40:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23120=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.52335e78ac6b04c98e0c3aae3b5564f0@vtiger.fosslabs.com> References: <076.52335e78ac6b04c98e0c3aae3b5564f0@vtiger.fosslabs.com> Message-ID: <085.f3540b59a56cb932d0703e30e8b639f9@vtiger.fosslabs.com> #120: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: jeri | Owner: philip Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: massdelete ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: richie => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:42:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:42:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23126=3A_?= =?utf-8?q?Issui_in_Seach_in_Leads_icon?= In-Reply-To: <076.90d521f3fe426b094d6cacdd659d381d@vtiger.fosslabs.com> References: <076.90d521f3fe426b094d6cacdd659d381d@vtiger.fosslabs.com> Message-ID: <085.7ab9f55d509857de429ccf3727bae696@vtiger.fosslabs.com> #126: Issui in Seach in Leads icon ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:43:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:43:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23127=3A_?= =?utf-8?q?Users_icon_not_proper?= In-Reply-To: <076.f1cfd246af878366c8bf7616bc1b62d8@vtiger.fosslabs.com> References: <076.f1cfd246af878366c8bf7616bc1b62d8@vtiger.fosslabs.com> Message-ID: <085.c4fe3e83709facf52780f7df60b593b6@vtiger.fosslabs.com> #127: Users icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: user icon ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:44:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:44:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23128=3A_?= =?utf-8?q?roles_icon_not_proper?= In-Reply-To: <076.0a01f2f437d64401b3cff20dd56372cd@vtiger.fosslabs.com> References: <076.0a01f2f437d64401b3cff20dd56372cd@vtiger.fosslabs.com> Message-ID: <085.a745c1b4f792592883fcaa05d68266cc@vtiger.fosslabs.com> #128: roles icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: roles icon ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:44:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:44:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23130=3A_?= =?utf-8?q?Calendar_in_Accounts_ListView_not_working?= In-Reply-To: <076.b1750d48d39ce294079c7219d43d4c59@vtiger.fosslabs.com> References: <076.b1750d48d39ce294079c7219d43d4c59@vtiger.fosslabs.com> Message-ID: <085.2e918e468fe10aef425a77957d32eeb8@vtiger.fosslabs.com> #130: Calendar in Accounts ListView not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: calendar ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: philip => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:44:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:44:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23129=3A_?= =?utf-8?q?profiles_icon_not_proper?= In-Reply-To: <076.022a98eb29d6a79f15851112170e2a06@vtiger.fosslabs.com> References: <076.022a98eb29d6a79f15851112170e2a06@vtiger.fosslabs.com> Message-ID: <085.3642e062d8b43d3577ecfeb0ea33937c@vtiger.fosslabs.com> #129: profiles icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profiles icon ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:45:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:45:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23132=3A_?= =?utf-8?q?groups=2C_default_organization=2Cassign_module_owners_icon_not_?= =?utf-8?q?proper?= In-Reply-To: <076.e71334eb43ddc9fb65b8db70042e99cb@vtiger.fosslabs.com> References: <076.e71334eb43ddc9fb65b8db70042e99cb@vtiger.fosslabs.com> Message-ID: <085.6f25fa1c2953e19f6278e701869328bb@vtiger.fosslabs.com> #132: groups, default organization,assign module owners icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: icons ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:48:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:48:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23133=3A_?= =?utf-8?q?Settings_icon_not_proper?= In-Reply-To: <076.f8f9273f78f9179ab6e89a6779e07153@vtiger.fosslabs.com> References: <076.f8f9273f78f9179ab6e89a6779e07153@vtiger.fosslabs.com> Message-ID: <085.c2f4a1fb4622951c62ebb8b9952f598a@vtiger.fosslabs.com> #133: Settings icon not proper ------------------------+--------------------------------------------------- Reporter: richie | Owner: saint Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: icons ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:49:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:49:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23147=3A_?= =?utf-8?q?qualify_button_is_not_working?= In-Reply-To: <076.c9b0e6926fdcd3584a62a35ae69aa260@vtiger.fosslabs.com> References: <076.c9b0e6926fdcd3584a62a35ae69aa260@vtiger.fosslabs.com> Message-ID: <085.91aaf59c02c622c0eded1a40a6d515c1@vtiger.fosslabs.com> #147: qualify button is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: qualify button in email --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:50:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:50:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23148=3A_?= =?utf-8?q?Improper_Values_after_Saving_Events_thru_Calendar?= In-Reply-To: <076.fece241f99eca80394e606738c23177f@vtiger.fosslabs.com> References: <076.fece241f99eca80394e606738c23177f@vtiger.fosslabs.com> Message-ID: <085.3d03e1d0d8a358e405c3204c13862604@vtiger.fosslabs.com> #148: Improper Values after Saving Events thru Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:51:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:51:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23150=3A_?= =?utf-8?q?search_is_not_working_in_email?= In-Reply-To: <076.6a257a14c69d067f58d0d5a606d8252f@vtiger.fosslabs.com> References: <076.6a257a14c69d067f58d0d5a606d8252f@vtiger.fosslabs.com> Message-ID: <085.c6519db51acde4722b90f77fd43ce2a2@vtiger.fosslabs.com> #150: search is not working in email --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: email search --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:52:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:52:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23151=3A_?= =?utf-8?q?sorting_in_Users_List_View_missing?= In-Reply-To: <076.7d526c19e2861849c72df4c050cd4462@vtiger.fosslabs.com> References: <076.7d526c19e2861849c72df4c050cd4462@vtiger.fosslabs.com> Message-ID: <085.fddf3222e17c6b94a357457948ad6320@vtiger.fosslabs.com> #151: sorting in Users List View missing ------------------------+--------------------------------------------------- Reporter: richie | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: user sort ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:52:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:52:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23152=3A_?= =?utf-8?q?Time_Filter_Combo_Box_non_functional_in_Calendar_-_Week_Tab?= In-Reply-To: <076.f746c9f29152fef0cd48e6c12a634dac@vtiger.fosslabs.com> References: <076.f746c9f29152fef0cd48e6c12a634dac@vtiger.fosslabs.com> Message-ID: <085.5e1e8deddc6057d924ba90e355527aae@vtiger.fosslabs.com> #152: Time Filter Combo Box non functional in Calendar - Week Tab ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Time Filter - Week Tab ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:52:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:52:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23154=3A_?= =?utf-8?q?Cannot_Create_Task_from_Calendar_Module?= In-Reply-To: <076.ea1c68f9f29d7dafb9a1eec31db3fabc@vtiger.fosslabs.com> References: <076.ea1c68f9f29d7dafb9a1eec31db3fabc@vtiger.fosslabs.com> Message-ID: <085.2e053f0a24f6a9b2cf687e1301e9a992@vtiger.fosslabs.com> #154: Cannot Create Task from Calendar Module ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:57:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:57:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23155=3A_?= =?utf-8?q?no_validation_for_Accounts_Quick_Create?= In-Reply-To: <076.8d3fbbc033e3711a67b80f6cb00ee0c0@vtiger.fosslabs.com> References: <076.8d3fbbc033e3711a67b80f6cb00ee0c0@vtiger.fosslabs.com> Message-ID: <085.1ca4013ae1f30679ef51d387562bf62e@vtiger.fosslabs.com> #155: no validation for Accounts Quick Create ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: validation,quick create ---------------------------+------------------------------------------------ Changes (by don): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 15:59:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 19:59:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23156=3A_?= =?utf-8?q?Word_Plugin_not_available_for_5=2E0?= In-Reply-To: <076.319fa46e4b9e06a8a7ab980c4a9d4947@vtiger.fosslabs.com> References: <076.319fa46e4b9e06a8a7ab980c4a9d4947@vtiger.fosslabs.com> Message-ID: <085.3a87b67073bd1cd1b325e9e44f9c977f@vtiger.fosslabs.com> #156: Word Plugin not available for 5.0 ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: word plugin ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:00:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:00:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23157=3A_?= =?utf-8?q?Qualify_button_is_not_working?= In-Reply-To: <076.e4d330136528d5f1fc841090b09b56ae@vtiger.fosslabs.com> References: <076.e4d330136528d5f1fc841090b09b56ae@vtiger.fosslabs.com> Message-ID: <085.0cb44928ae1d3fdf86df584d099d7b53@vtiger.fosslabs.com> #157: Qualify button is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: qualify button in email --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:01:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:01:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23165=3A_?= =?utf-8?q?no_validation_for__import?= In-Reply-To: <076.58df247bb99d03c05c53b66b68302b68@vtiger.fosslabs.com> References: <076.58df247bb99d03c05c53b66b68302b68@vtiger.fosslabs.com> Message-ID: <085.c3272073a5c3cfe9276ee9aac776d1e5@vtiger.fosslabs.com> #165: no validation for import ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: assigned Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: import,validation ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:01:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:01:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23168=3A_?= =?utf-8?q?Multiple_Events_Not_Displayed_for_Particular_Day_in_Calendar_-_?= =?utf-8?q?Month_Tab?= In-Reply-To: <076.e1ee923196db4883b67e00116c5e092c@vtiger.fosslabs.com> References: <076.e1ee923196db4883b67e00116c5e092c@vtiger.fosslabs.com> Message-ID: <085.bdfb93bf9185d0067d418502575ad41a@vtiger.fosslabs.com> #168: Multiple Events Not Displayed for Particular Day in Calendar - Month Tab ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:01:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:01:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23173=3A_?= =?utf-8?q?forward_button_is_not_working_in_Emails?= In-Reply-To: <076.947bbfcb4222c4072df4f7b58bc601e4@vtiger.fosslabs.com> References: <076.947bbfcb4222c4072df4f7b58bc601e4@vtiger.fosslabs.com> Message-ID: <085.d81113a0225a9a9fb46362e2ee7bb01d@vtiger.fosslabs.com> #173: forward button is not working in Emails --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: forward mail --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:03:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:03:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23175=3A_?= =?utf-8?q?reply_button_is_not_working_in_email?= In-Reply-To: <076.b3d758cb82e127f01bb7a64dd690ea36@vtiger.fosslabs.com> References: <076.b3d758cb82e127f01bb7a64dd690ea36@vtiger.fosslabs.com> Message-ID: <085.ad23c69ce724d54afd423ee7c6de27b9@vtiger.fosslabs.com> #175: reply button is not working in email --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: reply mail --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => richie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:03:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:03:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23178=3A_?= =?utf-8?q?download_attachment_is_not_working?= In-Reply-To: <076.338642f7a7c28ade353b3ad60a69ca5d@vtiger.fosslabs.com> References: <076.338642f7a7c28ade353b3ad60a69ca5d@vtiger.fosslabs.com> Message-ID: <085.272b03c41494ed986d248f5a566e8f64@vtiger.fosslabs.com> #178: download attachment is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: mickie Type: defect | Status: assigned Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: download attachments --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:03:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:03:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23198=3A_?= =?utf-8?q?calculator_UI_not_good?= In-Reply-To: <076.ca470107fa9ea27c72e141dd762f111b@vtiger.fosslabs.com> References: <076.ca470107fa9ea27c72e141dd762f111b@vtiger.fosslabs.com> Message-ID: <085.1bc797ba311602647590735eaeba8ed8@vtiger.fosslabs.com> #198: calculator UI not good ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:03:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:03:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23179=3A_?= =?utf-8?q?Custom_Field_Settings?= In-Reply-To: <076.a2c3435196291816734e4b849887c36b@vtiger.fosslabs.com> References: <076.a2c3435196291816734e4b849887c36b@vtiger.fosslabs.com> Message-ID: <085.9f2f59a06e08cd545ac46cc53e4720ed@vtiger.fosslabs.com> #179: Custom Field Settings ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Custom Field Settings ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => ela -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:05:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:05:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23204=3A_?= =?utf-8?q?Inviting_Users=2C_Recurring_Events_=26_Reminder_Non_Functional_?= =?utf-8?q?-__Calendar?= In-Reply-To: <076.59442eec4e6153f731214192b8585aa8@vtiger.fosslabs.com> References: <076.59442eec4e6153f731214192b8585aa8@vtiger.fosslabs.com> Message-ID: <085.bcf6468edc55b75eb6371f5b37fd02e5@vtiger.fosslabs.com> #204: Inviting Users, Recurring Events & Reminder Non Functional - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:05:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:05:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23207=3A_?= =?utf-8?q?Quick_Create_Not_working?= In-Reply-To: <076.8a8a9547957df99d71fe7ce3ec4d5b2b@vtiger.fosslabs.com> References: <076.8a8a9547957df99d71fe7ce3ec4d5b2b@vtiger.fosslabs.com> Message-ID: <085.b2a83f8c59dd2e943fcde1f341bd78b1@vtiger.fosslabs.com> #207: Quick Create Not working ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: QuickCreate ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:06:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:06:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23209=3A_?= =?utf-8?q?Date_and_Time_Buttons_in_Add_Event_Non_Functional_-_Calendar?= In-Reply-To: <076.f869a371012c25e18f2dca1fd3fae5ec@vtiger.fosslabs.com> References: <076.f869a371012c25e18f2dca1fd3fae5ec@vtiger.fosslabs.com> Message-ID: <085.c640b7a473cc2a413ce14fe58e88ef06@vtiger.fosslabs.com> #209: Date and Time Buttons in Add Event Non Functional - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:07:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:07:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23210=3A_?= =?utf-8?q?Mail_Merge_Not_available_in_Detail_View?= In-Reply-To: <076.17121deb1c6eed5b8e670ddebc5b4719@vtiger.fosslabs.com> References: <076.17121deb1c6eed5b8e670ddebc5b4719@vtiger.fosslabs.com> Message-ID: <085.f90df9f19a7c554299791ad759919af3@vtiger.fosslabs.com> #210: Mail Merge Not available in Detail View ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: mailmerge ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:07:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:07:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23214=3A_?= =?utf-8?q?Detail_View_UI_not_proper?= In-Reply-To: <076.781e9f6b2539201b781f0ba926b26dcd@vtiger.fosslabs.com> References: <076.781e9f6b2539201b781f0ba926b26dcd@vtiger.fosslabs.com> Message-ID: <085.d11467801b45b84c920269339c09818d@vtiger.fosslabs.com> #214: Detail View UI not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: UI ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:08:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:08:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23216=3A_?= =?utf-8?q?backup_edit_showing_previous_value?= In-Reply-To: <076.79c7faeb56f57dd761581121742ae2df@vtiger.fosslabs.com> References: <076.79c7faeb56f57dd761581121742ae2df@vtiger.fosslabs.com> Message-ID: <085.602786ea2dca209f6c61887924e61c27@vtiger.fosslabs.com> #216: backup edit showing previous value ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: backup ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:10:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:10:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23223=3A_?= =?utf-8?q?Issue_Entering_ticker_symbol?= In-Reply-To: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com> References: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com> Message-ID: <085.18e9d8d357e8ff335a839fd9ebacbd93@vtiger.fosslabs.com> #223: Issue Entering ticker symbol ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ticker symbol ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:10:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:10:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23220=3A_?= =?utf-8?q?Events_Scheduled_after_more_than_1_hour_gets_displayed_only_at_?= =?utf-8?q?the_start_of_the_Hour_-_Calendar?= In-Reply-To: <076.106fba7ba90fc32941161e0f200a0e12@vtiger.fosslabs.com> References: <076.106fba7ba90fc32941161e0f200a0e12@vtiger.fosslabs.com> Message-ID: <085.419046448a503557e1d76546fe92d776@vtiger.fosslabs.com> #220: Events Scheduled after more than 1 hour gets displayed only at the start of the Hour - Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:11:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:11:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23217=3A_?= =?utf-8?q?Validation_check_not_evailable_for_ajax_edit?= In-Reply-To: <076.6de19a3609cbfe64214bee620fe01442@vtiger.fosslabs.com> References: <076.6de19a3609cbfe64214bee620fe01442@vtiger.fosslabs.com> Message-ID: <085.a16c90c2a74456613d84c8991383b6de@vtiger.fosslabs.com> #217: Validation check not evailable for ajax edit ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ajax ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:11:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:11:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23224=3A_?= =?utf-8?q?Validation_not_proper?= In-Reply-To: <076.8342f02ae6134b90ef70026e212bd85e@vtiger.fosslabs.com> References: <076.8342f02ae6134b90ef70026e212bd85e@vtiger.fosslabs.com> Message-ID: <085.864fe040f6acb9282bc786882dfff4af@vtiger.fosslabs.com> #224: Validation not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: validation ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:14:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:14:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23227=3A_?= =?utf-8?q?Validation_not_proper?= In-Reply-To: <076.4d0af3665d7fb13a9e1f2ab8cf2d2a62@vtiger.fosslabs.com> References: <076.4d0af3665d7fb13a9e1f2ab8cf2d2a62@vtiger.fosslabs.com> Message-ID: <085.bf75188f30eff52ec19ff0173cce8512@vtiger.fosslabs.com> #227: Validation not proper ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: validation ---------------------------+------------------------------------------------ Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:15:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:15:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23233=3A_?= =?utf-8?q?can_not_short_emails_by_RelatedTo_field?= In-Reply-To: <076.cbb939ab7d11690d947ba79539ce8104@vtiger.fosslabs.com> References: <076.cbb939ab7d11690d947ba79539ce8104@vtiger.fosslabs.com> Message-ID: <085.85cf57b1dccf52ef086712257e691be1@vtiger.fosslabs.com> #233: can not short emails by RelatedTo field --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: shorting email by relatedto --------------------------------+------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:16:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:16:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23234=3A_?= =?utf-8?q?Users_list_view_-_Navigation_breaking?= In-Reply-To: <076.31d197d3c870774eea2af708fa57615f@vtiger.fosslabs.com> References: <076.31d197d3c870774eea2af708fa57615f@vtiger.fosslabs.com> Message-ID: <085.ddf38872f8c7b04072d77db589d4033e@vtiger.fosslabs.com> #234: Users list view - Navigation breaking ------------------------+--------------------------------------------------- Reporter: gopal | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:16:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:16:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23231=3A_?= =?utf-8?q?assigned_to_field_are_not_editable?= In-Reply-To: <076.fe422d819681890c2567841813edea3f@vtiger.fosslabs.com> References: <076.fe422d819681890c2567841813edea3f@vtiger.fosslabs.com> Message-ID: <085.fef16c829636ccf7cbff066ce9f24281@vtiger.fosslabs.com> #231: assigned to field are not editable ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ajax ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:16:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:16:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23230=3A_?= =?utf-8?q?check_boxes_not_editable?= In-Reply-To: <076.5e23f28d0f16149532b6b827f8fbccfe@vtiger.fosslabs.com> References: <076.5e23f28d0f16149532b6b827f8fbccfe@vtiger.fosslabs.com> Message-ID: <085.8ca2018892b055d873b6e7c1549576d5@vtiger.fosslabs.com> #230: check boxes not editable ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ajax ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:17:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:17:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23236=3A_?= =?utf-8?q?Scalability_Isse_in_All_link_in_list_view?= In-Reply-To: <076.51adff6f3414f5a553ed4c62a54f0d49@vtiger.fosslabs.com> References: <076.51adff6f3414f5a553ed4c62a54f0d49@vtiger.fosslabs.com> Message-ID: <085.de0518acf9d1d87f6fb70cb23d7c96ce@vtiger.fosslabs.com> #236: Scalability Isse in All link in list view ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:18:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:18:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23243=3A_?= =?utf-8?q?can_not_short_emails_list_by_=27Date_Sent=27_field?= In-Reply-To: <076.7334a2c4f71ac3987f31d336154c2e22@vtiger.fosslabs.com> References: <076.7334a2c4f71ac3987f31d336154c2e22@vtiger.fosslabs.com> Message-ID: <085.d76fc829858c12a00cf45c297b16a04a@vtiger.fosslabs.com> #243: can not short emails list by 'Date Sent' field --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: shorting emails by date sent --------------------------------+------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:19:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:19:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23247=3A_?= =?utf-8?q?can_not_short_emails_by_=27Assigned_To=27_field?= In-Reply-To: <076.d261ef45e04de01dd23abed25421c306@vtiger.fosslabs.com> References: <076.d261ef45e04de01dd23abed25421c306@vtiger.fosslabs.com> Message-ID: <085.40ce0c7f48891c214448570eb98ef5a1@vtiger.fosslabs.com> #247: can not short emails by 'Assigned To' field --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: shorting emails by assigned to --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:19:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:19:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23254=3A_?= =?utf-8?q?Related_List_Error?= In-Reply-To: <076.ca758b2c5ad3758eb71992dfea7b9b77@vtiger.fosslabs.com> References: <076.ca758b2c5ad3758eb71992dfea7b9b77@vtiger.fosslabs.com> Message-ID: <085.818c32bd234fdcca1f32222f3d54ec72@vtiger.fosslabs.com> #254: Related List Error ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: Related lists ---------------------------+------------------------------------------------ Changes (by don): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:20:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:20:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23268=3A_?= =?utf-8?q?Selection_in_multiple_pages_from_list_view_is_not_supported?= In-Reply-To: <076.30c1b9af33fc83b78b78088399b52250@vtiger.fosslabs.com> References: <076.30c1b9af33fc83b78b78088399b52250@vtiger.fosslabs.com> Message-ID: <085.3e2708cfab50d2fe7d668b55ae9a89e9@vtiger.fosslabs.com> #268: Selection in multiple pages from list view is not supported ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:21:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:21:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23272=3A_?= =?utf-8?q?User_name_duplicated_in_popup?= In-Reply-To: <076.bcf5f8a6d18be7a4229ae7d427ac1f31@vtiger.fosslabs.com> References: <076.bcf5f8a6d18be7a4229ae7d427ac1f31@vtiger.fosslabs.com> Message-ID: <085.cd4f058f88874c70b37b893b5e0adc9e@vtiger.fosslabs.com> #272: User name duplicated in popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Popup ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:21:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:21:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23267=3A_?= =?utf-8?q?Calendar_-_Day_View_-_Time_starts_at_12_am_and_ends_at_11_pm?= In-Reply-To: <076.5fc2bcbd09d62e4d3a7b4407afe21821@vtiger.fosslabs.com> References: <076.5fc2bcbd09d62e4d3a7b4407afe21821@vtiger.fosslabs.com> Message-ID: <085.fbfae2d65091270f50a539a02c891288@vtiger.fosslabs.com> #267: Calendar - Day View - Time starts at 12 am and ends at 11 pm ------------------------+--------------------------------------------------- Reporter: gopal | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:21:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:21:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23258=3A_?= =?utf-8?q?Issue_in_recuring_type_is_not_saved_through_ajax_edit?= In-Reply-To: <076.c60e226ccb4078a30325f57db1263754@vtiger.fosslabs.com> References: <076.c60e226ccb4078a30325f57db1263754@vtiger.fosslabs.com> Message-ID: <085.30e64145cfc4640d0ffb03e22b0e2662@vtiger.fosslabs.com> #258: Issue in recuring type is not saved through ajax edit ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: recurring type ---------------------------+------------------------------------------------ Changes (by don): * priority: major => critical * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:24:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:24:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23315=3A_?= =?utf-8?q?Check_if_user_already_exists=2C_in_the_same_page=2E?= In-Reply-To: <076.2e1aaf74031a03bfe756a227e3d670ca@vtiger.fosslabs.com> References: <076.2e1aaf74031a03bfe756a227e3d670ca@vtiger.fosslabs.com> Message-ID: <085.7393607807aa48f57b61f665c3989585@vtiger.fosslabs.com> #315: Check if user already exists, in the same page. ------------------------+--------------------------------------------------- Reporter: saraj | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Create View Duplicate user ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:24:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:24:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23308=3A_?= =?utf-8?q?Drilldown_for_leads_by_industry_shows_no_data?= In-Reply-To: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com> References: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com> Message-ID: <085.06d79df30b88049aa692d3f9263f7c18@vtiger.fosslabs.com> #308: Drilldown for leads by industry shows no data ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:25:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:25:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23317=3A_?= =?utf-8?q?Custom_View_List_in_Metrics_function_does_not_work?= In-Reply-To: <076.6fab6bba9535dd754c98600a440c932a@vtiger.fosslabs.com> References: <076.6fab6bba9535dd754c98600a440c932a@vtiger.fosslabs.com> Message-ID: <085.3321ce885a8f8a3e4c9a2da71fc0fc9b@vtiger.fosslabs.com> #317: Custom View List in Metrics function does not work ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: customview ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:26:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:26:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23322=3A_?= =?utf-8?q?quick_edit_of_Description_field_is_not_working?= In-Reply-To: <076.cbc407907f556cdd833010ab07611ffc@vtiger.fosslabs.com> References: <076.cbc407907f556cdd833010ab07611ffc@vtiger.fosslabs.com> Message-ID: <085.13c9b136f71a6f1c744636f7ceaee1f8@vtiger.fosslabs.com> #322: quick edit of Description field is not working ------------------------+--------------------------------------------------- Reporter: don | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: richie => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:26:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:26:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23324=3A_?= =?utf-8?q?Improper_Population_of_Data_while_Adding_New_Note_-_HelpDesk?= In-Reply-To: <076.4ddb7dae4b348b3aa3d0c47a16a5b636@vtiger.fosslabs.com> References: <076.4ddb7dae4b348b3aa3d0c47a16a5b636@vtiger.fosslabs.com> Message-ID: <085.97e9bd255ffa3ca1db7888b016a2d893@vtiger.fosslabs.com> #324: Improper Population of Data while Adding New Note - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:28:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:28:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23338=3A_?= =?utf-8?q?Testing_Ajaxification_in_Emails_DetailView?= In-Reply-To: <076.4b1a77e43b8ec303cb90faffc44cd522@vtiger.fosslabs.com> References: <076.4b1a77e43b8ec303cb90faffc44cd522@vtiger.fosslabs.com> Message-ID: <085.0ec7acce3f2d37d8e711cd31d3262bbb@vtiger.fosslabs.com> #338: Testing Ajaxification in Emails DetailView --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ajaxification in email detailview --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:29:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:29:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23351=3A_?= =?utf-8?q?Convert_Lead_totally_not_working?= In-Reply-To: <076.8540ec7d330280bead061290a97f5042@vtiger.fosslabs.com> References: <076.8540ec7d330280bead061290a97f5042@vtiger.fosslabs.com> Message-ID: <085.daeba59ab6ac0ad3597fdde63bcfafeb@vtiger.fosslabs.com> #351: Convert Lead totally not working ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => blocker * owner: developer => mangai -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:29:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:29:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23343=3A_?= =?utf-8?q?Enter_button_click_in_tag_is_improper?= In-Reply-To: <076.c91dd8f875d266e8146594637ea2e15b@vtiger.fosslabs.com> References: <076.c91dd8f875d266e8146594637ea2e15b@vtiger.fosslabs.com> Message-ID: <085.5239d4b720fae5954563442549a2c66a@vtiger.fosslabs.com> #343: Enter button click in tag is improper ------------------------+--------------------------------------------------- Reporter: don | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:29:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:29:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23355=3A_?= =?utf-8?q?Option_can_be_provided_to_convert_a_lead_from_leads_list_view_i?= =?utf-8?q?tself?= In-Reply-To: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com> References: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com> Message-ID: <085.172c287d9752fd1e6fbd174c1e241da0@vtiger.fosslabs.com> #355: Option can be provided to convert a lead from leads list view itself ------------------------+--------------------------------------------------- Reporter: don | Owner: saint Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => saint -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:31:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:31:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23360=3A_?= =?utf-8?q?Getting_Hacking_Attempt_Error_for_Merge_-_HelpDesk?= In-Reply-To: <076.d2c150001298d217e957e3e96f1ac691@vtiger.fosslabs.com> References: <076.d2c150001298d217e957e3e96f1ac691@vtiger.fosslabs.com> Message-ID: <085.feef6b5e544be3d281cb01b311b1a5d6@vtiger.fosslabs.com> #360: Getting Hacking Attempt Error for Merge - HelpDesk ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:31:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:31:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23381=3A_?= =?utf-8?q?delete_link_present_only_for_Notes_and_Attachments_in_Related_L?= =?utf-8?q?ist?= In-Reply-To: <076.b2c1498f3d67dc4ddf90b7a1f51c03e4@vtiger.fosslabs.com> References: <076.b2c1498f3d67dc4ddf90b7a1f51c03e4@vtiger.fosslabs.com> Message-ID: <085.daa960af853403db1cf5d736bbde5f83@vtiger.fosslabs.com> #381: delete link present only for Notes and Attachments in Related List ------------------------+--------------------------------------------------- Reporter: don | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => duplicate * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:31:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:31:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23373=3A_?= =?utf-8?q?no_css/smartification_for_user_popup?= In-Reply-To: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> References: <076.f6d4ea79d0fdd4a5716878c6e1ed2ab6@vtiger.fosslabs.com> Message-ID: <085.07852678b93629946142bb4b100208dc@vtiger.fosslabs.com> #373: no css/smartification for user popup ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: User Popup ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical * owner: jerrydgeorge => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:33:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:33:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23384=3A_?= =?utf-8?q?Email_not_send_to_selected_Contact?= In-Reply-To: <076.d5ca1911c6e37f4b21552d5e2508e0ff@vtiger.fosslabs.com> References: <076.d5ca1911c6e37f4b21552d5e2508e0ff@vtiger.fosslabs.com> Message-ID: <085.c71798ff6962bb64a68bc51a321a4c04@vtiger.fosslabs.com> #384: Email not send to selected Contact --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: mickie Type: defect | Status: assigned Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:34:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:34:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23386=3A_?= =?utf-8?q?contact_name_is_not_displayed_in_emails_detailview?= In-Reply-To: <076.0ab47da7faec98ebf101f5025443bdb2@vtiger.fosslabs.com> References: <076.0ab47da7faec98ebf101f5025443bdb2@vtiger.fosslabs.com> Message-ID: <085.5b35afeb1e2ba271032fe91f1a6b33da@vtiger.fosslabs.com> #386: contact name is not displayed in emails detailview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:34:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:34:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23387=3A_?= =?utf-8?q?eamil_template_selection_issue?= In-Reply-To: <076.d26218bd6499657af0736ab373779b21@vtiger.fosslabs.com> References: <076.d26218bd6499657af0736ab373779b21@vtiger.fosslabs.com> Message-ID: <085.15a53936ed2cc100402449342c7fe469@vtiger.fosslabs.com> #387: eamil template selection issue --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical * owner: developer => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:35:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:35:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23390=3A_?= =?utf-8?q?bulk_mail_is_not_working?= In-Reply-To: <076.640f2fa60008715207f0ce4950299833@vtiger.fosslabs.com> References: <076.640f2fa60008715207f0ce4950299833@vtiger.fosslabs.com> Message-ID: <085.a420ae581b1f0f74d49741187feced41@vtiger.fosslabs.com> #390: bulk mail is not working --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:37:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:37:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23396=3A_?= =?utf-8?q?Unable_to_sort_accounts_in_Contacts_List_View?= In-Reply-To: <076.458c7d1acc4332636d7a3ab839407613@vtiger.fosslabs.com> References: <076.458c7d1acc4332636d7a3ab839407613@vtiger.fosslabs.com> Message-ID: <085.9fabcc93edfd4142bebce67a436528ac@vtiger.fosslabs.com> #396: Unable to sort accounts in Contacts List View ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:37:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:37:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23406=3A_?= =?utf-8?q?Campaigns_module_missing?= In-Reply-To: <076.69533f198515fd391ea1fa6897389004@vtiger.fosslabs.com> References: <076.69533f198515fd391ea1fa6897389004@vtiger.fosslabs.com> Message-ID: <085.ec40e0fcabcc98eca537cc4dd7e8e5d7@vtiger.fosslabs.com> #406: Campaigns module missing ------------------------+--------------------------------------------------- Reporter: saraj | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Setting Assign Module Owners ------------------------+--------------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:39:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:39:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23412=3A_?= =?utf-8?q?can_not_search_email_from_email_listview?= In-Reply-To: <076.49644acad9635b623215f2ca3c0e299b@vtiger.fosslabs.com> References: <076.49644acad9635b623215f2ca3c0e299b@vtiger.fosslabs.com> Message-ID: <085.2e663f8cd4783c8fc659a2f36064e5f3@vtiger.fosslabs.com> #412: can not search email from email listview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:39:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:39:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23413=3A_?= =?utf-8?q?notes_can_not_shorted_by_Contact_name=2CRelated_to_and_File?= In-Reply-To: <076.b0a80bc08839a88be787f3bb4694d7e2@vtiger.fosslabs.com> References: <076.b0a80bc08839a88be787f3bb4694d7e2@vtiger.fosslabs.com> Message-ID: <085.41aed395c106557346324ccb4d6b681a@vtiger.fosslabs.com> #413: notes can not shorted by Contact name,Related to and File --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: philip Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * owner: developer => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:39:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:39:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23408=3A_?= =?utf-8?q?Export_Emails_link_is_not_given_in_emails_listview?= In-Reply-To: <076.2ed7e14b8b9460c61f69e99dd212d1c7@vtiger.fosslabs.com> References: <076.2ed7e14b8b9460c61f69e99dd212d1c7@vtiger.fosslabs.com> Message-ID: <085.7305b64c159091e80704eb1ea4685ec4@vtiger.fosslabs.com> #408: Export Emails link is not given in emails listview --------------------------------+------------------------------------------- Reporter: minnie at vtiger.com | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------------+------------------------------------------- Changes (by don): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 16:40:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 09 May 2006 20:40:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23420=3A_?= =?utf-8?q?unwanted_cancel_button?= In-Reply-To: <076.3f56b68cc035d15ef64600a2ec193115@vtiger.fosslabs.com> References: <076.3f56b68cc035d15ef64600a2ec193115@vtiger.fosslabs.com> Message-ID: <085.319a78a6feb03fc86aee7a0335883ea7@vtiger.fosslabs.com> #420: unwanted cancel button ------------------------+--------------------------------------------------- Reporter: richie | Owner: don Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: profile ------------------------+--------------------------------------------------- Changes (by don): * owner: developer => don -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 9 21:07:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 01:07:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23752=3A_?= =?utf-8?q?Add_postgresql_support_to_trunk?= In-Reply-To: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> References: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> Message-ID: <085.09f240ff6a2c70dc48168b6a0f15ddde@vtiger.fosslabs.com> #752: Add postgresql support to trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: adodb postgresql database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5806]) refs #752. Create a branch of vtigercrm/trunk named vtigercrm/branches/5.0_postgresql_integration. Development on this branch should be merged back to vtigercrm/trunk as soon as complete, to be included in vtigercrm/tags/vtigercrm-5.0.0beta series of releases -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 21:07:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 01:07:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5806 - /vtigercrm/branches/5.0_postgresql_integration/ Message-ID: <20060510010711.0BBAF718198@vtiger.fosslabs.com> Author: allanbush Date: Tue May 9 19:07:05 2006 New Revision: 5806 Log: refs #752. Create a branch of vtigercrm/trunk named vtigercrm/branches/5.0_postgresql_integration. Development on this branch should be merged back to vtigercrm/trunk as soon as complete, to be included in vtigercrm/tags/vtigercrm-5.0.0beta series of releases Added: vtigercrm/branches/5.0_postgresql_integration/ - copied from r5805, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 21:18:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 01:18:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5807 - in /vtigercrm/branches/5.0_postgresql_integration: data/ include/ include/utils/ install/ modules/Reports/ modules/Users/ schema/ Message-ID: <20060510011843.D81D7717B97@vtiger.fosslabs.com> Author: allanbush Date: Tue May 9 19:18:27 2006 New Revision: 5807 Log: Ref #752. Table creation and nearly all the demo data population is working (one issue with the creation of helpdesk tickets still). Modified: vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php vtigercrm/branches/5.0_postgresql_integration/include/PopulateComboValues.php vtigercrm/branches/5.0_postgresql_integration/include/utils/CommonUtils.php vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php vtigercrm/branches/5.0_postgresql_integration/install/5createTables.inc.php vtigercrm/branches/5.0_postgresql_integration/install/populateSeedData.php vtigercrm/branches/5.0_postgresql_integration/modules/Reports/PopulateReports.php vtigercrm/branches/5.0_postgresql_integration/modules/Users/LoginHistory.php vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml Modified: vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php Tue May 9 19:18:27 2006 @@ -89,6 +89,9 @@ if($_REQUEST['module'] != 'Emails') { + if(!$parentid) { + $parentid = $adb->getUniqueID('seactivityrel'); + } $mysql='insert into seactivityrel values('.$parentid.','.$actid.')'; $adb->query($mysql); } @@ -382,7 +385,7 @@ else { $description_val = from_html($adb->formatString("crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false); - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",'".$date_var."','".$date_var."')"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",".$adb->formatDate($date_var).",".$adb->formatDate($date_var).")"; $adb->query($sql); $this->id = $current_id; } Modified: vtigercrm/branches/5.0_postgresql_integration/include/PopulateComboValues.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/include/PopulateComboValues.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/include/PopulateComboValues.php Tue May 9 19:18:27 2006 @@ -26,13 +26,14 @@ $i=0; foreach ($values as $val => $cal) { + $id = $adb->getUniqueID($tableName); if($val != '') { - $adb->query("insert into ".$tableName. " values(null,'".$val."',".$i.",1)"); + $adb->query("insert into ".$tableName. " values(".$id.",'".$val."',".$i.",1)"); } else { - $adb->query("insert into ".$tableName. " values(null,'--None--',".$i.",1)"); + $adb->query("insert into ".$tableName. " values(".$id.",'--None--',".$i.",1)"); } $i++; } Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/include/utils/CommonUtils.php Tue May 9 19:18:27 2006 @@ -1681,7 +1681,7 @@ 'Contacts'=>'LNK_NEW_CONTACT', 'Vendors'=>'LNK_NEW_VENDOR'); -$qc_query = "select distinct tablabel,tab.name from field inner join tab on tab.tabid = field.tabid where quickcreate=0 order by tab.tablabel"; +$qc_query = "select distinct tab.tablabel,tab.name from field inner join tab on tab.tabid = field.tabid where quickcreate=0 order by tab.tablabel"; $result = $adb->query($qc_query); $noofrows = $adb->num_rows($result); $qcmodule_array = Array(); Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php Tue May 9 19:18:27 2006 @@ -1198,7 +1198,11 @@ list($y,$m,$d) = split('-',$value); } - $insert_date=$y.'-'.$m.'-'.$d; + if(!$y && !$m && !$d) { + $insert_date = ''; + } else { + $insert_date=$y.'-'.$m.'-'.$d; + } $log->debug("Exiting getDBInsertDateValue method ..."); return $insert_date; } Modified: vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php Tue May 9 19:18:27 2006 @@ -138,6 +138,15 @@ !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']; + } + + // determine database options + $db_options = array(); + if(function_exists('mysql_connect')) { + $db_options['mysql'] = 'MySQL'; + } + if(function_exists('pg_connect')) { + $db_options['pgsql'] = 'Postgres'; } ?> @@ -293,9 +302,19 @@
    Database Configuration
    Database Type * + + + No Database Support Deteched + + + + + +
    - - - - REFERENCES salesorder(salesorderid) ON DELETE CASCADE - - - REFERENCES groups(groupname) ON DELETE CASCADE - - - - groupname - - Type=InnoDB -
    - - - - - REFERENCES invoice(invoiceid) ON DELETE CASCADE - - - REFERENCES groups(groupname) ON DELETE CASCADE - - - - groupname - invoiceid - - Type=InnoDB -
    - - - - - REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE - - - REFERENCES groups(groupname) ON DELETE CASCADE - - - - groupname - purchaseorderid - - Type=InnoDB -
    - @@ -2738,6 +2690,115 @@
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + purpose + + + Type=InnoDB +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + Type=InnoDB +
    + @@ -2752,115 +2813,6 @@ profileidglobalactionid - Type=InnoDB -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - purpose - - - Type=InnoDB -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - Type=InnoDB
    @@ -2940,9 +2892,7 @@ - - - + Type=InnoDB
    @@ -3067,6 +3017,21 @@ Type=InnoDB
    + + + + REFERENCES salesorder(salesorderid) ON DELETE CASCADE + + + REFERENCES groups(groupname) ON DELETE CASCADE + + + + groupname + + Type=InnoDB +
    + @@ -3471,6 +3436,22 @@ contactid + + Type=InnoDB +
    + + + + + REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE + + + REFERENCES groups(groupname) ON DELETE CASCADE + + + + groupname + purchaseorderidType=InnoDB
    @@ -3574,6 +3555,22 @@ Type=InnoDB
    + + + + REFERENCES invoice(invoiceid) ON DELETE CASCADE + + + REFERENCES groups(groupname) ON DELETE CASCADE + + + + groupname + invoiceid + + Type=InnoDB +
    + From vtiger-tickets at vtiger.fosslabs.com Tue May 9 21:55:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 01:55:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23752=3A_?= =?utf-8?q?Add_postgresql_support_to_trunk?= In-Reply-To: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> References: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com> Message-ID: <085.57ba3ed610249b6dd4f0c93a6c79a908@vtiger.fosslabs.com> #752: Add postgresql support to trunk ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: adodb postgresql database ------------------------+--------------------------------------------------- Comment (by allanbush): (In [5808]) Home tab loads without query errors after a freash install. Refs #752. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 21:55:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 01:55:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5808 - in /vtigercrm/branches/5.0_postgresql_integration/modules: Accounts/ListViewTop.php Activities/OpenListView.php CustomView/CustomView.php Message-ID: <20060510015522.DABF471879A@vtiger.fosslabs.com> Author: allanbush Date: Tue May 9 19:55:12 2006 New Revision: 5808 Log: Home tab loads without query errors after a freash install. Refs #752. Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php vtigercrm/branches/5.0_postgresql_integration/modules/Activities/OpenListView.php vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php Tue May 9 19:55:12 2006 @@ -33,7 +33,7 @@ global $current_user; $current_module_strings = return_module_language($current_language, "Accounts"); - $list_query = 'select account.accountid, account.accountname, account.tickersymbol, sum(potential.amount) as amount from potential inner join crmentity on (potential.potentialid=crmentity.crmid) inner join account on (potential.accountid=account.accountid) where crmentity.deleted=0 AND crmentity.smownerid="'.$current_user->id.'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_WON'].'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_LOST'].'" group by account.accountname order by 3 desc;'; + $list_query = "select account.accountid, account.accountname, account.tickersymbol, sum(potential.amount) as amount from potential inner join crmentity on (potential.potentialid=crmentity.crmid) inner join account on (potential.accountid=account.accountid) where crmentity.deleted=0 AND crmentity.smownerid='".$current_user->id."' and potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' and potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' group by account.accountid, account.accountname, account.tickersymbol order by amount desc;"; $list_result=$adb->query($list_query); $open_accounts_list = array(); $noofrows = min($adb->num_rows($list_result),7); Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Activities/OpenListView.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/Activities/OpenListView.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/Activities/OpenListView.php Tue May 9 19:55:12 2006 @@ -77,11 +77,11 @@ if($activity_view != 'OverDue') { - $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.status is NULL || activity.status != 'Deferred') and ( activity.eventstatus is NULL || activity.eventstatus != 'Held') and (activity.eventstatus is NULL || activity.eventstatus != 'Not Held' ) AND (((date_start >= '$today' AND date_start < '$later') OR (date_start < '$today')) OR (recurringevents.recurringdate between '$today' and '$later') ) AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; + $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (((date_start >= '$today' AND date_start < '$later') OR (date_start < '$today')) OR (recurringevents.recurringdate between '$today' and '$later') ) AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; } else { - $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL || activity.status != 'Completed' ) and ( activity.status is NULL || activity.status != 'Deferred') and ( activity.eventstatus is NULL || activity.eventstatus != 'Held') and (activity.eventstatus is NULL || activity.eventstatus != 'Not Held' ) AND (due_date < '$today') OR (recurringevents.recurringdate < '$today') AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; + $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (due_date < '$today') OR (recurringevents.recurringdate < '$today') AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; } $list_result = $adb->limitQuery($list_query,0,5); $open_activity_list = array(); Modified: vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php Tue May 9 19:55:12 2006 @@ -1203,7 +1203,7 @@ { $listviewquery = substr($listquery, strpos($listquery,'from'),strlen($listquery)); - $query = "select count(*) count ".$listviewquery; + $query = "select count(*) AS count ".$listviewquery; $stdfiltersql = $this->getCVStdFilterSQL($viewid); $advfiltersql = $this->getCVAdvFilterSQL($viewid); From vtigercrm-commits at vtiger.fosslabs.com Tue May 9 23:52:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 03:52:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5809 - /vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Message-ID: <20060510035259.6579E717BF2@vtiger.fosslabs.com> Author: saraj Date: Tue May 9 21:52:46 2006 New Revision: 5809 Log: changes made to fix the issue id:328 Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Tue May 9 21:52:46 2006 @@ -38,7 +38,7 @@ - + @@ -76,7 +76,7 @@ - + From vtiger-tickets at vtiger.fosslabs.com Tue May 9 23:54:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 03:54:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23328=3A_?= =?utf-8?q?Duplicate_of_Leads_not_working?= In-Reply-To: <076.0d6a38a1ab29e288c9243566e326d0a4@vtiger.fosslabs.com> References: <076.0d6a38a1ab29e288c9243566e326d0a4@vtiger.fosslabs.com> Message-ID: <085.970084dd62dda335772f469cb4c34be6@vtiger.fosslabs.com> #328: Duplicate of Leads not working ------------------------+--------------------------------------------------- Reporter: don | Owner: mangai Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: This has been fixed and integrated in SVN. It will be available in our next release. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 03:33:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 07:33:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23758=3A_?= =?utf-8?q?Announcements_bug?= Message-ID: <076.d9e5d4115ac45944ff8a461e3f93316d@vtiger.fosslabs.com> #758: Announcements bug -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- When a user post an announcement it can be seen at the top of the page. When you delete the user the announcement made by this user remains at the top of the page for ever and there is no way to remove it. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 03:41:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 07:41:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5810 - /vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Message-ID: <20060510074100.E1D3C71AB6C@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 01:40:48 2006 New Revision: 5810 Log: i18n done for createprofile template file - ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Wed May 10 01:40:48 2006 @@ -39,8 +39,9 @@
    - Basic details of Profile
    - Step 1 Of 3 + {$CMOD.LBL_BASIC_PROFILE_DETAILS}
    + {$CMOD.LBL_STEP_1_3} +
    @@ -48,7 +49,7 @@
     
    - * {$CMOD.LBL_NEW_PROFILE_NAME} :
     
    -    -    - +    +    +
    - Select Base Profile
    - Step 2 Of 3 + {$CMOD.LBL_SELECT_BASE_PROFILE}
    + {$CMOD.LBL_STEP_2_3}
    @@ -56,11 +56,11 @@ {/if}
    I would like to setup a base profile and edit privileges (Recommened){$CMOD.LBL_BASE_PROFILE_MESG}
     Base Profile: + {$CMOD.LBL_BASE_PROFILE}
     
    ( OR )
    ( {$CMOD.LBL_OR} )
     
    @@ -83,14 +83,14 @@ {/if} I will choose the privileges from scratch (Advanced Users){$CMOD.LBL_BASE_PROFILE_MESG_ADV}
     
    -    -    - +    +    +
    From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 03:43:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 07:43:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5812 - /vtigercrm/trunk/Smarty/templates/EditProfile.tpl Message-ID: <20060510074351.E7C5C71AB56@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 01:43:42 2006 New Revision: 5812 Log: i18n done for editprofile template file - ahmed Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Wed May 10 01:43:42 2006 @@ -34,8 +34,8 @@
    - Profile Privileges
    - Step 3 Of 3 + {$CMOD.LBL_PROFILE_PRIVILEGES}
    + {$CMOD.LBL_STEP_3_3}
    - Profile Privileges
    + {$CMOD.LBL_PROFILE_PRIVILEGES}
    {$PROFILE_NAME}
    - - - - - + + + + +
    Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities{$CMOD.LBL_GLOBAL_PRIVILEGES}{$CMOD.LBL_TAB_PRIVILEGES}{$CMOD.LBL_STANDARD_PRIVILEGES}{$CMOD.LBL_FIELD_PRIVILEGES}{$CMOD.LBL_UTILITIES}
    @@ -99,8 +99,8 @@ - +
    Global Privileges for "{$PROFILE_NAME}"
    - Select the options below to change global privileges
    {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
    + {$CMOD.LBL_GLOBAL_MESG_OPTION}
    @@ -124,22 +124,22 @@ - + - + - + - +
    {$GLOBAL_PRIV.0}View all {$CMOD.LBL_VIEW_ALL}
    Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}
     
    {$GLOBAL_PRIV.1}Edit all {$CMOD.LBL_EDIT_ALL}
    Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}
    @@ -165,8 +165,8 @@ - Standard Privileges for "{$PROFILE_NAME}"
    -Select the standard actions to be permitted + {$CMOD.LBL_STANDARD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
    +{$CMOD.LBL_STD_MESG_OPTION} @@ -192,10 +192,10 @@ - - - - + + + + {foreach item=value from=$STANDARD_PRIV} @@ -232,8 +232,8 @@
    EntityCreate/EditDeleteView{$CMOD.LBL_ENTITY}{$CMOD.LBL_CREATE_EDIT}{$CMOD.LBL_DELETE}{$CMOD.LBL_VIEW}
    - Tab Privileges for "{$PROFILE_NAME}"
    -Select the tabs/modules to be permitted + {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
    +{$CMOD.LBL_TAB_MESG_OPTION}
    @@ -295,8 +295,8 @@ - Utility Privileges for "{$PROFILE_NAME}"
    -Select the utility actions to be permitted + {$CMOD.LBL_UTILITY_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
    +{$CMOD.LBL_UTILITY_MESG_OPTION} @@ -361,8 +361,8 @@ - Field Privileges for "{$PROFILE_NAME}"
    -Select the fields to be permitted + {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
    +{$CMOD.LBL_FIELD_MESG_OPTION} @@ -439,14 +439,14 @@ {if $MODE neq "edit"} -    +    {/if} {if $ACTION eq 'SaveProfile'} -    +    {else} -    +    {/if} - + From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 03:45:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 07:45:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5813 - /vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Message-ID: <20060510074553.F284E71AB56@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 01:45:43 2006 New Revision: 5813 Log: i18n done for ProfileDetailView template file - ahmed Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Wed May 10 01:45:43 2006 @@ -32,7 +32,7 @@ - Detail View of Profile
    + {$CMOD.LBL_PROFILE_DETAIL_VIEW}
    {$PROFILE_NAME} @@ -59,11 +59,11 @@ - - - - - + + + + +
    Global PrivilegesTab PrivilegesStandard PrivilegesField PrivilegesUtilities{$CMOD.LBL_GLOBAL_PRIVILEGES}{$CMOD.LBL_TAB_PRIVILEGES}{$CMOD.LBL_STANDARD_PRIVILEGES}{$CMOD.LBL_FIELD_PRIVILEGES}{$CMOD.LBL_UTILITIES}
    @@ -78,8 +78,8 @@ - Global Privileges for "{$PROFILE_NAME}"
    - Select the options below to change global privileges + {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
    + {$CMOD.LBL_GLOBAL_MESG_OPTION} @@ -103,22 +103,22 @@ - + - + - + - +
    {$GLOBAL_PRIV.0}View all {$CMOD.LBL_VIEW_ALL}
    Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}
     
    {$GLOBAL_PRIV.1}Edit all {$CMOD.LBL_EDIT_ALL}
    Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}
    @@ -144,8 +144,8 @@ - Standard Action Privileges for "{$PROFILE_NAME}"
    - Select the standard actions to be permitted + {$CMOD.LBL_STANDARD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
    + {$CMOD.LBL_STD_MESG_OPTION} @@ -171,10 +171,10 @@ - - - - + + + + {foreach item=value from=$STANDARD_PRIV} @@ -211,8 +211,8 @@
    EntityCreate/EditDeleteView{$CMOD.LBL_ENTITY}{$CMOD.LBL_CREATE_EDIT}{$CMOD.LBL_DELETE}{$CMOD.LBL_VIEW}
    - Tab Privileges for "{$PROFILE_NAME}"
    - Select the tabs/modules to be permitted + {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
    + {$CMOD.LBL_TAB_MESG_OPTION}
    @@ -275,8 +275,8 @@ - Utility Action Privileges for "{$PROFILE_NAME}"
    - Select the utility actions to be permitted + {$CMOD.LBL_UTILITY_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
    + {$CMOD.LBL_UTILITY_MESG_OPTION} @@ -341,8 +341,8 @@ - Field Privileges for "{$PROFILE_NAME}"
    - Select the fields to be permitted + {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"
    + {$CMOD.LBL_FIELD_MESG_OPTION} @@ -419,8 +419,8 @@   -    - +    + From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 03:51:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 07:51:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5814 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060510075118.D0B6771ABBE@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 01:51:05 2006 New Revision: 5814 Log: language file for users module updated - ahmed Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Wed May 10 01:51:05 2006 @@ -130,7 +130,7 @@ 'LBL_ENTITY'=>'Entity', 'LBL_CREATE_EDIT'=>'Create/Edit', 'LBL_DELETE'=>'Delete', -'LBL_ALLOW'=>'Allow', +'LBL_VIEW'=>'View', 'LBL_LEADS'=>'Leads', 'LBL_ACCOUNTS'=>'Accounts', 'LBL_CONTACTS'=>'Contacts', @@ -226,6 +226,36 @@ 'LBL_NEW_PROFILE'=>'New Profile', 'LBL_NEW_PROFILE_NAME'=>'Profile Name', 'LBL_PARENT_PROFILE'=>'Parent Profile', +'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile', +'LBL_STEP_1_3'=>'Step 1 of 3', +'LBL_STEP_2_3'=>'Step 2 of 3', +'LBL_STEP_3_3'=>'Step 3 of 3', +'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile', +'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges', +'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges', +'LBL_TAB_PRIVILEGES'=>'Tab Privileges', +'LBL_FIELD_PRIVILEGES'=>'Field Privileges', +'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges', +'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges', +'LBL_UTILITIES'=>'Utilities', +'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges (Recommended)', +'LBL_BASE_PROFILE'=>'Base Profile:', +'LBL_OR'=>'OR', +'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch (Advanced Users)', +'LBL_FOR'=>'for', +'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges', +'LBL_VIEW_ALL'=>'View all', +'LBL_EDIT_ALL'=>'Edit all', +'LBL_ALLOW'=>'Allows', +'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM', +'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM', +'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted', +'LBL_TAB_MESG_OPTION'=>'Select the tabs/modules to be permitted', +'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted', +'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted', +'LBL_FINISH_BUTTON'=>'Finish', +'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile', + //Added fields in createrole.php 'LBL_HDR_ROLE_NAME'=>'Create New Role:', From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 05:22:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 09:22:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5815 - /vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Message-ID: <20060510092238.9591071AE04@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 03:22:34 2006 New Revision: 5815 Log: * Removed the hidden value for contact_id because the same potential id has been assigned to the hidden values for potential and contact ids. Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Wed May 10 03:22:34 2006 @@ -40,7 +40,6 @@ {$HIDDEN_PARENTS_LIST} {elseif $MODULE eq 'Potentials'} - {elseif $MODULE eq 'Quotes'} {elseif $MODULE eq 'SalesOrder'} From vtiger-tickets at vtiger.fosslabs.com Wed May 10 05:23:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:23:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23541=3A_?= =?utf-8?q?quotes_not_adding_to_potentials_related_lists?= In-Reply-To: <076.1b48c23ce877ca31ac00797fc0803bc5@vtiger.fosslabs.com> References: <076.1b48c23ce877ca31ac00797fc0803bc5@vtiger.fosslabs.com> Message-ID: <085.2bfc89f058837991981fa338330a51d4@vtiger.fosslabs.com> #541: quotes not adding to potentials related lists ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mickie Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Related Lists ---------------------------+------------------------------------------------ Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue has been fixed and checkedin in svn -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 05:26:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:26:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23309=3A_?= =?utf-8?q?Quotes_by_Accounts_on_drill_down_shows_List_View?= In-Reply-To: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> References: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> Message-ID: <085.c0e9b02803cd0167b778043ce8e5b478@vtiger.fosslabs.com> #309: Quotes by Accounts on drill down shows List View ------------------------+--------------------------------------------------- Reporter: richie | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ------------------------+--------------------------------------------------- Changes (by mickie): * owner: mickie => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 05:27:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:27:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23311=3A_?= =?utf-8?q?SalesOrder_by_Accounts_on_drilldown_shows_list_view?= In-Reply-To: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com> References: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com> Message-ID: <085.d14685bb3564ee508aa389558035da2f@vtiger.fosslabs.com> #311: SalesOrder by Accounts on drilldown shows list view ------------------------+--------------------------------------------------- Reporter: richie | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: dashboard ------------------------+--------------------------------------------------- Changes (by mickie): * owner: mickie => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 05:36:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:36:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23309=3A_?= =?utf-8?q?Quotes_by_Accounts_on_drill_down_shows_List_View?= In-Reply-To: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> References: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> Message-ID: <085.3f9940865553c42c8823cfc482815d29@vtiger.fosslabs.com> #309: Quotes by Accounts on drill down shows List View ------------------------+--------------------------------------------------- Reporter: richie | Owner: jerrydgeorge Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ------------------------+--------------------------------------------------- Changes (by don): * owner: philip => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 05:36:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:36:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23309=3A_?= =?utf-8?q?Quotes_by_Accounts_on_drill_down_shows_List_View?= In-Reply-To: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> References: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com> Message-ID: <085.3d9adca1a43c9543e25524ca6c40460c@vtiger.fosslabs.com> #309: Quotes by Accounts on drill down shows List View ------------------------+--------------------------------------------------- Reporter: richie | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Dashboard ------------------------+--------------------------------------------------- Changes (by don): * owner: jerrydgeorge => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 10 05:50:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 10 May 2006 09:50:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2398=3A_C?= =?utf-8?q?annot_add_a_new_product?= In-Reply-To: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> References: <076.dabf879e60620c5e316f10d3b12e9692@vtiger.fosslabs.com> Message-ID: <085.8421efe495ef27a186468e631fc77af3@vtiger.fosslabs.com> #98: Cannot add a new product --------------------------------+------------------------------------------- Reporter: Robgsem at yahoo.com | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: worksforme | Keywords: --------------------------------+------------------------------------------- Changes (by mickie): * resolution: => worksforme * status: new => closed Comment: This issue could not be reproduced now (in may 03rd files from svn) -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 07:16:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:16:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5816 - in /vtigercrm/trunk/Smarty/templates: CreateEmailTemplate.tpl DetailViewEmailTemplate.tpl ListEmailTemplates.tpl Message-ID: <20060510111634.34015718E8F@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 05:16:27 2006 New Revision: 5816 Log: i18n done for Email Template - ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Wed May 10 05:16:27 2006 @@ -121,10 +121,10 @@
    {if $EMODE eq 'edit'} {$MOD.LBL_SETTINGS} - > Communication Templates > Editing Email Templates > {$TEMPLATENAME} + > {$MOD.LBL_COMMUNICATION_TEMPLATES} > {$MOD.LBL_EDIT} {$MOD.EMAILTEMPLATES} > {$TEMPLATENAME} {else} {$MOD.LBL_SETTINGS} - > Communication Templates > Creating Email Templates > New + > {$MOD.LBL_COMMUNICATION_TEMPLATES} > {$MOD.LBL_CREATE_EMAIL_TEMPLATES} > {$MOD.NEW} {/if}
    @@ -145,9 +145,9 @@ *{$UMOD.LBL_TEMPLATE_NAME}

    - Description:
    + {$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_COLON}


    - *Folder: + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_FOLDER}{$UMOD.LBL_COLON} @@ -162,9 +162,9 @@ {if $FOLDERNAME == 'Public'} - + {else} - + {/if} {/foreach} @@ -197,12 +197,12 @@ - + - + @@ -250,11 +250,11 @@ Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Wed May 10 05:16:27 2006 @@ -42,9 +42,9 @@ - +
    {$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}
    Available Merge Fields
    {$UMOD.LBL_AVAILABLE_MERGE_FIELDS}
     
    {$UMOD.LBL_SELECT_FIELD_TYPE}
     
    {$UMOD.LBL_SELECT_FIELD}
     
    {$UMOD.LBL_MERGE_FIELD_VALUE}
    -    +    {if $EMODE eq 'edit'} - + {else} - + {/if}  
    {$TEMPLATENAME}
    - {$TEMPLATENAME} Template + {$TEMPLATENAME} {$UMOD.LBL_TEMPLATE_HEADER}
    Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Wed May 10 05:16:27 2006 @@ -89,11 +89,11 @@   - +   -
    +
    {* *} @@ -117,7 +117,7 @@ {/if}  {$template.templatename} {$template.description} - View Sample Email + {$UMOD.LNK_SAMPLE_EMAIL} {/foreach} @@ -133,7 +133,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 07:17:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:17:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5817 - in /vtigercrm/trunk/Smarty/templates: CreateWordTemplate.tpl ListWordTemplates.tpl Message-ID: <20060510111751.C21377188A9@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 05:17:46 2006 New Revision: 5817 Log: i18n done for mail merge Template - ahmed Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Wed May 10 05:17:46 2006 @@ -62,7 +62,7 @@ {$UMOD.LBL_SELECT_MODULE}
    - Select a module to assign this Template + {$UMOD.LBL_MERGE_MSG} @@ -83,7 +83,7 @@ - {$UMOD.LBL_MERGE_FILE} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_MERGE_FILE}
    (Eg - .doc, .rtf files) Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Wed May 10 05:17:46 2006 @@ -90,11 +90,11 @@   - +   -
    +
    {* *} From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 07:20:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:20:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5818 - in /vtigercrm/trunk/Smarty/templates: SettingsMenu.tpl UserDetailView.tpl UserEditView.tpl UserListView.tpl Message-ID: <20060510112030.3E396718E8F@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 05:20:23 2006 New Revision: 5818 Log: i18n done for Users - ahmed Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/Smarty/templates/UserDetailView.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Wed May 10 05:20:23 2006 @@ -83,4 +83,4 @@
    -Expand/Close Menu +{$MOD.LBL_EXPAND_CLOSE_MENU} Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Wed May 10 05:20:23 2006 @@ -46,14 +46,14 @@ {$MOD.LBL_SETTINGS} - > {$MOD.LBL_USER_MANAGEMENT} + > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}
    {$USER_NAME}
    - Detail View of {$FIRST_NAME} {$LAST_NAME} + {$UMOD.LBL_DETAIL_VIEW} {$FIRST_NAME} {$LAST_NAME} @@ -100,34 +100,34 @@ {$UMOD.LBL_USER_INFORMATION} - *{$UMOD.LBL_USER_NAME} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_USER_NAME} {$USER_NAME}  {$UMOD.LBL_ADMIN} {if $MODE eq 'edit'} - *{$UMOD.LBL_PASSWORD} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_PASSWORD} - *{$UMOD.LBL_CONFIRM_PASSWORD} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_CONFIRM_PASSWORD} {/if} {$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}  - *{$UMOD.LBL_LAST_NAME} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_LAST_NAME} {$LAST_NAME}  - *{$UMOD.LBL_USER_ROLE} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_USER_ROLE} {$ROLEASSIGNED}  {$UMOD.LBL_GROUP_NAME} {$GROUPASSIGNED}  - *{$UMOD.LBL_EMAIL} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_EMAIL} {$EMAIL1}  - *{$UMOD.LBL_STATUS} + {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_STATUS} {$STATUS}  @@ -139,7 +139,7 @@ {$LEAD_VIEW}  - *{$UMOD.LBL_COLOR} + {$UMOD.LBL_COLOR} {$COLORASSIGNED}  {$UMOD.LBL_CURRENCY_NAME} {$CURRENCY_NAME}  Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Wed May 10 05:20:23 2006 @@ -35,15 +35,22 @@ {$MOD.LBL_SETTINGS} - > {$MOD.LBL_USER_MANAGEMENT} > User + > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}
    - {$USER_NAME}
    - Edit View of {$FIRST_NAME} {$LAST_NAME} + {if $MODE eq 'edit'} + {$USER_NAME}
    + {$UMOD.LBL_EDIT_VIEW} {$FIRST_NAME} {$LAST_NAME} + {else} + {$UMOD.LBL_NEW_USER_BUTTON_LABEL}
    + {$UMOD.LBL_CREATE_NEW_USER} + + {/if} + @@ -91,39 +98,43 @@ + {if $MODE eq 'edit'} + + {else} + {/if} - + {if $MODE neq 'edit'} - + - + {/if} - + - + - + - + {$USER_STATUS_OPTIONS} @@ -135,7 +146,7 @@ - + @@ -151,7 +162,11 @@ - -
    {$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}{$UMOD.LBL_NEW_FORM_TITLE}
    *{$UMOD.LBL_USER_NAME} {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_USER_NAME} {$UMOD.LBL_ADMIN}
    *{$UMOD.LBL_PASSWORD} {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD} {$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_CONFIRM_PASSWORD}
    {$UMOD.LBL_FIRST_NAME} *{$UMOD.LBL_LAST_NAME}{$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_LAST_NAME}
    *{$UMOD.LBL_USER_ROLE}{$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_USER_ROLE} {$USER_ROLE}*{$UMOD.LBL_EMAIL}{$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_EMAIL}
    *{$UMOD.LBL_STATUS}{$APP.LBL_REQUIRED_SYMBOL}{$UMOD.LBL_STATUS} 
    {$LEAD_VIEW}
    *{$UMOD.LBL_COLOR}{$UMOD.LBL_COLOR}   {$CAL_COLOR} {$UMOD.LBL_CURRENCY_NAME} {$CURRENCY_NAME}
    - + {if $MODE eq 'edit'} + + {else} + + {/if} @@ -218,7 +233,11 @@ @@ -36,7 +36,7 @@ @@ -55,7 +55,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 07:39:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:39:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5819 - /vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Message-ID: <20060510113909.2F9C57185C9@vtiger.fosslabs.com> Author: richie Date: Wed May 10 05:39:02 2006 New Revision: 5819 Log: Control-M characters removed Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl Wed May 10 05:39:02 2006 @@ -1,140 +1,140 @@ -{**} - - -
    {$UMOD.LBL_NEW_FORM_TITLE}{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}{$UMOD.LBL_NEW_FORM_TITLE}
    {$UMOD.LBL_TITLE}
    - + {if $MODE eq 'edit'} + + {else} + + {/if} @@ -262,8 +281,8 @@
    {$UMOD.LBL_NEW_FORM_TITLE}{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}{$UMOD.LBL_NEW_FORM_TITLE}
    {$UMOD.LBL_ADDRESS}
     
    - - + +
    Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Wed May 10 05:20:23 2006 @@ -26,7 +26,7 @@
    {$MOD.LBL_SETTINGS} - > {$MOD.LBL_USER_MANAGEMENT} > Users + > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}
     {$MOD.LBL_USER_MANAGEMENT} - +
     
    {$CMOD.LBL_TOTAL} {$USER_COUNT.user} {$CMOD.LBL_USERS}
    {$CMOD.LBL_ADMIN} :
    {$CMOD.LBL_ADMIN} {$CMOD.LBL_COLON} {$USER_COUNT.admin} {$CMOD.LBL_USERS}
    {$CMOD.LBL_OTHERS}
    - - {include file='SettingsMenu.tpl'} - - -
    - - - - - - - - -

    -{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {$ORGANIZATIONNAME}

    -
    {$MOD.LBL_ORGANIZATION_NAME} : {$ORGANIZATIONNAME}
    {$MOD.LBL_ORGANIZATION_ADDRESS} : {$ORGANIZATIONADDRESS}
    {$MOD.LBL_ORGANIZATION_CITY} : {$ORGANIZATIONCITY}
    {$MOD.LBL_ORGANIZATION_STATE} : {$ORGANIZATIONSTATE}
    {$MOD.LBL_ORGANIZATION_CODE} : {$ORGANIZATIONCODE}
    {$MOD.LBL_ORGANIZATION_COUNTRY} : {$ORGANIZATIONCOUNTRY}

    - - - - - - - - - - - - - - - -
    {$MOD.LBL_ORGANIZATION_PHONE} : {$ORGANIZATIONPHONE}{$MOD.LBL_ORGANIZATION_WEBSITE} : {$ORGANIZATIONWEBSITE}
    {$MOD.LBL_ORGANIZATION_FAX} : {$ORGANIZATIONFAX}{$MOD.LBL_ORGANIZATION_LOGO} : {$ORGANIZATIONLOGONAME}

    - -    -
    -
    -
    - -
     
    -
    -
    - {include file='SettingsSubMenu.tpl'} -{literal} - -{/literal} +{**} + + + + + {include file='SettingsMenu.tpl'} + + +
    + + + + + + + + +

    +{$MOD.LBL_SETTINGS} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO} +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     {$ORGANIZATIONNAME}

    +
    {$MOD.LBL_ORGANIZATION_NAME} : {$ORGANIZATIONNAME}
    {$MOD.LBL_ORGANIZATION_ADDRESS} : {$ORGANIZATIONADDRESS}
    {$MOD.LBL_ORGANIZATION_CITY} : {$ORGANIZATIONCITY}
    {$MOD.LBL_ORGANIZATION_STATE} : {$ORGANIZATIONSTATE}
    {$MOD.LBL_ORGANIZATION_CODE} : {$ORGANIZATIONCODE}
    {$MOD.LBL_ORGANIZATION_COUNTRY} : {$ORGANIZATIONCOUNTRY}

    + + + + + + + + + + + + + + + +
    {$MOD.LBL_ORGANIZATION_PHONE} : {$ORGANIZATIONPHONE}{$MOD.LBL_ORGANIZATION_WEBSITE} : {$ORGANIZATIONWEBSITE}
    {$MOD.LBL_ORGANIZATION_FAX} : {$ORGANIZATIONFAX}{$MOD.LBL_ORGANIZATION_LOGO} : {$ORGANIZATIONLOGONAME}

    + +    +
    +
    +
    + +
     
    +
    + + + + {include file='SettingsSubMenu.tpl'} +{literal} + +{/literal} From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 07:41:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:41:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5820 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060510114113.761FE718347@vtiger.fosslabs.com> Author: saraj Date: Wed May 10 05:41:09 2006 New Revision: 5820 Log: i18n done for Users - ahmed Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Wed May 10 05:41:09 2006 @@ -36,7 +36,7 @@   {$MOD.LBL_PROFILES} - +   From vtigercrm-commits at vtiger.fosslabs.com Wed May 10 07:48:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 10 May 2006 11:48:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r5821 - in /vtigercrm/trunk/Smarty/templates/Settings: ModuleOwnersContents.tpl PickList.tpl PickListContents.tpl Message-ID: <20060510114853.9680471AF94@vtiger.fosslabs.com> Author: richie Date: Wed May 10 05:48:47 2006 New Revision: 5821 Log: Hardcoded strings removed Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl Wed May 10 05:48:47 2006 @@ -32,8 +32,8 @@ # - Module - Owned By + {$MOD.LBL_MODULE} + {$MOD.LBL_OWNER} {if $MODULE_MODE neq 'edit'} {foreach name=modulelists item=modules from=$USER_LIST} Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Wed May 10 05:48:47 2006 @@ -118,13 +118,13 @@   - Select Module + {$MOD.LBL_SELECT_MODULE}   - Select the CRM module : + {$MOD.LBL_SELECT_CRM_MODULE} : {foreach key=report_in_fld_id item=report_in_fld_name from=$REPINFOLDER} {if $report_in_fld_id neq $REPORTID} @@ -70,8 +70,8 @@ - - + + Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Wed May 10 06:42:07 2006 @@ -63,7 +63,7 @@ - +
     
    Select Column : Select Time : {$MOD.LBL_SELECT_COLUMN} : {$MOD.LBL_SELECT_TIME} :  {$MOD.LBL_SF_STARTDATE} :  {$MOD.LBL_SF_ENDDATE} : 
    Modified: vtigercrm/trunk/Smarty/templates/Reports.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Reports.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Reports.tpl Wed May 10 06:42:07 2006 @@ -85,13 +85,13 @@
    - Folder Name : + {$MOD.LBL_REP_FOLDER_NAME} : - Folder Description : + {$MOD.LBL_REP_FOLDER_DESC} :   Modified: vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsCustomize.tpl Wed May 10 06:42:07 2006 @@ -58,7 +58,7 @@
    {foreachelse}
    - Click Here to Add New Group + {$MOD.LBL_CLICK_HERE} {$MOD.LBL_TO_ADD_NEW_GROUP}
    {/foreach} @@ -66,7 +66,7 @@ @@ -67,7 +67,7 @@ @@ -75,7 +75,7 @@
     {$keyval}
    @@ -83,7 +83,7 @@
     {$keyval}
    @@ -92,7 +92,7 @@ @@ -104,7 +104,7 @@ {else} {/if} -
    or +
    or Cancel
    @@ -112,7 +112,7 @@ @@ -120,7 +120,7 @@ @@ -129,7 +129,7 @@ @@ -137,7 +137,7 @@ @@ -145,7 +145,7 @@ @@ -156,7 +156,7 @@ From vtiger-tickets at vtiger.fosslabs.com Mon May 29 05:40:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 09:40:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2399=3A_v?= =?utf-8?q?alidation_is_not_working_for_Notes_module?= In-Reply-To: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> References: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> Message-ID: <085.911caeeb016a586fa675fd1f03d9a87c@vtiger.fosslabs.com> #99: validation is not working for Notes module ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: ahmed Type: defect | Status: reopened Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: duplicate => * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 05:40:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 09:40:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2399=3A_v?= =?utf-8?q?alidation_is_not_working_for_Notes_module?= In-Reply-To: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> References: <076.7a3afc76bba03ac9644950c05984d3a1@vtiger.fosslabs.com> Message-ID: <085.aac340ae367db6203bfc5318f221fcca@vtiger.fosslabs.com> #99: validation is not working for Notes module ------------------------+--------------------------------------------------- Reporter: Minnie | Owner: ahmed Type: defect | Status: reopened Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * priority: major => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 05:49:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 09:49:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23916=3A_?= =?utf-8?q?Home_=3E_Emails_=3E_Compose_Button?= In-Reply-To: <076.8124c19b04836834bb5c81db02e35c7c@vtiger.fosslabs.com> References: <076.8124c19b04836834bb5c81db02e35c7c@vtiger.fosslabs.com> Message-ID: <085.4898cda3f5092a73257de1178c8be339@vtiger.fosslabs.com> #916: Home > Emails > Compose Button ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 05:59:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 09:59:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23787=3A_?= =?utf-8?q?Metrics?= In-Reply-To: <076.fe7a5aebcea4828624aec5838b299765@vtiger.fosslabs.com> References: <076.fe7a5aebcea4828624aec5838b299765@vtiger.fosslabs.com> Message-ID: <085.6196c6e96e3ce5e32e377fbed689cd3d@vtiger.fosslabs.com> #787: Metrics ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => invalid * status: new => closed Comment: invalid as the feature has been removed from the home page -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:09:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:09:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231062=3A?= =?utf-8?q?_Role_View?= In-Reply-To: <076.c7af2565b9df95bcead67d86eb2f3e39@vtiger.fosslabs.com> References: <076.c7af2565b9df95bcead67d86eb2f3e39@vtiger.fosslabs.com> Message-ID: <085.621b2bdfa12e4a90b58d6d6d6edf4661@vtiger.fosslabs.com> #1062: Role View ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: trivial | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [6663]) Fixes #1062 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:09:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:09:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6663 - /vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Message-ID: <20060529100946.0A6B77C9A33@vtiger.fosslabs.com> Author: richie Date: Mon May 29 04:09:40 2006 New Revision: 6663 Log: Fixes #1062 Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Mon May 29 04:09:40 2006 @@ -45,7 +45,7 @@ - + From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:11:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:11:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231061=3A?= =?utf-8?q?_user_having_read_only_permission_can_able_to_change_owner?= In-Reply-To: <076.412eec6f43e386c14515e32d3e43c609@vtiger.fosslabs.com> References: <076.412eec6f43e386c14515e32d3e43c609@vtiger.fosslabs.com> Message-ID: <085.77504fede7d102192883d13974e3a2aa@vtiger.fosslabs.com> #1061: user having read only permission can able to change owner ------------------------+--------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:27:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:27:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6664 - in /vtigercrm/trunk: include/js/general.js modules/Emails/Email.js Message-ID: <20060529102701.7A64E7C9A36@vtiger.fosslabs.com> Author: don Date: Mon May 29 04:26:55 2006 New Revision: 6664 Log: opencompose function moved to general.js file from email.js Modified: vtigercrm/trunk/include/js/general.js vtigercrm/trunk/modules/Emails/Email.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Mon May 29 04:26:55 2006 @@ -1595,3 +1595,21 @@ function fnHide_Event(obj){ document.getElementById(obj).style.display = 'none'; } + +function OpenCompose(id,mode) +{ + switch(mode) + { + case 'edit': + url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id; + break; + case 'create': + url = 'index.php?module=Emails&action=EmailsAjax&file=EditView'; + break; + case 'forward': + url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id+'&forward=true'; + break; + } + openPopUp('xComposeEmail',this,url,'createemailWin',820,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no'); +} + Modified: vtigercrm/trunk/modules/Emails/Email.js ============================================================================== --- vtigercrm/trunk/modules/Emails/Email.js (original) +++ vtigercrm/trunk/modules/Emails/Email.js Mon May 29 04:26:55 2006 @@ -103,20 +103,3 @@ ajaxObj.process("index.php?",urlstring); } -function OpenCompose(id,mode) -{ - switch(mode) - { - case 'edit': - url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id; - break; - case 'create': - url = 'index.php?module=Emails&action=EmailsAjax&file=EditView'; - break; - case 'forward': - url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id+'&forward=true'; - break; - } - openPopUp('xComposeEmail',this,url,'createemailWin',820,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no'); -} - From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:29:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:29:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23891=3A_?= =?utf-8?q?cannot_go_to_email_detailview_from_lleads_relatedlist?= In-Reply-To: <076.73cdbeb2e9ad587c3e01791f964332fd@vtiger.fosslabs.com> References: <076.73cdbeb2e9ad587c3e01791f964332fd@vtiger.fosslabs.com> Message-ID: <085.05af79eb00cd4176a05c6439c98fb962@vtiger.fosslabs.com> #891: cannot go to email detailview from lleads relatedlist ------------------------+--------------------------------------------------- Reporter: mickie | Owner: jeri Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed Comment: (In [6665]) Fixes #891 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:29:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:29:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6665 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060529102928.F19717C9A36@vtiger.fosslabs.com> Author: don Date: Mon May 29 04:29:24 2006 New Revision: 6665 Log: Fixes #891 Modified: vtigercrm/trunk/include/utils/ListViewUtils.php Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon May 29 04:29:24 2006 @@ -693,6 +693,13 @@ elseif($owner_id == 0 && $name == 'Assigned To') { $value=$adb->query_result($list_result,$i-1,"groupname"); + } + elseif($module =='Emails' && $relatedlist != '' && $name=='Subject') + { + $list_result_count = $i-1; + $tmp_value = getValue($ui_col_array,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset,$oCv->setdefaultviewid); + $value = ''.$tmp_value.''; + } else { From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:31:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:31:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231038=3A?= =?utf-8?q?_in_ajax_edit=2C_it_is_difficult_to_edit_the_field_which_has_no?= =?utf-8?q?_values?= In-Reply-To: <076.c5e40f51dbad87ab0eba4afdc71f65ad@vtiger.fosslabs.com> References: <076.c5e40f51dbad87ab0eba4afdc71f65ad@vtiger.fosslabs.com> Message-ID: <085.0d0219910ecc4e05ab17483cb80e5011@vtiger.fosslabs.com> #1038: in ajax edit, it is difficult to edit the field which has no values ------------------------+--------------------------------------------------- Reporter: mickie | Owner: jeri Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:35:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:35:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23909=3A_?= =?utf-8?q?Detail_Views?= In-Reply-To: <076.b06792568ed3810a23a5cebcc01b6223@vtiger.fosslabs.com> References: <076.b06792568ed3810a23a5cebcc01b6223@vtiger.fosslabs.com> Message-ID: <085.d8babaf24833c954757585f432ea0d22@vtiger.fosslabs.com> #909: Detail Views ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 06:35:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 10:35:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23894=3A_?= =?utf-8?q?the_pagination_buttons_are_not_good?= In-Reply-To: <076.4bcf6422cb869cfdd12131614ac7c6d2@vtiger.fosslabs.com> References: <076.4bcf6422cb869cfdd12131614ac7c6d2@vtiger.fosslabs.com> Message-ID: <085.9465a2931cb64587b1eb06e7aab9cb7e@vtiger.fosslabs.com> #894: the pagination buttons are not good ------------------------+--------------------------------------------------- Reporter: don | Owner: saint Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * priority: critical => major -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:46:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:46:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6666 - /vtigercrm/trunk/include/images/install/ Message-ID: <20060529104615.BFC237CA402@vtiger.fosslabs.com> Author: richie Date: Mon May 29 04:45:53 2006 New Revision: 6666 Log: mistakenly deleted. added back again Added: vtigercrm/trunk/include/images/install/ vtigercrm/trunk/include/images/install/cwBtnChange.gif (with props) vtigercrm/trunk/include/images/install/cwBtnFinish.gif (with props) vtigercrm/trunk/include/images/install/cwBtnNext.gif (with props) vtigercrm/trunk/include/images/install/cwBtnStart.gif (with props) vtigercrm/trunk/include/images/install/cwHdrCnfSysConf.gif (with props) vtigercrm/trunk/include/images/install/cwHdrCrConfFile.gif (with props) vtigercrm/trunk/include/images/install/cwHdrCrDbTables.gif (with props) vtigercrm/trunk/include/images/install/cwHdrSysCheck.gif (with props) vtigercrm/trunk/include/images/install/cwHdrSysConf.gif (with props) vtigercrm/trunk/include/images/install/cwHdrVtConfWiz.gif (with props) vtigercrm/trunk/include/images/install/cwIcoConfFile.gif (with props) vtigercrm/trunk/include/images/install/cwIcoDB.gif (with props) vtigercrm/trunk/include/images/install/cwIcoSystem.gif (with props) vtigercrm/trunk/include/images/install/cwRegVCRM.gif (with props) vtigercrm/trunk/include/images/install/cwShadeBg.gif (with props) vtigercrm/trunk/include/images/install/cwShadeLeft.gif (with props) vtigercrm/trunk/include/images/install/cwShadeRight.gif (with props) vtigercrm/trunk/include/images/install/cwStep1of5.gif (with props) vtigercrm/trunk/include/images/install/cwStep2of5.gif (with props) vtigercrm/trunk/include/images/install/cwStep3of5.gif (with props) vtigercrm/trunk/include/images/install/cwStep4of5.gif (with props) vtigercrm/trunk/include/images/install/cwStep5of5.gif (with props) vtigercrm/trunk/include/images/install/cwTitle.gif (with props) vtigercrm/trunk/include/images/install/cwTopBg.gif (with props) vtigercrm/trunk/include/images/install/cwTopLeft.gif (with props) vtigercrm/trunk/include/images/install/cwTopRight.gif (with props) vtigercrm/trunk/include/images/install/cwURL.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:47:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:47:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6667 - /vtigercrm/trunk/install/images/ Message-ID: <20060529104745.716187CA413@vtiger.fosslabs.com> Author: richie Date: Mon May 29 04:47:41 2006 New Revision: 6667 Log: removed image files as they have been relocated Removed: vtigercrm/trunk/install/images/ From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:52:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:52:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6668 - in /vtigercrm/trunk/modules: Invoice/EditView.php SalesOrder/EditView.php Message-ID: <20060529105203.2E70C7CA42A@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 04:51:57 2006 New Revision: 6668 Log: * Modified to set the tax and adjustment values as 0 if the column_field value of the object is empty Modified: vtigercrm/trunk/modules/Invoice/EditView.php vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/EditView.php (original) +++ vtigercrm/trunk/modules/Invoice/EditView.php Mon May 29 04:51:57 2006 @@ -49,10 +49,13 @@ //Added to display the Quote's associated products -- when we create invoice from Quotes DetailView $associated_prod = getAssociatedProducts("Quotes",$quote_focus); + $txtTax = (($quote_focus->column_fields['txtTax'] != '')?$quote_focus->column_fields['txtTax']:'0.000'); + $txtAdj = (($quote_focus->column_fields['txtAdjustment'] != '')?$quote_focus->column_fields['txtAdjustment']:'0.000'); + $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); $smarty->assign("MODE", $quote_focus->mode); - $smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $quote_focus->column_fields['txtAdjustment']); + $smarty->assign("TAXVALUE", $txtTax); + $smarty->assign("ADJUSTMENTVALUE", $txtAdj); $smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']); $smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']); $smarty->assign("AVAILABLE_PRODUCTS", 'true'); @@ -67,10 +70,13 @@ //Added to display the SalesOrder's associated products -- when we create invoice from SO DetailView $associated_prod = getAssociatedProducts("SalesOrder",$so_focus); + $txtTax = (($so_focus->column_fields['txtTax'] != '')?$so_focus->column_fields['txtTax']:'0.000'); + $txtAdj = (($so_focus->column_fields['txtAdjustment'] != '')?$so_focus->column_fields['txtAdjustment']:'0.000'); + $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); $smarty->assign("MODE", $so_focus->mode); - $smarty->assign("TAXVALUE", $so_focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $so_focus->column_fields['txtAdjustment']); + $smarty->assign("TAXVALUE", $txtTax); + $smarty->assign("ADJUSTMENTVALUE", $txtAdj); $smarty->assign("SUBTOTAL", $so_focus->column_fields['hdnSubTotal']); $smarty->assign("GRANDTOTAL", $so_focus->column_fields['hdnGrandTotal']); $smarty->assign("AVAILABLE_PRODUCTS", 'true'); Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Mon May 29 04:51:57 2006 @@ -226,12 +226,15 @@ if(isset($_REQUEST['convertmode']) && ($_REQUEST['convertmode'] == 'quotetoso' || $_REQUEST['convertmode'] == 'update_quote_val')) { $num_of_products = getNoOfAssocProducts("Quotes",$quote_focus); + $txtTax = (($quote_focus->column_fields['txtTax'] != '')?$quote_focus->column_fields['txtTax']:'0.000'); + $txtAdj = (($quote_focus->column_fields['txtAdjustment'] != '')?$quote_focus->column_fields['txtAdjustment']:'0.000'); + $smarty->assign("ROWCOUNT", $num_of_products); $associated_prod = getAssociatedProducts("Quotes",$quote_focus); $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); $smarty->assign("MODE", $focus->mode); - $smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $quote_focus->column_fields['txtAdjustment']); + $smarty->assign("TAXVALUE", $txtTax); + $smarty->assign("ADJUSTMENTVALUE", $txtAdj); $smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']); $smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 06:55:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 10:55:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6669 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060529105513.12E367CA42D@vtiger.fosslabs.com> Author: don Date: Mon May 29 04:55:03 2006 New Revision: 6669 Log: scrollbars removed from listview Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon May 29 04:55:03 2006 @@ -261,7 +261,7 @@
    {$CMOD.LBL_GROUP_DETAILS}{$CMOD.LBL_ROLE_DETAILS}
     
    -
    +
    From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 07:08:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 11:08:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6670 - /vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Message-ID: <20060529110838.5F5A57CA46A@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 05:08:32 2006 New Revision: 6670 Log: * Added hidden variables product_id for products, vendors and pricebooks and vendor_id for Vendors Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Mon May 29 05:08:32 2006 @@ -84,6 +84,12 @@ {$HIDDEN_PARENTS_LIST} {elseif $MODULE eq 'Products' || $MODULE eq 'Vendors' || $MODULE eq 'PriceBooks'} + {if $MODULE eq 'Products'} + + {elseif $MODULE eq 'Vendors'} + + {/if} + From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 07:09:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 11:09:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6671 - /vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Message-ID: <20060529110957.6598A7CA40B@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 05:09:53 2006 New Revision: 6671 Log: * Modified to give the proper links for module basis and commented some links which are not working and we will enable these links in feature Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Mon May 29 05:09:53 2006 @@ -21,9 +21,13 @@ + + + {if $MODULE neq 'PurchaseOrder' && $MODULE neq 'Invoice'} + {/if} @@ -33,21 +37,28 @@ - - - - - - - + Create Quote + + + + + + + + + + + + {elseif $MODULE eq 'Vendors'} @@ -73,25 +91,29 @@ - + Create PurchaseOrder + + + {elseif $MODULE eq 'PurchaseOrder'} + {elseif $MODULE eq 'SalesOrder'} @@ -99,6 +121,13 @@ + + {elseif $MODULE eq 'Quotes'} @@ -128,18 +158,14 @@ {elseif $MODULE eq 'Invoice'} + {/if} @@ -149,47 +175,41 @@ - + +{if $MODULE neq 'Products' && $MODULE neq 'Vendors'} - - - - +{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} + + {if $MODULE eq 'SalesOrder'} + {assign var=export_pdf_action value="CreateSOPDF"} + {else} + {assign var=export_pdf_action value="CreatePDF"} + {/if} + - - - - ---> - - - -{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} - - - {/if} + - + + +{/if} + + + + +
     
    {$APP.LBL_ACTIONS}
    - Create Quote -
    - - Create Invoice -
    - - Create SalesOrder -
    + + Create Invoice +
    + + Create SalesOrder +
    + + Create PurchaseOrder +
    - Create PurchaseOrder -
    + Create Invoice +
    - Other Functions
    -
    - Use Customer Name -
    - - Use Shipping Address -
    - - Export To PDF + Export To PDF
    From vtiger-tickets at vtiger.fosslabs.com Mon May 29 07:12:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 11:12:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231098=3A?= =?utf-8?q?_Security_is_not_implemented_for_New_Emails?= Message-ID: <076.9338ecb11bbd664fc8df6eb42c9a07c1@vtiger.fosslabs.com> #1098: Security is not implemented for New Emails --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: don Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 07:18:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 11:18:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6672 - in /vtigercrm/trunk/modules: Accounts/ Activities/ Campaigns/ Contacts/ HelpDesk/ Invoice/ Potentials/ PurchaseOrder/ Quotes/ SalesOrder/ Message-ID: <20060529111843.C97A47CA469@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 05:18:30 2006 New Revision: 6672 Log: Updated module level security for change owner button - ahmed Modified: vtigercrm/trunk/modules/Accounts/ListView.php vtigercrm/trunk/modules/Activities/ListView.php vtigercrm/trunk/modules/Campaigns/ListView.php vtigercrm/trunk/modules/Contacts/ListView.php vtigercrm/trunk/modules/HelpDesk/ListView.php vtigercrm/trunk/modules/Invoice/ListView.php vtigercrm/trunk/modules/Potentials/ListView.php vtigercrm/trunk/modules/PurchaseOrder/ListView.php vtigercrm/trunk/modules/Quotes/ListView.php vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Mon May 29 05:18:30 2006 @@ -96,6 +96,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } +if(isPermitted('Accounts','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if(isPermitted('Emails','EditView','') == 'yes') { $other_text['s_mail'] = $app_strings[LBL_SEND_MAIL_BUTTON]; Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Mon May 29 05:18:30 2006 @@ -100,6 +100,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } +if(isPermitted('Activities','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} global $task_title; $title_display = $current_module_strings['LBL_LIST_FORM_TITLE']; if ($task_title) $title_display= $task_title; Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Mon May 29 05:18:30 2006 @@ -93,7 +93,10 @@ { $other_text ['del']=$app_strings[LBL_MASS_DELETE]; } - +if(isPermitted('Campaigns','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Mon May 29 05:18:30 2006 @@ -121,6 +121,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } +if(isPermitted('Contacts','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if(isPermitted('Emails','EditView','') == 'yes') $other_text['s_mail'] = $app_strings[LBL_SEND_MAIL_BUTTON]; Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Mon May 29 05:18:30 2006 @@ -93,7 +93,10 @@ // Buttons and View options if(isPermitted('HelpDesk','Delete','') == 'yes') $other_text['del'] = $app_strings[LBL_MASS_DELETE]; - +if(isPermitted('HelpDesk','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Mon May 29 05:18:30 2006 @@ -90,6 +90,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } +if(isPermitted('Invoice','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Mon May 29 05:18:30 2006 @@ -117,6 +117,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } +if(isPermitted('Potentials','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Mon May 29 05:18:30 2006 @@ -90,7 +90,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } - +if(isPermitted('PurchaseOrder','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Mon May 29 05:18:30 2006 @@ -91,7 +91,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } - +if(isPermitted('Quotes','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Mon May 29 05:18:30 2006 @@ -90,7 +90,10 @@ { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } - +if(isPermitted('SalesOrder','EditView','') == 'yes') +{ + $other_text['c_owner'] = $app_strings[LBL_CHANGE_OWNER]; +} if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 07:26:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 11:26:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6673 - in /vtigercrm/trunk/Smarty/templates: ListView.tpl ListViewEntries.tpl Message-ID: <20060529112641.3097F7CA40B@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 05:26:37 2006 New Revision: 6673 Log: Updated module level security for change owner button - ahmed Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon May 29 05:26:37 2006 @@ -224,12 +224,13 @@ {elseif $button_check eq 'c_status'} + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} {/if} {/foreach} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} {$RECORD_COUNTS} @@ -291,12 +292,13 @@ {elseif $button_check eq 'c_status'} + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} {/if} {/foreach} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} {$RECORD_COUNTS} Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Mon May 29 05:26:37 2006 @@ -32,12 +32,13 @@ {elseif $button_check eq 'c_status'} + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} {/if} {/foreach} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} {$RECORD_COUNTS} @@ -106,12 +107,13 @@ {elseif $button_check eq 'c_status'} + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} {/if} {/foreach} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} {$RECORD_COUNTS} From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 07:59:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 11:59:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6674 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060529115932.2C6237CA413@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 05:59:27 2006 New Revision: 6674 Log: default data for hour_format,start_time and end_time has been included Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Mon May 29 05:59:27 2006 @@ -56,9 +56,15 @@ - - - + + + + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 08:15:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 12:15:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6675 - /vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Message-ID: <20060529121555.C2B897CA483@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:15:52 2006 New Revision: 6675 Log: Added record level security for change owner/status for all modules - ahmed Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Mon May 29 06:15:52 2006 @@ -10,8 +10,8 @@ * ********************************************************************************/ - require_once('include/database/PearDatabase.php'); +require_once('include/utils/utils.php'); $idlist= $_REQUEST['idlist']; $leadstatusval = $_REQUEST['leadval']; @@ -22,14 +22,23 @@ global $adb; $storearray = explode(";",$idlist); +$ids_list = array(); + $date_var = date('YmdHis'); if(isset($_REQUEST['user_id']) && $_REQUEST['user_id']!='') { foreach($storearray as $id) { - if($id != '') { - $sql = "update crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid='" .$id."'"; - $result = $adb->query($sql); + if(isPermitted($return_module,'EditView',$id) == 'yes') + { + if($id != '') { + $sql = "update crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid='" .$id."'"; + $result = $adb->query($sql); + } + } + else + { + $ids_list[] = $id; } } } @@ -37,14 +46,30 @@ { foreach($storearray as $id) { - if($id != '') { - $sql = "update leaddetails set leadstatus='" .$leadstatusval ."' where leadid='" .$id."'"; - $result = $adb->query($sql); - $query = "update crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$id; - $result1 = $adb->query($query); + if(isPermitted($return_module,'EditView',$id) == 'yes') + { + if($id != '') { + $sql = "update leaddetails set leadstatus='" .$leadstatusval ."' where leadid='" .$id."'"; + $result = $adb->query($sql); + $query = "update crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$id; + $result1 = $adb->query($query); + } } + else + { + $ids_list[] = $id; + } + } } -header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid); +$ret_owner = getEntityName($return_module,$ids_list); +if(count($ret_owner) > 0) +{ + $errormsg = implode(',',$ret_owner); +}else +{ + $errormsg = ''; +} + +header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid."&errormsg=".$errormsg); ?> - From vtiger-tickets at vtiger.fosslabs.com Mon May 29 08:21:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 12:21:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231067=3A?= =?utf-8?q?_Tab_privileges_do_not_work?= In-Reply-To: <076.baa7b69c6ca44b0daa26fc51089e8b17@vtiger.fosslabs.com> References: <076.baa7b69c6ca44b0daa26fc51089e8b17@vtiger.fosslabs.com> Message-ID: <085.09fc20513e5cc67cc24b1578ad4a44f2@vtiger.fosslabs.com> #1067: Tab privileges do not work ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 08:50:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 12:50:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6676 - in /vtigercrm/trunk/modules: Accounts/ Activities/ Campaigns/ Contacts/ HelpDesk/ Invoice/ Leads/ Potentials/ PurchaseOrder/ Quotes/ SalesOrder/ Message-ID: <20060529125001.3DD067CA4B1@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:49:47 2006 New Revision: 6676 Log: Implemented record level security for change owner/status button - ahmed Modified: vtigercrm/trunk/modules/Accounts/ListView.php vtigercrm/trunk/modules/Activities/ListView.php vtigercrm/trunk/modules/Campaigns/ListView.php vtigercrm/trunk/modules/Contacts/ListView.php vtigercrm/trunk/modules/HelpDesk/ListView.php vtigercrm/trunk/modules/Invoice/ListView.php vtigercrm/trunk/modules/Leads/ListView.php vtigercrm/trunk/modules/Potentials/ListView.php vtigercrm/trunk/modules/PurchaseOrder/ListView.php vtigercrm/trunk/modules/Quotes/ListView.php vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Mon May 29 06:49:47 2006 @@ -57,7 +57,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Mon May 29 06:49:47 2006 @@ -55,7 +55,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Mon May 29 06:49:47 2006 @@ -44,7 +44,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Mon May 29 06:49:47 2006 @@ -53,7 +53,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Mon May 29 06:49:47 2006 @@ -45,7 +45,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Mon May 29 06:49:47 2006 @@ -49,7 +49,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Mon May 29 06:49:47 2006 @@ -62,7 +62,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Mon May 29 06:49:47 2006 @@ -51,7 +51,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Mon May 29 06:49:47 2006 @@ -48,7 +48,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Mon May 29 06:49:47 2006 @@ -49,7 +49,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Mon May 29 06:49:47 2006 @@ -46,7 +46,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); }else { $smarty->assign("ERROR",""); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 08:56:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 12:56:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6677 - in /vtigercrm/trunk/modules/Calendar: Calendar.php addEventUI.php calendarLayout.php Message-ID: <20060529125619.573CF7CA4B5@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:56:14 2006 New Revision: 6677 Log: changes made for calendar actions Modified: vtigercrm/trunk/modules/Calendar/Calendar.php vtigercrm/trunk/modules/Calendar/addEventUI.php vtigercrm/trunk/modules/Calendar/calendarLayout.php Modified: vtigercrm/trunk/modules/Calendar/Calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/Calendar.php Mon May 29 06:56:14 2006 @@ -1,4 +1,14 @@ '; for($i=1;$i<=12;$i++) { - if($i == $selvalue) - $selected = 'selected'; - else - $selected = ''; if($i <= 9 && strlen(trim($i)) < 2) { $hrvalue= '0'.$i; } - elseif($i == 12) $hrvalue = '00'; + //elseif($i == 12) $hrvalue = '00'; else $hrvalue= $i; - $combo .= ''; + $combo .= ''; } $combo .= ' '; $combo .= ' '; $combo .= ''; @@ -132,33 +114,25 @@ $combo .= 'Hr '; $combo .= ' min'; } @@ -277,11 +251,11 @@ - + - + - +
           
    @@ -477,7 +451,7 @@ - - - - + - @@ -491,10 +465,10 @@
    Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Mon May 29 06:56:14 2006 @@ -1,4 +1,14 @@ view == 'day') @@ -426,6 +452,10 @@ } } +/*To get calendar layout for dayview + *@param $cal -- The calendar array :: Type Array + *@param $type -- The type :: Type string +*/ function getDayViewLayout(& $cal,$type) { global $current_user,$app_strings; @@ -500,6 +530,10 @@ echo $dayview_layout; } +/*To get calendar layout for week view + *@param $cal -- The calendar array :: Type Array + *@param $type -- The type :: Type string +*/ function getWeekViewLayout(& $cal,$type) { global $current_user,$app_strings; @@ -598,6 +632,10 @@ } +/*To get calendar layout for month view + *@param $cal -- The calendar array :: Type Array + *@param $type -- The type :: Type string +*/ function getMonthViewLayout(& $cal,$type) { global $current_user,$app_strings; @@ -668,6 +706,10 @@ } +/*To get calendar layout for year view + *@param $cal -- The calendar array :: Type Array + *@param $type -- The type :: Type string +*/ function getYearViewLayout(& $cal,$type) { global $mod_strings; @@ -772,7 +814,11 @@ } - +/*To display events in day view + *@param $cal -- The calendar array :: Type Array + *@param $slice -- The slice(date and time) :: Type string + *returns event in html div format +*/ function getdayEventLayer(& $cal,$slice) { global $mod_strings; @@ -810,7 +856,7 @@ @@ -821,6 +867,11 @@ } } +/*To display events in week view + *@param $cal -- The calendar array :: Type Array + *@param $slice -- The slice(date) :: Type string + *returns event in html div format +*/ function getweekEventLayer(& $cal,$slice) { global $mod_strings; @@ -853,6 +904,11 @@ } +/*To display events in month view + *@param $cal -- The calendar array :: Type Array + *@param $slice -- The slice(date) :: Type string + *returns event in html div format +*/ function getmonthEventLayer(& $cal,$slice) { global $mod_strings; @@ -904,7 +960,13 @@ } - +/*To get events list scheduled between specified dates + *@param $calendar -- The calendar array :: Type Array + *@param $start_date -- the start date :: Type string + *@param $end_date -- the end date :: Type string + *@param $info -- the info :: Type string + *returns $Entries :: Type Array +*/ function getEventList(& $calendar,$start_date,$end_date,$info='') { $Entries = Array(); @@ -971,13 +1033,21 @@ $image_tag = " ".$type; $element['eventtype'] = $image_tag; $element['eventdetail'] = $contact_data." ".$subject." ".$more_link; - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"event\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $element['status'] = $adb->query_result($result,$i,"eventstatus"); $Entries[] = $element; } return $Entries; } + +/*To get todos list scheduled between specified dates + *@param $calendar -- The calendar array :: Type Array + *@param $start_date -- the start date :: Type string + *@param $end_date -- the end date :: Type string + *@param $info -- the info :: Type string + *returns $Entries :: Type Array +*/ function getTodoList(& $calendar,$start_date,$end_date,$info='') { $Entries = Array(); @@ -1023,7 +1093,7 @@ $more_link = "".$subject.""; $element['tododetail'] = $more_link; $element['status'] = $adb->query_result($result,$i,"status"); - $element['action'] = ""; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"todo\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $Entries[] = $element; } return $Entries; From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 08:56:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 12:56:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6678 - /vtigercrm/trunk/modules/Calendar/calendar_share.php Message-ID: <20060529125659.3F0D87CA4B5@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:56:55 2006 New Revision: 6678 Log: changes made for calendar actions Modified: vtigercrm/trunk/modules/Calendar/calendar_share.php Modified: vtigercrm/trunk/modules/Calendar/calendar_share.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_share.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_share.php Mon May 29 06:56:55 2006 @@ -70,7 +70,7 @@ } ?>
    -   + hour_format == '24'){?> checked value="24">  From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 08:57:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 12:57:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6679 - /vtigercrm/trunk/modules/Calendar/Date.php Message-ID: <20060529125736.7CD5E7CA4B5@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:57:33 2006 New Revision: 6679 Log: license added Modified: vtigercrm/trunk/modules/Calendar/Date.php Modified: vtigercrm/trunk/modules/Calendar/Date.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Date.php (original) +++ vtigercrm/trunk/modules/Calendar/Date.php Mon May 29 06:57:33 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Mon May 29 06:58:18 2006 New Revision: 6680 Log: license added Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/new_calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/new_calendar.php Mon May 29 06:58:18 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Mon May 29 06:59:05 2006 New Revision: 6681 Log: changes made for calendar actions Modified: vtigercrm/trunk/modules/Calendar/script.js vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Mon May 29 06:59:05 2006 @@ -1,3 +1,13 @@ +/********************************************************************************* + +** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + ********************************************************************************/ + function DisableSharing() { @@ -86,22 +96,28 @@ if (y.display=="none") { - document.getElementById("jscal_field_due_date").value = enddate; - document.getElementById("starthr").value = starthr; - document.getElementById("startmin").value = startmin; - document.getElementById("startfmt").value = startfmt; - document.getElementById("endhr").value = endhr; - document.getElementById("endmin").value = endmin; - document.getElementById("endfmt").value = endfmt; - if(type == 'call') - document.appSave.activitytype[0].checked = true; - if(type == 'meeting') - document.appSave.activitytype[1].checked = true; - if(type == 'todo') - document.getElementById("task_jscal_field_date_start").value = startdate; - else - document.getElementById("jscal_field_date_start").value = startdate; - + if(type == 'call' || type == 'meeting') + { + if(type == 'call') + document.appSave.activitytype[0].checked = true; + if(type == 'meeting') + document.appSave.activitytype[1].checked = true; + + document.appSave.date_start.value = startdate; + document.appSave.starthr.value = starthr; + document.appSave.startmin.value = startmin; + document.appSave.startfmt.value = startfmt; + document.appSave.endhr.value = endhr; + document.appSave.endmin.value = endmin; + document.appSave.endfmt.value = endfmt; + } + if(type == 'todo') + { + document.createTodo.task_date_start.value = startdate; + document.createTodo.starthr.value = starthr; + document.createTodo.startmin.value = startmin; + document.createTodo.startfmt.value = startfmt; + } y.display="block"; } } @@ -153,7 +169,6 @@ else document.SharingForm.start_hour.disabled = true; } - function check_form() { @@ -235,6 +250,26 @@ } } +function task_check_form() +{ + starthour = document.createTodo.starthr.value; + startmin = document.createTodo.startmin.value; + startformat = document.createTodo.startfmt.value; + if(startformat != '') + { + if(startformat == 'pm') + { + starthour = eval(starthour) + 12; + startmin = startmin; + } + else + { + starthour = starthour; + startmin = startmin; + } + } + document.createTodo.task_time_start.value = starthour+':'+startmin; +} var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj; @@ -410,7 +445,7 @@ document.getElementById("calSettings").innerHTML=response.responseText; } -function getcalAction(obj,Lay,id,view,hour,day,month,year){ +function getcalAction(obj,Lay,id,view,hour,day,month,year,type){ var tagName = document.getElementById(Lay); var leftSide = findPosX(obj); var topSide = findPosY(obj); @@ -426,10 +461,24 @@ tagName.style.top= topSide + 'px'; tagName.style.display = 'block'; tagName.style.visibility = "visible"; - document.getElementById("complete").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&eventstatus=Held&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; - document.getElementById("pending").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&eventstatus=Not Held&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; - document.getElementById("postpone").href="index.php?action=EditView&module=Activities&record="+id+"&activity_mode=Events"; - document.getElementById("actdelete").href="index.php?return_module=Calendar&return_action=index&action=Delete&module=Activities&record="+id+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + if(type == 'event') + { + var heldstatus = "eventstatus=Held"; + var notheldstatus = "eventstatus=Not Held"; + var activity_mode = "Events"; + } + if(type == 'todo') + { + var heldstatus = "status=Completed"; + var notheldstatus = "status=Deferred"; + var activity_mode = "Task"; + } + + document.getElementById("complete").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+heldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + document.getElementById("pending").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+notheldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + document.getElementById("postpone").href="index.php?action=EditView&module=Activities&record="+id+"&activity_mode="+activity_mode; + document.getElementById("actdelete").href="index.php?return_module=Calendar&return_action=index&action=massdelete&module=Users&idlist="+id+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; document.getElementById("changeowner").href="javascript:fnvshobj(this,'act_changeowner');"; -} - + +} + Modified: vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php (original) +++ vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php Mon May 29 06:59:05 2006 @@ -10,6 +10,13 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); global $adb; + +if(isset($_REQUEST['hour_format']) && $_REQUEST['hour_format'] != '') + $hour_format = $_REQUEST['hour_format']; +else + $hour_format = 'am/pm'; +$delquery = "delete from sharedcalendar where userid=".$_REQUEST["current_userid"]; +$adb->query($delquery); $sharedid = $_REQUEST['user']; if(isset($sharedid) && $sharedid != null) { @@ -28,11 +35,8 @@ $adb->query($sql); } -if(isset($_REQUEST['hour_format']) && $_REQUEST['hour_format'] != '') -{ - $sql = "update users set hour_format='".$_REQUEST['hour_format']."' where id=".$current_user->id; - $adb->query($sql); -} +$sql = "update users set hour_format='".$hour_format."' where id=".$current_user->id; +$adb->query($sql); header("Location: index.php?action=index&module=Calendar&parenttab=My Home Page"); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:00:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:00:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6682 - /vtigercrm/trunk/modules/Calendar/TodoSave.php Message-ID: <20060529130000.62D727CA4B5@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 06:59:56 2006 New Revision: 6682 Log: file added for todo save Added: vtigercrm/trunk/modules/Calendar/TodoSave.php From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:00:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:00:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23896=3A_?= =?utf-8?q?Pagination_not_working_in_Popup?= In-Reply-To: <076.9e25407318a009f0a78d7698ad4a8ab4@vtiger.fosslabs.com> References: <076.9e25407318a009f0a78d7698ad4a8ab4@vtiger.fosslabs.com> Message-ID: <085.671189316c49cfcdbe2fb2dcea5518c4@vtiger.fosslabs.com> #896: Pagination not working in Popup ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:01:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:01:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6683 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060529130136.AF3397CBAD1@vtiger.fosslabs.com> Author: don Date: Mon May 29 07:01:32 2006 New Revision: 6683 Log: inserted ajax entries into the actionmapping file Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Mon May 29 07:01:32 2006 @@ -2047,6 +2047,9 @@ $this->db->query("insert into actionmapping values(0,'SavePriceBook',0)"); $this->db->query("insert into actionmapping values(2,'DeletePriceBook',0)"); $this->db->query("insert into actionmapping values(9,'ConvertLead',0)"); + $this->db->query("insert into actionmapping values(1,'DetailViewAjax',0)"); + $this->db->query("insert into actionmapping values(4,'TagCloud',0)"); + $this->db->query("insert into actionmapping values(1,'QuickCreate',0)"); //Insert values for moduleowners table which contains the modules and their users. default user id admin - after 4.2 patch 2 $module_array = Array('Potentials','Contacts','Accounts','Leads','Notes','Activities','Emails','HelpDesk','Products','Faq','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Reports','Campaigns'); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:01:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:01:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6684 - /vtigercrm/trunk/index.php Message-ID: <20060529130157.792377CBAD1@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:01:54 2006 New Revision: 6684 Log: header escaped for TodoSave Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon May 29 07:01:54 2006 @@ -192,7 +192,7 @@ { $log->info("About to take action ".$action); $log->debug("in $action"); - if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action) || ereg("^RecalculateSharingRules",$action) || (ereg("^body",$action) && ereg("^Webmails",$module)) || (ereg("^DetailView",$action) && ereg("^Webmails",$module) )) + if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action) || ereg("^TodoSave",$action) || ereg("^RecalculateSharingRules",$action) || (ereg("^body",$action) && ereg("^Webmails",$module)) || (ereg("^DetailView",$action) && ereg("^Webmails",$module) )) { $skipHeaders=true; //skip headers for all these invocations as they are mostly popups From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:03:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:03:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6685 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060529130322.BF90D7CEE4D@vtiger.fosslabs.com> Author: don Date: Mon May 29 07:03:19 2006 New Revision: 6685 Log: We are and help link added to header Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon May 29 07:03:19 2006 @@ -44,7 +44,9 @@ - + + +
    {$APP.LBL_MY_PREFERENCES} {$APP.LBL_LOGOUT} ({$CURRENT_USER}){$APP.LNK_HELP}{$APP.LNK_WEARE} {$APP.LBL_LOGOUT} ({$CURRENT_USER})
    @@ -418,3 +420,10 @@ + + From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:04:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:04:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6686 - /vtigercrm/trunk/modules/Users/massdelete.php Message-ID: <20060529130446.BAED97CEE4D@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:04:43 2006 New Revision: 6686 Log: changes made to delete activities from calendar Modified: vtigercrm/trunk/modules/Users/massdelete.php Modified: vtigercrm/trunk/modules/Users/massdelete.php ============================================================================== --- vtigercrm/trunk/modules/Users/massdelete.php (original) +++ vtigercrm/trunk/modules/Users/massdelete.php Mon May 29 07:04:43 2006 @@ -63,6 +63,10 @@ { header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&ajax=delete&file=ListView&viewname=".$viewid."&errormsg=".$errormsg); } +elseif($returnmodule == 'Calendar') +{ + header("Location: index.php?module=".$returnmodule."&action=index&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&parenttab=My Home Page"); +} else { header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&ajax=delete&file=ListView&errormsg=".$errormsg); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:06:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:06:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6687 - /vtigercrm/trunk/index.php Message-ID: <20060529130640.653847C4382@vtiger.fosslabs.com> Author: don Date: Mon May 29 07:06:36 2006 New Revision: 6687 Log: added security check for ajax actions Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon May 29 07:06:36 2006 @@ -465,16 +465,29 @@ if(!$skipSecurityCheck) { + + require_once('include/utils/UserInfoUtil.php'); - if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') - { - $display = isPermitted($module,$action,$_REQUEST['record']); - } - else - { - $display = isPermitted($module,$action); - } + + if(ereg('Ajax',$action)) + { + $now_action=$_REQUEST['file']; + } + else + { + $now_action=$action; + } + + if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') + { + $display = isPermitted($module,$now_action,$_REQUEST['record']); + } + else + { + $display = isPermitted($module,$now_action); + } $seclog->debug('########### Pemitted ---> '.$display.' ##############'); + } else { From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:08:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:08:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6688 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060529130858.6EDFE766D1F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:08:54 2006 New Revision: 6688 Log: query updated for activities module Modified: vtigercrm/trunk/include/utils/ListViewUtils.php Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon May 29 07:08:54 2006 @@ -1752,7 +1752,7 @@ $query .= $sec_parameter; } - $query .=" group by activity.activityid "; + //$query .=" group by activity.activityid "; //included by Jaguar } if($module == "Emails") From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:10:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:10:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23857=3A_?= =?utf-8?q?Links_in_Communication_Templates_Headings?= In-Reply-To: <076.b701bab91b5663913e5b005347f8c28e@vtiger.fosslabs.com> References: <076.b701bab91b5663913e5b005347f8c28e@vtiger.fosslabs.com> Message-ID: <085.9aa9c64566ea610f060ca17a79a62a2c@vtiger.fosslabs.com> #857: Links in Communication Templates Headings --------------------------+------------------------------------------------- Reporter: mangai | Owner: ahmed Type: enhancement | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: --------------------------+------------------------------------------------- Changes (by jerrydgeorge): * owner: jeri => ahmed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:11:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:11:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231012=3A?= =?utf-8?q?_HelpDesk_-_Detail_View_UI_problem?= In-Reply-To: <076.b198b1e865f9e93c599c9d928fe197d4@vtiger.fosslabs.com> References: <076.b198b1e865f9e93c599c9d928fe197d4@vtiger.fosslabs.com> Message-ID: <085.cbd279ecd097c37a94c4b6fdc5a451a8@vtiger.fosslabs.com> #1012: HelpDesk - Detail View UI problem ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangay Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: helpdesk detailview ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * owner: jeridgeorge => mangay -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:11:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:11:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6689 - /vtigercrm/trunk/modules/Migration/Migration.php Message-ID: <20060529131137.790D5766D1F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:11:34 2006 New Revision: 6689 Log: * Added function call RecalculateSharingRules which will recalculate the sharing previleges and write it in the file Modified: vtigercrm/trunk/modules/Migration/Migration.php Modified: vtigercrm/trunk/modules/Migration/Migration.php ============================================================================== --- vtigercrm/trunk/modules/Migration/Migration.php (original) +++ vtigercrm/trunk/modules/Migration/Migration.php Mon May 29 07:11:34 2006 @@ -337,6 +337,9 @@ echo '
    Dump could not be applied correctly. so your previous database restored.'; include("modules/Migration/MigrationStep1.php"); } + + //Now we should recalculate the user and sharing privileges + RecalculateSharingRules(); } } From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:12:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:12:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6690 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060529131207.BFBFD766D1F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:12:04 2006 New Revision: 6690 Log: style added for CurrencyDelete Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Mon May 29 07:12:04 2006 @@ -2246,6 +2246,16 @@ padding:5px; } +#CurrencyDeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; +} + /* For Report HTML Generation*/ .rptCellLabel { From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:15:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:15:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6691 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060529131514.9149F766D1F@vtiger.fosslabs.com> Author: don Date: Mon May 29 07:15:10 2006 New Revision: 6691 Log: label added for FOR Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Mon May 29 07:15:10 2006 @@ -873,7 +873,7 @@ 'COVERED_PERCENTAGE'=>'(%)', 'LBL_TAG_CLOUD'=>'Tag Cloud', - +'LBL_FOR'=>'for', ); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:15:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:15:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6692 - /tags/vtigercrm-5.0.0-val/ Message-ID: <20060529131520.B62757CF68F@vtiger.fosslabs.com> Author: richie Date: Mon May 29 07:15:15 2006 New Revision: 6692 Log: made a copy Added: tags/vtigercrm-5.0.0-val/ - copied from r6690, vtigercrm/trunk/ From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:17:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:17:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23766=3A_?= =?utf-8?q?Change_Owner_Button?= In-Reply-To: <076.f565da083c8fd4113733a3e15d4a4fad@vtiger.fosslabs.com> References: <076.f565da083c8fd4113733a3e15d4a4fad@vtiger.fosslabs.com> Message-ID: <085.f5c634b977389f3bddc6132979ce3488@vtiger.fosslabs.com> #766: Change Owner Button ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:23:26 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:23:26 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23788=3A_?= =?utf-8?q?detail_view_Leads?= In-Reply-To: <076.6da2531272f72eb12dc7914b4b93f169@vtiger.fosslabs.com> References: <076.6da2531272f72eb12dc7914b4b93f169@vtiger.fosslabs.com> Message-ID: <085.b5a0f2435fbcbd2e4fcdcd9c768f8964@vtiger.fosslabs.com> #788: detail view Leads ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed - Tag Cloud & Mail Merge blocks can be viewed separately now -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:26:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:26:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23838=3A_?= =?utf-8?q?Settings_=3E_CommunicationsTemplates_=3E_Mail_Merge_Template?= In-Reply-To: <076.e25ff08fdd1aa2a8f2e85835ca2ed712@vtiger.fosslabs.com> References: <076.e25ff08fdd1aa2a8f2e85835ca2ed712@vtiger.fosslabs.com> Message-ID: <085.a9ede45e3e71b1eca9f6f3937c1d981e@vtiger.fosslabs.com> #838: Settings > CommunicationsTemplates > Mail Merge Template ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:27:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:27:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6693 - /vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl Message-ID: <20060529132700.066B5766D1F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:26:55 2006 New Revision: 6693 Log: * Added multipart/form-data as ENCTYPE in form tag because in tickets we have attachments Modified: vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl Mon May 29 07:26:55 2006 @@ -52,7 +52,7 @@ {elseif $MODULE eq 'HelpDesk'} -
    + {elseif $MODULE eq 'Leads'} From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:28:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:28:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23398=3A_?= =?utf-8?q?Attachment_Issues_-_HelpDesk?= In-Reply-To: <076.7a510c5b49e89d51cb7e175be79d8b36@vtiger.fosslabs.com> References: <076.7a510c5b49e89d51cb7e175be79d8b36@vtiger.fosslabs.com> Message-ID: <085.1624b4740f4cd325ff6b8fa649955791@vtiger.fosslabs.com> #398: Attachment Issues - HelpDesk ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: assigned => closed Comment: This issue is fixed. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:29:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:29:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23907=3A_?= =?utf-8?q?Campain_Detail_View?= In-Reply-To: <076.4a06e5f0535423280cd4351eba88e627@vtiger.fosslabs.com> References: <076.4a06e5f0535423280cd4351eba88e627@vtiger.fosslabs.com> Message-ID: <085.e0c05d44ea2f22c284a242c97932e1b4@vtiger.fosslabs.com> #907: Campain Detail View ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:29:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:29:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23908=3A_?= =?utf-8?q?Leads=2C_Detail_view?= In-Reply-To: <076.b26f1641789daff11acea1e418be60b2@vtiger.fosslabs.com> References: <076.b26f1641789daff11acea1e418be60b2@vtiger.fosslabs.com> Message-ID: <085.f8e91c00e83cb9f121cc5553a5dd20cc@vtiger.fosslabs.com> #908: Leads, Detail view ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:33:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:33:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23957=3A_?= =?utf-8?q?Plural_form_is_used_for_quick_create_function?= In-Reply-To: <076.9e6c95fdf872c50c6563ccb0b75787a7@vtiger.fosslabs.com> References: <076.9e6c95fdf872c50c6563ccb0b75787a7@vtiger.fosslabs.com> Message-ID: <085.f133f0f642c52c8dfa8e11c203b1aa3c@vtiger.fosslabs.com> #957: Plural form is used for quick create function ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed - Name changed to singular -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:36:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:36:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23915=3A_?= =?utf-8?q?Issues_in_Home_Page?= In-Reply-To: <076.c91d734dfe491bd408e8ae74e611ac1a@vtiger.fosslabs.com> References: <076.c91d734dfe491bd408e8ae74e611ac1a@vtiger.fosslabs.com> Message-ID: <085.c6cbc18b4f60f827cfee74a6dda19e75@vtiger.fosslabs.com> #915: Issues in Home Page ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: jeri Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed Comment: (In [6694]) Fixes #915 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:36:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:36:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6694 - in /vtigercrm/trunk: Smarty/templates/HomePage.tpl modules/Activities/OpenListView.php modules/Home/language/en_us.lang.php Message-ID: <20060529133637.C2D1E7CF888@vtiger.fosslabs.com> Author: don Date: Mon May 29 07:36:28 2006 New Revision: 6694 Log: Fixes #915 Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl vtigercrm/trunk/modules/Activities/OpenListView.php vtigercrm/trunk/modules/Home/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Mon May 29 07:36:28 2006 @@ -114,40 +114,11 @@
    {/if} {/foreach} -
    - - - - - - - - - - -
    {$MOD.LBL_LEADS_BY_SOURCE}
    - {$MOD.LBL_TOTAL}340 -
    -
    -
    - - - - - - - - - - -
    {$MOD.LBL_LEADS_BY_STATUS}
    - {$MOD.LBL_TOTAL}340 -
    -
    + {if $ACTIVITIES.0.Entries.noofactivities > 0} @@ -158,10 +129,9 @@ + +
    - + - {foreach item=entries from=$ACTIVITIES.0.Entries} @@ -173,6 +143,9 @@
    {$MOD.LBL_UPCOMING_EVENTS}
    {$ACTIVITIES.0.Entries.noofactivities} {$MOD.LBL_TODAYEVENT}
    {$MOD.LBL_UPCOMING_EVENTS}
    {$ACTIVITIES.0.Entries.noofactivities} {$APP.Events} {$APP.LBL_FOR} {$ACTIVITIES.0.Title.0}
    {$entries.IMAGE}

    + {/if} + + {if $ACTIVITIES.1.Entries.noofactivities > 0} @@ -201,6 +174,7 @@

    + {/if} {if $TAGCLOUD_JS ne ''}
    Modified: vtigercrm/trunk/modules/Activities/OpenListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/OpenListView.php (original) +++ vtigercrm/trunk/modules/Activities/OpenListView.php Mon May 29 07:36:28 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -function getPendingActivities() +function getPendingActivities($mode) { global $log; $log->debug("Entering getPendingActivities() method ..."); @@ -74,14 +74,16 @@ { $later = date("Y-m-d", strtotime("$today +1 day")); } - - if($activity_view != 'OverDue') - { - $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (((date_start >= '$today' AND date_start < '$later') OR (date_start < '$today')) OR (recurringevents.recurringdate between '$today' and '$later') ) AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; + $last_tendays = date("Y-m-d",strtotime("$today - 10 days")); + if($mode != 1) + { + //for upcoming avtivities + $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (((date_start > '$today' AND date_start < '$later')) OR (recurringevents.recurringdate between '$today' and '$later') ) AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; } else { - $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (due_date < '$today') OR (recurringevents.recurringdate < '$today') AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; + //for pending activities for the last 10 days + $list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR activity.eventstatus != 'Not Held' ) AND (due_date > '$last_tendays' AND due_date <= '$today') OR (recurringevents.recurringdate > '$last_tendays' AND recurringevents.recurringdate <= '$today') AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'"; } $res = $adb->query($list_query); $noofrecords = $adb->num_rows($res); @@ -114,8 +116,8 @@ $later_day = getDisplayDate(date("Y-m-d", strtotime("$later -1 day "))); $title=array(); + $title[]=$activity_view; $title[]='myUpcoPendAct.gif'; - $title[]=$current_module_strings["LBL_UPCOMING"]; //.'('.$current_module_strings["LBL_TODAY"].' '.$later_day.')'; $title[]='home_myact'; $title[]=getActivityView($activity_view); @@ -262,10 +264,6 @@ { $selected4 = 'selected'; } - else if($activity_view == 'OverDue') - { - $selected5 = 'selected'; - } //constructing the combo values for activities $ACTIVITY_VIEW_SELECT_OPTION = ''; Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Home/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Home/language/en_us.lang.php Mon May 29 07:36:28 2006 @@ -45,7 +45,7 @@ 'LBL_UPCOMING_EVENTS'=>'Upcoming Events', 'LBL_PENDING_EVENTS'=>'Pending Events', -'LBL_TODAYEVENT'=>'Events for Today', +'LBL_TODAYEVENT'=>'Events for Last Ten days', ); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 09:37:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 13:37:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6695 - /vtigercrm/trunk/modules/Users/massdelete.php Message-ID: <20060529133758.343B5766D1F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 07:37:54 2006 New Revision: 6695 Log: code added for activity Delete from users Modified: vtigercrm/trunk/modules/Users/massdelete.php Modified: vtigercrm/trunk/modules/Users/massdelete.php ============================================================================== --- vtigercrm/trunk/modules/Users/massdelete.php (original) +++ vtigercrm/trunk/modules/Users/massdelete.php Mon May 29 07:37:54 2006 @@ -59,13 +59,14 @@ } header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&folderid=".$folderid."&ajax=delete&file=ListView&errormsg=".$errormsg); } +elseif($returnmodule == 'Calendar') +{ + header("Location: index.php?module=".$returnmodule."&action=index&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&parenttab=My Home Page"); +} + elseif($returnmodule!='Faq') { header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&ajax=delete&file=ListView&viewname=".$viewid."&errormsg=".$errormsg); -} -elseif($returnmodule == 'Calendar') -{ - header("Location: index.php?module=".$returnmodule."&action=index&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&parenttab=My Home Page"); } else { From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:40:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:40:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23775=3A_?= =?utf-8?q?Convert_lead_not_working?= In-Reply-To: <076.96742e746599375cfefc6f9ca387de68@vtiger.fosslabs.com> References: <076.96742e746599375cfefc6f9ca387de68@vtiger.fosslabs.com> Message-ID: <085.4a7120d6a82c5579b1db30b54f2b49c5@vtiger.fosslabs.com> #775: Convert lead not working ------------------------+--------------------------------------------------- Reporter: Nathan | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:41:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:41:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231076=3A?= =?utf-8?q?_no_create_new_activities?= In-Reply-To: <076.eaaa8cb928d1aa031a8dfd5536e82811@vtiger.fosslabs.com> References: <076.eaaa8cb928d1aa031a8dfd5536e82811@vtiger.fosslabs.com> Message-ID: <085.1b78f0f486303f48eb62162cb6c76f2c@vtiger.fosslabs.com> #1076: no create new activities ------------------------+--------------------------------------------------- Reporter: ftc | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Activities is segregated into New Task & Events. So you have to create either one of them to get the data in the Activities List view. Accounts is functional from Marketing tab -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:43:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:43:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231014=3A?= =?utf-8?q?_Conver_to_FAQ_-_string_is_appended_in_Answer_text_area?= In-Reply-To: <076.34563da44e84c9b36342cfa57486392a@vtiger.fosslabs.com> References: <076.34563da44e84c9b36342cfa57486392a@vtiger.fosslabs.com> Message-ID: <085.ccbdc2d73c9518828673b8d71bfbc7fa@vtiger.fosslabs.com> #1014: Conver to FAQ - string is appended in Answer text area ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => invalid * status: new => closed Comment: This string is reasonably added to show the comments and solutions seperately. This is expected bahaviour. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:44:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:44:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23801=3A_?= =?utf-8?q?calendar_settings_icon?= In-Reply-To: <076.c60abf35c03ea2802e25e5deb4509bae@vtiger.fosslabs.com> References: <076.c60abf35c03ea2802e25e5deb4509bae@vtiger.fosslabs.com> Message-ID: <085.3cff97f28c28cc354ad19c6a3479ca0a@vtiger.fosslabs.com> #801: calendar settings icon ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:45:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:45:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23906=3A_?= =?utf-8?q?Calendar_-_To_Do?= In-Reply-To: <076.eb017c5a70b5b97f512e27a68ca27cc5@vtiger.fosslabs.com> References: <076.eb017c5a70b5b97f512e27a68ca27cc5@vtiger.fosslabs.com> Message-ID: <085.b525888ec24cd2d775b9d2e022dd8ebc@vtiger.fosslabs.com> #906: Calendar - To Do ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:47:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:47:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23974=3A_?= =?utf-8?q?Sorting_is_not_working_in_Email_Listts_View?= In-Reply-To: <076.2c7b086732146900250e4894a2effdaa@vtiger.fosslabs.com> References: <076.2c7b086732146900250e4894a2effdaa@vtiger.fosslabs.com> Message-ID: <085.eb67db276430bf247bc354143332a7c0@vtiger.fosslabs.com> #974: Sorting is not working in Email Listts View ------------------------+--------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:47:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:47:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231092=3A?= =?utf-8?q?_Calendar_=3E_ToDo_=3E_Actions_do_not_work?= In-Reply-To: <076.86166d768aa3521237bd3836bb3b3b28@vtiger.fosslabs.com> References: <076.86166d768aa3521237bd3836bb3b3b28@vtiger.fosslabs.com> Message-ID: <085.9b393e28a5d71af45dc3f2553a86a3ac@vtiger.fosslabs.com> #1092: Calendar > ToDo > Actions do not work ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:48:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:48:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231016=3A?= =?utf-8?q?_HelpDesk_-_Attached_file_name_is_missing_in_detail_view?= In-Reply-To: <076.5b39819938d72761fa4a92d4814d80ce@vtiger.fosslabs.com> References: <076.5b39819938d72761fa4a92d4814d80ce@vtiger.fosslabs.com> Message-ID: <085.7d20d3a1122e35906127e6dbc1d22762@vtiger.fosslabs.com> #1016: HelpDesk - Attached file name is missing in detail view ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => duplicate * status: new => closed Comment: This issue is fixed This is the duplication ticket of 398 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:48:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:48:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231086=3A?= =?utf-8?q?_Home_page_graphs_are_broken?= In-Reply-To: <076.e8c3d7abf047c083f365b76693799438@vtiger.fosslabs.com> References: <076.e8c3d7abf047c083f365b76693799438@vtiger.fosslabs.com> Message-ID: <085.e31c56df2d7c34f4ffec08aece6c8359@vtiger.fosslabs.com> #1086: Home page graphs are broken ------------------------+--------------------------------------------------- Reporter: gopal | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by jerrydgeorge): removed from Home Page temp work arround -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:50:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:50:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2345=3A_F?= =?utf-8?q?ix_for_=22Fatal_error=2E=2E=2E=22_by_reports_with_custom_field?= In-Reply-To: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> References: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> Message-ID: <085.1e945324b8dd9d65ff5e3fbc0981ece5@vtiger.fosslabs.com> #45: Fix for "Fatal error..." by reports with custom field ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * status: reopened => new * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:50:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:50:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2344=3A_F?= =?utf-8?q?ix_for_Error_by_custom_view_with_a_custom_fields?= In-Reply-To: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> References: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> Message-ID: <085.9c2ac52030a1141678eb62d02bd2df9d@vtiger.fosslabs.com> #44: Fix for Error by custom view with a custom fields ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * status: reopened => new * owner: developer => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:51:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:51:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23109=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> References: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> Message-ID: <085.7e6a0de1d995329541d661bb2ca98bfc@vtiger.fosslabs.com> #109: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: jerrydgeorge Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: Accounts,MassDelete ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * owner: philip => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:51:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:51:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23109=3A_?= =?utf-8?q?Issue_in_Mass_Delete?= In-Reply-To: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> References: <076.ca39a8dd0e1a26f9efcc5fecf629d930@vtiger.fosslabs.com> Message-ID: <085.66111a5d2fac7fe8e1b0dcfcd4a28ca2@vtiger.fosslabs.com> #109: Issue in Mass Delete ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Accounts,MassDelete ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 09:53:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 13:53:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23281=3A_?= =?utf-8?q?ListView_of_Leads_must_color-differentiate_junk_leads?= In-Reply-To: <076.f37448842ef9b3b36384b24b610b9e83@vtiger.fosslabs.com> References: <076.f37448842ef9b3b36384b24b610b9e83@vtiger.fosslabs.com> Message-ID: <085.91273ade02b9446aa2918b5236a7e4e3@vtiger.fosslabs.com> #281: ListView of Leads must color-differentiate junk leads --------------------------+------------------------------------------------- Reporter: richie | Owner: philip Type: enhancement | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: leads --------------------------+------------------------------------------------- Changes (by jerrydgeorge): * type: defect => enhancement -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 10:19:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 14:19:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23713=3A_?= =?utf-8?q?Alphabetical_search_missing_in_campaign?= In-Reply-To: <076.cb538ed353558cca1414c6f4d7dd19a3@vtiger.fosslabs.com> References: <076.cb538ed353558cca1414c6f4d7dd19a3@vtiger.fosslabs.com> Message-ID: <085.2d7d0033992463b4a9d9340fc19b2788@vtiger.fosslabs.com> #713: Alphabetical search missing in campaign ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Campaign Alphabetical ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 10:24:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 14:24:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231099=3A?= =?utf-8?q?_images_not_coming_in_all_installation_pages?= Message-ID: <076.37294b1e8e1224f195b3fa8ffd3b77b5@vtiger.fosslabs.com> #1099: images not coming in all installation pages -----------------------+---------------------------------------------------- Reporter: mangai | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- images not coming in all installation pages -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 10:25:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 14:25:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231099=3A?= =?utf-8?q?_images_not_coming_in_all_installation_pages?= In-Reply-To: <076.37294b1e8e1224f195b3fa8ffd3b77b5@vtiger.fosslabs.com> References: <076.37294b1e8e1224f195b3fa8ffd3b77b5@vtiger.fosslabs.com> Message-ID: <085.6b3aea7395b64ed8dafee3bd4ab62777@vtiger.fosslabs.com> #1099: images not coming in all installation pages ------------------------+--------------------------------------------------- Reporter: mangai | Owner: jerry Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * owner: developer => jerry -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 10:38:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 14:38:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6696 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060529143801.0B3BE7CF897@vtiger.fosslabs.com> Author: don Date: Mon May 29 08:37:57 2006 New Revision: 6696 Log: image location changed Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== --- vtigercrm/trunk/install/0welcome.php (original) +++ vtigercrm/trunk/install/0welcome.php Mon May 29 08:37:57 2006 @@ -61,12 +61,12 @@

    - +
    - - + + - +
    vtiger CRMv5 Betavtiger CRMv5 Beta

     vtiger CRM Configuration Wizard

     vtiger CRM Configuration Wizard

    @@ -2568,24 +2568,24 @@
    -
    +
    By clicking the Start button, you are agreeing to the licensing terms.
    - +
    - - + +
    - +
    Register vtiger CRM (Optional)Register vtiger CRM (Optional)
    Please take a moment to register your copy of vtiger CRM. Though this is optional, we encourage you to register. Only your name and email address are required for registration. We do not sell, rent, share or otherwise, distribute your information to third parties.
    From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 10:44:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 14:44:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6697 - /vtigercrm/trunk/modules/Users/Login.php Message-ID: <20060529144407.301FB7CF6A8@vtiger.fosslabs.com> Author: richie Date: Mon May 29 08:44:03 2006 New Revision: 6697 Log: changed the message Modified: vtigercrm/trunk/modules/Users/Login.php Modified: vtigercrm/trunk/modules/Users/Login.php ============================================================================== --- vtigercrm/trunk/modules/Users/Login.php (original) +++ vtigercrm/trunk/modules/Users/Login.php Mon May 29 08:44:03 2006 @@ -103,15 +103,14 @@
    - Welcome to vtiger CRM 5.0.0

    - vtigerCRM 5.0.0 is more user-friendly than ever before and sets the standard for all commercial-grade business applications, open-source or otherwise.

    + Welcome to vtiger CRM 5 Beta

    New in Beta
    -
  • Integrated Mail Client
  • -
  • API docs
  • -
  • Optimized Performance
  • +
  • Integrated webmail Client
  • +
  • Campaign Management
  • +
  • Better Performance
  • Sexier Dashboards,Reports,Calendar
  • Migration Support

  • - Your 'vtiger-xperience' is ...
    + How is 'vtiger-experience' ?
  • vtiger blogs
  • bloglines
  • technorati
  • From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 10:45:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 14:45:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6698 - /vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Message-ID: <20060529144539.0E3B67CF896@vtiger.fosslabs.com> Author: don Date: Mon May 29 08:45:35 2006 New Revision: 6698 Log: scrollbars removed from listview Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Mon May 29 08:45:35 2006 @@ -73,7 +73,7 @@
    -
    +
    {if $SHOW_MASS_SELECT neq 'false'} From vtiger-tickets at vtiger.fosslabs.com Mon May 29 10:48:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 14:48:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231100=3A?= =?utf-8?q?_Search_Issue?= Message-ID: <076.121568b45778e432f494a514491fb077@vtiger.fosslabs.com> #1100: Search Issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: philip Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- I clicked on Search under Campaigns and i clicked advanced search,then i clicked on Basic Search,then i clicked on Advanced search ,now i cant go back to Basic Search -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 10:59:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 14:59:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231101=3A?= =?utf-8?q?_UI_issue_View_Names_for_Calendar?= Message-ID: <076.b7a056cbb88a5a06ee49d953312cc2d3@vtiger.fosslabs.com> #1101: UI issue View Names for Calendar --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- the View Name for Calendar Week View and Month view is not understandable -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:01:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:01:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23149=3A_?= =?utf-8?q?Able_to_add_events_for_days_gone_by_without_any_check_in_Calend?= =?utf-8?q?ar?= In-Reply-To: <076.cf1907ebb39ce87940079993e8ae3424@vtiger.fosslabs.com> References: <076.cf1907ebb39ce87940079993e8ae3424@vtiger.fosslabs.com> Message-ID: <085.748d9516615a89612b76101313f10a80@vtiger.fosslabs.com> #149: Able to add events for days gone by without any check in Calendar ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:02:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:02:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23187=3A_?= =?utf-8?q?Cannot_Disable_Share_Calendar_Feature_for_Single_User?= In-Reply-To: <076.4a8338ece8b8361dd08d6153e6e829c1@vtiger.fosslabs.com> References: <076.4a8338ece8b8361dd08d6153e6e829c1@vtiger.fosslabs.com> Message-ID: <085.054f8acf6eb01ff5f2a80638c34c228b@vtiger.fosslabs.com> #187: Cannot Disable Share Calendar Feature for Single User ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:04:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:04:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23910=3A_?= =?utf-8?q?Calendar_-_Settings_Icon?= In-Reply-To: <076.8768051958f9fba0b00bf8e84c552efd@vtiger.fosslabs.com> References: <076.8768051958f9fba0b00bf8e84c552efd@vtiger.fosslabs.com> Message-ID: <085.58cb9ea3c803d87ae64c5987b41b8941@vtiger.fosslabs.com> #910: Calendar - Settings Icon ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:05:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:05:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231026=3A?= =?utf-8?q?_Calendar_-_Time_format_problem?= In-Reply-To: <076.5c969aa71b8ff64c4db327a2be7cce6c@vtiger.fosslabs.com> References: <076.5c969aa71b8ff64c4db327a2be7cce6c@vtiger.fosslabs.com> Message-ID: <085.97f136e781ac41170589d89625747cd3@vtiger.fosslabs.com> #1026: Calendar - Time format problem ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: calendar ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed in calendar setting UI -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:06:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:06:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231029=3A?= =?utf-8?q?_Calendar_-_No_quick_create_link_for_Todo/task?= In-Reply-To: <076.f88a93d596410fb17fcf0f1bccbc78de@vtiger.fosslabs.com> References: <076.f88a93d596410fb17fcf0f1bccbc78de@vtiger.fosslabs.com> Message-ID: <085.5bf3de9995ad8059ac060ee8a63662b1@vtiger.fosslabs.com> #1029: Calendar - No quick create link for Todo/task ------------------------+--------------------------------------------------- Reporter: saraj | Owner: managi Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: calendar ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:08:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:08:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231102=3A?= =?utf-8?q?_Calendar_Month_View_Issue?= Message-ID: <076.5adc91d14a1acc250e808369d6f5dadc@vtiger.fosslabs.com> #1102: Calendar Month View Issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- In Calendar Month View The Event comes out of the space alloted for a day -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:09:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:09:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231103=3A?= =?utf-8?q?_Change_Owner_not_working_for_Events_in_Calendar?= Message-ID: <076.456354da9a057d9c87ee8cd8dca6b107@vtiger.fosslabs.com> #1103: Change Owner not working for Events in Calendar --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:10:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:10:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23802=3A_?= =?utf-8?q?calendar_icon?= In-Reply-To: <076.4aa45f3db8ea735b9656aeaa4dd835de@vtiger.fosslabs.com> References: <076.4aa45f3db8ea735b9656aeaa4dd835de@vtiger.fosslabs.com> Message-ID: <085.ce561797bbfdc1c0d621345df867936c@vtiger.fosslabs.com> #802: calendar icon ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:10:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:10:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231104=3A?= =?utf-8?q?_Issue_in_notes_attachment?= Message-ID: <076.72db068eaf2b283598eb7f6d6eae55de@vtiger.fosslabs.com> #1104: Issue in notes attachment -----------------------+---------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In notes attachement upload a file named features.html. this file is getting saved as features.html.txt -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:14:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:14:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231105=3A?= =?utf-8?q?_Calendar_Issue?= Message-ID: <076.828097aad950dc3eaa698a08d3117831@vtiger.fosslabs.com> #1105: Calendar Issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- When I do any operations from ListView af a calendar it is going back to Hour View -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 11:18:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 15:18:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6699 - /vtigercrm/trunk/index.php Message-ID: <20060529151813.D66917CF8A0@vtiger.fosslabs.com> Author: allanbush Date: Mon May 29 09:18:11 2006 New Revision: 6699 Log: Cleaned up formatting. Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon May 29 09:18:11 2006 @@ -112,6 +112,7 @@ $_SERVER['REQUEST_URI'] = ''; } +$action = ''; if(isset($_REQUEST['action'])) { $action = $_REQUEST['action']; @@ -192,11 +193,97 @@ { $log->info("About to take action ".$action); $log->debug("in $action"); - if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action) || ereg("^TodoSave",$action) || ereg("^RecalculateSharingRules",$action) || (ereg("^body",$action) && ereg("^Webmails",$module)) || (ereg("^DetailView",$action) && ereg("^Webmails",$module) )) + if(ereg("^Save", $action) || + ereg("^Delete", $action) || + ereg("^Choose", $action) || + ereg("^Popup", $action) || + ereg("^ChangePassword", $action) || + ereg("^Authenticate", $action) || + ereg("^Logout", $action) || + ereg("^Export",$action) || + ereg("^add2db", $action) || + ereg("^result", $action) || + ereg("^LeadConvertToEntities", $action) || + ereg("^downloadfile", $action) || + ereg("^massdelete", $action) || + ereg("^updateLeadDBStatus",$action) || + ereg("^AddCustomFieldToDB", $action) || + ereg("^updateRole",$action) || + ereg("^UserInfoUtil",$action) || + ereg("^deleteRole",$action) || + ereg("^UpdateComboValues",$action) || + ereg("^fieldtypes",$action) || + ereg("^app_ins",$action) || + ereg("^minical",$action) || + ereg("^minitimer",$action) || + ereg("^app_del",$action) || + ereg("^send_mail",$action) || + ereg("^populatetemplate",$action) || + ereg("^TemplateMerge",$action) || + ereg("^testemailtemplateusage",$action) || + ereg("^saveemailtemplate",$action) || + ereg("^lookupemailtemplate",$action) || + ereg("^deletewordtemplate",$action) || + ereg("^deleteemailtemplate",$action) || + ereg("^CurrencyDelete",$action) || + ereg("^deleteattachments",$action) || + ereg("^MassDeleteUsers",$action) || + ereg("^UpdateFieldLevelAccess",$action) || + ereg("^UpdateDefaultFieldLevelAccess",$action) || + ereg("^UpdateProfile",$action) || + ereg("^updateRelations",$action) || + ereg("^updateNotificationSchedulers",$action) || + ereg("^Star",$action) || + ereg("^addPbProductRelToDB",$action) || + ereg("^UpdateListPrice",$action) || + ereg("^PriceListPopup",$action) || + ereg("^SalesOrderPopup",$action) || + ereg("^CreatePDF",$action) || + ereg("^CreateSOPDF",$action) || + ereg("^redirect",$action) || + ereg("^webmail",$action) || + ereg("^left_main",$action) || + ereg("^delete_message",$action) || + ereg("^mime",$action) || + ereg("^move_messages",$action) || + ereg("^folders_create",$action) || + ereg("^imap_general",$action) || + ereg("^mime",$action) || + ereg("^download",$action) || + ereg("^about_us",$action) || + ereg("^SendMailAction",$action) || + ereg("^CreateXL",$action) || + ereg("^savetermsandconditions",$action) || + ereg("^home_rss",$action) || + ereg("^ConvertAsFAQ",$action) || + ereg("^Tickerdetail",$action) || + ereg("^".$module."Ajax",$action) || + ereg("^chat",$action) || + ereg("^vtchat",$action) || + ereg("^updateCalendarSharing",$action) || + ereg("^disable_sharing",$action) || + ereg("^HeadLines",$action) || + ereg("^TodoSave",$action) || + ereg("^RecalculateSharingRules",$action) || + (ereg("^body",$action) && + ereg("^Webmails",$module)) || + (ereg("^DetailView",$action) && + ereg("^Webmails",$module) )) { $skipHeaders=true; //skip headers for all these invocations as they are mostly popups - if(ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Export", $action) || ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^lookupemailtemplate",$action) || ereg("^about_us",$action) || ereg("^home_rss",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action)|| ereg("^vtchat",$action) || ereg("^massdelete", $action)) + if(ereg("^Popup", $action) || + ereg("^ChangePassword", $action) || + ereg("^Export", $action) || + ereg("^downloadfile", $action) || + ereg("^fieldtypes",$action) || + ereg("^lookupemailtemplate",$action) || + ereg("^about_us",$action) || + ereg("^home_rss",$action) || + ereg("^".$module."Ajax",$action) || + ereg("^chat",$action) || + ereg("^vtchat",$action) || + ereg("^massdelete", $action)) $skipFooters=true; //skip footers for all these invocations as they are mostly popups if(ereg("^downloadfile", $action) || ereg("^fieldtypes",$action)) From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:30:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:30:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23921=3A_?= =?utf-8?q?issue_in_file_upload?= In-Reply-To: <076.bddce29e7351c94aa52dd807c034f953@vtiger.fosslabs.com> References: <076.bddce29e7351c94aa52dd807c034f953@vtiger.fosslabs.com> Message-ID: <085.7f1acff284801f6eb660f9e07e2cdfa3@vtiger.fosslabs.com> #921: issue in file upload ------------------------+--------------------------------------------------- Reporter: mangai | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:39:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:39:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231106=3A?= =?utf-8?q?_Issue_in_Calendar_Quick_Access_link?= Message-ID: <076.c6e100f8424625fa3cd82a6c919480dd@vtiger.fosslabs.com> #1106: Issue in Calendar Quick Access link --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- The Postpone link in Calendar QuickAcces do the same functionality of editing the calendar -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:40:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:40:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231107=3A?= =?utf-8?q?_Error_In_calendar?= Message-ID: <076.924adee6499b40eb86dddcd6dc28fd0e@vtiger.fosslabs.com> #1107: Error In calendar --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- type is not set when i delete an event i got this error -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:43:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:43:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231108=3A?= =?utf-8?q?_Issue_in_Week_hour_View?= Message-ID: <076.28a280a5e9b68de193a2ca12694caefc@vtiger.fosslabs.com> #1108: Issue in Week hour View --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- Week Hour View is not proper if i give a huge subject -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:51:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:51:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231109=3A?= =?utf-8?q?_total_cost_calculation_in_quote_not_clear?= Message-ID: <076.45e9bc14aab1f17446b516955f930775@vtiger.fosslabs.com> #1109: total cost calculation in quote not clear -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: quote | -----------------------+---------------------------------------------------- The Total value derived during quote creation is not intuitive. We have to assume that the total tax and the cost price are being added to get the Total Cost. The representation can be made more clearer. The product should be automatically related to the quote if the quote is being created from the related list of product or from a link in the product page -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:51:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:51:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231109=3A?= =?utf-8?q?_total_cost_calculation_in_quote_not_clear?= In-Reply-To: <076.45e9bc14aab1f17446b516955f930775@vtiger.fosslabs.com> References: <076.45e9bc14aab1f17446b516955f930775@vtiger.fosslabs.com> Message-ID: <085.57e5fb8cf5c2f6c11cfd591d2dba426b@vtiger.fosslabs.com> #1109: total cost calculation in quote not clear ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: quote ------------------------+--------------------------------------------------- Changes (by richie): * owner: developer => mickie -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:52:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:52:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231110=3A?= =?utf-8?q?_price_book_not_showing_any_entries?= Message-ID: <076.5b2bd510ab6218f7a668d3d6bf6f9aba@vtiger.fosslabs.com> #1110: price book not showing any entries -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: pricebook | -----------------------+---------------------------------------------------- when i click on the price book icon next to the list price while creation of a quote, the list view for the price book shows 0 entries. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:53:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:53:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231111=3A?= =?utf-8?q?_Unit_price_alignment?= Message-ID: <076.200736e54b6b9a89af6abc5d64dea244@vtiger.fosslabs.com> #1111: Unit price alignment ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: unit price | ------------------------+--------------------------------------------------- The Unit Price is not aligned in the same plane when there are more than one entries during quote creation -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:54:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:54:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231112=3A?= =?utf-8?q?_copy_shipping_to_billing_and_vice-versa_not_supported?= Message-ID: <076.7b8b2189052f43a7391dbcc8289cc21c@vtiger.fosslabs.com> #1112: copy shipping to billing and vice-versa not supported ---------------------------+------------------------------------------------ Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: product,quote | ---------------------------+------------------------------------------------ There is no facility to copy the shipping and billing addresses to each other if need be. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:56:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:56:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231113=3A?= =?utf-8?q?_export_to_pdf_fails_from_quotes?= Message-ID: <076.431db81bc7b29e1e6bec57b2346fde3b@vtiger.fosslabs.com> #1113: export to pdf fails from quotes -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: quote | -----------------------+---------------------------------------------------- Warning: getimagesize(test/logo/sale.jpeg) [function.getimagesize]: failed to open stream: No such file or directory in C:\mayval\vtigercrm-5.0.0-beta\apache\htdocs\vtigerCRM\include\fpdf\fpdf.php on line 1505 FPDF error: Missing or incorrect image file: test/logo/sale.jpeg -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 11:58:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 15:58:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231114=3A?= =?utf-8?q?_tax_split_up_shows_only_upon_clicking_on_button?= Message-ID: <076.e0fc7e9f8cb228797d775f33694000ad@vtiger.fosslabs.com> #1114: tax split up shows only upon clicking on button -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- tax split up gets listed only upon clicking the button. The sequence should have been the other way round. The button too is not intuitive. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 12:28:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 16:28:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231115=3A?= =?utf-8?q?_Report_Creator_=3E_Relative_Module_not_showing?= Message-ID: <076.bfc887d15993de2dff63a0499087006d@vtiger.fosslabs.com> #1115: Report Creator > Relative Module not showing -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- There are no entries at the relative module - step 2 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 13:20:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 17:20:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?= =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?= =?utf-8?q?leased?= Message-ID: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com> #1116: FCKeditor: document version used, merge new versions as released ---------------------------------------+------------------------------------ Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: editor packaging snapshot | ---------------------------------------+------------------------------------ It seems that the most recent FCKEditor snapshot was added in r1799, nearly 10 months ago. I don't know what version of FCKEditor this was, but I'd like to follow the same policy I advocated with adodb, specifically upgrading to the latest stable releases to take advantage of externally- developed feature additions and security and bug fixes. This is different packaging issue than adodb, because I think the client- side FCKEditor will always be used from its location in the vtigercrm source. However, with all the browser compatibilty work that goes into FCKEditor, we're foolish not to update to the most recent version as often as our release schedule permits. FCKEditor is under active development at http://www.fckeditor.net/ I propose the following: * Document the version of FCKEditor that is currently snapshotted per r1799 (or later). * I will merge (and give cursory testing to) the most recent stable FCKEditor: FCKeditor 2.2 released 2005-12-23 * In an easily-reversible changeset, I will merge (and give cursory testing to) the development version of FCKEditor: FCKeditor 2.3 Beta released 2006-05-16 As well as merging subsequent betas. By the time vtigercrm-5.0.0 nears release, FCKEditor-2.3 will be our documented snapshot. Please give feedback to this bug to help decide this course of action. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 14:12:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 18:12:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6700 - /vtigercrm/trunk/include/install/images/ Message-ID: <20060529181245.B58167D37E8@vtiger.fosslabs.com> Author: richie Date: Mon May 29 12:12:24 2006 New Revision: 6700 Log: install images moved to include/install/images Added: vtigercrm/trunk/include/install/images/ vtigercrm/trunk/include/install/images/cwBtnChange.gif (with props) vtigercrm/trunk/include/install/images/cwBtnFinish.gif (with props) vtigercrm/trunk/include/install/images/cwBtnNext.gif (with props) vtigercrm/trunk/include/install/images/cwBtnStart.gif (with props) vtigercrm/trunk/include/install/images/cwHdrCnfSysConf.gif (with props) vtigercrm/trunk/include/install/images/cwHdrCrConfFile.gif (with props) vtigercrm/trunk/include/install/images/cwHdrCrDbTables.gif (with props) vtigercrm/trunk/include/install/images/cwHdrSysCheck.gif (with props) vtigercrm/trunk/include/install/images/cwHdrSysConf.gif (with props) vtigercrm/trunk/include/install/images/cwHdrVtConfWiz.gif (with props) vtigercrm/trunk/include/install/images/cwIcoConfFile.gif (with props) vtigercrm/trunk/include/install/images/cwIcoDB.gif (with props) vtigercrm/trunk/include/install/images/cwIcoSystem.gif (with props) vtigercrm/trunk/include/install/images/cwRegVCRM.gif (with props) vtigercrm/trunk/include/install/images/cwShadeBg.gif (with props) vtigercrm/trunk/include/install/images/cwShadeLeft.gif (with props) vtigercrm/trunk/include/install/images/cwShadeRight.gif (with props) vtigercrm/trunk/include/install/images/cwStep1of5.gif (with props) vtigercrm/trunk/include/install/images/cwStep2of5.gif (with props) vtigercrm/trunk/include/install/images/cwStep3of5.gif (with props) vtigercrm/trunk/include/install/images/cwStep4of5.gif (with props) vtigercrm/trunk/include/install/images/cwStep5of5.gif (with props) vtigercrm/trunk/include/install/images/cwTitle.gif (with props) vtigercrm/trunk/include/install/images/cwTopBg.gif (with props) vtigercrm/trunk/include/install/images/cwTopLeft.gif (with props) vtigercrm/trunk/include/install/images/cwTopRight.gif (with props) vtigercrm/trunk/include/install/images/cwURL.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 14:13:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 18:13:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6701 - /vtigercrm/trunk/include/images/install/ Message-ID: <20060529181340.775F67D37F1@vtiger.fosslabs.com> Author: richie Date: Mon May 29 12:13:36 2006 New Revision: 6701 Log: install images deleted Removed: vtigercrm/trunk/include/images/install/ From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 14:46:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 18:46:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6702 - in /vtigercrm/trunk/include: images/install/ install/images/ Message-ID: <20060529184650.B7E787D37EA@vtiger.fosslabs.com> Author: jeffk Date: Mon May 29 12:46:37 2006 New Revision: 6702 Log: backing out r6700:6701. will do subversion-style history-aware move next Added: vtigercrm/trunk/include/images/install/ - copied from r6699, vtigercrm/trunk/include/images/install/ vtigercrm/trunk/include/images/install/cwBtnChange.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwBtnChange.gif vtigercrm/trunk/include/images/install/cwBtnFinish.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwBtnFinish.gif vtigercrm/trunk/include/images/install/cwBtnNext.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwBtnNext.gif vtigercrm/trunk/include/images/install/cwBtnStart.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwBtnStart.gif vtigercrm/trunk/include/images/install/cwHdrCnfSysConf.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrCnfSysConf.gif vtigercrm/trunk/include/images/install/cwHdrCrConfFile.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrCrConfFile.gif vtigercrm/trunk/include/images/install/cwHdrCrDbTables.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrCrDbTables.gif vtigercrm/trunk/include/images/install/cwHdrSysCheck.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrSysCheck.gif vtigercrm/trunk/include/images/install/cwHdrSysConf.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrSysConf.gif vtigercrm/trunk/include/images/install/cwHdrVtConfWiz.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwHdrVtConfWiz.gif vtigercrm/trunk/include/images/install/cwIcoConfFile.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwIcoConfFile.gif vtigercrm/trunk/include/images/install/cwIcoDB.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwIcoDB.gif vtigercrm/trunk/include/images/install/cwIcoSystem.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwIcoSystem.gif vtigercrm/trunk/include/images/install/cwRegVCRM.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwRegVCRM.gif vtigercrm/trunk/include/images/install/cwShadeBg.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwShadeBg.gif vtigercrm/trunk/include/images/install/cwShadeLeft.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwShadeLeft.gif vtigercrm/trunk/include/images/install/cwShadeRight.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwShadeRight.gif vtigercrm/trunk/include/images/install/cwStep1of5.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwStep1of5.gif vtigercrm/trunk/include/images/install/cwStep2of5.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwStep2of5.gif vtigercrm/trunk/include/images/install/cwStep3of5.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwStep3of5.gif vtigercrm/trunk/include/images/install/cwStep4of5.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwStep4of5.gif vtigercrm/trunk/include/images/install/cwStep5of5.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwStep5of5.gif vtigercrm/trunk/include/images/install/cwTitle.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwTitle.gif vtigercrm/trunk/include/images/install/cwTopBg.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwTopBg.gif vtigercrm/trunk/include/images/install/cwTopLeft.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwTopLeft.gif vtigercrm/trunk/include/images/install/cwTopRight.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwTopRight.gif vtigercrm/trunk/include/images/install/cwURL.gif - copied unchanged from r6699, vtigercrm/trunk/include/images/install/cwURL.gif Removed: vtigercrm/trunk/include/install/images/ From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 14:51:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 18:51:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6703 - in /vtigercrm/trunk/include: images/install/ install/images/ Message-ID: <20060529185130.78E257D37F7@vtiger.fosslabs.com> Author: jeffk Date: Mon May 29 12:51:28 2006 New Revision: 6703 Log: install images moved to include/install/images, history-aware replay of r6700:r6701 Added: vtigercrm/trunk/include/install/images/ - copied from r6702, vtigercrm/trunk/include/images/install/ Removed: vtigercrm/trunk/include/images/install/ From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 15:39:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 19:39:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6704 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060529193903.176E47D37FF@vtiger.fosslabs.com> Author: richie Date: Mon May 29 13:38:58 2006 New Revision: 6704 Log: status aligned Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon May 29 13:38:58 2006 @@ -419,7 +419,7 @@ - + +
    - + salesorderid @@ -3399,6 +3402,9 @@ + + + quoteid @@ -3521,6 +3527,9 @@ + + + quoteid @@ -3636,6 +3645,9 @@ + + + invoice From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 18:34:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 22:34:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6724 - /vtigercrm/trunk/index.php Message-ID: <20060529223409.D36484C4412@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 16:34:06 2006 New Revision: 6724 Log: * Modified to avoid the copyright statement in Popups Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Mon May 29 16:34:06 2006 @@ -650,7 +650,8 @@ "; - if($action != "about_us" && $action != "vtchat" && $action != "ChangePassword" && $action != "body" && $action != $module."Ajax") + if($action != "about_us" && $action != "vtchat" && $action != "ChangePassword" && $action != "body" && $action != $module."Ajax" && $action!='Popup') + { echo $copyrightstatement; echo ""; From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 18:35:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 22:35:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6725 - /vtigercrm/trunk/Smarty/templates/Popup.tpl Message-ID: <20060529223546.AE56A4C4412@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 16:35:43 2006 New Revision: 6725 Log: * Added class small in table to display the Alphabetical search letters as small Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Popup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Popup.tpl Mon May 29 16:35:43 2006 @@ -58,7 +58,7 @@ - + - - + + - - + + + - -
    {$APP.$CATEGORY} > {$APP.$MODULE}{$APP.$CATEGORY} > {$APP.$MODULE} @@ -22,7 +23,7 @@ - - - + + + '; $output .= ''; $output .= ''; - $output .= ''; + $output .= ''; $output .= ''; Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon May 29 16:25:34 2006 @@ -1209,11 +1209,16 @@ $productid=$adb->query_result($result,$i-1,'productid'); $qty=$adb->query_result($result,$i-1,'quantity'); $listprice=$adb->query_result($result,$i-1,'listprice'); + $vat=$adb->query_result($result,$i-1,'vattax'); + $sales=$adb->query_result($result,$i-1,'salestax'); + $service=$adb->query_result($result,$i-1,'servicetax'); + if($listprice == '') $listprice = $unitprice; if($qty =='') $qty = 1; $total = $qty*$listprice; + $total_with_tax = $total+($vat*$total/100)+($sales*$total/100)+($service*$total/100); $product_id_var = 'hdnProductId'.$i; $status_var = 'hdnRowStatus'.$i; @@ -1233,7 +1238,7 @@ $product_Detail[$i]['txtQty'.$i]=$qty; $product_Detail[$i]['unitPrice'.$i]=$unitprice; $product_Detail[$i]['txtListPrice'.$i]=$listprice; - $product_Detail[$i]['total'.$i]=$total; + $product_Detail[$i]['total'.$i]=$total_with_tax; if($i != 1) { @@ -1245,9 +1250,9 @@ $product_Detail[$i]['hdnTotal'.$i] = $total; //Added to pass the tax percentage values - $product_Detail[$i]['txtVATTax'.$i] = getProductTaxPercentage('VAT',$productid,'default'); - $product_Detail[$i]['txtSalesTax'.$i] = getProductTaxPercentage('Sales',$productid,'default'); - $product_Detail[$i]['txtServiceTax'.$i] = getProductTaxPercentage('Service',$productid,'default'); + $product_Detail[$i]['txtVATTax'.$i] = $vat;//getProductTaxPercentage('VAT',$productid,'default'); + $product_Detail[$i]['txtSalesTax'.$i] = $sales;//getProductTaxPercentage('Sales',$productid,'default'); + $product_Detail[$i]['txtServiceTax'.$i] = $service;//getProductTaxPercentage('Service',$productid,'default'); } $log->debug("Exiting getAssociatedProducts method ..."); Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Mon May 29 16:25:34 2006 @@ -69,14 +69,22 @@ $qty_var = 'txtQty'.$i; $list_price_var = 'txtListPrice'.$i; + $vat_var = 'txtVATTax'.$i; + $sales_var = 'txtSalesTax'.$i; + $service_var = 'txtServiceTax'.$i; + $prod_id = $_REQUEST[$product_id_var]; $prod_status = $_REQUEST[$status_var]; $qty = $_REQUEST[$qty_var]; $listprice = $_REQUEST[$list_price_var]; + $vat = $_REQUEST[$vat_var]; + $sales = $_REQUEST[$sales_var]; + $service = $_REQUEST[$service_var]; + if($prod_status != 'D') { - $query ="insert into invoiceproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; + $query ="insert into invoiceproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)"; $adb->query($query); //Updating the Quantity in Stock in the Product Table updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Invoice'); Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Mon May 29 16:25:34 2006 @@ -2756,7 +2756,27 @@ $update_query5 = "update field set quickcreate=1, quickcreatesequence=NULL where tabid in (10,14)"; Execute($update_query5); - +$alter_query_array18 = Array( + "alter table soproductrel add column vattax decimal(7,3) default NULL", + "alter table soproductrel add column salestax decimal(7,3) default NULL", + "alter table soproductrel add column servicetax decimal(7,3) default NULL", + + "alter table poproductrel add column vattax decimal(7,3) default NULL", + "alter table poproductrel add column salestax decimal(7,3) default NULL", + "alter table poproductrel add column servicetax decimal(7,3) default NULL", + + "alter table quotesproductrel add column vattax decimal(7,3) default NULL", + "alter table quotesproductrel add column salestax decimal(7,3) default NULL", + "alter table quotesproductrel add column servicetax decimal(7,3) default NULL", + + "alter table invoiceproductrel add column vattax decimal(7,3) default NULL", + "alter table invoiceproductrel add column salestax decimal(7,3) default NULL", + "alter table invoiceproductrel add column servicetax decimal(7,3) default NULL", + ); +foreach($alter_query_array18 as $query) +{ + Execute($query); +} Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Mon May 29 16:25:34 2006 @@ -59,14 +59,22 @@ $qty_var = 'txtQty'.$i; $list_price_var = 'txtListPrice'.$i; + $vat_var = 'txtVATTax'.$i; + $sales_var = 'txtSalesTax'.$i; + $service_var = 'txtServiceTax'.$i; + $prod_id = $_REQUEST[$product_id_var]; $prod_status = $_REQUEST[$status_var]; $qty = $_REQUEST[$qty_var]; $listprice = $_REQUEST[$list_price_var]; + $vat = $_REQUEST[$vat_var]; + $sales = $_REQUEST[$sales_var]; + $service = $_REQUEST[$service_var]; + if($prod_status != 'D') { - $query ="insert into poproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; + $query ="insert into poproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)"; $adb->query($query); if($update_prod_stock == 'true') { Modified: vtigercrm/trunk/modules/Quotes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Save.php (original) +++ vtigercrm/trunk/modules/Quotes/Save.php Mon May 29 16:25:34 2006 @@ -67,14 +67,22 @@ $qty_var = 'txtQty'.$i; $list_price_var = 'txtListPrice'.$i; + $vat_var = 'txtVATTax'.$i; + $sales_var = 'txtSalesTax'.$i; + $service_var = 'txtServiceTax'.$i; + $prod_id = $_REQUEST[$product_id_var]; $prod_status = $_REQUEST[$status_var]; $qty = $_REQUEST[$qty_var]; $listprice = $_REQUEST[$list_price_var]; + $vat = $_REQUEST[$vat_var]; + $sales = $_REQUEST[$sales_var]; + $service = $_REQUEST[$service_var]; + if($prod_status != 'D') { - $query ="insert into quotesproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; + $query ="insert into quotesproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)"; $adb->query($query); //Checking the re-order level and sending mail updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Quotes'); Modified: vtigercrm/trunk/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Save.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Save.php Mon May 29 16:25:34 2006 @@ -69,14 +69,22 @@ $qty_var = 'txtQty'.$i; $list_price_var = 'txtListPrice'.$i; + $vat_var = 'txtVATTax'.$i; + $sales_var = 'txtSalesTax'.$i; + $service_var = 'txtServiceTax'.$i; + $prod_id = $_REQUEST[$product_id_var]; $prod_status = $_REQUEST[$status_var]; $qty = $_REQUEST[$qty_var]; $listprice = $_REQUEST[$list_price_var]; + $vat = $_REQUEST[$vat_var]; + $sales = $_REQUEST[$sales_var]; + $service = $_REQUEST[$service_var]; + if($prod_status != 'D') { - $query ="insert into soproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; + $query ="insert into soproductrel values($focus->id, $prod_id , $qty, $listprice, $vat, $sales, $service)"; $adb->query($query); updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'SalesOrder'); } From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 18:31:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 22:31:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6722 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060529223121.3172E4C440F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 16:31:17 2006 New Revision: 6722 Log: * Modified the fnAddRow and fnAddRowForPO functions Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Mon May 29 16:31:17 2006 @@ -1445,10 +1445,10 @@ colfour.innerHTML=" 
    "; colfive.innerHTML="  "; //Added for tax calculation - colsix.innerHTML=" 
    - {if $CHECK.EditView eq 'yes'} + {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} {if $MODULE eq 'Activities'} {else} Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Mon May 29 14:15:51 2006 @@ -99,12 +99,11 @@ {rdelim} + {include file='Buttons_List.tpl'}
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...
    - @@ -152,7 +151,7 @@ {$MOD.LBL_QUAL_CONTACT} 
  •    - {$MOD.LBL_MY_MAILS}  + {$MOD.LBL_MY_MAILS} 

  •  {$MOD.LBL_SENT_MAILS} Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Mon May 29 14:15:51 2006 @@ -10,11 +10,10 @@ ********************************************************************************/ -->*} + {include file='Buttons_List.tpl'}

    - {$CATEGORY} > {$MODULE} -
    +
       
    - From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 16:17:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:17:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6712 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060529201733.8B4E47D2F9B@vtiger.fosslabs.com> Author: richie Date: Mon May 29 14:17:29 2006 New Revision: 6712 Log: appstrings added for wemails module Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Mon May 29 14:17:29 2006 @@ -727,6 +727,7 @@ 'Vendors'=>'Vendors', 'Rss'=>'RSS', 'Portal'=>'My Sites', +'Webmails'=>'Webmails', //Added language for Parent Tab From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 16:18:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:18:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6713 - in /vtigercrm/trunk/modules/Webmails: WebmailsAjax.php webmails.js Message-ID: <20060529201844.D12DC7D30A1@vtiger.fosslabs.com> Author: mmbrich Date: Mon May 29 14:18:43 2006 New Revision: 6713 Log: more fixes for mailbox tally Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/trunk/modules/Webmails/WebmailsAjax.php Mon May 29 14:18:43 2006 @@ -75,9 +75,9 @@ $boxes[$i]["name"] = $mailbox; if($val == sizeof($search)) $boxes[$i]["newmsgs"] = 0; - else { - $boxes[$i]["newmsgs"] = (sizeof($search)-$val); - $_SESSION["mailboxes"][$mailbox] = ($val+sizeof($search)); + elseif($val < sizeof($search)) { + $boxes[$i]["newmsgs"] = (sizeof($search) - $val); + $_SESSION["mailboxes"][$key] = (sizeof($search)); } $i++; } Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Mon May 29 14:18:43 2006 @@ -99,7 +99,7 @@ if(mbox != mymbox) { var mbox = data.msgs[i].msg.box; var numnew = parseInt(data.msgs[i].msg.newmsgs); - + var read = parseInt($(mbox+"_read").innerHTML); $(mbox+"_read").innerHTML = (read+numnew); var unread = parseInt($(mbox+"_unread").innerHTML); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 16:26:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:26:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6714 - /vtigercrm/trunk/modules/Webmails/ListView.php Message-ID: <20060529202652.26EB47D2D43@vtiger.fosslabs.com> Author: mmbrich Date: Mon May 29 14:26:50 2006 New Revision: 6714 Log: fixes for empty mailbox Modified: vtigercrm/trunk/modules/Webmails/ListView.php Modified: vtigercrm/trunk/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/ListView.php (original) +++ vtigercrm/trunk/modules/Webmails/ListView.php Mon May 29 14:26:50 2006 @@ -225,7 +225,8 @@ return $listview_entries[$num]; } - +$displayed_msgs=0; +$new_msgs=0; if($numEmails <= 0) $listview_entries[0][] = ''; else { @@ -245,8 +246,6 @@ // MAIN LOOP // Main loop to create listview entries -$displayed_msgs=0; -$new_msgs=0; $i=1; while ($i<$c) { if(is_array($searchlist)) { @@ -261,7 +260,7 @@ $i++; $start_message--; } - +} // Build folder list and move_to dropdown box $list = imap_getmailboxes($mbox, "{".$imapServerAddress."}", "*"); @@ -300,7 +299,6 @@ imap_close($mbox); global $current_user; -} $smarty = new vtigerCRM_Smarty; $smarty->assign("USERID", $current_user->id); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 16:47:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:47:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6715 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060529204741.02D067D2D22@vtiger.fosslabs.com> Author: richie Date: Mon May 29 14:47:37 2006 New Revision: 6715 Log: function fnhide added Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Mon May 29 14:47:37 2006 @@ -1133,6 +1133,13 @@ id.style.display = 'none'; } +function fnhide(divId) +{ + + var id = document.getElementById(divId); + + id.style.display = 'none'; +} function fnLoadValues(obj1,obj2,SelTab,unSelTab){ From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 16:48:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:48:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6716 - /vtigercrm/trunk/include/utils/ListViewUtils.php Message-ID: <20060529204811.923027D13AE@vtiger.fosslabs.com> Author: richie Date: Mon May 29 14:48:07 2006 New Revision: 6716 Log: cntct image restored Modified: vtigercrm/trunk/include/utils/ListViewUtils.php Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon May 29 14:48:07 2006 @@ -1410,11 +1410,14 @@ if($imagename != '') { $imgpath = "test/contact/".$imagename; - $contact_image='  '; + $contact_image=''; } - } + $value = '
    - {$CATEGORY} -> {$MODULE} -

    +
       
    No Emails In This Folder
    '.$temp_val.''.$contact_image.'
    '; + }else + { //Commented to give link even to the first name - Jaguar $value = $contact_image.''.$temp_val.''; + } } elseif($module == "Activities") { From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 16:49:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 20:49:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6717 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060529204901.139567D2D57@vtiger.fosslabs.com> Author: richie Date: Mon May 29 14:48:57 2006 New Revision: 6717 Log: cntct image restored Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon May 29 14:48:57 2006 @@ -17,7 +17,7 @@ {if $MODULE eq 'Contacts'} -
    +
    {/if} - - - - - - - - - - {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} - - {/if} - - - - - - - - - - - {foreach key=row_no item=data from=$ASSOCIATEDPRODUCTS} - {assign var="txtProduct" value="txtProduct"|cat:$row_no} - {assign var="qtyInStock" value="qtyInStock"|cat:$row_no} - {assign var="txtQty" value="txtQty"|cat:$row_no} - {assign var="unitPrice" value="unitPrice"|cat:$row_no} - {assign var="txtListPrice" value="txtListPrice"|cat:$row_no} - {assign var="total" value="total"|cat:$row_no} - {assign var="hdnProductId" value="hdnProductId"|cat:$row_no} - {assign var="hdnRowStatus" value="hdnRowStatus"|cat:$row_no} - {assign var="hdnTotal" value="hdnTotal"|cat:$row_no} - - {assign var="txtVATTax" value="txtVATTax"|cat:$row_no} - {assign var="txtSalesTax" value="txtSalesTax"|cat:$row_no} - {assign var="txtServiceTax" value="txtServiceTax"|cat:$row_no} - - - - - {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} - - {/if} - - - - - - - - - {/foreach} -
    - {$APP.LBL_PRODUCT_DETAILS} -
    *{$APP.LBL_PRODUCT}{$APP.LBL_QTY_IN_STOCK}*{$APP.LBL_QTY}{$APP.LBL_UNIT_PRICE}*{$APP.LBL_LIST_PRICE}{$APP.LBL_TAX_CALCULATION}{$APP.LBL_TOTAL} 
    -   -
    {$data.$qtyInStock}
     
    - - -
    {$data.$unitPrice}
      -
    -   - - - - -   - - - - - - - -
    {$data.$total}
      -
    - - -   -
    -
    - - - - {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - -  {$APP.LBL_SUB_TOTAL} - -  
      {$APP.LBL_TAX} 
      {$APP.LBL_ADJUSTMENT} 
      {$APP.LBL_GRAND_TOTAL} 
    - - - - - - - - +{**} + + + + + + + + + +
    + {$APP.LBL_PRODUCT_DETAILS} +
    + + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {/if} + + + + + + + + + + + {foreach key=row_no item=data from=$ASSOCIATEDPRODUCTS} + {assign var="txtProduct" value="txtProduct"|cat:$row_no} + {assign var="qtyInStock" value="qtyInStock"|cat:$row_no} + {assign var="txtQty" value="txtQty"|cat:$row_no} + {assign var="unitPrice" value="unitPrice"|cat:$row_no} + {assign var="txtListPrice" value="txtListPrice"|cat:$row_no} + {assign var="total" value="total"|cat:$row_no} + {assign var="hdnProductId" value="hdnProductId"|cat:$row_no} + {assign var="hdnRowStatus" value="hdnRowStatus"|cat:$row_no} + {assign var="hdnTotal" value="hdnTotal"|cat:$row_no} + + {assign var="txtVATTax" value="txtVATTax"|cat:$row_no} + {assign var="txtSalesTax" value="txtSalesTax"|cat:$row_no} + {assign var="txtServiceTax" value="txtServiceTax"|cat:$row_no} + + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {/if} + + + + + + + + + {/foreach} +
    *{$APP.LBL_PRODUCT}{$APP.LBL_QTY_IN_STOCK}*{$APP.LBL_QTY}{$APP.LBL_UNIT_PRICE}*{$APP.LBL_LIST_PRICE}{$APP.LBL_TAX_CALCULATION}{$APP.LBL_TOTAL} 
    +   + {$data.$qtyInStock}  + + + {$data.$unitPrice}  + +   + + + + +   + + + + + + + + + +
    {$data.$total}
      +
    + + +   +
    +
    + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {else} + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +  {$APP.LBL_SUB_TOTAL} + +  
      {$APP.LBL_TAX} 
      {$APP.LBL_ADJUSTMENT} 
      {$APP.LBL_GRAND_TOTAL} 
    + + + + + + + + Modified: vtigercrm/trunk/include/js/Inventory.js ============================================================================== --- vtigercrm/trunk/include/js/Inventory.js (original) +++ vtigercrm/trunk/include/js/Inventory.js Mon May 29 16:25:34 2006 @@ -79,7 +79,7 @@ return prodListBody; } -function delRow(rowId) { +/*function delRow(rowId) { var rowId=parseInt(rowId.substr(rowId.indexOf("w")+1,rowId.length)) //removing the corresponding row var prodListBody=getProdListBody() @@ -160,7 +160,111 @@ } calcGrandTotal() -} +}*/ + +/* New Delete Function */ + +// Don't take risk by changing this function + +function deleteRow(module,i) +{ + rowCnt--; + var tableName = document.getElementById('proTab'); + var prev = tableName.rows.length; + document.getElementById('proTab').deleteRow(i); + for(loop_count=i+1;loop_countquery_result($result,$i-1,'qtyinstock'); $qty=$adb->query_result($result,$i-1,'quantity'); $listprice=$adb->query_result($result,$i-1,'listprice'); + $vat=$adb->query_result($result,$i-1,'vattax'); + $sales=$adb->query_result($result,$i-1,'salestax'); + $service=$adb->query_result($result,$i-1,'servicetax'); $total = $qty*$listprice; + $total_with_tax = $total+($vat*$total/100)+($sales*$total/100)+($service*$total/100); if($i%2 == 0) { @@ -914,7 +918,7 @@ $output .= '
    '.$qty.''.$unitprice.''.$listprice.'
    '.$total.'
    '.$total_with_tax.'
     VAT
     Sales
     Service
    "; - - colseven.innerHTML=" 
    "; - coleight.innerHTML="Del"; + colsix.innerHTML=" "; + + colseven.innerHTML=" 
    "; + coleight.innerHTML="Del"; } function fnAddRowForPO(module){ @@ -1485,20 +1485,14 @@ colfour.innerHTML="  "; //Added for tax calculation - colfive.innerHTML=" "; - - colsix.innerHTML=" 
    "; - colseven.innerHTML="Del"; - -} + colfive.innerHTML=" "; + + colsix.innerHTML=" 
    "; + colseven.innerHTML="Del"; + +} + - -function deleteRow(i) -{ - rowCnt--; - document.getElementById('proTab').deleteRow(i); -} - function cancelForm(frm) { window.history.back(); From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 18:32:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 22:32:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6723 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060529223218.3F7F04C440F@vtiger.fosslabs.com> Author: saraj Date: Mon May 29 16:32:13 2006 New Revision: 6723 Log: * Added vat, sales and service tax fields in po, so, quotes and invoice product related tables Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Mon May 29 16:32:13 2006 @@ -3095,6 +3095,9 @@ + + +
    - +
    {$ALPHABETICAL} From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 18:40:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 22:40:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6726 - in /vtigercrm/trunk/modules/Webmails: WebmailsAjax.php webmails.js Message-ID: <20060529224009.8E55A492E93@vtiger.fosslabs.com> Author: mmbrich Date: Mon May 29 16:40:08 2006 New Revision: 6726 Log: more speed improvements with imap_status Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/trunk/modules/Webmails/WebmailsAjax.php Mon May 29 16:40:08 2006 @@ -70,20 +70,19 @@ $mailbox=$key; $mbox = getImapMbox($mailbox,$temprow,"true"); - $search = imap_search($mbox, "NEW ALL"); - if($search != false) { - $boxes[$i]["name"] = $mailbox; - if($val == sizeof($search)) - $boxes[$i]["newmsgs"] = 0; - elseif($val < sizeof($search)) { - $boxes[$i]["newmsgs"] = (sizeof($search)-$val); - $_SESSION["mailboxes"][$key] = (sizeof($search)); - } else { - $boxes[$i]["newmsgs"] = 0; - $_SESSION["mailboxes"][$key] = 0; - } - $i++; + $box = imap_status($mbox, "{".$imapServerAddress."}".$mailbox, SA_ALL); + + $boxes[$i]["name"] = $mailbox; + if($val == $box->unseen) + $boxes[$i]["newmsgs"] = 0; + elseif($val < $box->unseen) { + $boxes[$i]["newmsgs"] = ($box->unseen-$val); + $_SESSION["mailboxes"][$mailbox] = $box->unseen; + } else { + $boxes[$i]["newmsgs"] = 0; + $_SESSION["mailboxes"][$mailbox] = $box->unseen; } + $i++; imap_close($mbox); } Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Mon May 29 16:40:08 2006 @@ -84,7 +84,6 @@ if(degraded_service == 'true') { return; } - $("status").style.display="block"; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, @@ -92,13 +91,13 @@ postBody: 'module=Webmails&action=WebmailsAjax&command=check_mbox_all&ajax=true', onComplete: function(t) { //alert(t.responseText); - try { if(t.responseText != "") { var data = eval('(' + t.responseText + ')'); for (var i=0;i Author: mmbrich Date: Mon May 29 16:41:36 2006 New Revision: 6727 Log: no need to degrade service for check_all but it won't be hit on a degraded client anyways \(refresh happens first) Modified: vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Mon May 29 16:41:36 2006 @@ -81,9 +81,6 @@ } } function check_in_all_boxes(mymbox) { - if(degraded_service == 'true') { - return; - } new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, From vtiger-tickets at vtiger.fosslabs.com Mon May 29 18:42:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 29 May 2006 22:42:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23736=3A_?= =?utf-8?q?Changing_existing_quote_line_items_causes_improper_subtotal?= In-Reply-To: <076.1175e17764a34c299e4966098111d634@vtiger.fosslabs.com> References: <076.1175e17764a34c299e4966098111d634@vtiger.fosslabs.com> Message-ID: <085.f1fa6f4232963d45d152004c45dea62d@vtiger.fosslabs.com> #736: Changing existing quote line items causes improper subtotal ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: mickie Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: quote ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 19:01:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 23:01:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6728 - /vtigercrm/trunk/modules/Webmails/webmails.js Message-ID: <20060529230148.B17CD4C4A94@vtiger.fosslabs.com> Author: mmbrich Date: Mon May 29 17:01:47 2006 New Revision: 6728 Log: more mail check cleanups Modified: vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Mon May 29 17:01:47 2006 @@ -91,10 +91,9 @@ if(t.responseText != "") { var data = eval('(' + t.responseText + ')'); for (var i=0;i #1117: Ajax object naming collision --------------------------------------------------------+------------------- Reporter: mmbrich | Owner: developer Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: prototype, javascript, ajax, scriptaculous | --------------------------------------------------------+------------------- The vtiger Ajax object is named "Ajax" in ajax.js. This is causing a name collision with prototype since the prototype ajax object and it's constructors are named Ajax*. Please change the name of the vtiger Ajax object to something like VTAjax or VtigerAjax or something more geared towards vtiger and the environment that it's used in or prototype applications will not work well with vtiger. Matt -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon May 29 19:28:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 29 May 2006 23:28:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6729 - in /vtigercrm/trunk: Smarty/templates/ Smarty/templates/Inventory/ Smarty/templates/Settings/ include/js/ modules/Activities/ modules/Calendar/ modules/Contacts/js/ modules/Emails/ modules/Faq/ modules/Migration/ModifyDatabase/ modules/Portal/ modules/Users/ Message-ID: <20060529232825.3C1857D7D84@vtiger.fosslabs.com> Author: mmbrich Date: Mon May 29 17:28:17 2006 New Revision: 6729 Log: This renames function Ajax() to function VtigerAjax() and tries to find any files that had a call to Ajax and change appropriately. Since this is all done in one check-in it should be nice and easy to back out if I broke anything. Closes # 1117 Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/Emails.tpl vtigercrm/trunk/Smarty/templates/GroupEditView.tpl vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/Smarty/templates/ImportStep2.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl vtigercrm/trunk/Smarty/templates/ListRoles.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/trunk/Smarty/templates/Popup.tpl vtigercrm/trunk/Smarty/templates/ReportRun.tpl vtigercrm/trunk/Smarty/templates/Reports.tpl vtigercrm/trunk/Smarty/templates/RoleEditView.tpl vtigercrm/trunk/Smarty/templates/Rss.tpl vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/Smarty/templates/UserListView.tpl vtigercrm/trunk/Smarty/templates/UserProfile.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl vtigercrm/trunk/include/js/ListView.js vtigercrm/trunk/include/js/Mail.js vtigercrm/trunk/include/js/ajax.js vtigercrm/trunk/include/js/dtlviewajax.js vtigercrm/trunk/modules/Activities/Activity.js vtigercrm/trunk/modules/Calendar/script.js vtigercrm/trunk/modules/Contacts/js/chat.js vtigercrm/trunk/modules/Emails/Email.js vtigercrm/trunk/modules/Faq/Faq.js vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php vtigercrm/trunk/modules/Portal/Portal.js vtigercrm/trunk/modules/Users/listroles.html Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Mon May 29 17:28:17 2006 @@ -93,7 +93,7 @@ function dup_validation(profilename) {ldelim} - var ajaxObj = new Ajax(ajaxSaveResponse); + var ajaxObj = new VtigerAjax(ajaxSaveResponse); var urlstring ="module=Users&action=UsersAjax&file=CreateProfile1&ajax=true&dup_check=true&profile_name="+profilename; ajaxObj.process("index.php?",urlstring); Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Mon May 29 17:28:17 2006 @@ -35,7 +35,7 @@ if(Ticker!='') {ldelim} show('vtbusy_info'); - var ajaxObj = new Ajax(ajaxResponse); + var ajaxObj = new VtigerAjax(ajaxResponse); //var Ticker = document.getElementById('tickersymbol').value; var urlstring = "module={$MODULE}&action=Tickerdetail&tickersymbol="+Ticker; ajaxObj.process("index.php?",urlstring); Modified: vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Mon May 29 17:28:17 2006 @@ -16,7 +16,7 @@ function deleteCurrency(currid) { show("status"); - var ajaxObj = new Ajax(ajaxCurrencyDeleteResponse); + var ajaxObj = new VtigerAjax(ajaxCurrencyDeleteResponse); var urlstring = "action=SettingsAjax&file=CurrencyDeleteStep1&return_action=CurrencyListView&return_module=Settings&module=Settings&parenttab=Settings&id="+currid; ajaxObj.process("index.php?",urlstring); } @@ -31,7 +31,7 @@ { show("status"); hide("CurrencyDeleteLay"); - var ajaxObj = new Ajax(ajaxCurrencySaveResponse); + var ajaxObj = new VtigerAjax(ajaxCurrencySaveResponse); var trans_currencyid=document.getElementById('transfer_currency_id').options[document.getElementById('transfer_currency_id').options.selectedIndex].value; var urlstring ="module=Settings&action=SettingsAjax&file=CurrencyDelete&ajax=true&delete_currency_id="+del_currencyid+"&transfer_currency_id="+trans_currencyid; ajaxObj.process("index.php?",urlstring); Modified: vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Mon May 29 17:28:17 2006 @@ -16,7 +16,7 @@ {rdelim} function getCustomFieldList(customField) {ldelim} - var ajaxObj = new Ajax(ajaxSaveResponse); + var ajaxObj = new VtigerAjax(ajaxSaveResponse); var modulename = customField.options[customField.options.selectedIndex].value; var urlstring ="module=Settings&action=SettingsAjax&file=CustomFieldList&fld_module="+modulename+"&parenttab=Settings&ajax=true"; ajaxObj.process("index.php?",urlstring); @@ -37,7 +37,7 @@ {rdelim} function getCreateCustomFieldForm(customField,id,tabid,ui) {ldelim} - var ajaxObj = new Ajax(ajaxCFSaveResponse); + var ajaxObj = new VtigerAjax(ajaxCFSaveResponse); var modulename = customField; var urlstring ="module=Settings&action=SettingsAjax&file=CreateCustomField&fld_module="+modulename+"&parenttab=Settings&ajax=true&fieldid="+id+"&tabid="+tabid+"&uitype="+ui; ajaxObj.process("index.php?",urlstring); Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Mon May 29 17:28:17 2006 @@ -28,7 +28,7 @@ function callConvertLeadDiv(id) {ldelim} - var ajaxObj = new Ajax(ajaxSaveResponse); + var ajaxObj = new VtigerAjax(ajaxSaveResponse); var urlstring = "module=Leads&action=LeadsAjax&file=ConvertLead&record="+id; ajaxObj.process("index.php?",urlstring); {rdelim} @@ -313,7 +313,7 @@ "; echo $inputs; - //header("Location: index.php?action=$return_action&module=$return_module&parent_id=$parent_id&record=$return_id&filename=$filename&viewname=$return_viewname"); } ?> Modified: vtigercrm/trunk/modules/Emails/mail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mail.php (original) +++ vtigercrm/trunk/modules/Emails/mail.php Mon May 29 21:01:30 2006 @@ -138,7 +138,8 @@ * $contents -- body of the email you want to send * $from_email -- from email id which will be displayed in the mail * $from_name -- from name which will be displayed in the mail - * $to_email -- to email address + * $to_email -- to email address -- This can be an email in a single string, a comma separated + * list of emails or an array of email addresses * $attachment -- whether we want to attach the currently selected file or all files. [values = current,all] - optional * $emailid -- id of the email object which will be used to get the attachments - optional @@ -167,7 +168,16 @@ if($to_email != '') { - $mail->AddAddress($to_email); + if(is_array($to_email)) { + for($j=0,$num=count($to_email);$j<$num;$j++) { + $mail->addAddress($to_email[$j]); + } + } else { + $_tmp = explode(",",$to_email); + for($j=0,$num=count($_tmp);$j<$num;$j++) { + $mail->addAddress($_tmp[$j]); + } + } } $mail->AddReplyTo($from_email); From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:21:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 03:21:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23811=3A_?= =?utf-8?q?Recurring_Events_Functionality_Issue?= In-Reply-To: <076.8585fb4bdf941329df8632100a82d2cd@vtiger.fosslabs.com> References: <076.8585fb4bdf941329df8632100a82d2cd@vtiger.fosslabs.com> Message-ID: <085.10279c8fdfc3ff9905d28da969ee8dd0@vtiger.fosslabs.com> #811: Recurring Events Functionality Issue ----------------------------------+----------------------------------------- Reporter: sganendra at yahoo.com | Owner: developer Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: recurring, events, tasks ----------------------------------+----------------------------------------- Comment (by anonymous): I can't program, so I don't know how to fix this. But i believe the problem is due to the fact a recurring task has only one taskID. there is no need for a recurringID in my opinion. the recurring function in vTiger should purely generate x amount of IDs for the x amount of recurrences. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon May 29 23:55:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 03:55:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231118=3A?= =?utf-8?q?_issue_in_custom_field?= Message-ID: <076.b7ca86dba4ffe927aca5a0856f25df73@vtiger.fosslabs.com> #1118: issue in custom field -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- While editing the customfield, the field length and type are mismatched -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:03:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 04:03:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231119=3A?= =?utf-8?q?_custom_field_UI_not_proper_in_IE?= Message-ID: <076.fd3163da175acd9436235ee85221b737@vtiger.fosslabs.com> #1119: custom field UI not proper in IE -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- custom field create PopUI is not proper in IE browser -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:09:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 04:09:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231120=3A?= =?utf-8?q?_alignment_not_proper_in_Customfield_listview?= Message-ID: <076.4b884f803d6e52a23bdf4c14044cef75@vtiger.fosslabs.com> #1120: alignment not proper in Customfield listview -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In customfield listview text alignment is not proper. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:16:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 04:16:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231121=3A?= =?utf-8?q?_Picklist_UI_is_broken?= Message-ID: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com> #1121: Picklist UI is broken -----------------------+---------------------------------------------------- Reporter: mangai | Owner: jeri Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Picklist ListViewUI is broken.Picklist image and label for module select is missing. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:25:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 04:25:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231121=3A?= =?utf-8?q?_Picklist_UI_is_broken?= In-Reply-To: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com> References: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com> Message-ID: <085.917b079c6cfcfe917d2566835d04de30@vtiger.fosslabs.com> #1121: Picklist UI is broken ------------------------+--------------------------------------------------- Reporter: mangai | Owner: jeri Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * priority: critical => major -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 00:37:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 04:37:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231122=3A?= =?utf-8?q?_required_symbol_in_currency_editview_is_missing?= Message-ID: <076.e304b32450477f1ef20d72ae1c371e6d@vtiger.fosslabs.com> #1122: required symbol in currency editview is missing -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:34:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 05:34:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231123=3A?= =?utf-8?q?_issue_in_role_drag_and_drop?= Message-ID: <076.c4a5b714c12cec3b392d5125f15097cc@vtiger.fosslabs.com> #1123: issue in role drag and drop -----------------------+---------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- I got the following message in roles drag and drop '''Warning: explode(): Empty delimiter. in /home/mangayarkarasi/Mangai/Alpha3/vtigerCRM5_beta/apache/htdocs/vtigerCRM/may29_1/vtiger_crm/modules/Users/RoleDragDrop.php on line 40''' '''Warning: Cannot modify header information - headers already sent by (output started at /home/mangayarkarasi/Mangai/Alpha3/vtigerCRM5_beta/apache/htdocs/vtigerCRM/may29_1/vtiger_crm/modules/Users/RoleDragDrop.php:40) in /home/mangayarkarasi/Mangai/Alpha3/vtigerCRM5_beta/apache/htdocs/vtigerCRM/may29_1/vtiger_crm/modules/Users/RoleDragDrop.php on line 52''' -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:56:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 05:56:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2382=3A_T?= =?utf-8?q?icket-Activity-Relation?= In-Reply-To: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> References: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> Message-ID: <085.60dba27fea4d7685cf805fbfe4f272e1@vtiger.fosslabs.com> #82: Ticket-Activity-Relation -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: minnie Type: enhancement | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: -------------------------------+-------------------------------------------- Changes (by anonymous): * type: defect => enhancement -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 01:57:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 05:57:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2382=3A_T?= =?utf-8?q?icket-Activity-Relation?= In-Reply-To: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> References: <076.6df10c0ea64c5d95a412b52a9cface15@vtiger.fosslabs.com> Message-ID: <085.29149a0b2aed54f50d6a77c2869b0b3c@vtiger.fosslabs.com> #82: Ticket-Activity-Relation -------------------------------+-------------------------------------------- Reporter: eberle.d at 4net.ch | Owner: minnie Type: enhancement | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.1 Resolution: | Keywords: -------------------------------+-------------------------------------------- Changes (by anonymous): * milestone: 5.0.0 => * version: 5.0.0 => 5.0.1 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:07:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:07:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231124=3A?= =?utf-8?q?_issue_in_attachments?= Message-ID: <076.eece6f4dd358282fca02037b81e9226c@vtiger.fosslabs.com> #1124: issue in attachments -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mickie Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- First I've added a file and deleted that file. after that I've added 2 files and uploded. It is going to a blank page. I've done it from Accounts/Contacts relatedlists -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:10:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:10:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231125=3A?= =?utf-8?q?_attachment_missing_while_creating_ticket_from_product?= Message-ID: <076.478ea28a2c6031392264f0dfa9da56bd@vtiger.fosslabs.com> #1125: attachment missing while creating ticket from product ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: attachment | ------------------------+--------------------------------------------------- attachment missing while creating ticket from product -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:28:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:28:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231126=3A?= =?utf-8?q?_unwanted_field_Team_in_Quote_creation?= Message-ID: <076.11f2feb72adb5d0a18b85776bb31f1ab@vtiger.fosslabs.com> #1126: unwanted field Team in Quote creation -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: quote | -----------------------+---------------------------------------------------- unwanted field Team in Quote creation -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:29:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:29:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231127=3A?= =?utf-8?q?_Issue_in_Emaol?= Message-ID: <076.5f2796ef1febe6076fd5ba3545997e71@vtiger.fosslabs.com> #1127: Issue in Emaol -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In the Emails List, we the mouse cursor is moved over the subject, the mouse pointer should be changed to the hand pointer -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:31:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:31:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231128=3A?= =?utf-8?q?_too_high_reaction_time_in_using_inventory?= Message-ID: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com> #1128: too high reaction time in using inventory -------------------------+-------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: performance | -------------------------+-------------------------------------------------- Inventory queries need to be optimized. It takes a long time to load -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:32:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:32:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231129=3A?= =?utf-8?q?_SalesOrder_popup_gives_fatal_error?= Message-ID: <076.ed5850144fdfa69ed89800ea316794af@vtiger.fosslabs.com> #1129: SalesOrder popup gives fatal error ---------------------------+------------------------------------------------ Reporter: ahmed | Owner: Jeri Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: Pop Up Search | ---------------------------+------------------------------------------------ While creating a new invoice from Account related list & trying to add Salesorder from Pop up , I get a fatal error - Call to a member function Move() on a non-object in vtigerCRM/may29_1/include/database/PearDatabase.php on line 439 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:33:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:33:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231130=3A?= =?utf-8?q?_more_information_tab_ajaxified?= Message-ID: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com> #1130: more information tab ajaxified -------------------------+-------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: performance | -------------------------+-------------------------------------------------- more information tab ought to be ajaxified. takes too long a time to load -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:33:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:33:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231131=3A?= =?utf-8?q?_Copy_Merge_Field_Value_is_not__replaced_with_value?= Message-ID: <076.bef32b69825917dc34da8cbc8db15847@vtiger.fosslabs.com> #1131: Copy Merge Field Value is not replaced with value -----------------------+---------------------------------------------------- Reporter: mangai | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In email template,Copy Merge Field Value is not replaced with value -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:34:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:34:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231132=3A?= =?utf-8?q?_creation_of_related_entities_ought_to_be_ajaxified?= Message-ID: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com> #1132: creation of related entities ought to be ajaxified -------------------------+-------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: performance | -------------------------+-------------------------------------------------- Creation of related entities ought to be ajaxified. Currently, we unnecessarily take them to a different page. This gives a poor impression of the usability of the product -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:34:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:34:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231131=3A?= =?utf-8?q?_Copy_Merge_Field_Value_is_not__replaced_with_value_and_parentt?= =?utf-8?q?ab_not_parsed_for_edit_template?= In-Reply-To: <076.bef32b69825917dc34da8cbc8db15847@vtiger.fosslabs.com> References: <076.bef32b69825917dc34da8cbc8db15847@vtiger.fosslabs.com> Message-ID: <085.39ae9e2f00859fd133fd76ebdf7d6f06@vtiger.fosslabs.com> #1131: Copy Merge Field Value is not replaced with value and parenttab not parsed for edit template ------------------------+--------------------------------------------------- Reporter: mangai | Owner: ahmed Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * summary: Copy Merge Field Value is not replaced with value => Copy Merge Field Value is not replaced with value and parenttab not parsed for edit template -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:36:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:36:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231133=3A?= =?utf-8?q?_in_related_list_note_can_be_shown_in_a_different_color?= Message-ID: <076.2f01c0cdb39b0c84bd3ed216997c2d77@vtiger.fosslabs.com> #1133: in related list note can be shown in a different color -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- in related list note can be shown in a different color to differentiate from attachments. In that case, we can do away with the Type column altogether. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:38:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:38:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231134=3A?= =?utf-8?q?_unable_to_change_state_of_purchase_order_using_ajax_feature?= Message-ID: <076.6b6e1bdd6d4cf54f7a2bce3761f03794@vtiger.fosslabs.com> #1134: unable to change state of purchase order using ajax feature -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- not able to change the state of a purchase order using the ajax feature. I am not able to save the state at all. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:38:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:38:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231135=3A?= =?utf-8?q?_The_History_of_the_Purchase_Order_not_getting_displayed?= Message-ID: <076.70a50c265764e891dd51a97dd8390af4@vtiger.fosslabs.com> #1135: The History of the Purchase Order not getting displayed -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- PO history is not getting updated at all. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:44:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:44:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231136=3A?= =?utf-8?q?_parenttab_not_parsed_for_backup_server_configuration_save?= Message-ID: <076.111cd820f71186cdd653f9d438341dd5@vtiger.fosslabs.com> #1136: parenttab not parsed for backup server configuration save -----------------------+---------------------------------------------------- Reporter: mangai | Owner: jeri Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:45:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:45:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231137=3A?= =?utf-8?q?_Issue_in_Emails?= Message-ID: <076.9cbd988fd3d7e2707b4d3292e1da421d@vtiger.fosslabs.com> #1137: Issue in Emails -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Bring up the Emails Settings Page and click on the Cancel button. It takes you to the User DetailView. this should not happen. this should take back to the emails page -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:47:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:47:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231138=3A?= =?utf-8?q?_could_be_made_more_usable?= Message-ID: <076.6260faca7a3dab8756ec45d2be226913@vtiger.fosslabs.com> #1138: could be made more usable -----------------------+---------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- When clicking on the tax field during product addition, the default value is shown. If I need to change this value, I need to go to Settings and then change the value. It will be much more usable if I have a direct facility to access and change the required field present in Settings from the PO creation page itself. The same case holds for addition of custom fields. Even there, if I need to add a custom field during creation of the PO, I need to go to Settings and then make the changes and then come back to the particular screen. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:49:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:49:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231139=3A?= =?utf-8?q?_could_be_made_more_usable2?= Message-ID: <076.1772ef737aedfed24ad81cc9ac0c4e0f@vtiger.fosslabs.com> #1139: could be made more usable2 -----------------------+---------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- while adding a product, when i click on the PriceBook, if the entry is not present, I should be given an option to add to the price book right there. There should be no need for me to run in circles to add a product to a price book. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:50:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:50:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231140=3A?= =?utf-8?q?_Issue_in_Emails?= Message-ID: <076.a35124f4112b6efc1ce3a64ae8820aed@vtiger.fosslabs.com> #1140: Issue in Emails -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- The to address field in email should be made non editable because we ge the email ids only from the db. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:53:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:53:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231141=3A?= =?utf-8?q?_mandatory_shown_but_not_so?= Message-ID: <076.02fcc522483405a938931a6090a37b4c@vtiger.fosslabs.com> #1141: mandatory shown but not so -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: PO | -----------------------+---------------------------------------------------- while creation of PO, the product, qty, billing add, shipping address, are shown as mandatory. But they are actually not. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 02:53:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 06:53:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231142=3A?= =?utf-8?q?_currency_conversion_is_not_applied_for_product_details?= Message-ID: <076.ed680d7929677a23842f476fd7e13220@vtiger.fosslabs.com> #1142: currency conversion is not applied for product details -----------------------+---------------------------------------------------- Reporter: mangai | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:00:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:00:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231143=3A?= =?utf-8?q?_Issue_in_Email_Search?= Message-ID: <076.602112a95e47edfea50fc9b4ff0606e7@vtiger.fosslabs.com> #1143: Issue in Email Search -----------------------+---------------------------------------------------- Reporter: don | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Search in Emails is not working. Search with selecting 'in Subject or Sender' option. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:05:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:05:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231144=3A?= =?utf-8?q?_Ajax_Quick_Edit_Fields_Retains_value_in_the_text_box_even_if_w?= =?utf-8?q?e_cancel_it=2E?= Message-ID: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com> #1144: Ajax Quick Edit Fields Retains value in the text box even if we cancel it. -----------------------------+---------------------------------------------- Reporter: ahmed | Owner: Jeri Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: Quick Edit Ajax | -----------------------------+---------------------------------------------- While quick editing Account Detail View Fields, if we enter incorrect values it pops up error, but when we click cancel and move to editing other fields with values it gives the previous field error because the value is retained. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:10:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:10:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231145=3A?= =?utf-8?q?_in_edit_view_of_inventory=2C_the_right_hand_side_options_are_h?= =?utf-8?q?ardcoded?= Message-ID: <076.0e62778b6100dd068d2df9182121005c@vtiger.fosslabs.com> #1145: in edit view of inventory, the right hand side options are hardcoded -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- in edit view of inventory, the right hand side options are hardcoded. But the right hand side options work, only when one is in the Detail View screen. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:11:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:11:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231146=3A?= =?utf-8?q?_PriceBook_Popup_screen_too_big?= Message-ID: <076.30e2595c2b37b1575bee462504899f2f@vtiger.fosslabs.com> #1146: PriceBook Popup screen too big -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- PriceBook Popup screen too big -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:11:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:11:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231147=3A?= =?utf-8?q?_Vendor_Popup_screen_too_big?= Message-ID: <076.0794d0812b807cd905b48ff6aa59084a@vtiger.fosslabs.com> #1147: Vendor Popup screen too big -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Vendor Popup screen too big -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:12:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:12:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231148=3A?= =?utf-8?q?_category_not_drop_down_in_pricebook_creation?= Message-ID: <076.e7a68cf911647e37fc94092599e028b4@vtiger.fosslabs.com> #1148: category not drop down in pricebook creation -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Category field in pricebook should be a dropdown -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:17:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:17:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231149=3A?= =?utf-8?q?_could_not_enable_create/edit_option_in_standard_privileges?= Message-ID: <076.66092766998638d33820b88f8666d4b3@vtiger.fosslabs.com> #1149: could not enable create/edit option in standard privileges -----------------------+---------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In Profile standard profiles,I've given create/edit option only for contact module. But when I save it All modules create/edit option has been disabled.So could not create any records. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 03:27:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 07:27:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6732 - /vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Message-ID: <20060530072700.A8CFB7D4DBD@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 01:26:56 2006 New Revision: 6732 Log: Removed the calendar image from Quick create modules - Ahmed Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Tue May 30 01:26:56 2006 @@ -225,7 +225,6 @@ {assign var=time_val value="$time_value"} {/foreach} - {if $uitype eq 6} {/if} From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 03:36:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 07:36:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6733 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060530073613.A63367D5A89@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 01:36:09 2006 New Revision: 6733 Log: Moved the fields Ticker symbol & Member to Basic Infn for Accounts Module - ahmed Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue May 30 01:36:09 2006 @@ -158,9 +158,9 @@ $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'website','account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'fax','account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email1','account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email2','account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')"); From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:43:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:43:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231150=3A?= =?utf-8?q?_related_list_not_gettng_populated?= Message-ID: <076.4e1f98aeb67bc6258cc11f40272f4eef@vtiger.fosslabs.com> #1150: related list not gettng populated -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- while creating an inventory entity, i relate to contacts, leads, accounts, etc. In the respective entities, we should see the related list populated with these entries. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:45:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:45:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?= =?utf-8?q?_Error_message_in_Installer=2E=2E?= Message-ID: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com> #1151: Error message in Installer.. -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- If I specify wrong user name while creating a new DB: Warning: mysql_connect() [function.mysql-connect]: Access denied for user 'roo'@'gopals.vtiger.com' (using password: NO) in C:\wamp\www\vtcrm30m\adodb\drivers\adodb-mysql.inc.php on line 355 Warning: mysql_connect() [function.mysql-connect]: Access denied for user 'roo'@'gopals.vtiger.com' (using password: NO) in C:\wamp\www\vtcrm30m\adodb\drivers\adodb-mysql.inc.php on line 355 Convert this error message to easly understandable message. You have specified a wrong user name to create a new database. Please enter correct user name and password to create database for Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:47:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:47:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231152=3A?= =?utf-8?q?_cannot_go_to_different_months/years__from_popup_calendar?= Message-ID: <076.305f67d0510043ae0fbe7bd653f4aa48@vtiger.fosslabs.com> #1152: cannot go to different months/years from popup calendar -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- cannot go to different months/years from popup calendar -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:48:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:48:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231153=3A?= =?utf-8?q?_Source_Installer=3A_data_in_=22Path=22_field_disappears?= Message-ID: <076.a6308f317cdefba138949240f46f1aae@vtiger.fosslabs.com> #1153: Source Installer: data in "Path" field disappears -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- While refreshing the Step 2 of source installer, data in "Path" field is disappeared. Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:48:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:48:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231154=3A?= =?utf-8?q?_while_using_quick_create=2C_we_have_a_cheetah_running_instead_?= =?utf-8?q?of_a_tiger?= Message-ID: <076.77103b94050e4ea6ac8253b3e0ebffe5@vtiger.fosslabs.com> #1154: while using quick create, we have a cheetah running instead of a tiger -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- while using quick create, we have a cheetah running instead of a tiger -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:53:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:53:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231155=3A?= =?utf-8?q?_Home_page_-_not_much_informative?= Message-ID: <076.df32a5a4f009111920e73e95331da209@vtiger.fosslabs.com> #1155: Home page - not much informative -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Currently we have a lot boxes in Home page. It is better to have useful information. For example, Key Metrics box we can display: Prospect Accounts - 10 Open Tickets - 24 Hot Leads - 13 etc My Top Accounts ABC - $25000 XYZ - $20000 etc. Also there is no "More" link in each box.. Please get back to me if you need any clarifications. Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 03:54:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 07:54:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231156=3A?= =?utf-8?q?_can_create_invoice_without_specifying_product_quantity?= Message-ID: <076.92edb3c9cf4881a366e5a914f7e21365@vtiger.fosslabs.com> #1156: can create invoice without specifying product quantity -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- can create invoice without specifying product quantity -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:20:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:20:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231157=3A?= =?utf-8?q?_Wrong_display_of_Roles_in_Roles_Home?= Message-ID: <076.0042ce49f00228b56312a0bfc5ea57d9@vtiger.fosslabs.com> #1157: Wrong display of Roles in Roles Home -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- By default we are populating two different roles namely administrator and standard_user. standard_user is shown under administrator, but administrator role has to do nothing with standard_user. Both should be at same level. Please contact me for details. Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:22:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:22:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231158=3A?= =?utf-8?q?_JavaScript_errors_in_Roles_page?= Message-ID: <076.b08c0c9d886c70774389436fa08c82ca@vtiger.fosslabs.com> #1158: JavaScript errors in Roles page -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- While saving a role, JavaScript error displayed in IE6. Line: 709 Char: 3 Error: Object doesn't support this property or method Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:24:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:24:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231159=3A?= =?utf-8?q?_Roles_-_Expand_icon_is_not_intuitive?= Message-ID: <076.baaaff1e8853707e998ecfdccb70cd44@vtiger.fosslabs.com> #1159: Roles - Expand icon is not intuitive -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- For expand and collapse same icon is used. It is better to have + when roles are in collapsed mode and - when it is expand mode. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:27:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:27:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231160=3A?= =?utf-8?q?_Improper_Navigation_links?= Message-ID: <076.04585a3838305ae5eda12ac53ec9b7cd@vtiger.fosslabs.com> #1160: Improper Navigation links -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Settings > Users & Access Management > Create New Role. From Create New Role page you can't go to "Users & Access Management" You can directly access the Settings page. Either provide a separate page for each sub section or navigate back to Settings. Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:35:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:35:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231161=3A?= =?utf-8?q?_Roles_link_-_JavaScript_error_in_IE_6?= Message-ID: <076.1d3f81da3d97d1c4e9f35cf771595b2d@vtiger.fosslabs.com> #1161: Roles link - JavaScript error in IE 6 -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- While clicking Roles link under Users & Access Management JS error displayed: -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:44:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:44:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231162=3A?= =?utf-8?q?_navigation_issue_from_Calendar?= Message-ID: <076.be19fd30fd8c810bee45f8361c2c8b04@vtiger.fosslabs.com> #1162: navigation issue from Calendar -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- navigation issue from Calendar module. I cannot go/create anything. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 04:45:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 08:45:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6734 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060530084545.0EBAB7D77BC@vtiger.fosslabs.com> Author: don Date: Tue May 30 02:45:40 2006 New Revision: 6734 Log: Fixed the parent role issue in getRoleAndSubordinatesInfo() Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue May 30 02:45:40 2006 @@ -2542,7 +2542,7 @@ $roleid=$adb->query_result($result,$i,'roleid'); $rolename=$adb->query_result($result,$i,'rolename'); $roledepth=$adb->query_result($result,$i,'depth'); - $parentRoleSeq=$adb->query_result($result,$i,'parentrole'); + $parentrole=$adb->query_result($result,$i,'parentrole'); $roleDet=Array(); $roleDet[]=$rolename; $roleDet[]=$parentrole; From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:46:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:46:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231163=3A?= =?utf-8?q?_unable_to_save_Ajaxified_Terms_and_Conditions_field_in_Invoice?= Message-ID: <076.81406a0d124351606d1fccac357d6e5d@vtiger.fosslabs.com> #1163: unable to save Ajaxified Terms and Conditions field in Invoice -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- unable to save Ajaxified Terms and Conditions field in Invoice -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:47:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:47:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231164=3A?= =?utf-8?q?_unable_to_save_Ajaxified_Description_field_in_Invoice?= Message-ID: <076.b0bc283a60909e304007e4b26726e2ef@vtiger.fosslabs.com> #1164: unable to save Ajaxified Description field in Invoice -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- unable to save Ajaxified Description field in Invoice -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:48:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:48:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231165=3A?= =?utf-8?q?_Move_Role_is_not_working_in_IE=2E=2E?= Message-ID: <076.acbe4cea637c14b89f704105e9460ec2@vtiger.fosslabs.com> #1165: Move Role is not working in IE.. -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- After clciking the Move Role icon, role doesn't moved or there is no drag/drop option. There is -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:48:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:48:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231166=3A?= =?utf-8?q?_Move_Role_is_not_working_in_IE=2E=2E?= Message-ID: <076.a830516a48e8ac68dbcee16057ec5aab@vtiger.fosslabs.com> #1166: Move Role is not working in IE.. -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- After clciking the Move Role icon, role doesn't moved or there is no drag/drop option. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:49:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:49:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231166=3A?= =?utf-8?q?_Move_Role_is_not_working_in_IE=2E=2E?= In-Reply-To: <076.a830516a48e8ac68dbcee16057ec5aab@vtiger.fosslabs.com> References: <076.a830516a48e8ac68dbcee16057ec5aab@vtiger.fosslabs.com> Message-ID: <085.9439e47b796f69be6e658eeb10278e4a@vtiger.fosslabs.com> #1166: Move Role is not working in IE.. ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:50:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:50:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231167=3A?= =?utf-8?q?_able_to_store_negative_value_in_stock_while_creation_of_invoic?= =?utf-8?q?e?= Message-ID: <076.90681771b7b03afd5ee26a72d90bd95f@vtiger.fosslabs.com> #1167: able to store negative value in stock while creation of invoice -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- able to store negative value in stock while creation of invoice -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:52:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:52:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231168=3A?= =?utf-8?q?_Inconsistent_buttons?= Message-ID: <076.9785f194df3f213625826a4d8c4e3b59@vtiger.fosslabs.com> #1168: Inconsistent buttons -----------------------+---------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- CSS applied to some of the buttons, where as some buttons take browser default buttons. Better to have consistent button layout across the modules. Gopal -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 04:56:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 08:56:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231169=3A?= =?utf-8?q?_unable_to_relate_Quote_to_SalesOrder?= Message-ID: <076.bec9bdcd41de51d9a21b66c7a45dbe9a@vtiger.fosslabs.com> #1169: unable to relate Quote to SalesOrder -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:08:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:08:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231170=3A?= =?utf-8?q?_PO_related_to_SO_does_not_have_assigned_to_value?= Message-ID: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com> #1170: PO related to SO does not have assigned to value -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In the related list of SO, the PO does not have the assigned to value populated. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:09:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:09:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231171=3A?= =?utf-8?q?_If_i_add_a_to_do_it_is_not_showing_the_to_do_list_instead_it_i?= =?utf-8?q?s_showing_the_Events?= Message-ID: <076.85fe0d91a01ebf4f15b08b9ce5e2c3a3@vtiger.fosslabs.com> #1171: If i add a to do it is not showing the to do list instead it is showing the Events --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:10:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:10:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231172=3A?= =?utf-8?q?_unable_to_store_any_Ajax_edited_value?= Message-ID: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com> #1172: unable to store any Ajax edited value -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Ajax editing fails most of the times. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:10:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:10:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231172=3A?= =?utf-8?q?_unable_to_store_any_Ajax_edited_value?= In-Reply-To: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com> References: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com> Message-ID: <085.7bcbea0328aa7ba5c5d6bf567ac9e61a@vtiger.fosslabs.com> #1172: unable to store any Ajax edited value ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by richie): Only upon storing the Contact Name does the Ajax editing work. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:12:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:12:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231173=3A?= =?utf-8?q?_unable_to_veiw_pdf?= Message-ID: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com> #1173: unable to veiw pdf -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- pdf viewer crashes. win xp -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:13:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:13:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231174=3A?= =?utf-8?q?_unable_to_change_months/years_from_mini-calendar?= Message-ID: <076.2ef668b0f99e11dc546be8a077110184@vtiger.fosslabs.com> #1174: unable to change months/years from mini-calendar -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- unable to change months/years from mini-calendar -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:14:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:14:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231175=3A?= =?utf-8?q?_add_products_to_pricebook_UI_is_old?= Message-ID: <076.88a213b6789fd810420b69633d85a7ad@vtiger.fosslabs.com> #1175: add products to pricebook UI is old -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- add products to pricebook UI is old -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:15:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:15:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231176=3A?= =?utf-8?q?_is_more_info_needed_for_Pricebook=3F?= Message-ID: <076.6eea86995041f78926851950a9662262@vtiger.fosslabs.com> #1176: is more info needed for Pricebook? -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Do we really need to show a More Information tab for pricebook? We could list out the products to be added in 1 page itself. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:16:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:16:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231177=3A?= =?utf-8?q?_Calendar_Meeting_issue?= Message-ID: <076.2e85dcc580c77c2f77a32db653da9aec@vtiger.fosslabs.com> #1177: Calendar Meeting issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- I created a meeting of 4 hours duration.In calendar Hour view it is showing only the hour for the start time -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:16:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:16:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231178=3A?= =?utf-8?q?_Calendar_Meeting_issue?= Message-ID: <076.c5360e299833dfecaae35d0b42a6203c@vtiger.fosslabs.com> #1178: Calendar Meeting issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- I created a meeting of 4 hours duration.In calendar Hour view it is showing only the hour for the start time -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:41:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:41:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231179=3A?= =?utf-8?q?_Activity_Delete_issue?= Message-ID: <076.a2c2c663ffa4fa41b8ffbe8acd39e028@vtiger.fosslabs.com> #1179: Activity Delete issue --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- Instead of a confirm message an alert is coming for delete event from calendar -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:51:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:51:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231180=3A?= =?utf-8?q?_pricebook_related_list_shows_products_which_cannot_be_deleted_?= =?utf-8?q?from_related_list?= Message-ID: <076.0271cde3695160584f02fe99d754d59c@vtiger.fosslabs.com> #1180: pricebook related list shows products which cannot be deleted from related list -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- On clicking on del link in pricebook related list of products, focus goes to different page but the product is not deleted. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:55:53 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:55:53 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231181=3A?= =?utf-8?q?_header_buttons_missing_from_Import_Products_screen?= Message-ID: <076.4f57062275dd6f6a01adeebb79425762@vtiger.fosslabs.com> #1181: header buttons missing from Import Products screen -----------------------+---------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 05:57:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 09:57:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231182=3A?= =?utf-8?q?_Issue_in_email_templates?= Message-ID: <076.ac60ce16b49a2b500206812cfdc53853@vtiger.fosslabs.com> #1182: Issue in email templates -----------------------+---------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In the email compose page i have specified to,cc,bcc address and attachments. Now when i select an email template the page is reloded and the already specified email address and attachments are lost. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 05:59:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 09:59:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6735 - in /vtigercrm/trunk: Smarty/templates/Inventory/ProductDetails.tpl modules/Invoice/EditView.php modules/PurchaseOrder/EditView.php modules/Quotes/EditView.php modules/SalesOrder/EditView.php Message-ID: <20060530095912.EB6157D77FC@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 03:59:04 2006 New Revision: 6735 Log: * Modified to display the product details in new PO, SO, Quotes and Invoice when we create these entities from Product DetailView or Product Relatedlist Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl vtigercrm/trunk/modules/Invoice/EditView.php vtigercrm/trunk/modules/PurchaseOrder/EditView.php vtigercrm/trunk/modules/Quotes/EditView.php vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Tue May 30 03:59:04 2006 @@ -42,21 +42,21 @@ {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} - + {/if} - - {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } - - - - {else} - - {/if} - - -
    -   +        +   -   +   @@ -68,17 +68,17 @@ +{/if} + + + - + + +
    {$APP.$CATEGORY} > {$APP.$MODULE}{$APP.$CATEGORY} > {$APP.$MODULE} @@ -23,72 +39,76 @@ - - + + - - + + + - -
    - {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} - {if $MODULE eq 'Activities'} - - {else} - - {/if} + {if $CHECK.EditView eq 'yes'} + {if $MODULE eq 'Activities'} + + {else} + + {/if} {/if} {if $CHECK.index eq 'yes'} - + {/if} -
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_CHAT_ALT} -
    -
      + - - - - - + + + +
    {$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT} {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT} +
    -
    + + + + {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } + {if $CHECK.Import eq 'yes'} + + {else} + + {/if} + {if $CHECK.Export eq 'yes'} + + {else} + + {/if} + {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} + + + {else} + + + {/if} + {else} + + + {/if} + +
    {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE} + {if $CHECK.Export eq 'yes'} + {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}
    +
    - +
    {$APP.LBL_ALL_MENU_ALT}
    -
    +
    - {if $CHECK.Import eq 'yes' && $CHECK.Export eq 'yes'} - {$APP.LBL_IMPORT} {$APP.$MODULE} | - {$APP.LBL_EXPORT} {$APP.$MODULE} - {elseif $CHECK.Import eq 'yes' && $CHECK.Export eq 'no'} - {$APP.LBL_IMPORT} {$APP.$MODULE} - {elseif $CHECK.Import eq 'no' && $CHECK.Export eq 'yes' } - {$APP.LBL_EXPORT} {$APP.$MODULE} - {/if} - {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} - - {if $CHECK.Export eq 'yes'} - {$APP.LBL_EXPORT} {$APP.$MODULE} - {/if} -  
    Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 30 07:18:57 2006 @@ -31,7 +31,7 @@
    {$APP.$CATEGORY} > {$APP.$MODULE}{$APP.$CATEGORY} > {$APP.$MODULE} @@ -40,68 +40,73 @@
    {if $CHECK.EditView eq 'yes'} - {if $MODULE eq 'Activities'} - - {else} - - {/if} + {if $MODULE eq 'Activities'} + + {else} + + {/if} {/if} - +
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CHAT_ALT} -
    -
      + - - - - - + + + +
    {$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT} {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT} +
    -
    + + + + {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } + {if $CHECK.Import eq 'yes'} + + {else} + + {/if} + {if $CHECK.Export eq 'yes'} + + {else} + + {/if} + {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} + + + {else} + + + {/if} + {else} + + + {/if} + +
    {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE} + {if $CHECK.Export eq 'yes'} + {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}
    +
    - +
    {$APP.LBL_ALL_MENU_ALT}
    -
    +
    - {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } - - - {if $CHECK.Import eq 'yes' && $CHECK.Export eq 'yes'} - {$APP.LBL_IMPORT} {$APP.$MODULE} | - {$APP.LBL_EXPORT} {$APP.$MODULE} - {elseif $CHECK.Import eq 'yes' && $CHECK.Export eq 'no'} - {$APP.LBL_IMPORT} {$APP.$MODULE} - {elseif $CHECK.Import eq 'no' && $CHECK.Export eq 'yes' } - {$APP.LBL_EXPORT} {$APP.$MODULE} - {/if} - {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} - - - {if $CHECK.Export eq 'yes'} - {$APP.LBL_EXPORT} {$APP.$MODULE} - {/if} - - {else} -   - {/if} - - - Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Tue May 30 07:18:57 2006 @@ -147,7 +147,9 @@ $tabhtml = ""; $count = 1; include_once 'modules/Calendar/addEventUI.php'; - $div = "
    + include_once 'modules/Calendar/header.php'; + + $div = " "; echo $div; Modified: vtigercrm/trunk/modules/Home/index.php ============================================================================== --- vtigercrm/trunk/modules/Home/index.php (original) +++ vtigercrm/trunk/modules/Home/index.php Tue May 30 07:18:57 2006 @@ -160,6 +160,8 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("APP",$app_strings); $smarty->assign("MOD",$mod_strings); +$smarty->assign("MODULE",'Home'); +$smarty->assign("CATEGORY",getParenttab('Home')); $smarty->assign("HOMEDETAILS",$home_values); $smarty->assign("HOMEDEFAULTVIEW",DefHomeView()); $smarty->assign("ACTIVITIES",$activities); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:21:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:21:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6746 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060530132127.0ACE07D598E@vtiger.fosslabs.com> Author: don Date: Tue May 30 07:21:24 2006 New Revision: 6746 Log: icons in Home page has been changed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 30 07:21:24 2006 @@ -40,48 +40,65 @@ - - - - - - - - - + + + + + + + + + +
    {$MOD.LBL_MY_HOME} - - - - - - - -
    - - - - -
     
    -
      - - - - - - - - - - -
    {$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT} {$APP.LBL_ALL_MENU_ALT}
    -
    - - - -
    -
    -
     
    {$APP.$CATEGORY} > {$APP.$MODULE} + + + + + + + + + +
    + + + + + +
    +
    + + + + + + + + +
    {$APP.LBL_CALENDAR_ALT}{$APP.L
+BL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT} +
    +
    + + + + + +
    {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}
    +
    + + + + +
    {$APP.LBL_ALL_MENU_ALT}
    +
    +
    + + {* Main Contents Start Here *} From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:29:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:29:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6747 - in /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl Buttons_List1.tpl Message-ID: <20060530132941.BD9377D5BBD@vtiger.fosslabs.com> Author: don Date: Tue May 30 07:29:37 2006 New Revision: 6747 Log: fadded icons integrated Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue May 30 07:29:37 2006 @@ -40,16 +40,21 @@
    {if $CHECK.EditView eq 'yes'} - {if $MODULE eq 'Activities'} - - {else} - - {/if} + {if $MODULE eq 'Activities'} + + {else} + + {/if} + {else} + {/if} {if $CHECK.index eq 'yes'} - + + {else} + {/if} +
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...
    Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 30 07:29:37 2006 @@ -40,11 +40,15 @@ {if $CHECK.EditView eq 'yes'} - {if $MODULE eq 'Activities'} - - {else} - - {/if} + {if $MODULE eq 'Activities'} + + {else} + + {/if} + {else} + {/if} From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:30:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:30:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6748 - in /vtigercrm/trunk/modules/Settings: CreateCurrencyInfo.php CurrencyInfo.html CurrencyInfo.php customfield.html fieldtypes.php Message-ID: <20060530133009.6314D7D598E@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 07:30:04 2006 New Revision: 6748 Log: unwanted files removed Removed: vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php vtigercrm/trunk/modules/Settings/CurrencyInfo.html vtigercrm/trunk/modules/Settings/CurrencyInfo.php vtigercrm/trunk/modules/Settings/customfield.html vtigercrm/trunk/modules/Settings/fieldtypes.php From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:42:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:42:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6749 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060530134217.5A51F7D598E@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 07:42:13 2006 New Revision: 6749 Log: Updated History label as Activity History for Related List of all modules - Ahmed Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue May 30 07:42:13 2006 @@ -1600,7 +1600,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)"); $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)"); @@ -1620,7 +1620,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)"); $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)"); @@ -1645,7 +1645,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)"); $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)"); @@ -1657,7 +1657,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)"); $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)"); @@ -1667,7 +1667,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)"); //Inserting Product Related Lists @@ -1721,7 +1721,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)"); // Inserting Purchase order Related Lists @@ -1729,7 +1729,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)"); // Inserting Sales order Related Lists @@ -1739,7 +1739,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)"); // Inserting Invoice Related Lists @@ -1747,7 +1747,7 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'History',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)"); // Inserting Activities Related Lists From vtiger-tickets at vtiger.fosslabs.com Tue May 30 09:44:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 13:44:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231241=3A?= =?utf-8?q?_error_in_showing_the_activities_in_Product_related_list?= Message-ID: <076.2e657a67594262ade3f99d3cf68d91c4@vtiger.fosslabs.com> #1241: error in showing the activities in Product related list -----------------------+---------------------------------------------------- Reporter: mickie | Owner: developer Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- when i add a task or event in the product related list some errors are shown in the page and the activities are not shown in the corresponding table. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:44:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:44:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6750 - in /vtigercrm/trunk: Smarty/templates/RelatedLists.tpl include/language/en_us.lang.php Message-ID: <20060530134458.A66227D5844@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 07:44:53 2006 New Revision: 6750 Log: Updated History label as Activity History for Related List of all modules - Ahmed Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Tue May 30 07:44:53 2006 @@ -146,7 +146,7 @@     {/if} - {elseif $header eq 'History'} + {elseif $header eq 'Activity History'}   {/if} Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Tue May 30 07:44:53 2006 @@ -460,7 +460,7 @@ 'LBL_OPEN_ACTIVITIES'=>'Open Activities', -'LBL_HISTORY'=>'History', +'LBL_HISTORY'=>'Activity History', 'LBL_ATTACHMENTS'=>'Attachments', From vtiger-tickets at vtiger.fosslabs.com Tue May 30 09:45:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 13:45:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231242=3A?= =?utf-8?q?_Activities_history_is_missing_in_Product_relatedlist?= Message-ID: <076.4b9590790acecb205e8103ff0f8ca3a2@vtiger.fosslabs.com> #1242: Activities history is missing in Product relatedlist -------------------------+-------------------------------------------------- Reporter: mickie | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -------------------------+-------------------------------------------------- In product relatedlist, activities are available and we can create new task and events. but there is no table for activity history. if there is a related list for activities then we should have history in that relatedlist. so we should list out the open activities in the activities table and the closed activities in the History table. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:57:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:57:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6751 - in /vtigercrm/trunk: Copyright.txt LICENSE_AGREEMENT.txt Message-ID: <20060530135725.C35D47D7848@vtiger.fosslabs.com> Author: richie Date: Tue May 30 07:57:19 2006 New Revision: 6751 Log: updated licence files Modified: vtigercrm/trunk/Copyright.txt vtigercrm/trunk/LICENSE_AGREEMENT.txt Modified: vtigercrm/trunk/Copyright.txt ============================================================================== --- vtigercrm/trunk/Copyright.txt (original) +++ vtigercrm/trunk/Copyright.txt Tue May 30 07:57:19 2006 @@ -1,1542 +1,1603 @@ - -This software is a collective work consisting of the following major Open Source components: -Apache software, MySQL server, PHP, SugarCRM, phpBB, TUTOS, phpSysinfo, PHPMailer, and lastRSS each licensed under a separate Open Source License. -vtiger.com is not affiliated with nor endorsed by any of the above providers. - -For Windows - -1. Apache web server software used under the Apache License available at /vtigerCRM/apache/LICENSE.txt -2. MySQL database software used under the GPL License available at /vtigerCRM/mysql/README.txt -3. PHP software used under the PHP License version 3.0 available at /vtigerCRM/php/license.txt -4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 available at /vtigerCRM/LICENSE_windows.txt -5. gdwin32 software used under the GNU GPL available at gdwin32 /vtigerCRM/gdwin32/gd-license.txt -6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap -7. phpBB software used under GNU GPL downloaded from http://www.phpbb.com/support/license.php -8. TUTOS software used under GNU GPL downloaded from http://www.tutos.org/html/copyright.html available at /vtigerCRM/modules/Calendar/TUTOS_Copyright.pdf -9. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt -10. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -11. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING -12. lastRSS software used under GNU GPL downloaded from http://lastrss.webdot.cz/ -13. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt -14. Squirrel Mail used under GNU GPL downloaded from http://www.squirrelmail.org/download.php available at http://www.squirrelmail.org/wiki/en_US/SquirrelMailGPL -15. Mailfeed used under GNU GPL downloaed from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright -16. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). - -For Linux - -1. Apache web server software used under the Apache License available at /vtigerCRM_linux/apache/LICENSE.txt -2. MySQL database software used under the GPL available at /vtigerCRM_linux/mysql/README.txt -3. PHP software used under the PHP License version 3.0 available at /vtigerCRM_linux/php/license.txt -4. SugarCRM software used under the SugarCRM Public License (SPL 1.1.2) available at /vtigerCRM/LICENSE_linux.txt -5. gd 2.0.28 software used "AS IS" available at /vtigerCRM_linux/gd-2.0.28/ -6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap -7. phpBB software used under GNU GPL downloaded from http://www.phpbb.com/support/license.php -8. TUTOS software used under GNU GPL downloaded from http://www.tutos.org/html/copyright.html available at /vtigerCRM/modules/Calendar/TUTOS_Copyright.pdf -9. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt -10. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -11. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING -12. lastRSS software used under GNU GPL downloaded from http://lastrss.webdot.cz/ -13. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt -14. Squirrel Mail used under GNU GPL downloaded from http://www.squirrelmail.org/download.php available at http://www.squirrelmail.org/wiki/en_US/SquirrelMailGPL -15. Mailfeed used under GNU GPL downloaed from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright -16. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). -The licenses of the Open Source components are reproduced in full below. - - -The licenses of the Open Source components are reproduced in full below. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - -APACHE HTTP SERVER SUBCOMPONENTS: - -The Apache HTTP Server includes a number of subcomponents with -separate copyright notices and license terms. Your use of the source -code for the these subcomponents is subject to the terms and -conditions of the following licenses. - -For the mod_mime_magic component: - -/* - * mod_mime_magic: MIME type lookup via file magic numbers - * Copyright (c) 1996-1997 Cisco Systems, Inc. - * - * This software was submitted by Cisco Systems to the Apache Group in July - * 1997. Future revisions and derivatives of this source code must - * acknowledge Cisco Systems as the original contributor of this module. - * All other licensing and usage conditions are those of the Apache Group. - * - * Some of this code is derived from the free version of the file command - * originally posted to comp.sources.unix. Copyright info for that program - * is included below as required. - * --------------------------------------------------------------------------- - * - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin. - * - * This software is not subject to any license of the American Telephone and - * Telegraph Company or of the Regents of the University of California. - * - * Permission is granted to anyone to use this software for any purpose on any - * computer system, and to alter it and redistribute it freely, subject to - * the following restrictions: - * - * 1. The author is not responsible for the consequences of use of this - * software, no matter how awful, even if they arise from flaws in it. - * - * 2. The origin of this software must not be misrepresented, either by - * explicit claim or by omission. Since few users ever read sources, credits - * must appear in the documentation. - * - * 3. Altered versions must be plainly marked as such, and must not be - * misrepresented as being the original software. Since few users ever read - * sources, credits must appear in the documentation. - * - * 4. This notice may not be removed or altered. - * ------------------------------------------------------------------------- - * - */ - - -For the modules\mappers\mod_imap.c component: - - "macmartinized" polygon code copyright 1992 by Eric Haines, erich at eye.com - -For the server\util_md5.c component: - -/************************************************************************ - * NCSA HTTPd Server - * Software Development Group - * National Center for Supercomputing Applications - * University of Illinois at Urbana-Champaign - * 605 E. Springfield, Champaign, IL 61820 - * httpd at ncsa.uiuc.edu - * - * Copyright (C) 1995, Board of Trustees of the University of Illinois - * - ************************************************************************ - * - * md5.c: NCSA HTTPd code which uses the md5c.c RSA Code - * - * Original Code Copyright (C) 1994, Jeff Hostetler, Spyglass, Inc. - * Portions of Content-MD5 code Copyright (C) 1993, 1994 by Carnegie Mellon - * University (see Copyright below). - * Portions of Content-MD5 code Copyright (C) 1991 Bell Communications - * Research, Inc. (Bellcore) (see Copyright below). - * Portions extracted from mpack, John G. Myers - jgm+ at cmu.edu - * Content-MD5 Code contributed by Martin Hamilton (martin at net.lut.ac.uk) - * - */ - - -/* these portions extracted from mpack, John G. Myers - jgm+ at cmu.edu */ -/* (C) Copyright 1993,1994 by Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without - * fee, provided that the above copyright notice appear in all copies - * and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of Carnegie - * Mellon University not be used in advertising or publicity - * pertaining to distribution of the software without specific, - * written prior permission. Carnegie Mellon University makes no - * representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied - * warranty. - * - * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE - * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN - * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -/* - * Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore) - * - * Permission to use, copy, modify, and distribute this material - * for any purpose and without fee is hereby granted, provided - * that the above copyright notice and this permission notice - * appear in all copies, and that the name of Bellcore not be - * used in advertising or publicity pertaining to this - * material without the specific, prior written permission - * of an authorized representative of Bellcore. BELLCORE - * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY - * OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS", - * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. - */ - -For the srclib\apr\include\apr_md5.h component: -/* - * This is work is derived from material Copyright RSA Data Security, Inc. - * - * The RSA copyright statement and Licence for that original material is - * included below. This is followed by the Apache copyright statement and - * licence for the modifications made to that material. - */ - -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - rights reserved. - - License to copy and use this software is granted provided that it - is identified as the "RSA Data Security, Inc. MD5 Message-Digest - Algorithm" in all material mentioning or referencing this software - or this function. - - License is also granted to make and use derivative works provided - that such works are identified as "derived from the RSA Data - Security, Inc. MD5 Message-Digest Algorithm" in all material - mentioning or referencing the derived work. - - RSA Data Security, Inc. makes no representations concerning either - the merchantability of this software or the suitability of this - software for any particular purpose. It is provided "as is" - without express or implied warranty of any kind. - - These notices must be retained in any copies of any part of this - documentation and/or software. - */ - -For the srclib\apr\passwd\apr_md5.c component: - -/* - * This is work is derived from material Copyright RSA Data Security, Inc. - * - * The RSA copyright statement and Licence for that original material is - * included below. This is followed by the Apache copyright statement and - * licence for the modifications made to that material. - */ - -/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - */ - -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - rights reserved. - - License to copy and use this software is granted provided that it - is identified as the "RSA Data Security, Inc. MD5 Message-Digest - Algorithm" in all material mentioning or referencing this software - or this function. - - License is also granted to make and use derivative works provided - that such works are identified as "derived from the RSA Data - Security, Inc. MD5 Message-Digest Algorithm" in all material - mentioning or referencing the derived work. - - RSA Data Security, Inc. makes no representations concerning either - the merchantability of this software or the suitability of this - software for any particular purpose. It is provided "as is" - without express or implied warranty of any kind. - - These notices must be retained in any copies of any part of this - documentation and/or software. - */ -/* - * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0 - * MD5 crypt() function, which is licenced as follows: - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp - * ---------------------------------------------------------------------------- - */ - -For the srclib\apr-util\crypto\apr_md4.c component: - - * This is derived from material copyright RSA Data Security, Inc. - * Their notice is reproduced below in its entirety. - * - * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - * rights reserved. - * - * License to copy and use this software is granted provided that it - * is identified as the "RSA Data Security, Inc. MD4 Message-Digest - * Algorithm" in all material mentioning or referencing this software - * or this function. - * - * License is also granted to make and use derivative works provided - * that such works are identified as "derived from the RSA Data - * Security, Inc. MD4 Message-Digest Algorithm" in all material - * mentioning or referencing the derived work. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - */ - -For the srclib\apr-util\include\apr_md4.h component: - - * - * This is derived from material copyright RSA Data Security, Inc. - * Their notice is reproduced below in its entirety. - * - * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - * rights reserved. - * - * License to copy and use this software is granted provided that it - * is identified as the "RSA Data Security, Inc. MD4 Message-Digest - * Algorithm" in all material mentioning or referencing this software - * or this function. - * - * License is also granted to make and use derivative works provided - * that such works are identified as "derived from the RSA Data - * Security, Inc. MD4 Message-Digest Algorithm" in all material - * mentioning or referencing the derived work. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - */ - - -For the srclib\apr-util\test\testdbm.c component: - -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000-2002 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache at apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - * This file came from the SDBM package (written by oz at nexus.yorku.ca). - * That package was under public domain. This file has been ported to - * APR, updated to ANSI C and other, newer idioms, and added to the Apache - * codebase under the above copyright and license. - */ - - -For the srclib\apr-util\test\testmd4.c component: - - * - * This is derived from material copyright RSA Data Security, Inc. - * Their notice is reproduced below in its entirety. - * - * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All - * rights reserved. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - */ - -For the srclib\apr-util\xml\expat\conftools\install-sh component: - -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# - -For the srclib\pcre\install-sh component: - -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. - -For the pcre component: - -PCRE LICENCE ------------- - -PCRE is a library of functions to support regular expressions whose syntax -and semantics are as close as possible to those of the Perl 5 language. - -Written by: Philip Hazel - -University of Cambridge Computing Service, -Cambridge, England. Phone: +44 1223 334714. - -Copyright (c) 1997-2001 University of Cambridge - -Permission is granted to anyone to use this software for any purpose on any -computer system, and to redistribute it freely, subject to the following -restrictions: - -1. This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. In practice, this means that if you use - PCRE in software which you distribute to others, commercially or - otherwise, you must put a sentence like this - - Regular expression support is provided by the PCRE library package, - which is open source software, written by Philip Hazel, and copyright - by the University of Cambridge, England. - - somewhere reasonably visible in your documentation and in any relevant - files or online help data or similar. A reference to the ftp site for - the source, that is, to - - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ - - should also be given in the documentation. - -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. - -4. If PCRE is embedded in any software that is released under the GNU - General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL), - then the terms of that licence shall supersede any condition above with - which it is incompatible. - -The documentation for PCRE, supplied in the "doc" directory, is distributed -under the same terms as the software itself. - -End PCRE LICENCE - - -For the test\zb.c component: - -/* ZeusBench V1.01 - =============== - -This program is Copyright (C) Zeus Technology Limited 1996. - -This program may be used and copied freely providing this copyright notice -is not removed. - -This software is provided "as is" and any express or implied waranties, -including but not limited to, the implied warranties of merchantability and -fitness for a particular purpose are disclaimed. In no event shall -Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, -exemplary, or consequential damaged (including, but not limited to, -procurement of substitute good or services; loss of use, data, or profits; -or business interruption) however caused and on theory of liability. Whether -in contract, strict liability or tort (including negligence or otherwise) -arising in any way out of the use of this software, even if advised of the -possibility of such damage. - - Written by Adam Twiss (adam at zeus.co.uk). March 1996 - -Thanks to the following people for their input: - Mike Belshe (mbelshe at netscape.com) - Michael Campanella (campanella at stevms.enet.dec.com) - -*/ - -For the expat xml parser component: - -Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - and Clark Cooper - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -==================================================================== - -For the mod_deflate zlib compression component: - - (C) 1995-2002 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup at gzip.org madler at alumni.caltech.edu - -------------------------------------------------------------------------------------- - -This is a release of MySQL, a GPL (free) SQL database server (more -licence information in the PUBLIC file and in the reference manual). - -Please read the "Upgrading from..." section in the manual first, if you are -migrating from older versions of MySQL! - -The latest information about MySQL can be found at: -http://www.mysql.com - -To see what it can do take a look at the features section in the -manual. - -For installation instructions see the Installation chapter in the -manual. - -For future plans see the TODO appendix in the manual. - -New features/bug fixes history is in the news appendix in the manual. - -For the currently known bugs/misfeatures (known errors) see the bugs -appendix in the manual. - -For examples of SQL and benchmarking information see the bench -directory. - -The manual mentioned above can be found in the Docs directory. The -manual is available in the following formats: as plain ASCII text in -Docs/manual.txt, in HTML format in Docs/manual_toc.html, as GNU Info in -Docs/mysql.info and as PostScript in Docs/manual.ps. - -MySQL is brought to you by the MySQL team at MySQL AB - -For a list of developers and other contributors, see the Credits appendix -in the manual. - -************************************************************ - -IMPORTANT: - -Send bug (error) reports, questions and comments to the mailing list -at mysql at lists.mysql.com - -Please use the 'mysqlbug' script when posting bug reports or questions -about MySQL. mysqlbug will gather some information about your system -and start your editor with a form in which you can describe your -problem. Bug reports might be silently ignored by the MySQL -maintainers if there is not a good reason included in the report as to -why mysqlbug has not been used. A report that says 'MySQL does not -work for me. Why?' is not considered a valid bug report. - -The mysqlbug script can be found in the 'scripts' directory of the -distribution, that is '/scripts'. - - --------------------------------------------------------------------------------- - --------------------------------------------------------------------- - The PHP License, version 3.0 -Copyright (c) 1999 - 2002 The PHP Group. All rights reserved. --------------------------------------------------------------------- - -Redistribution and use in source and binary forms, with or without -modification, is permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name "PHP" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact group at php.net. - - 4. Products derived from this software may not be called "PHP", nor - may "PHP" appear in their name, without prior written permission - from group at php.net. You may indicate that your software works in - conjunction with PHP by saying "Foo for PHP" instead of calling - it "PHP Foo" or "phpfoo" - - 5. The PHP Group may publish revised and/or new versions of the - license from time to time. Each version will be given a - distinguishing version number. - Once covered code has been published under a particular version - of the license, you may always continue to use it under the terms - of that version. You may also choose to use such covered code - under the terms of any subsequent version of the license - published by the PHP Group. No one other than the PHP Group has - the right to modify the terms applicable to covered code created - under this License. - - 6. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes PHP, freely available from - ". - -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND -ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - --------------------------------------------------------------------- - -This software consists of voluntary contributions made by many -individuals on behalf of the PHP Group. - -The PHP Group can be contacted via Email at group at php.net. - -For more information on the PHP Group and the PHP project, -please see . - -This product includes the Zend Engine, freely available at -. - ------------------------------------------------------------------------ - - -SUGARCRM PUBLIC LICENSE -Version 1.1.2 - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party. - - 1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications. - - 1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. - - 1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. - - 1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data. - - 1.5. ''Executable'' means Covered Code in any form other than Source Code. - - 1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. - - 1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. - - 1.8. ''License'' means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. - - 1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: - A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or previous Modifications. - - 1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. - - 1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. - - 1.12. "You'' (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: - (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). - (c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor. - - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. - - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - SugarCRM Inc. (''SugarCRM'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by SugarCRM. No one other than SugarCRM has the right to modify the terms applicable to Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''SugarCRM'', ''SPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the SugarCRM Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. - - 8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as ?Multiple-Licensed?. ?Multiple-Licensed? means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the SPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. - -SugarCRM Public License 1.1.2 - Exhibit A - -The contents of this file are subject to the SugarCRM Public License Version 1.1.2 -("License"); You may not use this file except in compliance with the -License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -the specific language governing rights and limitations under the License. - -The Original Code is: SugarCRM Open Source - -The Initial Developer of the Original Code is SugarCRM, Inc. -Portions created by SugarCRM are Copyright (C) 2004 SugarCRM, Inc.; -All Rights Reserved. -Contributor(s): ______________________________________. - -[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - -SugarCRM Public License 1.1.2 - Exihibit B - -Additional Terms applicable to the SugarCRM Public License. - -I. Effect. -These additional terms described in this SugarCRM Public License ? Additional Terms shall apply to the Covered Code under this License. - -II. SugarCRM and logo. -This License does not grant any rights to use the trademarks "SugarCRM" and the "SugarCRM" logos even if such marks are included in the Original Code or Modifications. - - - -The modifications made to the code of SugarCRM are available under SPL and the new additions made by vtiger are available under Mozilla Public License (MPL) and GNU Public License (GPL). - - --------------------------------------------------------------------------------------------------------------- - -GNU Lesser General Public License - -Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, -Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and -distribute verbatim copies of this license document, but changing it is not -allowed. - - [This is the first released version of the Lesser GPL. It also counts as -the successor of the GNU Library Public License, version 2, hence the version -number 2.1.] - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public Licenses are intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. - -This license, the Lesser General Public License, applies to some specially -designated software packages--typically libraries--of the Free Software -Foundation and other authors who decide to use it. You can use it too, but we -suggest you first think carefully about whether this license or the ordinary -General Public License is the better strategy to use in any particular case, -based on the explanations below. - -When we speak of free software, we are referring to freedom of use, not price. -Our General Public Licenses are designed to make sure that you have the -freedom to distribute copies of free software (and charge for this service if -you wish); that you receive source code or can get it if you want it; that you -can change the software and use pieces of it in new free programs; and that -you are informed that you can do these things. - -To protect your rights, we need to make restrictions that forbid distributors -to deny you these rights or to ask you to surrender these rights. These -restrictions translate to certain responsibilities for you if you distribute -copies of the library or if you modify it. - -For example, if you distribute copies of the library, whether gratis or for a -fee, you must give the recipients all the rights that we gave you. You must -make sure that they, too, receive or can get the source code. If you link -other code with the library, you must provide complete object files to the -recipients, so that they can relink them with the library after making changes -to the library and recompiling it. And you must show them these terms so they -know their rights. - -We protect your rights with a two-step method: (1) we copyright the library, -and (2) we offer you this license, which gives you legal permission to copy, -distribute and/or modify the library. - -To protect each distributor, we want to make it very clear that there is no -warranty for the free library. Also, if the library is modified by someone -else and passed on, the recipients should know that what they have is not the -original version, so that the original author's reputation will not be -affected by problems that might be introduced by others. - -Finally, software patents pose a constant threat to the existence of any free -program. We wish to make sure that a company cannot effectively restrict the -users of a free program by obtaining a restrictive license from a patent -holder. Therefore, we insist that any patent license obtained for a version of -the library must be consistent with the full freedom of use specified in this -license. - -Most GNU software, including some libraries, is covered by the ordinary GNU -General Public License. This license, the GNU Lesser General Public License, -applies to certain designated libraries, and is quite different from the -ordinary General Public License. We use this license for certain libraries in -order to permit linking those libraries into non-free programs. - -When a program is linked with a library, whether statically or using a shared -library, the combination of the two is legally speaking a combined work, a -derivative of the original library. The ordinary General Public License -therefore permits such linking only if the entire combination fits its -criteria of freedom. The Lesser General Public License permits more lax -criteria for linking other code with the library. - -We call this license the "Lesser" General Public License because it does Less -to protect the user's freedom than the ordinary General Public License. It -also provides other free software developers Less of an advantage over -competing non-free programs. These disadvantages are the reason we use the -ordinary General Public License for many libraries. However, the Lesser -license provides advantages in certain special circumstances. - -For example, on rare occasions, there may be a special need to encourage the -widest possible use of a certain library, so that it becomes a de-facto -standard. To achieve this, non-free programs must be allowed to use the -library. A more frequent case is that a free library does the same job as -widely used non-free libraries. In this case, there is little to gain by -limiting the free library to free software only, so we use the Lesser General -Public License. - -In other cases, permission to use a particular library in non-free programs -enables a greater number of people to use a large body of free software. For -example, permission to use the GNU C Library in non-free programs enables many -more people to use the whole GNU operating system, as well as its variant, the -GNU/Linux operating system. - -Although the Lesser General Public License is Less protective of the users' -freedom, it does ensure that the user of a program that is linked with the -Library has the freedom and the wherewithal to run that program using a -modified version of the Library. - -The precise terms and conditions for copying, distribution and modification -follow. Pay close attention to the difference between a "work based on the -library" and a "work that uses the library". The former contains code derived -from the library, whereas the latter must be combined with the library in -order to run. -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License Agreement applies to any software library or other program -which contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Lesser General -Public License (also called "this License"). Each licensee is addressed as -"you". - -A "library" means a collection of software functions and/or data prepared so -as to be conveniently linked with application programs (which use some of -those functions and data) to form executables. - -The "Library", below, refers to any such software library or work which has -been distributed under these terms. A "work based on the Library" means either -the Library or any derivative work under copyright law: that is to say, a work -containing the Library or a portion of it, either verbatim or with -modifications and/or translated straightforwardly into another language. -(Hereinafter, translation is included without limitation in the term -"modification".) - -"Source code" for a work means the preferred form of the work for making -modifications to it. For a library, complete source code means all the source -code for all modules it contains, plus any associated interface definition -files, plus the scripts used to control compilation and installation of the -library. - -Activities other than copying, distribution and modification are not covered -by this License; they are outside its scope. The act of running a program -using the Library is not restricted, and output from such a program is covered -only if its contents constitute a work based on the Library (independent of -the use of the Library in a tool for writing it). Whether that is true depends -on what the Library does and what the program that uses the Library does. - -1. You may copy and distribute verbatim copies of the Library's complete -source code as you receive it, in any medium, provided that you conspicuously -and appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and distribute a copy of this License -along with the Library. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Library or any portion of it, -thus forming a work based on the Library, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you -also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices stating -that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no charge to all -third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a table -of data to be supplied by an application program that uses the facility, other -than as an argument passed when the facility is invoked, then you must make a -good faith effort to ensure that, in the event an application does not supply -such function or table, the facility still operates, and performs whatever -part of its purpose remains meaningful. - - (For example, a function in a library to compute square roots has a -purpose that is entirely well-defined independent of the application. -Therefore, Subsection 2d requires that any application-supplied function or -table used by this function must be optional: if the application does not -supply it, the square root function must still compute square roots.) - - These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Library, and can be reasonably -considered independent and separate works in themselves, then this License, -and its terms, do not apply to those sections when you distribute them as -separate works. But when you distribute the same sections as part of a whole -which is a work based on the Library, the distribution of the whole must be on -the terms of this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Library. - - In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of a -storage or distribution medium does not bring the other work under the scope -of this License. - -3. You may opt to apply the terms of the ordinary GNU General Public License -instead of this License to a given copy of the Library. To do this, you must -alter all the notices that refer to this License, so that they refer to the -ordinary GNU General Public License, version 2, instead of to this License. -(If a newer version than version 2 of the ordinary GNU General Public License -has appeared, then you can specify that version instead if you wish.) Do not -make any other change in these notices. - -Once this change is made in a given copy, it is irreversible for that copy, so -the ordinary GNU General Public License applies to all subsequent copies and -derivative works made from that copy. - -This option is useful when you wish to copy part of the code of the Library -into a program that is not a library. - -4. You may copy and distribute the Library (or a portion or derivative of it, -under Section 2) in object code or executable form under the terms of Sections -1 and 2 above provided that you accompany it with the complete corresponding -machine-readable source code, which must be distributed under the terms of -Sections 1 and 2 above on a medium customarily used for software interchange. - -If distribution of object code is made by offering access to copy from a -designated place, then offering equivalent access to copy the source code from -the same place satisfies the requirement to distribute the source code, even -though third parties are not compelled to copy the source along with the -object code. - -5. A program that contains no derivative of any portion of the Library, but is -designed to work with the Library by being compiled or linked with it, is -called a "work that uses the Library". Such a work, in isolation, is not a -derivative work of the Library, and therefore falls outside the scope of this -License. - -However, linking a "work that uses the Library" with the Library creates an -executable that is a derivative of the Library (because it contains portions -of the Library), rather than a "work that uses the library". The executable is -therefore covered by this License. Section 6 states terms for distribution of -such executables. - -When a "work that uses the Library" uses material from a header file that is -part of the Library, the object code for the work may be a derivative work of -the Library even though the source code is not. Whether this is true is -especially significant if the work can be linked without the Library, or if -the work is itself a library. The threshold for this to be true is not -precisely defined by law. - -If such an object file uses only numerical parameters, data structure layouts -and accessors, and small macros and small inline functions (ten lines or less -in length), then the use of the object file is unrestricted, regardless of -whether it is legally a derivative work. (Executables containing this object -code plus portions of the Library will still fall under Section 6.) - -Otherwise, if the work is a derivative of the Library, you may distribute the -object code for the work under the terms of Section 6. Any executables -containing that work also fall under Section 6, whether or not they are linked -directly with the Library itself. - -6. As an exception to the Sections above, you may also combine or link a "work -that uses the Library" with the Library to produce a work containing portions -of the Library, and distribute that work under terms of your choice, provided -that the terms permit modification of the work for the customer's own use and -reverse engineering for debugging such modifications. - -You must give prominent notice with each copy of the work that the Library is -used in it and that the Library and its use are covered by this License. You -must supply a copy of this License. If the work during execution displays -copyright notices, you must include the copyright notice for the Library among -them, as well as a reference directing the user to the copy of this License. -Also, you must do one of these things: - - a) Accompany the work with the complete corresponding machine-readable -source code for the Library including whatever changes were used in the work -(which must be distributed under Sections 1 and 2 above); and, if the work is -an executable linked with the Library, with the complete machine-readable -"work that uses the Library", as object code and/or source code, so that the -user can modify the Library and then relink to produce a modified executable -containing the modified Library. (It is understood that the user who changes -the contents of definitions files in the Library will not necessarily be able -to recompile the application to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the Library. A -suitable mechanism is one that (1) uses at run time a copy of the library -already present on the user's computer system, rather than copying library -functions into the executable, and (2) will operate properly with a modified -version of the library, if the user installs one, as long as the modified -version is interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at least three -years, to give the same user the materials specified in Subsection 6a, above, -for a charge no more than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy from a -designated place, offer equivalent access to copy the above specified -materials from the same place. - - e) Verify that the user has already received a copy of these materials or -that you have already sent this user a copy. - -For an executable, the required form of the "work that uses the Library" must -include any data and utility programs needed for reproducing the executable -from it. However, as a special exception, the materials to be distributed need -not include anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the operating -system on which the executable runs, unless that component itself accompanies -the executable. - -It may happen that this requirement contradicts the license restrictions of -other proprietary libraries that do not normally accompany the operating -system. Such a contradiction means you cannot use both them and the Library -together in an executable that you distribute. - -7. You may place library facilities that are a work based on the Library -side-by-side in a single library together with other library facilities not -covered by this License, and distribute such a combined library, provided that -the separate distribution of the work based on the Library and of the other -library facilities is otherwise permitted, and provided that you do these two -things: - - a) Accompany the combined library with a copy of the same work based on -the Library, uncombined with any other library facilities. This must be -distributed under the terms of the Sections above. - - b) Give prominent notice with the combined library of the fact that part -of it is a work based on the Library, and explaining where to find the -accompanying uncombined form of the same work. - -8. You may not copy, modify, sublicense, link with, or distribute the Library -except as expressly provided under this License. Any attempt otherwise to -copy, modify, sublicense, link with, or distribute the Library is void, and -will automatically terminate your rights under this License. However, parties -who have received copies, or rights, from you under this License will not have -their licenses terminated so long as such parties remain in full compliance. - -9. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the -Library or its derivative works. These actions are prohibited by law if you do -not accept this License. Therefore, by modifying or distributing the Library -(or any work based on the Library), you indicate your acceptance of this -License to do so, and all its terms and conditions for copying, distributing -or modifying the Library or works based on it. - -10. Each time you redistribute the Library (or any work based on the Library), -the recipient automatically receives a license from the original licensor to -copy, distribute, link with or modify the Library subject to these terms and -conditions. You may not impose any further restrictions on the recipients' -exercise of the rights granted herein. You are not responsible for enforcing -compliance by third parties with this License. - -11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or otherwise) -that contradict the conditions of this License, they do not excuse you from -the conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Library at all. -For example, if a patent license would not permit royalty-free redistribution -of the Library by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -12. If the distribution and/or use of the Library is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Library under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -13. The Free Software Foundation may publish revised and/or new versions of -the Lesser General Public License from time to time. Such new versions will be -similar in spirit to the present version, but may differ in detail to address -new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software -Foundation. If the Library does not specify a license version number, you may -choose any version ever published by the Free Software Foundation. - -14. If you wish to incorporate parts of the Library into other free programs -whose distribution conditions are incompatible with these, write to the author -to ask for permission. For software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we sometimes make -exceptions for this. Our decision will be guided by the two goals of -preserving the free status of all derivatives of our free software and of -promoting the sharing and reuse of software generally. - -NO WARRANTY - -15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE -THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE -OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR -DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR -A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH -HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -END OF TERMS AND CONDITIONS -How to Apply These Terms to Your New Libraries -If you develop a new library, and you want it to be of the greatest possible -use to the public, we recommend making it free software that everyone can -redistribute and change. You can do so by permitting redistribution under -these terms (or, alternatively, under the terms of the ordinary General Public -License). - -To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - - This library is free software; you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as published by the -Free Software Foundation; either version 2.1 of the License, or (at your -option) any later version. - - This library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License -for more details. - - You should have received a copy of the GNU Lesser General Public License -along with this library; if not, write to the Free Software Foundation, Inc., -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the library -`Frob' (a library for tweaking knobs) written by James Random Hacker. - - signature of Ty Coon, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - -Acknowledgements: - -We have used the following software: - -1. ExcelReader package to read the xls files. We have taken the utility from the following Web site : - http://freshmeat.net/projects/phpexcelreader/ - The product is available as GNU General Public License (GPL). - -2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the following Web site: -http://www.linuxscope.net/articles/mailAttachmentsPHP.html - -3. FPDF package to create PDF reports and documents. We have taken the utility from the following Web site: -http://www.fpdf.org/ - -We are grateful to the creators of the respective products for providing such a beautiful utilities. + +This software is a collective work consisting of the following major Open Source components: +Apache software, MySQL server, PHP, SugarCRM, ADOdb, Smarty, PHPMailer, phpSysinfo, MagpieRSS and others, each licensed under a separate Open Source License. +vtiger.com is not affiliated with nor endorsed by any of the above providers. + +For Windows + +1. Apache Web server software used under the Apache License available at /vtigerCRM/apache/LICENSE.txt + +2. MySQL database software used under the GPL License available at /vtigerCRM/mysql/README.txt + +3. PHP software used under the PHP License version 3.0 available at /vtigerCRM/php/license.txt + +4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 available at /vtigerCRM/LICENSE.txt + +5. gdwin32 software used under the GNU GPL available at gdwin32 /vtigerCRM/gdwin32/gd-license.txt + +6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap + +7. PHPMailer software used under the GNU LGPL downloaded from http://adodb.sourceforge.net available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt + +8. ADOdb software used under BSD license downloaded from http://adodb.sourceforge.net available at /vtigerCRM/adodb/license.txt + +9. phpSysinfo software used under GNU GPL downloaded from http://phpsysinfo.sourceforge.net/ available at /vtigerCRM/modules/System/COPYING + +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at + +11. FCKeditor software used under GNU LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt + +12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright + +13. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib + +14. freetag is used under dual license BSD and GNU LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt + +15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html + +16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt + +17. Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html + +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at + +19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html + +20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE + +21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# +22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). + +For Linux + +1. Apache Web server software used under the Apache License available at /vtigerCRM_linux/apache/LICENSE.txt + +2. MySQL database software used under the GPL available at /vtigerCRM_linux/mysql/README.txt + +3. PHP software used under the PHP License version 3.0 available at /vtigerCRM_linux/php/license.txt + +4. SugarCRM software used under the SugarCRM Public License (SPL 1.1.2) available at /vtigerCRM/LICENSE_linux.txt + +5. gd 2.0.28 software used "AS IS" available at /vtigerCRM_linux/gd-2.0.28/ + +6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap + +8. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt + +9. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt + +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ + +10. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING + +11. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt + +12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright + +13. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib + +14. freetag is used under dual license BSD and LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt + +15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html + +16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt + +17. Image_Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html + +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at + +19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html + +20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE + +21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# +22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL) + +The licenses of the Open Source components are reproduced in full below. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 09:57:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 13:57:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6752 - in /vtigercrm/trunk/pkg/license: License_linux.txt License_windows.txt Message-ID: <20060530135735.A0CB87D7848@vtiger.fosslabs.com> Author: richie Date: Tue May 30 07:57:30 2006 New Revision: 6752 Log: updated licence files Modified: vtigercrm/trunk/pkg/license/License_linux.txt vtigercrm/trunk/pkg/license/License_windows.txt Modified: vtigercrm/trunk/pkg/license/License_linux.txt ============================================================================== --- vtigercrm/trunk/pkg/license/License_linux.txt (original) +++ vtigercrm/trunk/pkg/license/License_linux.txt Tue May 30 07:57:30 2006 @@ -1,24 +1,51 @@ - This software is a collective work consisting of the following major Open Source components: -Apache software, MySQL server, PHP, SugarCRM, phpBB, phpSysinfo, Magpie and PHPMailer each licensed under a separate Open Source License. -vtiger.com is not affiliated with nor endorsed by any of the above providers. - +Apache software, MySQL server, PHP, SugarCRM, ADOdb, Smarty, PHPMailer, phpSysinfo, MagpieRSS and others, each licensed under a separate Open Source License. +vtiger.com is not affiliated with nor endorsed by any of the above providers. For Linux -1. Apache web server software used under the Apache License available at /vtigerCRM_linux/apache/LICENSE.txt +1. Apache Web server software used under the Apache License available at /vtigerCRM_linux/apache/LICENSE.txt + 2. MySQL database software used under the GPL available at /vtigerCRM_linux/mysql/README.txt + 3. PHP software used under the PHP License version 3.0 available at /vtigerCRM_linux/php/license.txt + 4. SugarCRM software used under the SugarCRM Public License (SPL 1.1.2) available at /vtigerCRM/LICENSE_linux.txt + 5. gd 2.0.28 software used "AS IS" available at /vtigerCRM_linux/gd-2.0.28/ + 6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap -7. phpBB software used under GNU GPL downloaded from http://www.phpbb.com/support/license.php -9. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt -10. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -11. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING -13. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt -15. Mailfeed used under GNU GPL downloaed from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright -16. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). + +8. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt + +9. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt + +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ + +10. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING + +11. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt + +12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright + +13. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib + +14. freetag is used under dual license BSD and LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt + +15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html + +16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt + +17. Image_Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html + +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at + +19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html + +20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE + +21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# +22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL) The licenses of the Open Source components are reproduced in full below. @@ -485,7 +512,6 @@ * * Copyright (c) 2000-2002 The Apache Software Foundation. All rights * reserved. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1193,7 +1219,6 @@ modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating @@ -1502,18 +1527,27 @@ That's all there is to it! -Acknowledgements: - We have used the following software: 1. ExcelReader package to read the xls files. We have taken the utility from the following Web site : http://freshmeat.net/projects/phpexcelreader/ The product is available as GNU General Public License (GPL). -2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the following Web site: +2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the http://www.linuxscope.net/articles/mailAttachmentsPHP.html -3. FPDF package to create PDF reports and documents. We have taken the utility from the following Web site: -http://www.fpdf.org/ - -We are grateful to the creators of the respective products for providing such beautiful utilities. +3. FPDF package to create PDF reports and documents. We have downloaded package from http://www.fpdf.org + +4. Prototype (Object-Oriented JavaScript framework) package to ease development of dynamic web applications. We have downloaded package from http://prototype.conio.net + +5. class_http to cache scraped content. We have downloaded package from http://www.troywolf.com/articles/php/class_http/ + +6.Carousel Slideshow package to display large images as thumbnails. We have downloaded package from http://www.dynamicdrive.com/dynamicindex14/carousel2.htm + +7. Ajax Popup Chat for enabling instant messaging for vtiger CRM users. We have downloaded package from http://www.os-solution.com/demo/ajaxcsspopupchat/index.php + +8. Image Crossfade Redux for enabling fade effect to images. We have downloaded package from http://slayeroffice.com/code/imageCrossFade/xfade2.html + +9. Calculator for enabling calculations in vtiger CRM. We have downloaded package from http://www.hmhd.com/steve + +We are grateful to the creators of the respective products for providing such a beautiful utilities. Modified: vtigercrm/trunk/pkg/license/License_windows.txt ============================================================================== --- vtigercrm/trunk/pkg/license/License_windows.txt (original) +++ vtigercrm/trunk/pkg/license/License_windows.txt Tue May 30 07:57:30 2006 @@ -1,23 +1,52 @@ This software is a collective work consisting of the following major Open Source components: -Apache software, MySQL server, PHP, SugarCRM, phpBB, phpSysinfo, Magpie and PHPMailer each licensed under a separate Open Source License. -vtiger.com is not affiliated with nor endorsed by any of the above providers. +Apache software, MySQL server, PHP, SugarCRM, ADOdb, Smarty, PHPMailer, phpSysinfo, MagpieRSS and others, each licensed under a separate Open Source License. +vtiger.com is not affiliated with nor endorsed by any of the above providers. For Windows -1. Apache web server software used under the Apache License available at /vtigerCRM/apache/LICENSE.txt +1. Apache Web server software used under the Apache License available at /vtigerCRM/apache/LICENSE.txt + 2. MySQL database software used under the GPL License available at /vtigerCRM/mysql/README.txt + 3. PHP software used under the PHP License version 3.0 available at /vtigerCRM/php/license.txt -4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 available at /vtigerCRM/LICENSE_windows.txt + +4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 available at /vtigerCRM/LICENSE.txt + 5. gdwin32 software used under the GNU GPL available at gdwin32 /vtigerCRM/gdwin32/gd-license.txt + 6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap -7. phpBB software used under GNU GPL downloaded from http://www.phpbb.com/support/license.php -9. PHPMailer software used under the GNU LGPL available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt -10. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -11. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING -13. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt -15. Mailfeed used under GNU GPL downloaed from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright -16. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). + +7. PHPMailer software used under the GNU LGPL downloaded from http://adodb.sourceforge.net available at /vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt + +8. ADOdb software used under BSD license downloaded from http://adodb.sourceforge.net available at /vtigerCRM/adodb/license.txt + +9. phpSysinfo software used under GNU GPL downloaded from http://phpsysinfo.sourceforge.net/ available at /vtigerCRM/modules/System/COPYING + +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at + +11. FCKeditor software used under GNU LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt + +12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright + +13. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib + +14. freetag is used under dual license BSD and GNU LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt + +15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html + +16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt + +17. Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html + +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at + +19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html + +20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE + +21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# +22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL). The licenses of the Open Source components are reproduced in full below. @@ -1501,7 +1530,7 @@ That's all there is to it! -Acknowledgements: +Acknowledgments: We have used the following software: @@ -1509,11 +1538,21 @@ http://freshmeat.net/projects/phpexcelreader/ The product is available as GNU General Public License (GPL). -2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the following Web site: +2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the http://www.linuxscope.net/articles/mailAttachmentsPHP.html -3. FPDF package to create PDF reports and documents. We have taken the utility from the following Web site: -http://www.fpdf.org/ - -We are grateful to the creators of the respective products for providing such beautiful utilities. - +3. FPDF package to create PDF reports and documents. We have downloaded package from http://www.fpdf.org + +4. Prototype (Object-Oriented JavaScript framework) package to ease development of dynamic web applications. We have downloaded package from http://prototype.conio.net + +5. class_http to cache scraped content. We have downloaded package from http://www.troywolf.com/articles/php/class_http/ + +6.Carousel Slideshow package to display large images as thumbnails. We have downloaded package from http://www.dynamicdrive.com/dynamicindex14/carousel2.htm + +7. Ajax Popup Chat for enabling instant messaging for vtiger CRM users. We have downloaded package from http://www.os-solution.com/demo/ajaxcsspopupchat/index.php + +8. Image Crossfade Redux for enabling fade effect to images. We have downloaded package from http://slayeroffice.com/code/imageCrossFade/xfade2.html + +9. Calculator for enabling calculations in vtiger CRM. We have downloaded package from http://www.hmhd.com/steve + +We are grateful to the creators of the respective products for providing such a beautiful utilities. From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:11:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:11:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6753 - in /vtigercrm/trunk: Copyright.txt LICENSE.txt Message-ID: <20060530141134.D73317D7808@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:11:29 2006 New Revision: 6753 Log: updated licence files Modified: vtigercrm/trunk/Copyright.txt vtigercrm/trunk/LICENSE.txt Modified: vtigercrm/trunk/Copyright.txt ============================================================================== --- vtigercrm/trunk/Copyright.txt (original) +++ vtigercrm/trunk/Copyright.txt Tue May 30 08:11:29 2006 @@ -23,7 +23,7 @@ 9. phpSysinfo software used under GNU GPL downloaded from http://phpsysinfo.sourceforge.net/ available at /vtigerCRM/modules/System/COPYING -10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at http://magpierss.sourceforge.net 11. FCKeditor software used under GNU LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt @@ -39,7 +39,7 @@ 17. Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html -18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at http://www.vxr.it/log4php/ 19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html @@ -66,7 +66,7 @@ 9. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at http://magpierss.sourceforge.net/ 10. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING @@ -84,7 +84,7 @@ 17. Image_Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html -18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at http://www.vxr.it/log4php/ 19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html Modified: vtigercrm/trunk/LICENSE.txt ============================================================================== --- vtigercrm/trunk/LICENSE.txt (original) +++ vtigercrm/trunk/LICENSE.txt Tue May 30 08:11:29 2006 @@ -1,406 +1,406 @@ -The Sugar Public License Version 1.1.2 ("SPL") consists of the Mozilla Public -License Version 1.1, modified to be specific to SugarCRM, with the Additional -Terms in Exhibit B. The original Mozilla Public License 1.1 can be found at: -http://www.mozilla.org/MPL/MPL-1.1.html - -SUGARCRM PUBLIC LICENSE -Version 1.1.2 - - --------------------------------------------------------------------------------- - -1. Definitions. - -1.0.1. "Commercial Use" means distribution or otherwise making the Covered -Code available to a third party. -1.1. ''Contributor'' means each entity that creates or contributes to the -creation of Modifications. - -1.2. ''Contributor Version'' means the combination of the Original Code, prior -Modifications used by a Contributor, and the Modifications made by that -particular Contributor. - -1.3. ''Covered Code'' means the Original Code or Modifications or the -combination of the Original Code and Modifications, in each case including -portions thereof. - -1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted -in the software development community for the electronic transfer of data. - -1.5. ''Executable'' means Covered Code in any form other than Source Code. - -1.6. ''Initial Developer'' means the individual or entity identified as the -Initial Developer in the Source Code notice required by Exhibit A. - -1.7. ''Larger Work'' means a work which combines Covered Code or portions -thereof with code not governed by the terms of this License. - -1.8. ''License'' means this document. - -1.8.1. "Licensable" means having the right to grant, to the maximum extent -possible, whether at the time of the initial grant or subsequently acquired, -any and all of the rights conveyed herein. - -1.9. ''Modifications'' means any addition to or deletion from the substance -or structure of either the Original Code or any previous Modifications. When -Covered Code is released as a series of files, a Modification is: - -A. Any addition to or deletion from the contents of a file containing Original -Code or previous Modifications. -B. Any new file that contains any part of the Original Code or previous -Modifications. - - -1.10. ''Original Code'' means Source Code of computer software code which is -described in the Source Code notice required by Exhibit A as Original Code, -and which, at the time of its release under this License is not already Covered -Code governed by this License. -1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter -acquired, including without limitation, method, process, and apparatus claims, -in any patent Licensable by grantor. - -1.11. ''Source Code'' means the preferred form of the Covered Code for making -modifications to it, including all modules it contains, plus any associated -interface definition files, scripts used to control compilation and installation -of an Executable, or source code differential comparisons against either the -Original Code or another well known, available Covered Code of the Contributor's -choice. The Source Code can be in a compressed or archival form, provided the -appropriate decompression or de-archiving software is widely available for no -charge. - -1.12. "You'' (or "Your") means an individual or a legal entity exercising -rights under, and complying with all of the terms of, this License or a future -version of this License issued under Section 6.1. For legal entities, "You'' -includes any entity which controls, is controlled by, or is under common -control with You. For purposes of this definition, "control'' means (a) the -power, direct or indirect, to cause the direction or management of such entity, -whether by contract or otherwise, or (b) ownership of more than fifty percent -(50%) of the outstanding shares or beneficial ownership of such entity. - -2. Source Code License. -2.1. The Initial Developer Grant. -The Initial Developer hereby grants You a world-wide, royalty-free, -non-exclusive license, subject to third party intellectual property claims: -(a) under intellectual property rights (other than patent or trademark) -Licensable by Initial Developer to use, reproduce, modify, display, perform, -sublicense and distribute the Original Code (or portions thereof) with or -without Modifications, and/or as part of a Larger Work; and -(b) under Patents Claims infringed by the making, using or selling of Original -Code, to make, have made, use, practice, sell, and offer for sale, and/or -otherwise dispose of the Original Code (or portions thereof). - - -(c) the licenses granted in this Section 2.1(a) and (b) are effective on -the date Initial Developer first distributes Original Code under the terms -of this License. -(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for -code that You delete from the Original Code; 2) separate from the Original Code; -or 3) for infringements caused by: i) the modification of the Original Code or -ii) the combination of the Original Code with other software or devices. - - -2.2. Contributor Grant. -Subject to third party intellectual property claims, each Contributor hereby -grants You a world-wide, royalty-free, non-exclusive license - -(a) under intellectual property rights (other than patent or trademark) -Licensable by Contributor, to use, reproduce, modify, display, perform, -sublicense and distribute the Modifications created by such Contributor -(or portions thereof) either on an unmodified basis, with other Modifications, -as Covered Code and/or as part of a Larger Work; and -(b) under Patent Claims infringed by the making, using, or selling of -Modifications made by that Contributor either alone and/or in combination with -its Contributor Version (or portions of such combination), to make, use, sell, -offer for sale, have made, and/or otherwise dispose of: 1) Modifications made -by that Contributor (or portions thereof); and 2) the combination of -Modifications made by that Contributor with its Contributor Version (or portions -of such combination). - -(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date -Contributor first makes Commercial Use of the Covered Code. - -(d) Notwithstanding Section 2.2(b) above, no patent license is granted: -1) for any code that Contributor has deleted from the Contributor Version; -2) separate from the Contributor Version; 3) for infringements caused -by: i) third party modifications of Contributor Version or ii) the -combination of Modifications made by that Contributor with other software -(except as part of the Contributor Version) or other devices; or 4) under -Patent Claims infringed by Covered Code in the absence of Modifications -made by that Contributor. - - -3. Distribution Obligations. - -3.1. Application of License. -The Modifications which You create or to which You contribute are -governed by the terms of this License, including without limitation -Section 2.2. The Source Code version of Covered Code may be distributed -only under the terms of this License or a future version of this License -released under Section 6.1, and You must include a copy of this License -with every copy of the Source Code You distribute. You may not offer or -impose any terms on any Source Code version that alters or restricts the -applicable version of this License or the recipients' rights hereunder. -However, You may include an additional document offering the additional -rights described in Section 3.5. -3.2. Availability of Source Code. -Any Modification which You create or to which You contribute must be made -available in Source Code form under the terms of this License either on -the same media as an Executable version or via an accepted Electronic -Distribution Mechanism to anyone to whom you made an Executable version -available; and if made available via Electronic Distribution Mechanism, -must remain available for at least twelve (12) months after the date it -initially became available, or at least six (6) months after a subsequent -version of that particular Modification has been made available to such -recipients. You are responsible for ensuring that the Source Code version -remains available even if the Electronic Distribution Mechanism is -maintained by a third party. - -3.3. Description of Modifications. -You must cause all Covered Code to which You contribute to contain a file -documenting the changes You made to create that Covered Code and the date of -any change. You must include a prominent statement that the Modification is -derived, directly or indirectly, from Original Code provided by the Initial -Developer and including the name of the Initial Developer in (a) the Source -Code, and (b) in any notice in an Executable version or related documentation -in which You describe the origin or ownership of the Covered Code. - -3.4. Intellectual Property Matters - -(a) Third Party Claims. -If Contributor has knowledge that a license under a third party's intellectual -property rights is required to exercise the rights granted by such Contributor -under Sections 2.1 or 2.2, Contributor must include a text file with the Source -Code distribution titled "LEGAL'' which describes the claim and the party making -the claim in sufficient detail that a recipient will know whom to contact. If -Contributor obtains such knowledge after the Modification is made available as -described in Section 3.2, Contributor shall promptly modify the LEGAL file in -all copies Contributor makes available thereafter and shall take other steps -(such as notifying appropriate mailing lists or newsgroups) reasonably calculated -to inform those who received the Covered Code that new knowledge has been obtained. -(b) Contributor APIs. -If Contributor's Modifications include an application programming interface and -Contributor has knowledge of patent licenses which are reasonably necessary to -implement that API, Contributor must also include this information in the LEGAL -file. - - - (c) Representations. -Contributor represents that, except as disclosed pursuant to Section 3.4(a) -above, Contributor believes that Contributor's Modifications are Contributor's -original creation(s) and/or Contributor has sufficient rights to grant the -rights conveyed by this License. - -3.5. Required Notices. -You must duplicate the notice in Exhibit A in each file of the Source Code. -If it is not possible to put such notice in a particular Source Code file -due to its structure, then You must include such notice in a location (such -as a relevant directory) where a user would be likely to look for such a -notice. If You created one or more Modification(s) You may add your name as -a Contributor to the notice described in Exhibit A. You must also duplicate -this License in any documentation for the Source Code where You describe -recipients' rights or ownership rights relating to Covered Code. You may -choose to offer, and to charge a fee for, warranty, support, indemnity or -liability obligations to one or more recipients of Covered Code. However, You -may do so only on Your own behalf, and not on behalf of the Initial Developer -or any Contributor. You must make it absolutely clear than any such warranty, -support, indemnity or liability obligation is offered by You alone, and You -hereby agree to indemnify the Initial Developer and every Contributor for any -liability incurred by the Initial Developer or such Contributor as a result of -warranty, support, indemnity or liability terms You offer. - -3.6. Distribution of Executable Versions. -You may distribute Covered Code in Executable form only if the requirements -of Section 3.1-3.5 have been met for that Covered Code, and if You include -a notice stating that the Source Code version of the Covered Code is available -under the terms of this License, including a description of how and where -You have fulfilled the obligations of Section 3.2. The notice must be -conspicuously included in any notice in an Executable version, related -documentation or collateral in which You describe recipients' rights relating -to the Covered Code. You may distribute the Executable version of Covered -Code or ownership rights under a license of Your choice, which may contain -terms different from this License, provided that You are in compliance with -the terms of this License and that the license for the Executable version -does not attempt to limit or alter the recipient's rights in the Source Code -version from the rights set forth in this License. If You distribute the -Executable version under a different license You must make it absolutely -clear that any terms which differ from this License are offered by You alone, -not by the Initial Developer or any Contributor. You hereby agree to indemnify -the Initial Developer and every Contributor for any liability incurred by the -Initial Developer or such Contributor as a result of any such terms You offer. - -3.7. Larger Works. -You may create a Larger Work by combining Covered Code with other code not -governed by the terms of this License and distribute the Larger Work as a -single product. In such a case, You must make sure the requirements of this -License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. -If it is impossible for You to comply with any of the terms of this License -with respect to some or all of the Covered Code due to statute, judicial order, -or regulation then You must: (a) comply with the terms of this License to the -maximum extent possible; and (b) describe the limitations and the code they -affect. Such description must be included in the LEGAL file described in -Section 3.4 and must be included with all distributions of the Source Code. -Except to the extent prohibited by statute or regulation, such description -must be sufficiently detailed for a recipient of ordinary skill to be able -to understand it. -5. Application of this License. -This License applies to code to which the Initial Developer has attached the -notice in Exhibit A and to related Covered Code. -6. Versions of the License. -6.1. New Versions. -SugarCRM Inc. (''SugarCRM'') may publish revised and/or new versions of the -License from time to time. Each version will be given a distinguishing version -number. -6.2. Effect of New Versions. -Once Covered Code has been published under a particular version of the License, -You may always continue to use it under the terms of that version. You may also -choose to use such Covered Code under the terms of any subsequent version of the -License published by SugarCRM. No one other than SugarCRM has the right to modify -the terms applicable to Covered Code created under this License. - -6.3. Derivative Works. -If You create or use a modified version of this License (which you may only do -in order to apply it to code which is not already Covered Code governed by this -License), You must (a) rename Your license so that the phrases ''SugarCRM'', -''SPL'' or any confusingly similar phrase do not appear in your license (except -to note that your license differs from this License) and (b) otherwise make it -clear that Your version of the license contains terms which differ from the -SugarCRM Public License. (Filling in the name of the Initial Developer, Original -Code or Contributor in the notice described in Exhibit A shall not of themselves -be deemed to be modifications of this License.) - -7. DISCLAIMER OF WARRANTY. -COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES -THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE -OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED -CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT -THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY -SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL -PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT -UNDER THIS DISCLAIMER. - -8. TERMINATION. -8.1. This License and the rights granted hereunder will terminate automatically if -You fail to comply with terms herein and fail to cure such breach within 30 days of -becoming aware of the breach. All sublicenses to the Covered Code which are properly -granted shall survive any termination of this License. Provisions which, by their -nature, must remain in effect beyond the termination of this License shall survive. - -8.2. If You initiate litigation by asserting a patent infringement claim (excluding -declatory judgment actions) against Initial Developer or a Contributor (the Initial -Developer or Contributor against whom You file such action is referred to as -"Participant") alleging that: - -(a) such Participant's Contributor Version directly or indirectly infringes any patent, -then any and all rights granted by such Participant to You under Sections 2.1 and/or -2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, -unless if within 60 days after receipt of notice You either: (i) agree in writing to -pay Participant a mutually agreeable reasonable royalty for Your past and future use -of Modifications made by such Participant, or (ii) withdraw Your litigation claim -with respect to the Contributor Version against such Participant. If within 60 days -of notice, a reasonable royalty and payment arrangement are not mutually agreed upon -in writing by the parties or the litigation claim is not withdrawn, the rights granted -by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the -expiration of the 60 day notice period specified above. - -(b) any software, hardware, or device, other than such Participant's Contributor Version, -directly or indirectly infringes any patent, then any rights granted to You by such -Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You -first made, used, sold, distributed, or had made, Modifications made by that Participant. - -8.3. If You assert a patent infringement claim against Participant alleging that such -Participant's Contributor Version directly or indirectly infringes any patent where such -claim is resolved (such as by license or settlement) prior to the initiation of patent -infringement litigation, then the reasonable value of the licenses granted by such -Participant under Sections 2.1 or 2.2 shall be taken into account in determining the -amount or value of any payment or license. - -8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license -agreements (excluding distributors and resellers) which have been validly granted by You -or any distributor hereunder prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. -UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), -CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY -DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY -PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER -INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER -FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH -PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF -LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH -PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME -JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL -DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. -The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 -(Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer -software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). -Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), -all U.S. Government End Users acquire Covered Code with only those rights set forth herein. - -11. MISCELLANEOUS. -This License represents the complete agreement concerning subject matter hereof. If -any provision of this License is held to be unenforceable, such provision shall be -reformed only to the extent necessary to make it enforceable. This License shall be -governed by California law provisions (except to the extent applicable law, if any, -provides otherwise), excluding its conflict-of-law provisions. With respect to disputes -in which at least one party is a citizen of, or an entity chartered or registered to do -business in the United States of America, any litigation relating to this License shall -be subject to the jurisdiction of the Federal Courts of the Northern District of California, -with venue lying in Santa Clara County, California, with the losing party responsible for -costs, including without limitation, court costs and reasonable attorneys' fees and expenses. -The application of the United Nations Convention on Contracts for the International Sale of -Goods is expressly excluded. Any law or regulation which provides that the language of a -contract shall be construed against the drafter shall not apply to this License. - -12. RESPONSIBILITY FOR CLAIMS. -As between Initial Developer and the Contributors, each party is responsible for claims -and damages arising, directly or indirectly, out of its utilization of rights under this -License and You agree to work with Initial Developer and Contributors to distribute such -responsibility on an equitable basis. Nothing herein is intended or shall be deemed to -constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. -Initial Developer may designate portions of the Covered Code as ?Multiple-Licensed?. -?Multiple-Licensed? means that the Initial Developer permits you to utilize portions of -the Covered Code under Your choice of the SPL or the alternative licenses, if any, specified -by the Initial Developer in the file described in Exhibit A. - - -SugarCRM Public License 1.1.2 - Exhibit A -The contents of this file are subject to the SugarCRM Public License Version 1.1.2 -("License"); You may not use this file except in compliance with the -License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -the specific language governing rights and limitations under the License. - -The Original Code is: SugarCRM Open Source - -The Initial Developer of the Original Code is SugarCRM, Inc. -Portions created by SugarCRM are Copyright (C) 2004 SugarCRM, Inc.; -All Rights Reserved. -Contributor(s): ______________________________________. - - -[NOTE: The text of this Exhibit A may differ slightly from the text of the notices -in the Source Code files of the Original Code. You should use the text of this -Exhibit A rather than the text found in the Original Code Source Code for Your -Modifications.] - - - -SugarCRM Public License 1.1.2 - Exhibit B - -Additional Terms applicable to the SugarCRM Public License. - -I. Effect. -These additional terms described in this SugarCRM Public License - Additional -Terms shall apply to the Covered Code under this License. - -II. SugarCRM and logo. -This License does not grant any rights to use the trademarks "SugarCRM" and the "SugarCRM" +The Sugar Public License Version 1.1.2 ("SPL") consists of the Mozilla Public +License Version 1.1, modified to be specific to SugarCRM, with the Additional +Terms in Exhibit B. The original Mozilla Public License 1.1 can be found at: +http://www.mozilla.org/MPL/MPL-1.1.html + +SUGARCRM PUBLIC LICENSE +Version 1.1.2 + + +-------------------------------------------------------------------------------- + +1. Definitions. + +1.0.1. "Commercial Use" means distribution or otherwise making the Covered +Code available to a third party. +1.1. ''Contributor'' means each entity that creates or contributes to the +creation of Modifications. + +1.2. ''Contributor Version'' means the combination of the Original Code, prior +Modifications used by a Contributor, and the Modifications made by that +particular Contributor. + +1.3. ''Covered Code'' means the Original Code or Modifications or the +combination of the Original Code and Modifications, in each case including +portions thereof. + +1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted +in the software development community for the electronic transfer of data. + +1.5. ''Executable'' means Covered Code in any form other than Source Code. + +1.6. ''Initial Developer'' means the individual or entity identified as the +Initial Developer in the Source Code notice required by Exhibit A. + +1.7. ''Larger Work'' means a work which combines Covered Code or portions +thereof with code not governed by the terms of this License. + +1.8. ''License'' means this document. + +1.8.1. "Licensable" means having the right to grant, to the maximum extent +possible, whether at the time of the initial grant or subsequently acquired, +any and all of the rights conveyed herein. + +1.9. ''Modifications'' means any addition to or deletion from the substance +or structure of either the Original Code or any previous Modifications. When +Covered Code is released as a series of files, a Modification is: + +A. Any addition to or deletion from the contents of a file containing Original +Code or previous Modifications. +B. Any new file that contains any part of the Original Code or previous +Modifications. + + +1.10. ''Original Code'' means Source Code of computer software code which is +described in the Source Code notice required by Exhibit A as Original Code, +and which, at the time of its release under this License is not already Covered +Code governed by this License. +1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter +acquired, including without limitation, method, process, and apparatus claims, +in any patent Licensable by grantor. + +1.11. ''Source Code'' means the preferred form of the Covered Code for making +modifications to it, including all modules it contains, plus any associated +interface definition files, scripts used to control compilation and installation +of an Executable, or source code differential comparisons against either the +Original Code or another well known, available Covered Code of the Contributor's +choice. The Source Code can be in a compressed or archival form, provided the +appropriate decompression or de-archiving software is widely available for no +charge. + +1.12. "You'' (or "Your") means an individual or a legal entity exercising +rights under, and complying with all of the terms of, this License or a future +version of this License issued under Section 6.1. For legal entities, "You'' +includes any entity which controls, is controlled by, or is under common +control with You. For purposes of this definition, "control'' means (a) the +power, direct or indirect, to cause the direction or management of such entity, +whether by contract or otherwise, or (b) ownership of more than fifty percent +(50%) of the outstanding shares or beneficial ownership of such entity. + +2. Source Code License. +2.1. The Initial Developer Grant. +The Initial Developer hereby grants You a world-wide, royalty-free, +non-exclusive license, subject to third party intellectual property claims: +(a) under intellectual property rights (other than patent or trademark) +Licensable by Initial Developer to use, reproduce, modify, display, perform, +sublicense and distribute the Original Code (or portions thereof) with or +without Modifications, and/or as part of a Larger Work; and +(b) under Patents Claims infringed by the making, using or selling of Original +Code, to make, have made, use, practice, sell, and offer for sale, and/or +otherwise dispose of the Original Code (or portions thereof). + + +(c) the licenses granted in this Section 2.1(a) and (b) are effective on +the date Initial Developer first distributes Original Code under the terms +of this License. +(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for +code that You delete from the Original Code; 2) separate from the Original Code; +or 3) for infringements caused by: i) the modification of the Original Code or +ii) the combination of the Original Code with other software or devices. + + +2.2. Contributor Grant. +Subject to third party intellectual property claims, each Contributor hereby +grants You a world-wide, royalty-free, non-exclusive license + +(a) under intellectual property rights (other than patent or trademark) +Licensable by Contributor, to use, reproduce, modify, display, perform, +sublicense and distribute the Modifications created by such Contributor +(or portions thereof) either on an unmodified basis, with other Modifications, +as Covered Code and/or as part of a Larger Work; and +(b) under Patent Claims infringed by the making, using, or selling of +Modifications made by that Contributor either alone and/or in combination with +its Contributor Version (or portions of such combination), to make, use, sell, +offer for sale, have made, and/or otherwise dispose of: 1) Modifications made +by that Contributor (or portions thereof); and 2) the combination of +Modifications made by that Contributor with its Contributor Version (or portions +of such combination). + +(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date +Contributor first makes Commercial Use of the Covered Code. + +(d) Notwithstanding Section 2.2(b) above, no patent license is granted: +1) for any code that Contributor has deleted from the Contributor Version; +2) separate from the Contributor Version; 3) for infringements caused +by: i) third party modifications of Contributor Version or ii) the +combination of Modifications made by that Contributor with other software +(except as part of the Contributor Version) or other devices; or 4) under +Patent Claims infringed by Covered Code in the absence of Modifications +made by that Contributor. + + +3. Distribution Obligations. + +3.1. Application of License. +The Modifications which You create or to which You contribute are +governed by the terms of this License, including without limitation +Section 2.2. The Source Code version of Covered Code may be distributed +only under the terms of this License or a future version of this License +released under Section 6.1, and You must include a copy of this License +with every copy of the Source Code You distribute. You may not offer or +impose any terms on any Source Code version that alters or restricts the +applicable version of this License or the recipients' rights hereunder. +However, You may include an additional document offering the additional +rights described in Section 3.5. +3.2. Availability of Source Code. +Any Modification which You create or to which You contribute must be made +available in Source Code form under the terms of this License either on +the same media as an Executable version or via an accepted Electronic +Distribution Mechanism to anyone to whom you made an Executable version +available; and if made available via Electronic Distribution Mechanism, +must remain available for at least twelve (12) months after the date it +initially became available, or at least six (6) months after a subsequent +version of that particular Modification has been made available to such +recipients. You are responsible for ensuring that the Source Code version +remains available even if the Electronic Distribution Mechanism is +maintained by a third party. + +3.3. Description of Modifications. +You must cause all Covered Code to which You contribute to contain a file +documenting the changes You made to create that Covered Code and the date of +any change. You must include a prominent statement that the Modification is +derived, directly or indirectly, from Original Code provided by the Initial +Developer and including the name of the Initial Developer in (a) the Source +Code, and (b) in any notice in an Executable version or related documentation +in which You describe the origin or ownership of the Covered Code. + +3.4. Intellectual Property Matters + +(a) Third Party Claims. +If Contributor has knowledge that a license under a third party's intellectual +property rights is required to exercise the rights granted by such Contributor +under Sections 2.1 or 2.2, Contributor must include a text file with the Source +Code distribution titled "LEGAL'' which describes the claim and the party making +the claim in sufficient detail that a recipient will know whom to contact. If +Contributor obtains such knowledge after the Modification is made available as +described in Section 3.2, Contributor shall promptly modify the LEGAL file in +all copies Contributor makes available thereafter and shall take other steps +(such as notifying appropriate mailing lists or newsgroups) reasonably calculated +to inform those who received the Covered Code that new knowledge has been obtained. +(b) Contributor APIs. +If Contributor's Modifications include an application programming interface and +Contributor has knowledge of patent licenses which are reasonably necessary to +implement that API, Contributor must also include this information in the LEGAL +file. + + + (c) Representations. +Contributor represents that, except as disclosed pursuant to Section 3.4(a) +above, Contributor believes that Contributor's Modifications are Contributor's +original creation(s) and/or Contributor has sufficient rights to grant the +rights conveyed by this License. + +3.5. Required Notices. +You must duplicate the notice in Exhibit A in each file of the Source Code. +If it is not possible to put such notice in a particular Source Code file +due to its structure, then You must include such notice in a location (such +as a relevant directory) where a user would be likely to look for such a +notice. If You created one or more Modification(s) You may add your name as +a Contributor to the notice described in Exhibit A. You must also duplicate +this License in any documentation for the Source Code where You describe +recipients' rights or ownership rights relating to Covered Code. You may +choose to offer, and to charge a fee for, warranty, support, indemnity or +liability obligations to one or more recipients of Covered Code. However, You +may do so only on Your own behalf, and not on behalf of the Initial Developer +or any Contributor. You must make it absolutely clear than any such warranty, +support, indemnity or liability obligation is offered by You alone, and You +hereby agree to indemnify the Initial Developer and every Contributor for any +liability incurred by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +3.6. Distribution of Executable Versions. +You may distribute Covered Code in Executable form only if the requirements +of Section 3.1-3.5 have been met for that Covered Code, and if You include +a notice stating that the Source Code version of the Covered Code is available +under the terms of this License, including a description of how and where +You have fulfilled the obligations of Section 3.2. The notice must be +conspicuously included in any notice in an Executable version, related +documentation or collateral in which You describe recipients' rights relating +to the Covered Code. You may distribute the Executable version of Covered +Code or ownership rights under a license of Your choice, which may contain +terms different from this License, provided that You are in compliance with +the terms of this License and that the license for the Executable version +does not attempt to limit or alter the recipient's rights in the Source Code +version from the rights set forth in this License. If You distribute the +Executable version under a different license You must make it absolutely +clear that any terms which differ from this License are offered by You alone, +not by the Initial Developer or any Contributor. You hereby agree to indemnify +the Initial Developer and every Contributor for any liability incurred by the +Initial Developer or such Contributor as a result of any such terms You offer. + +3.7. Larger Works. +You may create a Larger Work by combining Covered Code with other code not +governed by the terms of this License and distribute the Larger Work as a +single product. In such a case, You must make sure the requirements of this +License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. +If it is impossible for You to comply with any of the terms of this License +with respect to some or all of the Covered Code due to statute, judicial order, +or regulation then You must: (a) comply with the terms of this License to the +maximum extent possible; and (b) describe the limitations and the code they +affect. Such description must be included in the LEGAL file described in +Section 3.4 and must be included with all distributions of the Source Code. +Except to the extent prohibited by statute or regulation, such description +must be sufficiently detailed for a recipient of ordinary skill to be able +to understand it. +5. Application of this License. +This License applies to code to which the Initial Developer has attached the +notice in Exhibit A and to related Covered Code. +6. Versions of the License. +6.1. New Versions. +SugarCRM Inc. (''SugarCRM'') may publish revised and/or new versions of the +License from time to time. Each version will be given a distinguishing version +number. +6.2. Effect of New Versions. +Once Covered Code has been published under a particular version of the License, +You may always continue to use it under the terms of that version. You may also +choose to use such Covered Code under the terms of any subsequent version of the +License published by SugarCRM. No one other than SugarCRM has the right to modify +the terms applicable to Covered Code created under this License. + +6.3. Derivative Works. +If You create or use a modified version of this License (which you may only do +in order to apply it to code which is not already Covered Code governed by this +License), You must (a) rename Your license so that the phrases ''SugarCRM'', +''SPL'' or any confusingly similar phrase do not appear in your license (except +to note that your license differs from this License) and (b) otherwise make it +clear that Your version of the license contains terms which differ from the +SugarCRM Public License. (Filling in the name of the Initial Developer, Original +Code or Contributor in the notice described in Exhibit A shall not of themselves +be deemed to be modifications of this License.) + +7. DISCLAIMER OF WARRANTY. +COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES +THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE +OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED +CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT +THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY +SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL +PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT +UNDER THIS DISCLAIMER. + +8. TERMINATION. +8.1. This License and the rights granted hereunder will terminate automatically if +You fail to comply with terms herein and fail to cure such breach within 30 days of +becoming aware of the breach. All sublicenses to the Covered Code which are properly +granted shall survive any termination of this License. Provisions which, by their +nature, must remain in effect beyond the termination of this License shall survive. + +8.2. If You initiate litigation by asserting a patent infringement claim (excluding +declatory judgment actions) against Initial Developer or a Contributor (the Initial +Developer or Contributor against whom You file such action is referred to as +"Participant") alleging that: + +(a) such Participant's Contributor Version directly or indirectly infringes any patent, +then any and all rights granted by such Participant to You under Sections 2.1 and/or +2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, +unless if within 60 days after receipt of notice You either: (i) agree in writing to +pay Participant a mutually agreeable reasonable royalty for Your past and future use +of Modifications made by such Participant, or (ii) withdraw Your litigation claim +with respect to the Contributor Version against such Participant. If within 60 days +of notice, a reasonable royalty and payment arrangement are not mutually agreed upon +in writing by the parties or the litigation claim is not withdrawn, the rights granted +by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the +expiration of the 60 day notice period specified above. + +(b) any software, hardware, or device, other than such Participant's Contributor Version, +directly or indirectly infringes any patent, then any rights granted to You by such +Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You +first made, used, sold, distributed, or had made, Modifications made by that Participant. + +8.3. If You assert a patent infringement claim against Participant alleging that such +Participant's Contributor Version directly or indirectly infringes any patent where such +claim is resolved (such as by license or settlement) prior to the initiation of patent +infringement litigation, then the reasonable value of the licenses granted by such +Participant under Sections 2.1 or 2.2 shall be taken into account in determining the +amount or value of any payment or license. + +8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license +agreements (excluding distributors and resellers) which have been validly granted by You +or any distributor hereunder prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), +CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY +DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY +PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER +INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER +FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH +PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH +PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME +JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL +DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. +The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 +(Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer +software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). +Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), +all U.S. Government End Users acquire Covered Code with only those rights set forth herein. + +11. MISCELLANEOUS. +This License represents the complete agreement concerning subject matter hereof. If +any provision of this License is held to be unenforceable, such provision shall be +reformed only to the extent necessary to make it enforceable. This License shall be +governed by California law provisions (except to the extent applicable law, if any, +provides otherwise), excluding its conflict-of-law provisions. With respect to disputes +in which at least one party is a citizen of, or an entity chartered or registered to do +business in the United States of America, any litigation relating to this License shall +be subject to the jurisdiction of the Federal Courts of the Northern District of California, +with venue lying in Santa Clara County, California, with the losing party responsible for +costs, including without limitation, court costs and reasonable attorneys' fees and expenses. +The application of the United Nations Convention on Contracts for the International Sale of +Goods is expressly excluded. Any law or regulation which provides that the language of a +contract shall be construed against the drafter shall not apply to this License. + +12. RESPONSIBILITY FOR CLAIMS. +As between Initial Developer and the Contributors, each party is responsible for claims +and damages arising, directly or indirectly, out of its utilization of rights under this +License and You agree to work with Initial Developer and Contributors to distribute such +responsibility on an equitable basis. Nothing herein is intended or shall be deemed to +constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. +Initial Developer may designate portions of the Covered Code as ?Multiple-Licensed?. +?Multiple-Licensed? means that the Initial Developer permits you to utilize portions of +the Covered Code under Your choice of the SPL or the alternative licenses, if any, specified +by the Initial Developer in the file described in Exhibit A. + + +SugarCRM Public License 1.1.2 - Exhibit A +The contents of this file are subject to the SugarCRM Public License Version 1.1.2 +("License"); You may not use this file except in compliance with the +License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for +the specific language governing rights and limitations under the License. + +The Original Code is: SugarCRM Open Source + +The Initial Developer of the Original Code is SugarCRM, Inc. +Portions created by SugarCRM are Copyright (C) 2004 SugarCRM, Inc.; +All Rights Reserved. +Contributor(s): ______________________________________. + + +[NOTE: The text of this Exhibit A may differ slightly from the text of the notices +in the Source Code files of the Original Code. You should use the text of this +Exhibit A rather than the text found in the Original Code Source Code for Your +Modifications.] + + + +SugarCRM Public License 1.1.2 - Exhibit B + +Additional Terms applicable to the SugarCRM Public License. + +I. Effect. +These additional terms described in this SugarCRM Public License - Additional +Terms shall apply to the Covered Code under this License. + +II. SugarCRM and logo. +This License does not grant any rights to use the trademarks "SugarCRM" and the "SugarCRM" logos even if such marks are included in the Original Code or Modifications. From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:11:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:11:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6754 - in /vtigercrm/trunk/pkg/license: License_linux.txt License_windows.txt Message-ID: <20060530141152.6A55F5CE170@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:11:46 2006 New Revision: 6754 Log: updated licence files Modified: vtigercrm/trunk/pkg/license/License_linux.txt vtigercrm/trunk/pkg/license/License_windows.txt Modified: vtigercrm/trunk/pkg/license/License_linux.txt ============================================================================== --- vtigercrm/trunk/pkg/license/License_linux.txt (original) +++ vtigercrm/trunk/pkg/license/License_linux.txt Tue May 30 08:11:46 2006 @@ -20,31 +20,31 @@ 9. ADOdb software used under BSD license available at /vtigerCRM/adodb/license.txt -10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ - -10. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING - -11. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt - -12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright - -13. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib - -14. freetag is used under dual license BSD and LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt - -15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html - -16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt - -17. Image_Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html - -18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at - -19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html - -20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE - -21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at http://magpierss.sourceforge.net + +11. phpSysinfo software used under GNU GPL available at /vtigerCRM/modules/System/COPYING + +12. FCKeditor software used under LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt + +13. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright + +14. Smarty Template Engine for PHP used under the GNU LGPL available at available at /vtigerCRM/Smarty/COPYING.lib + +15. freetag is used under dual license BSD and LGPL downloaded from http://www.getluky.net available at /vtigerCRM/include/freetag/license.txt + +16. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html + +17. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt + +18. Image_Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html + +19. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at http://www.vxr.it/log4php/ + +20. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html + +21. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at /vtigerCRM/XTemplate/LICENSE + +22. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/# 22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL) The licenses of the Open Source components are reproduced in full below. Modified: vtigercrm/trunk/pkg/license/License_windows.txt ============================================================================== --- vtigercrm/trunk/pkg/license/License_windows.txt (original) +++ vtigercrm/trunk/pkg/license/License_windows.txt Tue May 30 08:11:46 2006 @@ -23,7 +23,7 @@ 9. phpSysinfo software used under GNU GPL downloaded from http://phpsysinfo.sourceforge.net/ available at /vtigerCRM/modules/System/COPYING -10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at +10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at http://magpierss.sourceforge.net/ 11. FCKeditor software used under GNU LGPL downloaded from http://www.fckeditor.net/download/default.html available at /vtigerCRM/includes/FCKeditor/license.txt @@ -39,7 +39,7 @@ 17. Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html -18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at +18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at http://www.vxr.it/log4php/ 19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:13:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:13:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6755 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060530141301.CC0417D78A4@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:12:57 2006 New Revision: 6755 Log: updated licence data at the top Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== --- vtigercrm/trunk/install/0welcome.php (original) +++ vtigercrm/trunk/install/0welcome.php Tue May 30 08:12:57 2006 @@ -108,47 +108,32 @@
    License Agreement
    - This software is a collective work consisting of the following major Open Source components:
    Apache software, MySQL server, PHP, SugarCRM, Smarty, phpSysinfo and PHPMailer each licensed under a separate Open Source License. vtiger.com is not affiliated with nor endorsed by any of the above - providers.                  -
    -
    - 1. Apache Web server software used under the Apache License available - at <vtiger CRM Home>/vtigerCRM/apache/LICENSE.txt
    - 2. MySQL database software used under the GPL License available at - <vtiger CRM Home>/vtigerCRM/mysql/README.txt
    - 3. PHP software used under the PHP License version 3.0 available at - <vtiger CRM Home>/vtigerCRM/php/license.txt 
    - 4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 - available at <vtiger CRM Home>/vtigerCRM/LICENSE_windows.txt
    - 5. gdwin32 software used under the GNU GPL available at gdwin32 - <vtiger CRM Home>/vtigerCRM/gdwin32/gd-license.txt
    - 6. nusoap software used under GNU LGPL from - http://sourceforge.net/projects/nusoap
    - 7. phpBB software used under GNU GPL downloaded from - http://www.phpbb.com/support/license.php
    - 8. TUTOS software used under GNU GPL downloaded from - http://www.tutos.org/html/copyright.html available at <vtiger CRM - Home>/vtigerCRM/modules/Calendar/TUTOS_Copyright.pdf
    - 9. PHPMailer software used under the GNU LGPL available at <vtiger - CRM Home>/vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt
    - 10. ADOdb software used under BSD license available at <vtiger CRM - Home>/vtigerCRM/adodb/license.txt
    - 11. phpSysinfo software used under GNU GPL available at <vtiger CRM - Home>/vtigerCRM/modules/System/COPYING
    - 12. feedParser software used under GNU GPL downloaded from - http://revjim.net/code/feedParser/
    - 13. FCKeditor software used under LGPL downloaded from - http://www.fckeditor.net/download/default.html available at <vtiger - CRM Home>/vtigerCRM/includes/FCKeditor/license.txt
    - 14. SquirrelMail used under GNU GPL downloaded from - http://www.squirrelmail.org/download.php available at - http://www.squirrelmail.org/wiki/en_US/SquirrelMailGPL
    - 15. Mailfeed used under GNU GPL downloaed from - http://wiki.wonko.com/software/mailfeed/ available at - http://wiki.wonko.com/software/mailfeed/#copyright
    - 16. In addition to the above mentioned Open Source components, vtiger - provides additional functionality, which is dual-licensed under Mozilla - Public License (MPL 1.1) as well as the GNU Public License (GPL).
    + This software is a collective work consisting of the following major Open Source components:
    Apache software, MySQL server, PHP, SugarCRM, ADOdb, Smarty, PHPMailer, phpSysinfo, MagpieRSS and others, each licensed under a separate Open Source License. vtiger.com is not affiliated with nor endorsed by any of the above providers.                   +
    +
    + 1. Apache Web server software used under the Apache License available at <vtiger CRM Home>/vtigerCRM/apache/LICENSE.txt
    + 2. MySQL database software used under the GPL License available at <vtiger CRM Home>/vtigerCRM/mysql/README.txt
    + 3. PHP software used under the PHP License version 3.0 available at <vtiger CRM Home>/vtigerCRM/php/license.txt
    + 4. SugarCRM software used under the SugarCRM Public License SPL 1.1.2 available at <vtiger CRM Home>/vtigerCRM/LICENSE.txt
    + 5. gdwin32 software used under the GNU GPL available at gdwin32 <vtiger CRM Home>/vtigerCRM/gdwin32/gd-license.txt
    + 6. nusoap software used under GNU LGPL from http://sourceforge.net/projects/nusoap
    + 7. PHPMailer software used under the GNU LGPL downloaded from http://adodb.sourceforge.net available at <vtiger CRM Home>/vtigerCRM/modules/Emails/PHPMailer_LICENSE.txt
    + 8. ADOdb software used under BSD license downloaded from http://adodb.sourceforge.net available at <vtiger CRM Home>/vtigerCRM/adodb/license.txt
    + 9. phpSysinfo software used under GNU GPL downloaded from http://phpsysinfo.sourceforge.net/ available at <vtiger CRM Home>/vtigerCRM/modules/System/COPYING
    + 10. MagpieRSS software used under GNU GPL downloaded from http://magpierss.sourceforge.net/ available at http://magpierss.sourceforge.net/
    + 11. FCKeditor software used under GNU LGPL downloaded from http://www.fckeditor.net/download/default.html available at <vtiger CRM Home>/vtigerCRM/includes/FCKeditor/license.txt
    + 12. Mailfeed used under GNU GPL downloaded from http://wiki.wonko.com/software/mailfeed/ available at http://wiki.wonko.com/software/mailfeed/#copyright
    + 13. Smarty Template Engine for PHP used under the GNU LGPL available at available at <vtiger CRM Home>/vtigerCRM/Smarty/COPYING.lib
    + 14. freetag is used under dual license BSD and GNU LGPL downloaded from http://www.getluky.net available at <vtiger CRM Home>/vtigerCRM/include/freetag/license.txt
    + 15. Image_Canvas is used under GNU LGPL downloaded from http://pear.php.net/pepr/pepr-proposal-show.php?id=212 available at http://www.gnu.org/copyleft/lesser.html
    + 16. Image_Color is used under PHP license 3.0 downloaded from http://pear.php.net/package/Image_Color available at http://www.php.net/license/3_0.txt
    + 17. Graph is used under GNU LGPL downloaded from http://pear.php.net/package/Image_Graph available at http://www.gnu.org/copyleft/lesser.html
    + 18. log4php is used under GNU LGPL downloaded from http://www.vxr.it/log4php/ available at http://www.vxr.it/log4php/
    + 19. jscalendar is used under GNU LGPL downloaded from http://www.dynarch.com/projects/calendar/ available at http://www.gnu.org/licenses/lgpl.html
    + 20. XTemplate is used under GNU LGPL downloaded from http://sourceforge.net/projects/xtpl/ available at <vtiger CRM Home>/vtigerCRM/XTemplate/LICENSE
    + 21. script.oculo.us scripts used under MIT Style license from http://script.aculo.us available under http://script.aculo.us/#
    + 22. In addition to the above mentioned Open Source components, vtiger provides additional functionality, which is dual-licensed under Mozilla Public License (MPL 1.1) as well as the GNU Public License (GPL).
    +
    The licenses of the Open Source components are reproduced in full below.

    @@ -2541,23 +2526,20 @@ Acknowledgements:

    We have used the following software:
    -
    - 1. ExcelReader package to read the xls files. We have taken the utility - from the following Web site :
    -  http://freshmeat.net/projects/phpexcelreader/
    -  The product is available as GNU General Public License (GPL).
    -
    - 2. E-mail Client to handle attachments with PHP. We have taken the - ideas from the article by Kevin Steffer available at the following Web - site:
    - http://www.linuxscope.net/articles/mailAttachmentsPHP.html
    -
    - 3. FPDF package to create PDF reports and documents. We have taken the - utility from the following Web site:
    - http://www.fpdf.org/
    -
    - We are grateful to the creators of the respective products for - providing such a beautiful utilities.
    +
    1. ExcelReader package to read the xls files. We have taken the utility from the following Web site :
    + http://freshmeat.net/projects/phpexcelreader/
    + The product is available as GNU General Public License (GPL).
    + 2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the
    + http://www.linuxscope.net/articles/mailAttachmentsPHP.html
    + 3. FPDF package to create PDF reports and documents. We have downloaded package from http://www.fpdf.org
    + 4. Prototype (Object-Oriented JavaScript framework) package to ease development of dynamic web applications. We have downloaded package from http://prototype.conio.net
    + 5. class_http to cache scraped content. We have downloaded package from http://www.troywolf.com/articles/php/class_http/
    + 6.Carousel Slideshow package to display large images as thumbnails. We have downloaded package from http://www.dynamicdrive.com/dynamicindex14/carousel2.htm
    + 7. Ajax Popup Chat for enabling instant messaging for vtiger CRM users. We have downloaded package from http://www.os-solution.com/demo/ajaxcsspopupchat/index.php
    + 8. Image Crossfade Redux for enabling fade effect to images. We have downloaded package from http://slayeroffice.com/code/imageCrossFade/xfade2.html
    + 9. Calculator for enabling calculations in vtiger CRM. We have downloaded package from http://www.hmhd.com/steve
    +We are grateful to the creators of the respective products for providing such a beautiful utilities.
    +  

    From vtiger-tickets at vtiger.fosslabs.com Tue May 30 10:13:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:13:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231086=3A?= =?utf-8?q?_Home_page_graphs_are_broken?= In-Reply-To: <076.e8c3d7abf047c083f365b76693799438@vtiger.fosslabs.com> References: <076.e8c3d7abf047c083f365b76693799438@vtiger.fosslabs.com> Message-ID: <085.02cded8d57361df229fec5662cf79e1f@vtiger.fosslabs.com> #1086: Home page graphs are broken ------------------------+--------------------------------------------------- Reporter: gopal | Owner: philip Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: the broken graphs have been removed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:14:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:14:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6756 - /vtigercrm/trunk/copyright.html Message-ID: <20060530141414.45D4C7D78A4@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:14:10 2006 New Revision: 6756 Log: updated licence files Modified: vtigercrm/trunk/copyright.html Modified: vtigercrm/trunk/copyright.html ============================================================================== --- vtigercrm/trunk/copyright.html (original) +++ vtigercrm/trunk/copyright.html Tue May 30 08:14:10 2006 @@ -5,11 +5,9 @@ -
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...
    +
    - (This software is a collective work consisting of the following major Open Source components: Apache software, MySQL server, PHP, SugarCRM, phpBB, TUTOS, phpSysinfo,SquirrelMail,Smarty,Dynamic Drive and PHPMailer each licensed under a separate Open Source License. vtiger.com is not affiliated with nor endorsed by any of the above providers. - See Copyrights for details.); -
    This software is a collective work consisting of the following major Open Source components:
    +Apache software, MySQL server, PHP, SugarCRM, ADOdb, Smarty, PHPMailer, phpSysinfo, MagpieRSS and others, each licensed under a separate Open Source License. +vtiger.com is not affiliated with nor endorsed by any of the above providers. See Copyrights for details.);
    From vtiger-tickets at vtiger.fosslabs.com Tue May 30 10:15:04 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:15:04 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231110=3A?= =?utf-8?q?_price_book_not_showing_any_entries?= In-Reply-To: <076.5b2bd510ab6218f7a668d3d6bf6f9aba@vtiger.fosslabs.com> References: <076.5b2bd510ab6218f7a668d3d6bf6f9aba@vtiger.fosslabs.com> Message-ID: <085.d559de6a97192d793e62e1fea7945702@vtiger.fosslabs.com> #1110: price book not showing any entries ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: pricebook ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 10:15:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:15:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231099=3A?= =?utf-8?q?_images_not_coming_in_all_installation_pages?= In-Reply-To: <076.37294b1e8e1224f195b3fa8ffd3b77b5@vtiger.fosslabs.com> References: <076.37294b1e8e1224f195b3fa8ffd3b77b5@vtiger.fosslabs.com> Message-ID: <085.9f6e49ac67b35fcaae2bd0c19d09959a@vtiger.fosslabs.com> #1099: images not coming in all installation pages ------------------------+--------------------------------------------------- Reporter: mangai | Owner: jerry Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 10:15:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:15:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231165=3A?= =?utf-8?q?_Move_Role_is_not_working_in_IE=2E=2E?= In-Reply-To: <076.acbe4cea637c14b89f704105e9460ec2@vtiger.fosslabs.com> References: <076.acbe4cea637c14b89f704105e9460ec2@vtiger.fosslabs.com> Message-ID: <085.335338174b5135b9a0566e657c208577@vtiger.fosslabs.com> #1165: Move Role is not working in IE.. ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Comment: 1165 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:22:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:22:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6757 - in /vtigercrm/trunk/Smarty/templates: DetailView.tpl DetailViewUI.tpl Inventory/InventoryDetailView.tpl Message-ID: <20060530142224.7F74D7D78A4@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 08:22:19 2006 New Revision: 6757 Log: * Modified to display the $ symbol with the label instead of display with the text value for the fields leads,accounts-annualrevenue, potential-amount and unit_price-product Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue May 30 08:22:19 2006 @@ -214,11 +214,13 @@ {if $label ne ''} - {if $keycntimage ne ''} - {$keycntimage} - {else} - {$label} - {/if} + {if $keycntimage ne ''} + {$keycntimage} + {elseif $keyid eq '71' || $keyid eq '72'} + {$label} ({$keycursymb}) + {else} + {$label} + {/if} {include file="DetailViewUI.tpl"} {else} Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Tue May 30 08:22:19 2006 @@ -1,18 +1,33 @@ - {if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} - - {if $keyid eq '55'} - {$keysalut} - {elseif $keyid eq '71' || $keyid eq '72'} - {$keycursymb} - {/if} -
    {$keyval} 
    - - - {elseif $keyid eq '13'} +{**} + + +{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} + + {if $keyid eq '55'} + {$keysalut} + {/if} + +
    {$keyval} 
    + + +{elseif $keyid eq '13'}
    {if $INT_MAILER eq 'true'}  {$keyval}
    Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Tue May 30 08:22:19 2006 @@ -174,7 +174,11 @@ {if $keycntimage ne ''} {$keycntimage} {elseif $label neq 'Tax Class'} - {$label} + {if $keyid eq '71' || $keyid eq '72'} + {$label} ({$keycursymb}) + {else} + {$label} + {/if} {/if} {include file="DetailViewUI.tpl"} {else} From vtiger-tickets at vtiger.fosslabs.com Tue May 30 10:23:40 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:23:40 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231006=3A?= =?utf-8?q?_Issue_in_Product_Detail_view?= In-Reply-To: <076.41c2aac4bc6126a11db4a86f2b52b346@vtiger.fosslabs.com> References: <076.41c2aac4bc6126a11db4a86f2b52b346@vtiger.fosslabs.com> Message-ID: <085.3f9350f5d3424c76e35fc642be4c6447@vtiger.fosslabs.com> #1006: Issue in Product Detail view ------------------------+--------------------------------------------------- Reporter: don | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue has been fixed as the $ symbol will be display with the field label. This will be applied for leads,account-annualrevenue and amount-potential and unit_price-product -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 10:27:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:27:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231125=3A?= =?utf-8?q?_attachment_missing_while_creating_ticket_from_product?= In-Reply-To: <076.478ea28a2c6031392264f0dfa9da56bd@vtiger.fosslabs.com> References: <076.478ea28a2c6031392264f0dfa9da56bd@vtiger.fosslabs.com> Message-ID: <085.18a636739005b492e141102b1ceb70d7@vtiger.fosslabs.com> #1125: attachment missing while creating ticket from product ------------------------+--------------------------------------------------- Reporter: richie | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: attachment ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:32:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:32:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6758 - /vtigercrm/trunk/modules/Users/ListView.php Message-ID: <20060530143226.2561C7D78CC@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:32:21 2006 New Revision: 6758 Log: issue in users listview has been fixed Modified: vtigercrm/trunk/modules/Users/ListView.php Modified: vtigercrm/trunk/modules/Users/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Users/ListView.php (original) +++ vtigercrm/trunk/modules/Users/ListView.php Tue May 30 08:32:21 2006 @@ -21,10 +21,13 @@ { $start = $_REQUEST['start']; } -else +elseif($_SESSION['user_pagestart'] != '') { $start = $_SESSION['user_pagestart']; } +else + $start=1; + $_SESSION['user_pagestart'] = $start; if($_REQUEST['sorder'] !='') $sortorder = $_REQUEST['sorder']; From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:34:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:34:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6759 - /vtigercrm/trunk/modules/Settings/AddMailAccount.html Message-ID: <20060530143414.9FCD17D78CC@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:34:11 2006 New Revision: 6759 Log: file removed as add mailaccount page has been smatified Removed: vtigercrm/trunk/modules/Settings/AddMailAccount.html From vtiger-tickets at vtiger.fosslabs.com Tue May 30 10:37:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 14:37:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231137=3A?= =?utf-8?q?_Issue_in_Emails?= In-Reply-To: <076.9cbd988fd3d7e2707b4d3292e1da421d@vtiger.fosslabs.com> References: <076.9cbd988fd3d7e2707b4d3292e1da421d@vtiger.fosslabs.com> Message-ID: <085.9743bfc63fcc26738be2f48b25f0b759@vtiger.fosslabs.com> #1137: Issue in Emails ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed Comment: (In [6760]) Fixes #1137 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:37:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:37:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6760 - /vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Message-ID: <20060530143702.D1E317D78F0@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:36:58 2006 New Revision: 6760 Log: Fixes #1137 Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Tue May 30 08:36:58 2006 @@ -156,7 +156,7 @@    - +   From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:41:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:41:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6761 - in /vtigercrm/trunk/modules/Reports: AdvancedFilter.html ListView.html NewReport0.html NewReportFolder.html ReportColumns.html ReportColumnsTotal.html ReportGrouping.html ReportType.html SaveReport.html StandardFilter.html Message-ID: <20060530144147.68B327D78A4@vtiger.fosslabs.com> Author: richie Date: Tue May 30 08:41:38 2006 New Revision: 6761 Log: html files removed as reports smartified Removed: vtigercrm/trunk/modules/Reports/AdvancedFilter.html vtigercrm/trunk/modules/Reports/ListView.html vtigercrm/trunk/modules/Reports/NewReport0.html vtigercrm/trunk/modules/Reports/NewReportFolder.html vtigercrm/trunk/modules/Reports/ReportColumns.html vtigercrm/trunk/modules/Reports/ReportColumnsTotal.html vtigercrm/trunk/modules/Reports/ReportGrouping.html vtigercrm/trunk/modules/Reports/ReportType.html vtigercrm/trunk/modules/Reports/SaveReport.html vtigercrm/trunk/modules/Reports/StandardFilter.html From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:47:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:47:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6762 - in /vtigercrm/trunk/modules/Users: ShowHistory.html ShowHistory.php Message-ID: <20060530144730.332FF7D78F8@vtiger.fosslabs.com> Author: don Date: Tue May 30 08:47:25 2006 New Revision: 6762 Log: new ui integrated for login history Modified: vtigercrm/trunk/modules/Users/ShowHistory.html vtigercrm/trunk/modules/Users/ShowHistory.php Modified: vtigercrm/trunk/modules/Users/ShowHistory.html ============================================================================== --- vtigercrm/trunk/modules/Users/ShowHistory.html (original) +++ vtigercrm/trunk/modules/Users/ShowHistory.html Tue May 30 08:47:25 2006 @@ -10,50 +10,44 @@ ********************************************************************************/ --> - +
    + + + - +

    + + {MOD.LBL_LOGIN_HISTORY_BUTTON_LABEL} +

    -
    + + + + + + - - - - - - - - - - - - + - - - - - - - -
     {APP.LBL_LIST_USER_NAME}{user_name_arrow} {APP.LBL_LIST_USERIP}{user_ip_arrow} {APP.LBL_LIST_SIGNIN}{login_time_arrow} {APP.LBL_LIST_SIGNOUT}{logout_time_arrow} {APP.LBL_LIST_STATUS}
    -  {APP.LBL_LIST_USER_NAME}{user_name_arrow} -  {APP.LBL_LIST_USERIP}{user_ip_arrow} -  {APP.LBL_LIST_SIGNIN}{login_time_arrow} -  {APP.LBL_LIST_SIGNOUT}{logout_time_arrow} -  {APP.LBL_LIST_STATUS} -
    {LOGIN.USER_NAME} {LOGIN.USER_IP} {LOGIN.LOGIN_TIME} {LOGIN.LOGOUT_TIME} {LOGIN.STATUS}
    +
    + + + + + + +
    Modified: vtigercrm/trunk/modules/Users/ShowHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/ShowHistory.php (original) +++ vtigercrm/trunk/modules/Users/ShowHistory.php Tue May 30 08:47:25 2006 @@ -44,27 +44,12 @@ $focus->id = ""; } -echo get_module_title($mod_strings['LBL_MODULE_NAME'], $current_module_strings['LBL_LOGIN_HISTORY_TITLE'], true); -echo "\n
    \n"; - // focus_list is the means of passing data to a ListView. global $focus_list; if (!isset($where)) $where = ""; $seedLogin = new LoginHistory(); - -$button = "\n"; - -$button .= ""; - -$button .= "
    \n"; -$button .= "\n"; -$button .= "\n"; -$button .= "\n"; -$button .= "\n"; -$button .= "\n"; -$button .= "
    "; $ListView = new ListView(); $ListView->initNewXTemplate('modules/Users/ShowHistory.html',$current_module_strings); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:54:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:54:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6763 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060530145417.D3A3F7D7908@vtiger.fosslabs.com> Author: don Date: Tue May 30 08:54:13 2006 New Revision: 6763 Log: removed AddBusiness in actionmapping Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue May 30 08:54:13 2006 @@ -2036,7 +2036,7 @@ $this->db->query("insert into actionmapping values(4,'DetailView',0)"); $this->db->query("insert into actionmapping values(5,'Import',0)"); $this->db->query("insert into actionmapping values(6,'Export',0)"); - $this->db->query("insert into actionmapping values(7,'AddBusinessCard',0)"); + //$this->db->query("insert into actionmapping values(7,'AddBusinessCard',0)"); $this->db->query("insert into actionmapping values(8,'Merge',0)"); $this->db->query("insert into actionmapping values(1,'VendorEditView',1)"); $this->db->query("insert into actionmapping values(4,'VendorDetailView',1)"); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 10:59:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 14:59:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6764 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060530145941.663DE7D7908@vtiger.fosslabs.com> Author: don Date: Tue May 30 08:59:37 2006 New Revision: 6764 Log: emails modules added in marketing and Support tab Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue May 30 08:59:37 2006 @@ -2102,6 +2102,8 @@ $this->db->query("insert into parenttabrel values (2,26,1)"); $this->db->query("insert into parenttabrel values (2,6,2)"); $this->db->query("insert into parenttabrel values (2,4,3)"); + $this->db->query("insert into parenttabrel values (2,10,4)"); + $this->db->query("insert into parenttabrel values (4,10,7)"); //Added to populate the default inventory tax informations $this->db->query("insert into inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')"); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 11:01:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 15:01:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6765 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060530150113.715127D7918@vtiger.fosslabs.com> Author: don Date: Tue May 30 09:01:06 2006 New Revision: 6765 Log: Modified entries into action mapping table Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 09:01:06 2006 @@ -132,21 +132,23 @@ "insert into actionmapping values(4,'DetailView',0)", "insert into actionmapping values(5,'Import',0)", "insert into actionmapping values(6,'Export',0)", - "insert into actionmapping values(7,'AddBusinessCard',0)", "insert into actionmapping values(8,'Merge',0)", - "insert into actionmapping values(1,'VendorEditView',0)", - "insert into actionmapping values(4,'VendorDetailView',0)", - "insert into actionmapping values(0,'SaveVendor',0)", - "insert into actionmapping values(2,'DeleteVendor',0)", - "insert into actionmapping values(1,'PriceBookEditView',0)", - "insert into actionmapping values(4,'PriceBookDetailView',0)", - "insert into actionmapping values(0,'SavePriceBook',0)", - "insert into actionmapping values(2,'DeletePriceBook',0)", - "insert into actionmapping values(1,'SalesOrderEditView',0)", - "insert into actionmapping values(4,'SalesOrderDetailView',0)", - "insert into actionmapping values(0,'SaveSalesOrder',0)", - "insert into actionmapping values(2,'DeleteSalesOrder',0)", + "insert into actionmapping values(1,'VendorEditView',1)", + "insert into actionmapping values(4,'VendorDetailView',1)", + "insert into actionmapping values(0,'SaveVendor',1)", + "insert into actionmapping values(2,'DeleteVendor',1)", + "insert into actionmapping values(1,'PriceBookEditView',1)", + "insert into actionmapping values(4,'PriceBookDetailView',1)", + "insert into actionmapping values(0,'SavePriceBook',1)", + "insert into actionmapping values(2,'DeletePriceBook',1)", + "insert into actionmapping values(1,'SalesOrderEditView',1)", + "insert into actionmapping values(4,'SalesOrderDetailView',1)", + "insert into actionmapping values(0,'SaveSalesOrder',1)", + "insert into actionmapping values(2,'DeleteSalesOrder',1)", "insert into actionmapping values(9,'ConvertLead',0)", + "insert into actionmapping values(1,'DetailViewAjax',1)", + "insert into actionmapping values(1,'QuickCreate',1)", + "insert into actionmapping values(4,'TagCloud',1)" ); foreach($actionmapping_array as $query) { From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:01:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:01:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231126=3A?= =?utf-8?q?_unwanted_field_Team_in_Quote_creation?= In-Reply-To: <076.11f2feb72adb5d0a18b85776bb31f1ab@vtiger.fosslabs.com> References: <076.11f2feb72adb5d0a18b85776bb31f1ab@vtiger.fosslabs.com> Message-ID: <085.67b458fea164141b9fd0b68cc13eef35@vtiger.fosslabs.com> #1126: unwanted field Team in Quote creation ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: quote ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:01:50 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:01:50 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231195=3A?= =?utf-8?q?_delete_webmail_does_not_work?= In-Reply-To: <076.b0ee4c3376a24e643a7a772804ec61b7@vtiger.fosslabs.com> References: <076.b0ee4c3376a24e643a7a772804ec61b7@vtiger.fosslabs.com> Message-ID: <085.bccf3b68749349a9ab7476f5e5f244ea@vtiger.fosslabs.com> #1195: delete webmail does not work ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:05:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:05:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231192=3A?= =?utf-8?q?_qualify_webmail_does_not_work?= In-Reply-To: <076.4e6af6fe6fc394f083bb6d1b73412aba@vtiger.fosslabs.com> References: <076.4e6af6fe6fc394f083bb6d1b73412aba@vtiger.fosslabs.com> Message-ID: <085.2e6eb74b6a1ed6146be33a5afdd6ca2c@vtiger.fosslabs.com> #1192: qualify webmail does not work ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:05:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:05:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231190=3A?= =?utf-8?q?_webmail_attachment_not_working?= In-Reply-To: <076.fc4283f5e72f7e31d90cc2f09f58e678@vtiger.fosslabs.com> References: <076.fc4283f5e72f7e31d90cc2f09f58e678@vtiger.fosslabs.com> Message-ID: <085.cff2624f434209e86bee139ed0f45f8d@vtiger.fosslabs.com> #1190: webmail attachment not working ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:05:59 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:05:59 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231189=3A?= =?utf-8?q?_check_mail_doest_not_fetch_any_new_mails?= In-Reply-To: <076.fd91883f0c96d6a7d31d035ebb7d884c@vtiger.fosslabs.com> References: <076.fd91883f0c96d6a7d31d035ebb7d884c@vtiger.fosslabs.com> Message-ID: <085.58a9655cabdf1dd87a4a65b4c8de6656@vtiger.fosslabs.com> #1189: check mail doest not fetch any new mails ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:20:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:20:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23809=3A_?= =?utf-8?q?Export_Contacts_SQL_Error?= In-Reply-To: <076.d3bef4ab96867550217aa5fdd66d20e3@vtiger.fosslabs.com> References: <076.d3bef4ab96867550217aa5fdd66d20e3@vtiger.fosslabs.com> Message-ID: <085.243baa17ed154c95133cae562482019e@vtiger.fosslabs.com> #809: Export Contacts SQL Error -------------------------------------------+-------------------------------- Reporter: Ken Lyle | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: export, contacts, SQL -------------------------------------------+-------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:21:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:21:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231022=3A?= =?utf-8?q?_Calendar_-_Home_page_warning?= In-Reply-To: <076.6e7a4250ac68538c03759d34d8848817@vtiger.fosslabs.com> References: <076.6e7a4250ac68538c03759d34d8848817@vtiger.fosslabs.com> Message-ID: <085.fce958a1b77a98c7b3ff437014d9a4f7@vtiger.fosslabs.com> #1022: Calendar - Home page warning ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: calendar ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 11:22:23 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 15:22:23 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231060=3A?= =?utf-8?q?_Inactive_icons_in_home_page?= In-Reply-To: <076.f941f6d15831c087b1f6f266884b9cd8@vtiger.fosslabs.com> References: <076.f941f6d15831c087b1f6f266884b9cd8@vtiger.fosslabs.com> Message-ID: <085.9428432046a6fdcbecf0d1e3883cf704@vtiger.fosslabs.com> #1060: Inactive icons in home page ------------------------+--------------------------------------------------- Reporter: saraj | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => invalid * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 11:35:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 15:35:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6766 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060530153520.849987D7968@vtiger.fosslabs.com> Author: don Date: Tue May 30 09:35:13 2006 New Revision: 6766 Log: Added migration support for profile2utility table Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 09:35:13 2006 @@ -2782,8 +2782,20 @@ - - +//Inserting into profile2utility table + $sql_sec="select profileid from profile"; + $result_sec=$conn->query($sql_sec); + $num_rows=$conn->num_rows($result_sec); + for($i=0;$i<$num_row;$i++) + { + $prof_id=$conn->query_result($result_sec,$i,'profileid'); + $sql1_sec="insert into profile2utility values(".$prof_id.",13,8,0)"; + Execute($sql1_sec); + + $sql2_sec="insert into profile2utility values(".$prof_id.",7,9,0)"; + Execute($sql2_sec); + + } From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 12:00:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:00:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6767 - /vtigercrm/trunk/vtigerservice.php Message-ID: <20060530160039.B9CD07D796C@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:00:35 2006 New Revision: 6767 Log: added word plugin Modified: vtigercrm/trunk/vtigerservice.php Modified: vtigercrm/trunk/vtigerservice.php ============================================================================== --- vtigercrm/trunk/vtigerservice.php (original) +++ vtigercrm/trunk/vtigerservice.php Tue May 30 10:00:35 2006 @@ -27,6 +27,10 @@ { include("soap/contactserialize.php"); } + elseif($_REQUEST['service'] == "wordplugin") + { + include("soap/contactserialize.php"); + } elseif($_REQUEST['service'] == "thunderbird") { include("soap/contactserialize.php"); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 12:21:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:21:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6768 - in /vtigercrm/trunk/modules/Calendar: Appointment.php addEventUI.php Message-ID: <20060530162103.B6D1A3DAA5C@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:20:56 2006 New Revision: 6768 Log: changes made to fix the issue Modified: vtigercrm/trunk/modules/Calendar/Appointment.php vtigercrm/trunk/modules/Calendar/addEventUI.php Modified: vtigercrm/trunk/modules/Calendar/Appointment.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Appointment.php (original) +++ vtigercrm/trunk/modules/Calendar/Appointment.php Tue May 30 10:20:56 2006 @@ -58,7 +58,7 @@ $q.=" ((activity.date_start < '". $to_datetime->get_formatted_date() ."' AND activity.date_start >= '". $from_datetime->get_formatted_date()."')"; if(!is_admin($current_user)) { - $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in ($shared_ids) and salesmanactivityrel.smid in ($shared_ids) and activity.visibility='Public'))"; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.") and activity.visibility='Public'))"; } $q .= " AND crmentity.deleted = 0) AND recurringevents.activityid is NULL "; $q .= " ORDER by activity.date_start,activity.time_start"; @@ -86,7 +86,7 @@ $q .= " (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') "; if(!is_admin($current_user)) { - $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in ($shared_ids) and salesmanactivityrel.smid in ($shared_ids) and activity.visibility='Public'))"; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.") and activity.visibility='Public'))"; } $q .= " AND crmentity.deleted = 0 )" ; Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Tue May 30 10:20:56 2006 @@ -442,16 +442,16 @@ -
    +
    - - - - + - + - - - - - - - + - + - + -
    @@ -616,7 +616,14 @@
    -
    +
    +
    + + + + + + @@ -639,10 +646,27 @@
    Change Owner
       - +
    +
    + +
    + + + + +
    + - + - + + - + - + - +
    +
    + From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 12:21:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:21:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6769 - /vtigercrm/trunk/modules/Calendar/calendarLayout.php Message-ID: <20060530162158.331853DAA5C@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:21:54 2006 New Revision: 6769 Log: changes made to fix the issue Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Tue May 30 10:21:54 2006 @@ -11,6 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/CommonUtils.php'); +require_once('modules/Calendar/CalendarCommon.php'); /** To construct calendar subtabs * @param $param_arr -- The calendar object:: Type class Calendar @@ -858,7 +859,7 @@ @@ -973,7 +974,7 @@ { $Entries = Array(); global $adb,$current_user,$mod_strings; - + $shared_ids = getSharedCalendarId($current_user->id); $query = "SELECT cntactivityrel.contactid, activity.* FROM activity INNER JOIN crmentity @@ -994,8 +995,10 @@ $res = $adb->query($pending_query); $pending_rows = $adb->num_rows($res); } - $query .= " AND crmentity.smownerid = ".$current_user->id." - ORDER BY activity.date_start,activity.time_start ASC"; + if(!is_admin($current_user)) + $query .= " AND crmentity.smownerid in (".$shared_ids.")"; + + $query .= "ORDER BY activity.date_start,activity.time_start ASC"; $result = $adb->query($query); $rows = $adb->num_rows($result); @@ -1035,7 +1038,7 @@ $image_tag = " ".$type; $element['eventtype'] = $image_tag; $element['eventdetail'] = $contact_data." ".$subject." ".$more_link; - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"event\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"event\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $element['status'] = $adb->query_result($result,$i,"eventstatus"); $Entries[] = $element; } @@ -1054,7 +1057,7 @@ { $Entries = Array(); global $adb,$current_user,$mod_strings; - + $shared_ids = getSharedCalendarId($current_user->id); $query = "SELECT cntactivityrel.contactid, activity.* FROM activity INNER JOIN crmentity @@ -1072,8 +1075,10 @@ $res = $adb->query($pending_query); $pending_rows = $adb->num_rows($res); } - $query .= " AND crmentity.smownerid = ".$current_user->id." - ORDER BY activity.date_start,activity.time_start ASC"; + + if(!is_admin($current_user)) + $query .= " AND crmentity.smownerid in (".$shared_ids.")"; + $query .= " ORDER BY activity.date_start,activity.time_start ASC"; $result = $adb->query($query); $rows = $adb->num_rows($result); @@ -1095,12 +1100,17 @@ $more_link = "".$subject.""; $element['tododetail'] = $more_link; $element['status'] = $adb->query_result($result,$i,"status"); - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"todo\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"todo\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $Entries[] = $element; } return $Entries; } +/*To get number of events and todos + *@param $cal -- The calendar array :: Type Array + *@param $mode -- The mode :: Type string + *return number of events and todos in Array format +*/ function getEventTodoInfo(& $cal, $mode) { global $mod_strings; @@ -1119,6 +1129,10 @@ return $event_todo_info; } +/*To construct event listview + *@param $entry_list -- The event entries array :: Type Array + *constructs event listview in HTML format +*/ function constructEventListView($entry_list) { global $mod_strings; @@ -1170,6 +1184,11 @@ echo $list_view; } +/*To construct todo listview + *@param $todo_list -- The todo entries array :: Type Array + *@param $cal -- The calendar array :: Type Array + *constructs todo listview in HTML format +*/ function constructTodoListView($todo_list,$cal) { global $mod_strings; From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 12:22:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:22:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6770 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060530162259.523F94E6AB8@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:22:55 2006 New Revision: 6770 Log: changes made to fix the issue Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Tue May 30 10:22:55 2006 @@ -466,19 +466,42 @@ var heldstatus = "eventstatus=Held"; var notheldstatus = "eventstatus=Not Held"; var activity_mode = "Events"; + var complete = document.getElementById("complete"); + var pending = document.getElementById("pending"); + var postpone = document.getElementById("postpone"); + var actdelete = document.getElementById("actdelete"); + var changeowner = document.getElementById("changeowner"); + } if(type == 'todo') { var heldstatus = "status=Completed"; var notheldstatus = "status=Deferred"; var activity_mode = "Task"; + var complete = document.getElementById("taskcomplete"); + var pending = document.getElementById("taskpending"); + var postpone = document.getElementById("taskpostpone"); + var actdelete = document.getElementById("taskactdelete"); + var changeowner = document.getElementById("taskchangeowner"); } - - document.getElementById("complete").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+heldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; - document.getElementById("pending").href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+notheldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; - document.getElementById("postpone").href="index.php?action=EditView&module=Activities&record="+id+"&activity_mode="+activity_mode; - document.getElementById("actdelete").href="index.php?return_module=Calendar&return_action=index&action=massdelete&module=Users&idlist="+id+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; - document.getElementById("changeowner").href="javascript:fnvshobj(this,'act_changeowner');"; - -} - + document.getElementById("idlist").value = id; + complete.href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+heldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + pending.href="index.php?return_module=Calendar&return_action=index&action=Save&module=Activities&record="+id+"&change_status=true&"+notheldstatus+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + postpone.href="index.php?action=EditView&module=Activities&record="+id+"&activity_mode="+activity_mode; + actdelete.href="index.php?return_module=Calendar&return_action=index&action=massdelete&module=Users&idlist="+id+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&parenttab=My Home Page"; + changeowner.href="javascript:fnvshNrm('act_changeowner');"; + +} + +function calendarChangeOwner() +{ + document.change_owner.action.value = "updateLeadDBStatus"; + document.change_owner.module.value = "Users"; + document.change_owner.return_module.value = "Calendar"; + document.change_owner.return_action.value = "index"; + document.change_owner.user_id.value = document.getElementById('activity_owner').options[document.getElementById('activity_owner').options.selectedIndex].value; + fninvsh('act_changeowner'); + window.document.change_owner.submit(); +} + + From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 12:25:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:25:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6771 - /vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Message-ID: <20060530162502.39F564E6AB8@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:24:58 2006 New Revision: 6771 Log: changes made to fix the issue Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Tue May 30 10:24:58 2006 @@ -236,7 +236,9 @@ 'db_email1' => 'LBL_LIST_EMAIL_ADDRESS', 'db_email2' => 'LBL_LIST_EMAIL_ADDRESS', 'LBL_COMPLETED'=>'Mark Completed', -'LBL_EPENDING'=>'Mark Not Held', +'LBL_DEFERRED'=>'Mark Deferred', +'LBL_HELD'=>'Mark Held', +'LBL_NOTHELD'=>'Mark Not Held', 'LBL_POSTPONE'=>'Postpone', 'LBL_CHANGEOWNER'=>'Change Owner', 'LBL_DEL'=>'Delete', From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 12:27:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:27:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6772 - /vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Message-ID: <20060530162739.C11FA4E5477@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:27:36 2006 New Revision: 6772 Log: changes made to fix the issue Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Tue May 30 10:27:36 2006 @@ -71,5 +71,14 @@ $errormsg = ''; } -header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid."&errormsg=".$errormsg); +if($return_module == 'Calendar') +{ + header("Location: index.php?module=$return_module&action=index"); +} +else +{ + header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid."&errormsg=".$errormsg); +} + + ?> From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 12:29:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:29:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6773 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060530162908.B3F114E5420@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 10:29:03 2006 New Revision: 6773 Log: style has been modified Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Tue May 30 10:29:03 2006 @@ -2158,7 +2158,7 @@ z-index:5000; } -#calAction{ +.calAction{ width:175px; background-color:#CCCCCC; border:1px solid #DDDDDD; From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 12:45:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:45:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6774 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060530164527.0B41E789889@vtiger.fosslabs.com> Author: don Date: Tue May 30 10:45:24 2006 New Revision: 6774 Log: border for calendar icon removed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 30 10:45:24 2006 @@ -62,9 +62,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 12:54:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:54:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6775 - in /vtigercrm/trunk/Smarty/templates: Emails.tpl Webmails.tpl Message-ID: <20060530165407.DF9D17D37F2@vtiger.fosslabs.com> Author: don Date: Tue May 30 10:54:03 2006 New Revision: 6775 Log: include file changed to Button_List.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl vtigercrm/trunk/Smarty/templates/Webmails.tpl Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Tue May 30 10:54:03 2006 @@ -99,7 +99,7 @@ {rdelim} - {include file='Buttons_List.tpl'} + {include file='Buttons_List1.tpl'}
    {$APP.LBL_CALENDAR_ALT}{$APP.LBL_CALENDAR_ALT} {$APP.L
 BL_CLOCK_ALT} {$APP.LBL_CALCULATOR_ALT}
    Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Tue May 30 10:54:03 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ -->*} - {include file='Buttons_List.tpl'} + {include file='Buttons_List1.tpl'}
    - + Modified: vtigercrm/trunk/modules/Reports/Report.js ============================================================================== --- vtigercrm/trunk/modules/Reports/Report.js (original) +++ vtigercrm/trunk/modules/Reports/Report.js Tue May 30 19:24:55 2006 @@ -500,9 +500,9 @@ { if(getObj('step1').style.display != 'none') { - if (trim(NewRep.reportname.value) == "") + if (trim(document.NewRep.reportname.value) == "") { - alert("Missing Folder Name"); + alert("Missing Report Name"); }else { hide('step1'); Modified: vtigercrm/trunk/modules/Reports/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Reports/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Reports/language/en_us.lang.php Tue May 30 19:24:55 2006 @@ -113,6 +113,7 @@ 'LBL_TABULAR_FORMAT'=>'Tabular Format', 'LBL_TABULAR_REPORTS_ARE_SIMPLEST'=>'Tabular Reports are the simplest and fastest way of getting your data', 'LBL_SUMMARY_REPORT_VIEW_DATA_WITH_SUBTOTALS'=>'Summary reports allow you to view your data along with subtotals and other summary information', +'LBL_FILTERS'=>'Filters', ) From vtiger-tickets at vtiger.fosslabs.com Tue May 30 22:44:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 02:44:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?= =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?= =?utf-8?q?leased?= In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com> References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com> Message-ID: <085.28633a93e133123dd429c5a25a031814@vtiger.fosslabs.com> #1116: FCKeditor: document version used, merge new versions as released ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: editor packaging snapshot ------------------------+--------------------------------------------------- Comment (by gopal): Hi Jeff, In v5 Beta, we are bundling FCKEditor 2.2. We are bundling only the needed files to reduce the size. FYI, I am maintaining all the list of third- party packages here locally. Please get back to me if you need any further clarifications. Gopal -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 23:46:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 03:46:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6813 - /vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Message-ID: <20060531034635.62E9E7D7DB3@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 21:46:31 2006 New Revision: 6813 Log: edit field block link has been disabled Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Tue May 30 21:46:31 2006 @@ -27,7 +27,7 @@
      From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 12:56:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 16:56:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6776 - /vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Message-ID: <20060530165642.D90477D4DD4@vtiger.fosslabs.com> Author: don Date: Tue May 30 10:56:39 2006 New Revision: 6776 Log: chk added for emails and webmails modules to fade the create icom Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 30 10:56:39 2006 @@ -39,7 +39,7 @@ - {if $CHECK.EditView eq 'yes'} + {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} {if $MODULE eq 'Activities'} {else} From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 13:16:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 17:16:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6777 - in /vtigercrm/trunk/modules/Dashboard: display_charts.php index.php Message-ID: <20060530171611.9675C7D598D@vtiger.fosslabs.com> Author: don Date: Tue May 30 11:16:07 2006 New Revision: 6777 Log: access menu added for dashboard Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/index.php Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue May 30 11:16:07 2006 @@ -268,22 +268,63 @@ } ?> -
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...
    - - - - - - - - - - - - - - -
    Analytics > Dashboard  
    + + + + + + + + + + + + +
    > + + + + + + + + + +
    + + + + + +
    <? echo $app_strings['LBL_CREATE_BUTTON_LABEL']; ?> <? echo $app_strings['Dashboard']; ?>...
    +
    + + + + + + + + +
    <? echo $app_strings['LBL_CALENDAR_ALT']; ?><? echo $app_strings['LBL_CLOCK_ALT']; ?><? echo $app_strings['LBL_CALCULATOR_ALT']; ?><? echo $app_strings['LBL_CHAT_ALT']; ?> +
    +
    + + + + + +
    <? echo $app_strings['LBL_IMPORT']; ?> <? echo $app_strings['Dashboard']; ?><? echo $app_strings['LBL_EXPORT']; ?> <? echo $app_strings['Dashboard']; ?>
    +
    + + + + +
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    +
    +
    + + Modified: vtigercrm/trunk/modules/Dashboard/index.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/index.php (original) +++ vtigercrm/trunk/modules/Dashboard/index.php Tue May 30 11:16:07 2006 @@ -52,22 +52,59 @@ $log = LoggerManager::getLogger('dashboard'); ?> -
    - - - - - - - - - - - - - - -
    >  
    + + + + + + + + + + +
    > + + + + + + + + + +
    + + + + + +
    <? echo $app_strings['LBL_CREATE_BUTTON_LABEL']; ?> <? echo $app_strings['Dashboard']; ?>...
    +
    + + + + + + + + +
    <? echo $app_strings['LBL_CALENDAR_ALT']; ?><? echo $app_strings['LBL_CLOCK_ALT']; ?><? echo $app_strings['LBL_CALCULATOR_ALT']; ?><? echo $app_strings['LBL_CHAT_ALT']; ?> +
    +
    + + + + + +
    <? echo $app_strings['LBL_IMPORT']; ?> <? echo $app_strings['Dashboard']; ?><? echo $app_strings['LBL_EXPORT']; ?> <? echo $app_strings['Dashboard']; ?>
    +
    + + + + +
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    +
    +
    From vtiger-tickets at vtiger.fosslabs.com Tue May 30 13:27:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 17:27:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23821=3A_?= =?utf-8?q?Login_History?= In-Reply-To: <076.67783c370aef9f19733e3b5753407726@vtiger.fosslabs.com> References: <076.67783c370aef9f19733e3b5753407726@vtiger.fosslabs.com> Message-ID: <085.0ce40f0a9f75b7dc88b5fe47a5b3516e@vtiger.fosslabs.com> #821: Login History ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 13:58:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 17:58:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231123=3A?= =?utf-8?q?_issue_in_role_drag_and_drop?= In-Reply-To: <076.c4a5b714c12cec3b392d5125f15097cc@vtiger.fosslabs.com> References: <076.c4a5b714c12cec3b392d5125f15097cc@vtiger.fosslabs.com> Message-ID: <085.3e28f9fa66e915a8bf41be317a494048@vtiger.fosslabs.com> #1123: issue in role drag and drop ------------------------+--------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 14:01:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:01:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231149=3A?= =?utf-8?q?_could_not_enable_create/edit_option_in_standard_privileges?= In-Reply-To: <076.66092766998638d33820b88f8666d4b3@vtiger.fosslabs.com> References: <076.66092766998638d33820b88f8666d4b3@vtiger.fosslabs.com> Message-ID: <085.525f6d4f0983a72fb027eeaba0a63fd0@vtiger.fosslabs.com> #1149: could not enable create/edit option in standard privileges ------------------------+--------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 14:04:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:04:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231089=3A?= =?utf-8?q?_Security_support_not_done_for_detail_view_ajaxification?= In-Reply-To: <076.85bf505f267544ac8fa5162a6126fa33@vtiger.fosslabs.com> References: <076.85bf505f267544ac8fa5162a6126fa33@vtiger.fosslabs.com> Message-ID: <085.878ff2376a40d7bbc915b5164311280d@vtiger.fosslabs.com> #1089: Security support not done for detail view ajaxification ------------------------+--------------------------------------------------- Reporter: don | Owner: don Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 14:06:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:06:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231090=3A?= =?utf-8?q?_Security_implementation_not_working_for_ajax_actions?= In-Reply-To: <076.ec9800314dfe32c924106e87835f8225@vtiger.fosslabs.com> References: <076.ec9800314dfe32c924106e87835f8225@vtiger.fosslabs.com> Message-ID: <085.c5cb2394cbe17a3b69aae50fa75e59f0@vtiger.fosslabs.com> #1090: Security implementation not working for ajax actions ------------------------+--------------------------------------------------- Reporter: don | Owner: don Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 14:26:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:26:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6779 - /vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Message-ID: <20060530182636.05CBE7D7990@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 12:26:32 2006 New Revision: 6779 Log: * Modified to add the Ticket History in related list Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue May 30 12:26:32 2006 @@ -106,20 +106,36 @@ $query = "SELECT activity.*, crmentity.crmid, contactdetails.contactid, contactdetails.lastname, contactdetails.firstname, recurringevents.recurringtype, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left outer join recurringevents on recurringevents.activityid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting')"; $log->debug("Exiting get_activities method ..."); + return GetRelatedList('HelpDesk','Activities',$focus,$query,$button,$returnset); } - /** Function to display the History of the Ticket which just includes a file which contains the TicketHistory informations + /** Function to get the Ticket History information as in array format + * @param int $ticketid - ticket id + * return array with title and the ticket history informations in the following format + array( + header=>array('0'=>'title'), + entries=>array('0'=>'info1','1'=>'info2',etc.,) + ) */ - function Get_Ticket_History() - { - global $log; - $log->debug("Entering Get_Ticket_History() method ..."); - global $mod_strings; - echo '

    '; - echo get_form_header($mod_strings['LBL_TICKET_HISTORY'],"", false); - include("modules/HelpDesk/TicketHistory.php"); - $log->debug("Exiting Get_Ticket_History method ..."); + function get_ticket_history($ticketid) + { + global $log, $adb; + $log->debug("Entering into get_ticket_history($ticketid) method ..."); + + $query="select title,update_log from troubletickets where ticketid=".$ticketid; + $result=$adb->query($query); + $update_log = $adb->query_result($result,0,"update_log"); + + $splitval = split('--//--',trim($update_log,'--//--')); + + $header[] = $adb->query_result($result,0,"title"); + + $return_value = Array('header'=>$header,'entries'=>$splitval); + + $log->debug("Exiting from get_ticket_history($ticketid) method ..."); + + return $return_value; } /** Function to form the query to get the list of attachments and notes From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 14:28:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:28:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6780 - in /vtigercrm/trunk/modules/HelpDesk: TicketHistory.html TicketHistory.php Message-ID: <20060530182807.B73727D7998@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 12:28:04 2006 New Revision: 6780 Log: * Removed the files which were used to display the Ticket History informations in the relatedlist. now this history informations will be formed as array and passed to the get related list function call. Removed: vtigercrm/trunk/modules/HelpDesk/TicketHistory.html vtigercrm/trunk/modules/HelpDesk/TicketHistory.php From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 14:31:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:31:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6781 - /vtigercrm/trunk/modules/Products/Product.php Message-ID: <20060530183157.950F27D7998@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 12:31:53 2006 New Revision: 6781 Log: * Commented the if condition which has restrict the activity object create which caused error in the product related list and the activities are not shown in the list. Modified: vtigercrm/trunk/modules/Products/Product.php Modified: vtigercrm/trunk/modules/Products/Product.php ============================================================================== --- vtigercrm/trunk/modules/Products/Product.php (original) +++ vtigercrm/trunk/modules/Products/Product.php Tue May 30 12:31:53 2006 @@ -213,8 +213,9 @@ $log->debug("Entering get_activities(".$id.") method ..."); global $app_strings; - require_once('modules/Activities/Activity.php'); - if($this->column_fields['contact_id']!=0 && $this->column_fields['contact_id']!='') + require_once('modules/Activities/Activity.php'); + + //if($this->column_fields['contact_id']!=0 && $this->column_fields['contact_id']!='') $focus = new Activity(); $button = ''; From vtiger-tickets at vtiger.fosslabs.com Tue May 30 14:32:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:32:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231232=3A?= =?utf-8?q?_Global_Search_shows_Contacts_by_default=2C_must_show_All?= In-Reply-To: <076.5c332f8e820b8bdd6c537fa60f24845c@vtiger.fosslabs.com> References: <076.5c332f8e820b8bdd6c537fa60f24845c@vtiger.fosslabs.com> Message-ID: <085.811c1e856b05b282a2799b5458e2ed85@vtiger.fosslabs.com> #1232: Global Search shows Contacts by default, must show All ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: new => closed Comment: 953 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 14:32:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:32:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23947=3A_?= =?utf-8?q?Close_option_is_missing_for_Search_function?= In-Reply-To: <076.9449a290acf00d17c2120ba787bc473f@vtiger.fosslabs.com> References: <076.9449a290acf00d17c2120ba787bc473f@vtiger.fosslabs.com> Message-ID: <085.09ed631d011cd225d904355662fb4a67@vtiger.fosslabs.com> #947: Close option is missing for Search function ------------------------+--------------------------------------------------- Reporter: gopal | Owner: anonymous Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: duplicate | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => duplicate * status: assigned => closed Comment: 877 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 14:32:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:32:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6782 - /vtigercrm/trunk/include/RelatedListView.php Message-ID: <20060530183251.730E27D79AF@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 12:32:47 2006 New Revision: 6782 Log: * Added license Modified: vtigercrm/trunk/include/RelatedListView.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== --- vtigercrm/trunk/include/RelatedListView.php (original) +++ vtigercrm/trunk/include/RelatedListView.php Tue May 30 12:32:47 2006 @@ -1,4 +1,15 @@ Author: don Date: Tue May 30 12:34:23 2006 New Revision: 6783 Log: fixed sec query inner join issue Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Tue May 30 12:34:23 2006 @@ -305,7 +305,7 @@ else { $profileList = getCurrentUserProfileList(); - $sql = "select * from field inner join tab on tab.tabid = field.tabid innerjoin profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid "; + $sql = "select * from field inner join tab on tab.tabid = field.tabid inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid "; $sql.= " where field.tabid=".$tabid." and field.block in (".$blockids.") and (field.uitype =5 or field.displaytype=2)"; $sql.= " and profile2field.visible=0"; $sql.= " and def_org_field.visible=0 and profile2field.profileid in ".$profileList." order by field.sequence"; From vtiger-tickets at vtiger.fosslabs.com Tue May 30 14:35:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:35:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231032=3A?= =?utf-8?q?_can_not_create_New_Contact_or_New_Leads_when_having_permission?= =?utf-8?q?_for_create/edit?= In-Reply-To: <076.affb8cb4c352ba6ca316af085c1f0e41@vtiger.fosslabs.com> References: <076.affb8cb4c352ba6ca316af085c1f0e41@vtiger.fosslabs.com> Message-ID: <085.c8a6efd019da2bd317c644a974ae52d3@vtiger.fosslabs.com> #1032: can not create New Contact or New Leads when having permission for create/edit ------------------------+--------------------------------------------------- Reporter: mangai | Owner: don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 14:39:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:39:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231082=3A?= =?utf-8?q?_vtiger_Logo_missing?= In-Reply-To: <076.b25d8abf5fc3e3a8fa5169b5af5452f1@vtiger.fosslabs.com> References: <076.b25d8abf5fc3e3a8fa5169b5af5452f1@vtiger.fosslabs.com> Message-ID: <085.fb3e7f21b6142efdf5edb85fb42ca87b@vtiger.fosslabs.com> #1082: vtiger Logo missing ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 14:39:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:39:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231129=3A?= =?utf-8?q?_SalesOrder_popup_gives_fatal_error?= In-Reply-To: <076.ed5850144fdfa69ed89800ea316794af@vtiger.fosslabs.com> References: <076.ed5850144fdfa69ed89800ea316794af@vtiger.fosslabs.com> Message-ID: <085.4c70f00dbd9adcf23a5009cdd9b650d9@vtiger.fosslabs.com> #1129: SalesOrder popup gives fatal error ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: Jeri Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Pop Up Search ------------------------+--------------------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 14:46:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:46:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23825=3A_?= =?utf-8?q?Selecting_multiple_contacts_or_accounts_to_email_doesn=27t_work?= In-Reply-To: <076.683cae006e1fdd273b3c9d1c8840ad6b@vtiger.fosslabs.com> References: <076.683cae006e1fdd273b3c9d1c8840ad6b@vtiger.fosslabs.com> Message-ID: <085.cbb65184cb31f76fbcffb1c399a27f0b@vtiger.fosslabs.com> #825: Selecting multiple contacts or accounts to email doesn't work -----------------------------------+---------------------------------------- Reporter: jay at forecasttech.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: -----------------------------------+---------------------------------------- Changes (by richie): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 14:49:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:49:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6784 - /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Message-ID: <20060530184947.0BB1C7D79D3@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 12:49:43 2006 New Revision: 6784 Log: * Added get_ticket_history entry for Ticket in related lists table Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue May 30 12:49:43 2006 @@ -1703,9 +1703,11 @@ $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)"); - $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)"); + $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)"); + + //Inserting PriceBook Related Lists $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)"); // Inserting Vendor Related Lists From vtiger-tickets at vtiger.fosslabs.com Tue May 30 14:54:31 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 18:54:31 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231019=3A?= =?utf-8?q?_Help_desk_-_Ticket_history_missing?= In-Reply-To: <076.9c5107e627c0574d829eb9fdf2b44421@vtiger.fosslabs.com> References: <076.9c5107e627c0574d829eb9fdf2b44421@vtiger.fosslabs.com> Message-ID: <085.069dfa69fad89070c321e55eb6c491fa@vtiger.fosslabs.com> #1019: Help desk - Ticket history missing ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: Ticket history ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed as the Ticket History is added in the Ticket related list. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 14:58:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 18:58:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6785 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060530185800.B6B247D79DB@vtiger.fosslabs.com> Author: don Date: Tue May 30 12:57:56 2006 New Revision: 6785 Log: Fixed issue in isPermitted() if the actionname is not listed in actionmapping table Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue May 30 12:57:56 2006 @@ -1405,12 +1405,12 @@ { $permission = "yes"; $log->debug("Exiting isPermitted method ..."); - return $permission; } else { $permission ="no"; } + return $permission; } From vtiger-tickets at vtiger.fosslabs.com Tue May 30 15:00:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 19:00:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231204=3A?= =?utf-8?b?IGxlYWQgaGlzdG9yeT8/Pz8/Pz8=?= In-Reply-To: <076.bbbe8e270b4c7d1759f1f5202c6ad934@vtiger.fosslabs.com> References: <076.bbbe8e270b4c7d1759f1f5202c6ad934@vtiger.fosslabs.com> Message-ID: <085.d7dcf4d305c1c1fba4241c5f83e7a53b@vtiger.fosslabs.com> #1204: lead history??????? ------------------------+--------------------------------------------------- Reporter: richie | Owner: don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 15:01:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 19:01:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231209=3A?= =?utf-8?b?IGNvbnRhY3RzIGhpc3Rvcnk/Pz8/Pz8=?= In-Reply-To: <076.42cb83c6d048c893bb0ffcf27ba6f9e1@vtiger.fosslabs.com> References: <076.42cb83c6d048c893bb0ffcf27ba6f9e1@vtiger.fosslabs.com> Message-ID: <085.b14e4bb25d6818c19765f89cc0571002@vtiger.fosslabs.com> #1209: contacts history?????? ------------------------+--------------------------------------------------- Reporter: richie | Owner: don Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 16:49:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 20:49:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6786 - /vtigercrm/trunk/Smarty/templates/ListRoles.tpl Message-ID: <20060530204934.334657D7A3F@vtiger.fosslabs.com> Author: don Date: Tue May 30 14:49:29 2006 New Revision: 6786 Log: Fixed the drag and drop issue in IE 6 Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListRoles.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListRoles.tpl Tue May 30 14:49:29 2006 @@ -50,15 +50,23 @@ {rdelim} -
    +
    {include file='SettingsMenu.tpl'} + + + + + + {if $header eq 'Comments' || $header eq 'Comment Information'} + + + + + + + + {/if} + + + + + {strip} {elseif $keyid eq '19' || $keyid eq '20'} + + {if $label eq 'Add Comment'} + {assign var=keyval value=""} + {/if} {/if} {elseif $uitype eq 19 || $uitype eq 20} + + {if $fldlabel eq 'Add Comment'} + {assign var=fldvalue value=""} + {/if} + + + + + {if $header eq 'Comments' || $header eq 'Comment Information'} + + + + + + + + + {/if} + + + + Modified: vtigercrm/trunk/modules/Faq/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/DetailView.php (original) +++ vtigercrm/trunk/modules/Faq/DetailView.php Tue May 30 14:57:57 2006 @@ -90,6 +90,9 @@ $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - + +//Added to display the Faq comments information +$smarty->assign("COMMENT_BLOCK",$focus->getFAQComments($_REQUEST['record'])); + $smarty->display("DetailView.tpl"); ?> Modified: vtigercrm/trunk/modules/Faq/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/EditView.php (original) +++ vtigercrm/trunk/modules/Faq/EditView.php Tue May 30 14:57:57 2006 @@ -106,7 +106,13 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); - + +if($_REQUEST['record'] != '') +{ + //Added to display the Faq comments information + $smarty->assign("COMMENT_BLOCK",$focus->getFAQComments($_REQUEST['record'])); +} + if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); else Modified: vtigercrm/trunk/modules/Faq/Faq.php ============================================================================== --- vtigercrm/trunk/modules/Faq/Faq.php (original) +++ vtigercrm/trunk/modules/Faq/Faq.php Tue May 30 14:57:57 2006 @@ -110,16 +110,19 @@ return ''; } - $list .= '
    '; + $list .= '
    '; for($i=0;$i<$noofrows;$i++) { $comment = $this->db->query_result($result,$i,'comments'); $createdtime = $this->db->query_result($result,$i,'createdtime'); if($comment != '') { - $list .= '
      '.$comment.'
    '; - $list .= '
    '.$mod_strings['Created Time']; - $list .= ' : '.$createdtime.'
    '; + //this div is to display the comment + $list .= '
    '.make_clickable(nl2br($comment)).'
    '; + + //this div is to display the created time + $list .= '
    '.$mod_strings['Created Time']; + $list .= ' : '.$createdtime.'
    '; } } $list .= '
    '; Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/DetailView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/DetailView.php Tue May 30 14:57:57 2006 @@ -99,6 +99,9 @@ $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); +//Added to display the ticket comments information +$smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record'])); + $smarty->assign("MODULE",$currentModule); $smarty->display("DetailView.tpl"); $focus->id = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/HelpDesk/EditView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/EditView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/EditView.php Tue May 30 14:57:57 2006 @@ -102,6 +102,12 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +if($_REQUEST['record'] != '') +{ + //Added to display the ticket comments information + $smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record'])); +} + if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); else Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue May 30 14:57:57 2006 @@ -358,16 +358,21 @@ return ''; } - $list .= '
    '; + $list .= '
    '; for($i=0;$i<$noofrows;$i++) { if($adb->query_result($result,$i,'comments') != '') { - $list .= '
    '; + //this div is to display the comment + $list .= '
    '; $list .= make_clickable(nl2br($adb->query_result($result,$i,'comments'))); - $list .= '
    '; + $list .= '
    '; + + //this div is to display the author and time + $list .= '
    '; $list .= $mod_strings['LBL_AUTHOR'].' : '; + if($adb->query_result($result,$i,'ownertype') == 'user') $list .= getUserName($adb->query_result($result,$i,'ownerid')); else @@ -388,7 +393,7 @@ * @param int $id - Ticket id * @return string $customername - The contact name **/ -function getCustomerName($id) + function getCustomerName($id) { global $log; $log->debug("Entering getCustomerName(".$id.") method ..."); Modified: vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php Tue May 30 14:57:57 2006 @@ -157,6 +157,7 @@ 'LBL_CONVERT_AS_FAQ_BUTTON_KEY'=>'C', 'LBL_CONVERT_AS_FAQ_BUTTON_LABEL'=>'Convert As FAQ', 'Attachment'=>'Attachment', +'LBL_COMMENT_INFORMATION'=>'Comment Information', ); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:48:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 21:48:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6789 - in /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl EmailContents.tpl EmailDetails.tpl Emails.tpl Header.tpl HomePage.tpl Message-ID: <20060530214821.37DCF7D7D56@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 15:48:13 2006 New Revision: 6789 Log: updated the UI changes given by saint - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/EmailContents.tpl vtigercrm/trunk/Smarty/templates/EmailDetails.tpl vtigercrm/trunk/Smarty/templates/Emails.tpl vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue May 30 15:48:13 2006 @@ -28,14 +28,18 @@
    @@ -167,7 +175,7 @@ {ldelim} childId = childId.replace(/user_/gi,''); parentId = parentId.replace(/user_/gi,''); - var ajaxObj = new VtigerAjax(ajaxSaveResponse); + var ajaxObj = new Ajax(ajaxSaveResponse); var urlstring ="module=Users&action=UsersAjax&file=RoleDragDrop&ajax=true&parentId="+parentId+"&childId="+childId; ajaxObj.process("index.php?",urlstring); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 16:51:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 20:51:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6787 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060530205128.288817D7A3F@vtiger.fosslabs.com> Author: don Date: Tue May 30 14:51:24 2006 New Revision: 6787 Log: Handled migration in security tables Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 14:51:24 2006 @@ -2794,6 +2794,33 @@ $sql2_sec="insert into profile2utility values(".$prof_id.",7,9,0)"; Execute($sql2_sec); + + $sql3_sec="insert into profile2tab values(".$prof_id.",26,0)"; + Execute($sql3_sec); + + $sql4_sec="insert into profile2tab values(".$prof_id.",27,0)"; + Execute($sql4_sec); + + $sql5_sec="delete from profile2standardpermissions where tabid=1 and profileid=".$prof_id; + Execute($sql5_sec); + + $sql6_sec="delete from profile2standardpermissions where tabid=3 and profileid=".$prof_id; + Execute($sql6_sec); + + $sql7_sec="insert into profile2standardpermissions values(".$prof_id.",26,0,0)"; + Execute($sql7_sec); + + $sql8_sec="insert into profile2standardpermissions values(".$prof_id.",26,1,0)"; + Execute($sql8_sec); + + $sql9_sec="insert into profile2standardpermissions values(".$prof_id.",26,2,0)"; + Execute($sql9_sec); + + $sql10_sec="insert into profile2standardpermissions values(".$prof_id.",26,3,0)"; + Execute($sql10_sec); + + $sql11_sec="insert into profile2standardpermissions values(".$prof_id.",26,4,0)"; + Execute($sql11_sec); } From vtiger-tickets at vtiger.fosslabs.com Tue May 30 16:51:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 20:51:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23810=3A_?= =?utf-8?q?Creating_New_Potential?= In-Reply-To: <076.b82f5ddc46ef8a0cb2806330580b0dba@vtiger.fosslabs.com> References: <076.b82f5ddc46ef8a0cb2806330580b0dba@vtiger.fosslabs.com> Message-ID: <085.0611a8bc904dda3806a2d1dd22edfca2@vtiger.fosslabs.com> #810: Creating New Potential ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: richie Type: defect | Status: assigned Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by richie): * priority: critical => major * status: new => assigned * owner: developer => richie Comment: Could you please elaborate on which module you are facing this situation? A little more info will go a long way in helping us. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 16:58:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 20:58:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6788 - in /vtigercrm/trunk: Smarty/templates/ modules/Faq/ modules/HelpDesk/ modules/HelpDesk/language/ Message-ID: <20060530205810.715187D7A3B@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 14:57:57 2006 New Revision: 6788 Log: * Modified to display the comment details in Edit and DetailView and in the EditView page, in the comment text area already comment will not be shown now. it will be shown as empty Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl vtigercrm/trunk/Smarty/templates/DisplayFields.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl vtigercrm/trunk/modules/Faq/DetailView.php vtigercrm/trunk/modules/Faq/EditView.php vtigercrm/trunk/modules/Faq/Faq.php vtigercrm/trunk/modules/HelpDesk/DetailView.php vtigercrm/trunk/modules/HelpDesk/EditView.php vtigercrm/trunk/modules/HelpDesk/HelpDesk.php vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue May 30 14:57:57 2006 @@ -189,6 +189,27 @@ {/if}
    + {$MOD.LBL_COMMENT_INFORMATION} +
    {$COMMENT_BLOCK}
     
    Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Tue May 30 14:57:57 2006 @@ -87,6 +87,10 @@
     {$keyval}
    {if $uitype eq 20} * Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Tue May 30 14:57:57 2006 @@ -122,7 +122,26 @@ {foreach key=header item=data from=$BLOCKS} -
     
    + {$MOD.LBL_COMMENT_INFORMATION} +
    {$COMMENT_BLOCK}
     
    {$header}
    - - - - - -
    {$APP.$CATEGORY} > {$APP.$MODULE} - + + + +
    {$APP.$CATEGORY} > {$APP.$MODULE} + + + + + + - - + - -
    + + + - - + +
    @@ -57,11 +61,14 @@
    -
    +
    +
      + - @@ -70,10 +77,11 @@
    {$APP.LBL_CALENDAR_ALT} {$APP.LBL_CLOCK_ALT}
    -
    - + + + -
      + + {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } {if $CHECK.Import eq 'yes'} @@ -87,7 +95,7 @@ {/if} {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} - @@ -100,20 +108,19 @@ {/if} -
    {$APP.LBL_EXPORT} {$APP.$MODULE} + {if $CHECK.Export eq 'yes'} {$APP.LBL_IMPORT} {$APP.$MODULE} {$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}
    -
    +
    +
      +
    {$APP.LBL_ALL_MENU_ALT}
    -
    +
    Modified: vtigercrm/trunk/Smarty/templates/EmailContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EmailContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EmailContents.tpl Tue May 30 15:48:13 2006 @@ -1,38 +1,38 @@ -{**} -
    - - - - - - - - {foreach key=id item=row from=$LISTENTITY} - - - - - - - {/foreach} -
    {$LISTHEADER.0}{$LISTHEADER.1}{$LISTHEADER.2}
    - -{$row.0}{$row.1}{$row.2}
    -
    - +{**} +
    + + + + + + + + {foreach key=id item=row from=$LISTENTITY} + + + + + + + {/foreach} +
    {$LISTHEADER.0}{$LISTHEADER.1}{$LISTHEADER.2}
    + +{$row.0}{$row.1}{$row.2}
    +
    + Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Tue May 30 15:48:13 2006 @@ -15,7 +15,7 @@ {if $BLOCKS neq ''} - - Modified: vtigercrm/trunk/modules/Calendar/header.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/header.php (original) +++ vtigercrm/trunk/modules/Calendar/header.php Tue May 30 18:38:31 2006 @@ -62,7 +62,7 @@ Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue May 30 18:38:31 2006 @@ -315,7 +315,7 @@ Modified: vtigercrm/trunk/modules/Dashboard/index.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/index.php (original) +++ vtigercrm/trunk/modules/Dashboard/index.php Tue May 30 18:38:31 2006 @@ -99,7 +99,7 @@ From vtiger-tickets at vtiger.fosslabs.com Tue May 30 21:09:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 01:09:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231196=3A?= =?utf-8?q?_Reports_-_Next_Button_non_functional_in_Mozilla_Browser_=28Bin?= =?utf-8?q?_Installation=29?= In-Reply-To: <076.d539b2e8d861c4293c89750188d77963@vtiger.fosslabs.com> References: <076.d539b2e8d861c4293c89750188d77963@vtiger.fosslabs.com> Message-ID: <085.bee3db99d2d2b1e4f296400dc7ebcbab@vtiger.fosslabs.com> #1196: Reports - Next Button non functional in Mozilla Browser (Bin Installation) ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: Jeri Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 21:10:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 01:10:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231198=3A?= =?utf-8?q?_Reports_-_Cancel_Button_Non_function_in_Create_Report?= In-Reply-To: <076.8e9d3facea1ac93ec4ce77bef5d8633e@vtiger.fosslabs.com> References: <076.8e9d3facea1ac93ec4ce77bef5d8633e@vtiger.fosslabs.com> Message-ID: <085.f8b1e0709648e2b01cb4074fd35cca72@vtiger.fosslabs.com> #1198: Reports - Cancel Button Non function in Create Report ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: Jeri Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 21:12:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 01:12:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231197=3A?= =?utf-8?q?_Reports_-_Incorrect_Alert_Message?= In-Reply-To: <076.a565900329edc9f32752c9b71a73baa9@vtiger.fosslabs.com> References: <076.a565900329edc9f32752c9b71a73baa9@vtiger.fosslabs.com> Message-ID: <085.0d74410e19edf6fb03340a089bdd172a@vtiger.fosslabs.com> #1197: Reports - Incorrect Alert Message ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: jerrydgeorge Type: defect | Status: new Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * owner: Jeri => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 21:13:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 01:13:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6810 - in /vtigercrm/branches/4.2.4: changelog.txt modules/Users/about_us.php themes/Aqua/header.html themes/blue/header.html themes/nature/header.html themes/orange/header.html vtigerversion.php Message-ID: <20060531011333.9D1307D7D95@vtiger.fosslabs.com> Author: allanbush Date: Tue May 30 19:13:27 2006 New Revision: 6810 Log: Changes for 4.2.4 release as per #52. Added a few extra changes to the changelog that occured since that ticket was made. Closes #52. Modified: vtigercrm/branches/4.2.4/changelog.txt vtigercrm/branches/4.2.4/modules/Users/about_us.php vtigercrm/branches/4.2.4/themes/Aqua/header.html vtigercrm/branches/4.2.4/themes/blue/header.html vtigercrm/branches/4.2.4/themes/nature/header.html vtigercrm/branches/4.2.4/themes/orange/header.html vtigercrm/branches/4.2.4/vtigerversion.php Modified: vtigercrm/branches/4.2.4/changelog.txt ============================================================================== --- vtigercrm/branches/4.2.4/changelog.txt (original) +++ vtigercrm/branches/4.2.4/changelog.txt Tue May 30 19:13:27 2006 @@ -1,7 +1,92 @@ +vtigerCRM v4.2.4 (Jun 1, 2006) +------------------------------- + +NOTE: first time vtigerCRM users can directly install the source in their vtiger supported version of LAMP / WAMP. + +bug fixes +--------- + +r3606: Issue in Pop-up New link which caused elements to disappear when hovering over ">>" +r3607: Display currency symbol in listview header +r3608: Added dash after Potential Name when converting from Lead +r3609: Start/End date options in Custom View +r3614: utils.php call time pass reference error +r3615: fix for totals in reports not showing up +r3616: PearDatabase.php call time pass reference +r3617: Signatures are double-spaced in e-mails +r3618: vendor search has a field "company" .but vendor form does not have company field +r3619: "Email" mapping added for new search field +r3773: Search leads by Fax in advanced search +r3775: Order pending activities by date and time +r3776: Allow more lead columns to be sorted +r3777: Import CSV files with CR as line ending +r3779: Set memory limit higher than 8mb +r3783: removing schtasks.exe from source cron directory +r3784: move DatabaseSchema.xml out of adodb/ into new schema/ directory +r3787: Emails that contain HTML characters cause bad display in the Reply, Reply to All buttons area +r3789: My Group Allocation on the Home page does not have a border on the right edge +r3790: When switching from Email to Webmails and back to Emails, the tabs are drawn incorrectly +r3792: Products listed in the Help Desk custom views display the record ID instead of the Product Name +r3794: Missing border on Home module with more than 5 tickets open +r3795: Remove readonly attribs from installer db form fields +r3796: when we display fieldlabels, the label will not be displayed if there is a special character(like &) +r3803: copyright / license cleanup +r3809: install cleanup +r3811: unified naming scheme to vtigerCRM files +r3824: split README with Changelog +r3831: fix extraneous colon character appearing in installer stage 3 next to database name +r3833: add template for config file and 4.2.3 sql file +r3834: add config file for FHS system +r3868: update to jpgraph-1.20.3 +r3869: rename db_host_name and db_user_name to db_hostname and db_username +r3871: move columns for sunday and week number to the right +r3872: Fix Home Ticket List is Colored Opposite of Other Sections +r3873: Fix html emails sent with tags viewable +r3874: fixed time shift occuring if the calendar view spans a time change (daylight saving switch) +r3875: removed magic quotes check on input sanitization as magic quotes are removed on all input in the index.php file +r3876: Apostrophe in description of Lead means that the lead is lost upon converting +r3877: Don't die 'Couldn't get the group listing' +r3878: fix direct calls to mysql functions +r3879: Fix activities relatedlist won't display well if translated +r3891: Fix missing "break" in OpenListView.php CASE statement +r3892: Show rendered html instead of tags in notes editor +r3911: update to adodb-4.72 +r3912: Fix Quotes/Invoices/Orders Do Not Support Negative Adjustments +r3914: add file to extract adodb XML schema from database +r3915: remove unused code in extractSchema +r3931: port constraints & table type hack for AXMLS from 4.55 to 4.72 +r3932: Add indexes & fix FK name collisions in DB XML Schema +r3933: Remove foreign keys that point to missing fields +r3934: remove duplicate indexes in database +r3935: turn on adodb and AXMLS debugging during install +r3937: installer use template file +r3938: Put vtiger version and release date only in vtigerversion.php +r3940: config.inc.php is configuration file included by config.php +r3941: added missing parameters in template file +r3942: create install/5createTables.inc.php and modify install.php to use it when called from the command line +r3943: output one less line to compensate for create_default_users(). see #40 +r3945: fix scope issue in getUserFldArray() +r3966: remove old unused modules and files +r4051: Remove hard coded upload limits +r4057: changes made to support multiple packaging +r4058: reduce memory usage in lead attachment upload code +r4059: reduce adodb memory usage to enable larger BLOB uploads +r4392: clean up uninitialized var notice while importing leads ref #70 +r4394: disable installer after successful install for security reasons. closes #25 +r4397: Patch forUnicode-readyAlphabeticalSearch(), by justoff. +r4399: Jpgraph fixes for Traditional Chinese, by kiange. closes #37 +r4400: Fix quotes are not created correctly form Potentials or from Quote screen, by onwealdandy. closes #51 +r4401: Translate of hard code by Summing columns in reports, by kleo. closes #54 +r4402: urlencode the downloading filename to deal with special characters, by mcrowe. closes #64 +r4443: expand lead street field to match street maxlen in contacts +r5079: Detect if the key metric is for a sub module and set the partent module and appropriate sub module code when needed. Closes #93. +r5113: Added inital condition check before looping through the parts list. Closes #96. +r6804: $host_name doesn't appear to be used anywhere, removing from configureation. Closes #68. + + + vtigerCRM v4.2.3 (Dec 23, 2005) ------------------------------- - -NOTE: first time vtigerCRM users can directly install the source in their vtiger supported version of LAMP / WAMP. vulnerability fixes ------------------- @@ -20,6 +105,7 @@ b) Authentication ByPass c) Unsafe File Inclusion d) Arbitrary code execution + vtigerCRM v4.2 Patch 2 (Sep 15, 2005) ------------------------------------- @@ -125,6 +211,7 @@ 61. T2512 - Home upcoming activities 62. P8030 - Meetings not held must not be shown in upcoming activities + vtigerCRM v4.2 Patch 1 (Aug 10, 2005) ------------------------------------- @@ -197,6 +284,7 @@ 59. Internal: Single, double quotes problem in ticket comments and FAQ comments 60. Forum Topic ID 1612: Misbehaviour on validation of number fields + vtigerCRM v4.2 GA (July 18, 2005) --------------------------------- @@ -379,6 +467,7 @@ NOTE: For more details about vtigerCRM v4.2 Release Notes, Please refer to the following URL: http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4_2_Release_Notes + vtigerCRM v4.2 Alpha (May 31, 2005) ----------------------------------- @@ -397,6 +486,7 @@ 10. Event Reminders 11. Configurable Email Notifications 12. Incoming Email Support + vtigerCRM v4.0.1 (April 29, 2005) --------------------------------- @@ -465,6 +555,7 @@ 49) Displaying of Closed Ticket in Home Page. 50) Deleted entities are getting listed in Tracker. 51) Enabling History tabs in Leads, Contacts, Accounts and Potentials for Activity History. + vtigerCRM v4.0 (March 29, 2005) -------------------------------- @@ -682,6 +773,7 @@ 2. In Windowos OS, System Inoformantion is not displayed 3. While importing leads, accounts, contacts, and potentials the XLS file format can be browsed even though the allowed file format is CSV. + vtigerCRM v4.0 Beta (January 10, 2005) ------------------------------------- @@ -724,6 +816,7 @@ 18. 1093669 - Delete attachments 19. Support for Latest versions of Apache and MySQL in installation wizard (Both Linux and Windows). + vtigerCRM v3.2.1 (December 21, 2004) ------------------------------------ @@ -745,6 +838,7 @@ g) Proper Message display is done when a user with no delete privileges tries to delete the entity. h) vtiger Outlook Plug-in in server side fixes related to performance improvement. + vtigerCRM v3.2 (December 13, 2004) ---------------------------------- @@ -775,6 +869,7 @@ Released vtiger Outlook Plug-in, business productivity enhancement utility for Microsoft Outlook users. It is an open source project covered under vtiger Public License 1.0 based on Mozilla Public License 1.1. + vtigerCRM v2.0 (September 6, 2004) ---------------------------------- @@ -808,6 +903,7 @@ Send your feedback, which is vital for our understanding your needs. + vtigerCRM v1.0 (August 26, 2004) -------------------------------- Modified: vtigercrm/branches/4.2.4/modules/Users/about_us.php ============================================================================== --- vtigercrm/branches/4.2.4/modules/Users/about_us.php (original) +++ vtigercrm/branches/4.2.4/modules/Users/about_us.php Tue May 30 19:13:27 2006 @@ -37,28 +37,33 @@ - - + + - - + + + + + + + - + - - + + - - + + @@ -76,4 +81,3 @@
    +   {if $EMAIL_FLAG neq 'WEBMAIL'}   @@ -39,7 +39,7 @@
    + {foreach item=row from=$BLOCKS} {foreach item=elements key=title from=$row} {if $title eq 'Subject'} Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Emails.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Emails.tpl Tue May 30 15:48:13 2006 @@ -99,18 +99,18 @@ {rdelim} - {include file='Buttons_List1.tpl'} + {include file='Buttons_List.tpl'} + + - - - - - - - + + - - + - + + + + - - + - - + + Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 30 18:38:31 2006 @@ -126,7 +126,7 @@
      -  
    - - + + +
    + +
    + @@ -118,44 +118,52 @@ - - + + +
    +
    + + + - - - - - - - + + + + + + + + + + + +
    - - - +
    +  {$MOD.LBL_COMPOSE} +  {$MOD.LBL_SETTINGS}
    {$MOD.LBL_EMAIL_FOLDERS}  {$MOD.LBL_ALLMAILS}
    -  {$MOD.LBL_INBOX} -
      + +
    {$MOD.LBL_EMAIL_FOLDERS}  {$MOD.LBL_ALLMAILS}
    + + +  {$MOD.LBL_INBOX} +
    -  {$MOD.LBL_SENT_MAILS} -
      +
    + +  {$MOD.LBL_SENT_MAILS} +
    +
      + - - + +
      - - {$APP.LBL_SEARCH}   -   +   + {$APP.LBL_SEARCH}   + +  
      @@ -200,14 +212,17 @@
     
       
      @@ -228,7 +243,9 @@

     
    Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Tue May 30 15:48:13 2006 @@ -113,10 +113,11 @@
    - +
    - - From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:54:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 21:54:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6790 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060530215434.09F817D7D59@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 15:54:31 2006 New Revision: 6790 Log: Style updated - ahmed Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Tue May 30 15:54:31 2006 @@ -72,7 +72,7 @@ background:#bbbbbb url(images/tabSeperatorBg.gif) repeat-x; } -.level2text { +/*.level2text { background:#bbbbbb url(images/level2Bg.gif) repeat-x; font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -82,12 +82,25 @@ padding-bottom:5px; font-weight:bold; color:white; +}*/ + +.level2text { + background:#bbbbbb url(images/level2Bg.gif) repeat-x; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:20px; + padding-right:20px; + padding-top:3px; + padding-bottom:3px; + font-weight:bold; + color:white; } .level2text a{ text-decoration:none; color:white; - + padding-left:10px; + padding-right:10px; } .level2text a:hover { @@ -117,6 +130,10 @@ .level2textSel{ font-weight:bold; color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:3px; + padding-bottom:3px; } @@ -2446,3 +2463,26 @@ .unread_email { font-weight:bold; } + + +.tagCloud { + border:1px solid #737373; +} + + +.tagCloudTopBg { + background: url(images/tagCloudBg.gif) repeat-x; + background-color:#e5e5e5; + +} + +.tagCloudDisplay { + background-color:#e5e5e5; + padding:10px; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height: 14px; + color: #000000; + height:100px; + +} From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 17:57:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 21:57:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6791 - in /vtigercrm/trunk/themes/blue/images: tagCloudBg.gif tagCloudName.gif Message-ID: <20060530215757.C68267D7D5D@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 15:57:52 2006 New Revision: 6791 Log: Added Tag cloud images - ahmed Added: vtigercrm/trunk/themes/blue/images/tagCloudBg.gif (with props) vtigercrm/trunk/themes/blue/images/tagCloudName.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 18:19:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 22:19:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6792 - /vtigercrm/trunk/modules/Emails/EditView.php Message-ID: <20060530221901.4122E7D7D73@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 16:18:57 2006 New Revision: 6792 Log: Updated Email Edit view for Template formating - ahmed Modified: vtigercrm/trunk/modules/Emails/EditView.php Modified: vtigercrm/trunk/modules/Emails/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EditView.php (original) +++ vtigercrm/trunk/modules/Emails/EditView.php Tue May 30 16:18:57 2006 @@ -157,8 +157,8 @@ if(isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !='') { $templatedetails = getTemplateDetails($_REQUEST['templateid']); - $details['Email Information'][2][0][3][0] = $templatedetails[2]; - $details['Email Information'][3][0][3][0] = $templatedetails[1]; + $details['Email Information'][2][0][3][0] = $templatedetails[2]; //Subject + $details['Email Information'][3][0][3][0] = nl2br($templatedetails[1]); //Body } $smarty->assign("BLOCKS",$details['Email Information']); $smarty->assign("MODULE",$currentModule); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 18:20:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 22:20:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6793 - /vtigercrm/trunk/Smarty/templates/ListRoles.tpl Message-ID: <20060530222037.E39927D7D73@vtiger.fosslabs.com> Author: don Date: Tue May 30 16:20:34 2006 New Revision: 6793 Log: Fixed Ajax instantiation issue Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListRoles.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListRoles.tpl Tue May 30 16:20:34 2006 @@ -175,7 +175,7 @@ {ldelim} childId = childId.replace(/user_/gi,''); parentId = parentId.replace(/user_/gi,''); - var ajaxObj = new Ajax(ajaxSaveResponse); + var ajaxObj = new VtigerAjax(ajaxSaveResponse); var urlstring ="module=Users&action=UsersAjax&file=RoleDragDrop&ajax=true&parentId="+parentId+"&childId="+childId; ajaxObj.process("index.php?",urlstring); From vtiger-tickets at vtiger.fosslabs.com Tue May 30 18:27:43 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 22:27:43 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231243=3A?= =?utf-8?q?_unable_to_create_exel_in_PHP5?= Message-ID: <076.f553d0d7442fa0ef5488ddc5b4309f8b@vtiger.fosslabs.com> #1243: unable to create exel in PHP5 --------------------------+------------------------------------------------- Reporter: jerrydgeorge | Owner: richie Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | --------------------------+------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 18:29:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 22:29:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6794 - in /vtigercrm/trunk: Smarty/templates/CreateEmailTemplate.tpl include/utils/CommonUtils.php modules/Emails/mailsend.php Message-ID: <20060530222956.1EDA17D7D73@vtiger.fosslabs.com> Author: don Date: Tue May 30 16:29:49 2006 New Revision: 6794 Log: email temp issue has been fixed Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/trunk/include/utils/CommonUtils.php vtigercrm/trunk/modules/Emails/mailsend.php Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Tue May 30 16:29:49 2006 @@ -43,31 +43,31 @@ options[0] = blankOption; - options[1] = new Option('Account: Account Name', '{$accounts_accountname}'); - options[2] = new Option('Account: Account Type', '{$accounts_account_type}'); - options[3] = new Option('Account: Industry', '{$accounts_industry}'); - options[4] = new Option('Account: Annual Revenue', '{$accounts_annualrevenue}'); - options[5] = new Option('Account: Phone', '{$accounts_phone}'); - options[6] = new Option('Account: Email', '{$accounts_email1}'); - options[7] = new Option('Account: Rating', '{$accounts_rating}'); - options[8] = new Option('Account: Website', '{$accounts_website}'); - options[9] = new Option('Account: Fax', '{$accounts_fax}'); + options[1] = new Option('Account: Account Name', '$accounts-accountname$'); + options[2] = new Option('Account: Account Type', '$accounts-account_type$'); + options[3] = new Option('Account: Industry', '$accounts-industry$'); + options[4] = new Option('Account: Annual Revenue', '$accounts-annualrevenue$'); + options[5] = new Option('Account: Phone', '$accounts-phone$'); + options[6] = new Option('Account: Email', '$accounts-email1$'); + options[7] = new Option('Account: Rating', '$accounts-rating$'); + options[8] = new Option('Account: Website', '$accounts-website$'); + options[9] = new Option('Account: Fax', '$accounts-fax$'); allOpts[1] = options; options = new Object(11); options[0] = blankOption; - options[1] = new Option('Contact: First Name', '{$contacts_firstname}'); - options[2] = new Option('Contact: Last Name', '{$contacts_lastname}'); - options[3] = new Option('Contact: Salutation', '{$contacts_salutationtype}'); - options[4] = new Option('Contact: Title', '{$contacts_title}'); - options[5] = new Option('Contact: Email', '{$contacts_email}'); - options[6] = new Option('Contact: Department', '{$contacts_department}'); - options[7] = new Option('Contact: Other Email','{$contacts_otheremail}'); - options[8] = new Option('Contact: Phone', '{$contacts_phone}'); - options[9] = new Option('Contact: Mobile', '{$contacts_mobile}'); - options[10] = new Option('Contact: Currency', '{$contacts_currency}'); + options[1] = new Option('Contact: First Name', '$contacts-firstname$'); + options[2] = new Option('Contact: Last Name', '$contacts-lastname$'); + options[3] = new Option('Contact: Salutation', '$contacts-salutationtype$'); + options[4] = new Option('Contact: Title', '$contacts-title$'); + options[5] = new Option('Contact: Email', '$contacts-email$'); + options[6] = new Option('Contact: Department', '$contacts-department$'); + options[7] = new Option('Contact: Other Email','$contacts-otheremail$'); + options[8] = new Option('Contact: Phone', '$contacts-phone$'); + options[9] = new Option('Contact: Mobile', '$contacts-mobile$'); + options[10] = new Option('Contact: Currency', '$contacts-currency$'); allOpts[2] = options; @@ -76,36 +76,36 @@ options[0] = blankOption; - options[1] = new Option('Lead: First Name', '{$leads_firstname}'); - options[2] = new Option('Lead: Last Name', '{$leads_lastname}'); - options[3] = new Option('Lead: Lead Source', '{$leads_leadsource}'); - options[4] = new Option('Lead: Status', '{$leads_leadstatus}'); - options[5] = new Option('Lead: Rating', '{$leads_rating}'); - options[6] = new Option('Lead: Industry', '{$leads_industry}'); - options[7] = new Option('Lead: Yahoo ID', '{$leads_yahooid}'); - options[8] = new Option('Lead: Email', '{$leads_email}'); - options[9] = new Option('Lead: Annual Revenue', '{$leads_annualrevenue}'); - options[10] = new Option('Lead: Title', '{$leads_designation}'); - options[11] = new Option('Lead: Salutation', '{$leads_salutation}'); + options[1] = new Option('Lead: First Name', '$leads-firstname$'); + options[2] = new Option('Lead: Last Name', '$leads-lastname$'); + options[3] = new Option('Lead: Lead Source', '$leads-leadsource$'); + options[4] = new Option('Lead: Status', '$leads-leadstatus$'); + options[5] = new Option('Lead: Rating', '$leads-rating$'); + options[6] = new Option('Lead: Industry', '$leads-industry$'); + options[7] = new Option('Lead: Yahoo ID', '$leads-yahooid$'); + options[8] = new Option('Lead: Email', '$leads-email$'); + options[9] = new Option('Lead: Annual Revenue', '$leads-annualrevenue$'); + options[10] = new Option('Lead: Title', '$leads-designation$'); + options[11] = new Option('Lead: Salutation', '$leads-salutation$'); allOpts[3] = options; options = new Object(19); options[0] = blankOption; - options[1] = new Option('User: First Name', '{$users_first_name}'); - options[2] = new Option('User: Last Name', '{$users_last_name}'); - options[3] = new Option('User: Title', '{$users_title}'); - options[4] = new Option('User: Department', '{$users_department}'); - options[5] = new Option('User: HomePhone', '{$users_phone_home}'); - options[6] = new Option('User: Mobile', '{$users_phone_mobile}'); - options[7] = new Option('User: Signature', '{$users_signature}'); - options[8] = new Option('User: Email', '{$users_email}'); - options[9] = new Option('User: Street', '{$users_address_street}'); - options[10] = new Option('User: City', '{$users_address_city}'); - options[11] = new Option('User: State', '{$users_address_state}'); - options[11] = new Option('User: Country', '{$users_address_country}'); - options[11] = new Option('User: PostalCode', '{$users_address_postalcode}'); + options[1] = new Option('User: First Name', '$users-first_name$'); + options[2] = new Option('User: Last Name', '$users-last_name$'); + options[3] = new Option('User: Title', '$users-title$'); + options[4] = new Option('User: Department', '$users-department$'); + options[5] = new Option('User: HomePhone', '$users-phone_home$'); + options[6] = new Option('User: Mobile', '$users-phone_mobile$'); + options[7] = new Option('User: Signature', '$users-signature$'); + options[8] = new Option('User: Email', '$users-email$'); + options[9] = new Option('User: Street', '$users-address_street$'); + options[10] = new Option('User: City', '$users-address_city$'); + options[11] = new Option('User: State', '$users-address_state$'); + options[11] = new Option('User: Country', '$users-address_country$'); + options[11] = new Option('User: PostalCode', '$users-address_postalcode$'); allOpts[4] = options; Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Tue May 30 16:29:49 2006 @@ -2250,6 +2250,93 @@ $log->debug("Exiting from getTemplateDetails($templateid) method ..."); return $returndata; } - +/** + * This function is used to merge the Template Details with the email description + * @param string $description -body of the mail(ie template) + * @param integer $tid - Id of the entity + * @param string $parent_type - module of the entity + * return string $description - Returns description, merged with the input template. +*/ + +function getMergedDescription($description,$id,$parent_type) +{ + global $adb,$log; + $log->debug("Entering getMergedDescription ..."); + $token_data_pair = explode('$',$description); + $fields = Array(); + for($i=1;$i < count($token_data_pair);$i+=2) + { + + $module = explode('-',$token_data_pair[$i]); + $fields[$module[0]][] = $module[1]; + + } + //replace the tokens with the values for the selected parent + switch($parent_type) + { + case 'Accounts': + if(is_array($fields["accounts"])) + { + $columnfields = implode(',',$fields["accounts"]); + $query = 'select '.$columnfields.' from account where accountid ='.$id; + $result = $adb->query($query); + foreach($fields["accounts"] as $columnname) + { + $token_data = '$accounts-'.$columnname.'$'; + $description = str_replace($token_data,$adb->query_result($result,0,$columnname),$description); + } + } + break; + case 'Contacts': + if(is_array($fields["contacts"])) + { + $columnfields = implode(',',$fields["contacts"]); + $query = 'select '.$columnfields.' from contactdetails where contactid='.$id; + $result = $adb->query($query); + foreach($fields["contacts"] as $columnname) + { + $token_data = '$contacts-'.$columnname.'$'; + $description = str_replace($token_data,$adb->query_result($result,0,$columnname),$description); + } + } + break; + case 'Leads': + if(is_array($fields["leads"])) + { + $columnfields = implode(',',$fields["leads"]); + $query = 'select '.$columnfields.' from leaddetails where leadid='.$id; + $result = $adb->query($query); + foreach($fields["leads"] as $columnname) + { + $token_data = '$leads-'.$columnname.'$'; + $description = str_replace($token_data,$adb->query_result($result,0,$columnname),$description); + } + } + break; + case 'Users': + if(is_array($fields["users"])) + { + $columnfields = implode(',',$fields["users"]); + $query = 'select '.$columnfields.' from users where id='.$id; + $result = $adb->query($query); + foreach($fields["users"] as $columnname) + { + $token_data = '$users-'.$columnname.'$'; + $description = str_replace($token_data,$adb->query_result($result,0,$columnname),$description); + } + } + break; + } + //replace the unwanted tokens by null + $token_data_pair = explode('$',$description); + for($i=1;$i < count($token_data_pair);$i+=2) + { + $token_data = '$'.$token_data_pair[$i].'$'; + $description = str_replace($token_data,'',$description); + } + $log->debug("Exiting from getMergedDescription ..."); + return $description; +} + ?> Modified: vtigercrm/trunk/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mailsend.php (original) +++ vtigercrm/trunk/modules/Emails/mailsend.php Tue May 30 16:29:49 2006 @@ -107,7 +107,9 @@ { //handle the mail send to users $emailadd = $adb->query_result($adb->query("select email1 from users where id=$mycrmid"),0,'email1'); - $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$_REQUEST['description'],'','','all',$focus->id); + $pmodule = 'Users'; + $description = getMergedDescription($focus->column_fields['description'],$mycrmid,$pmodule); + $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$description,'','','all',$focus->id); $all_to_emailids []= $emailadd; $mail_status_str .= $emailadd."=".$mail_status."&&&"; } @@ -143,7 +145,8 @@ if($emailadd != '') { - $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$focus->column_fields['description'],'','','all',$focus->id); + $description = getMergedDescription($focus->column_fields['description'],$mycrmid,$pmodule); + $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$description,'','','all',$focus->id); $all_to_emailids []= $emailadd; $mail_status_str .= $emailadd."=".$mail_status."&&&"; @@ -155,8 +158,8 @@ } } } + } - //Added to redirect the page to Emails/EditView if there is an error in mail sending if($errorheader1 == 1 || $errorheader2 == 1) { From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 18:34:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 22:34:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6795 - /vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Message-ID: <20060530223413.681907D7D73@vtiger.fosslabs.com> Author: don Date: Tue May 30 16:34:09 2006 New Revision: 6795 Log: the to mail id made to readonly Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Tue May 30 16:34:09 2006 @@ -55,7 +55,7 @@ '; $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - $query = "select crmentity.crmid, troubletickets.title, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, troubletickets.status, troubletickets.priority, crmentity.smownerid from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on contactdetails.contactid=troubletickets.parent_id left join users on users.id=crmentity.smownerid left join ticketgrouprelation on troubletickets.ticketid=ticketgrouprelation.ticketid left join groups on groups.groupname=ticketgrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; + $query = "select users.user_name,crmentity.crmid, troubletickets.title, contactdetails.contactid, troubletickets.parent_id, contactdetails.firstname, contactdetails.lastname, troubletickets.status, troubletickets.priority, crmentity.smownerid from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid left join contactdetails on contactdetails.contactid=troubletickets.parent_id left join users on users.id=crmentity.smownerid left join ticketgrouprelation on troubletickets.ticketid=ticketgrouprelation.ticketid left join groups on groups.groupname=ticketgrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; $log->info("Ticket Related List for Contact Displayed"); $log->debug("Exiting get_tickets method ..."); return GetRelatedList('Contacts','HelpDesk',$focus,$query,$button,$returnset); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 18:44:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 22:44:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6797 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060530224442.822757D7D70@vtiger.fosslabs.com> Author: don Date: Tue May 30 16:44:38 2006 New Revision: 6797 Log: Security Migration done Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 16:44:38 2006 @@ -111,6 +111,7 @@ $res = $conn->query($sql); $noofprofiles = $conn->num_rows($res); +/* Commented by Don. Handled below for($i=0;$i<$noofprofiles;$i++) { $profile_id = $conn->query_result($res,$i,'profileid'); @@ -121,7 +122,7 @@ Execute($sql1); Execute($sql2); } - +*/ //Insert Values into action mapping table: $actionmapping_array = Array( @@ -726,7 +727,7 @@ //Inserting for all tabs -$def_org_tabid=Array(2,4,6,7,9,10,13,16,20,21,22,23); +$def_org_tabid=Array(2,4,6,7,9,10,13,16,20,21,22,23,26); foreach($def_org_tabid as $def_tabid) { $insert_query_array2 = Array( @@ -915,7 +916,7 @@ $insert_query_array4 = Array( "insert into parenttab values(1,'My Home Page',1,0),(2,'Marketing',2,0),(3,'Sales',3,0),(4,'Support',4,0),(5,'Analytics',5,0),(6,'Inventory',6,0), (7,'Tools',7,0),(8,'Settings',8,0)", - "insert into parenttabrel values(1,9,2),(1,17,3),(1,10,4),(1,3,1),(3,7,1),(3,6,2),(3,4,3),(3,2,4),(3,20,5),(3,22,6),(3,23,7),(3,14,8),(3,19,9),(3,8,10),(4,13,1),(4,15,2),(4,6,3),(4,4,4),(4,14,5),(4,8,6),(5,1,1),(5,25,2),(6,14,1), (6,18,2), (6,19,3), (6,21,4), (6,22,5), (6,20,6), (6,23,7), (7,24,1), (7,27,2), (7,8,3), (2,26,1) " + "insert into parenttabrel values(1,9,2),(1,17,3),(1,10,4),(1,3,1),(3,7,1),(3,6,2),(3,4,3),(3,2,4),(3,20,5),(3,22,6),(3,23,7),(3,14,8),(3,19,9),(3,8,10),(4,13,1),(4,15,2),(4,6,3),(4,4,4),(4,14,5),(4,8,6),(5,1,1),(5,25,2),(6,14,1), (6,18,2), (6,19,3), (6,21,4), (6,22,5), (6,20,6), (6,23,7), (7,24,1), (7,27,2), (7,8,3), (2,26,1), (2,6,2), (2,4,3) " ); foreach($insert_query_array4 as $query) { @@ -2782,7 +2783,7 @@ -//Inserting into profile2utility table +//Security profile and tab table handling by DON starts $sql_sec="select profileid from profile"; $result_sec=$conn->query($sql_sec); $num_rows=$conn->num_rows($result_sec); @@ -2801,12 +2802,6 @@ $sql4_sec="insert into profile2tab values(".$prof_id.",27,0)"; Execute($sql4_sec); - $sql5_sec="delete from profile2standardpermissions where tabid=1 and profileid=".$prof_id; - Execute($sql5_sec); - - $sql6_sec="delete from profile2standardpermissions where tabid=3 and profileid=".$prof_id; - Execute($sql6_sec); - $sql7_sec="insert into profile2standardpermissions values(".$prof_id.",26,0,0)"; Execute($sql7_sec); @@ -2824,7 +2819,44 @@ } - + //Inserting into tab tables + $sec2="INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)"; + $sec3="INSERT INTO tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)"; + + //Insert into def_org_share tables + $sec4="insert into def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)"; + + Execute($sec2); + Execute($sec3); + Execute($sec4); + + //Inserting into datashare related modules table + + //Lead Related Module + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)"); + + //Account Related Module + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)"); + + + + //Potential Related Module + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)"); + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)"); + + //Quote Related Module + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)"); + + //SO Related Module + Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)"); + + +//By Don Ends //Added to get the conversion rate and update for all records From vtiger-tickets at vtiger.fosslabs.com Tue May 30 19:11:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 23:11:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231215=3A?= =?utf-8?q?_created_a_PO__from_contacts_related_list_but_assigned_user_not?= =?utf-8?q?_being_populated?= In-Reply-To: <076.1c0bb4f84ea5a64f39ac1e16d2e486f4@vtiger.fosslabs.com> References: <076.1c0bb4f84ea5a64f39ac1e16d2e486f4@vtiger.fosslabs.com> Message-ID: <085.f328ff25f0201bc9424c981137f21cca@vtiger.fosslabs.com> #1215: created a PO from contacts related list but assigned user not being populated ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed Comment: (In [6798]) Fixes #1214 and #1215 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 19:11:56 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 30 May 2006 23:11:56 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231214=3A?= =?utf-8?q?_created_a_quote_from_contacts_related_list_but_assigned_user_n?= =?utf-8?q?ot_being_populated?= In-Reply-To: <076.d4ab1c727afb4d92c713d4866b7daba3@vtiger.fosslabs.com> References: <076.d4ab1c727afb4d92c713d4866b7daba3@vtiger.fosslabs.com> Message-ID: <085.7ae0978ad1f96eb72fe287b71392feb4@vtiger.fosslabs.com> #1214: created a quote from contacts related list but assigned user not being populated ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by don): * resolution: => fixed * status: new => closed Comment: (In [6798]) Fixes #1214 and #1215 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 19:11:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 30 May 2006 23:11:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6798 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060530231157.24FE57D7D8D@vtiger.fosslabs.com> Author: don Date: Tue May 30 17:11:52 2006 New Revision: 6798 Log: Fixes #1214 and #1215 Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Tue May 30 17:11:52 2006 @@ -285,7 +285,6 @@ // First, get the list of IDs. $query = 'select users.user_name,groups.groupname,contactdetails.accountid, contactdetails.contactid , potential.potentialid, potential.potentialname, potential.potentialtype, potential.sales_stage, potential.amount, potential.closingdate, crmentity.crmid, crmentity.smownerid from contactdetails inner join potential on contactdetails.accountid = potential.accountid inner join crmentity on crmentity.crmid = potential.potentialid left join potentialgrouprelation on potential.potentialid=potentialgrouprelation.potentialid left join groups on groups.groupname=potentialgrouprelation.groupname left join users on users.id=crmentity.smownerid where contactdetails.contactid = '.$id.' and crmentity.deleted=0'; - if($this->column_fields['account_id'] != 0) $log->debug("Exiting get_opportunities method ..."); return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset); @@ -316,7 +315,7 @@ $log->info("Activity Related List for Contact Displayed"); - $query = "SELECT contactdetails.lastname, contactdetails.firstname, activity.activityid , activity.subject, activity.activitytype, activity.date_start, activity.due_date, cntactivityrel.contactid, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, recurringevents.recurringtype from contactdetails inner join cntactivityrel on cntactivityrel.contactid = contactdetails.contactid inner join activity on cntactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid = cntactivityrel.activityid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where contactdetails.contactid=".$id." and crmentity.deleted = 0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') "; //recurring type is added in Query -Jaguar + $query = "SELECT users.user_name,contactdetails.lastname, contactdetails.firstname, activity.activityid , activity.subject, activity.activitytype, activity.date_start, activity.due_date, cntactivityrel.contactid, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, recurringevents.recurringtype from contactdetails inner join cntactivityrel on cntactivityrel.contactid = contactdetails.contactid inner join activity on cntactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid = cntactivityrel.activityid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where contactdetails.contactid=".$id." and crmentity.deleted = 0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') "; //recurring type is added in Query -Jaguar $log->debug("Exiting get_activities method ..."); return GetRelatedList('Contacts','Activities',$focus,$query,$button,$returnset); @@ -408,7 +407,7 @@ $button .= ' '; } $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - $query = "select crmentity.*, quotes.*,potential.potentialname,contactdetails.lastname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid left outer join contactdetails on contactdetails.contactid=quotes.contactid left outer join potential on potential.potentialid=quotes.potentialid left join quotegrouprelation on quotes.quoteid=quotegrouprelation.quoteid left join groups on groups.groupname=quotegrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; + $query = "select users.user_name,crmentity.*, quotes.*,potential.potentialname,contactdetails.lastname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid left outer join contactdetails on contactdetails.contactid=quotes.contactid left outer join potential on potential.potentialid=quotes.potentialid left join users on users.id=crmentity.smownerid left join quotegrouprelation on quotes.quoteid=quotegrouprelation.quoteid left join groups on groups.groupname=quotegrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id; $log->debug("Exiting get_quotes method ..."); return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset); } @@ -429,7 +428,7 @@ } $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - $query = "select crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname, contactdetails.lastname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid left outer join contactdetails on contactdetails.contactid=salesorder.contactid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and salesorder.contactid = ".$id; + $query = "select users.user_name,crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname, contactdetails.lastname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid left join users on users.id=crmentity.smownerid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid left outer join contactdetails on contactdetails.contactid=salesorder.contactid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and salesorder.contactid = ".$id; $log->debug("Exiting get_salesorder method ..."); return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset); } @@ -472,7 +471,7 @@ } $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - $query = "select crmentity.*, purchaseorder.*,vendor.vendorname,contactdetails.lastname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left outer join contactdetails on contactdetails.contactid=purchaseorder.contactid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.contactid=".$id; + $query = "select users.user_name,crmentity.*, purchaseorder.*,vendor.vendorname,contactdetails.lastname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left outer join contactdetails on contactdetails.contactid=purchaseorder.contactid left join users on users.id=crmentity.smownerid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.contactid=".$id; $log->debug("Exiting get_purchase_orders method ..."); return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:04:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:04:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6799 - in /vtigercrm/trunk/modules/Dashboard: display_charts.php index.php Message-ID: <20060531000458.DB1A87D7D9D@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:04:53 2006 New Revision: 6799 Log: Dashboard buttons made proper - ahmed Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/index.php Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue May 30 18:04:53 2006 @@ -269,17 +269,16 @@ ?> - -
      + + + @@ -124,9 +125,9 @@ {if $maintabs eq $CATEGORY} {foreach key=number item=module from=$detail} {if $module eq $MODULE_NAME} - + {else} - + {/if} {/foreach} {/if} @@ -396,8 +397,8 @@ {/literal} {* Quick Access Functionality *} -
    -
    {$APP[$module]}{$APP[$module]} {$APP[$module]} {$APP[$module]}
    +
    +
    {assign var="parentno" value=0} Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 30 15:48:13 2006 @@ -39,59 +39,100 @@ *} + - - - -
    {$APP.$CATEGORY} > {$APP.$MODULE} - - - - - - - + + +
    - - - - - -
    -
    - - - - - - - - -
    {$APP.LBL_CALENDAR_ALT}{$APP.L
-BL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT} -
    -
    - - - + + - - + {/if} + +
    {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.$CATEGORY} > {$APP.$MODULE} + + + + + + + + + - - -
      + + + + + +
    + + + {if $CHECK.EditView eq 'yes'} + {if $MODULE eq 'Activities'} + + {else} + + {/if} + {else} + + {/if} + + {if $CHECK.index eq 'yes'} + + {else} + + {/if} + + +
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...
    +
    +
      + + + + + + + + +
    {$APP.LBL_CALENDAR_ALT}{$APP.LBL_CLOCK_ALT}{$APP.LBL_CALCULATOR_ALT}{$APP.LBL_CHAT_ALT}
    +
      + + + + {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } + {if $CHECK.Import eq 'yes'} + + {else} + + {/if} + {if $CHECK.Export eq 'yes'} + + {else} + + {/if} + {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} + + {if $CHECK.Export eq 'yes'} + + + {else} + + + {/if} + {else} + - -
    {$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_IMPORT} {$APP.$MODULE} {$APP.LBL_EXPORT} {$APP.$MODULE}
    -
    - - - - -
    {$APP.LBL_ALL_MENU_ALT}
    -
    -
    +
      + + + + + +
    {$APP.LBL_ALL_MENU_ALT}
    +
    +
    @@ -199,6 +240,20 @@
    {/if} + + + + + + + + +
    {$ALL_TAG}
    + + + + +
    - +  
    - - + + - - + - + + -
    > + + - + - - +
    + @@ -287,8 +286,11 @@
    <? echo $app_strings['LBL_CREATE_BUTTON_LABEL']; ?> <? echo $app_strings['Dashboard']; ?>...
    +
    +
      @@ -300,16 +302,17 @@
    +  
    <? echo $app_strings['LBL_IMPORT']; ?> <? echo $app_strings['Dashboard']; ?> <? echo $app_strings['LBL_EXPORT']; ?> <? echo $app_strings['Dashboard']; ?>
    -
    +   @@ -319,10 +322,13 @@
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    + + + Modified: vtigercrm/trunk/modules/Dashboard/index.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/index.php (original) +++ vtigercrm/trunk/modules/Dashboard/index.php Tue May 30 18:04:53 2006 @@ -57,11 +57,12 @@
    > + + - + - - +
    + @@ -69,8 +70,11 @@
    <? echo $app_strings['LBL_CREATE_BUTTON_LABEL']; ?> <? echo $app_strings['Dashboard']; ?>...
    +
    +
      @@ -82,16 +86,17 @@
    +  
    <? echo $app_strings['LBL_IMPORT']; ?> <? echo $app_strings['Dashboard']; ?> <? echo $app_strings['LBL_EXPORT']; ?> <? echo $app_strings['Dashboard']; ?>
    -
    +   From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:06:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:06:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6800 - /vtigercrm/trunk/modules/Calendar/header.php Message-ID: <20060531000649.769527D7D9D@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:06:45 2006 New Revision: 6800 Log: Calendar buttons made proper - ahmed Modified: vtigercrm/trunk/modules/Calendar/header.php Modified: vtigercrm/trunk/modules/Calendar/header.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/header.php (original) +++ vtigercrm/trunk/modules/Calendar/header.php Tue May 30 18:06:45 2006 @@ -17,21 +17,26 @@ - - - + + - - +
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    '.$app_strings["My Home Page"].' > '.$app_strings["Calendar"].' + '.$app_strings["My Home Page"].' > '.$app_strings["Calendar"].' - + +
    + - -
    +
    +
    +
      + @@ -43,17 +48,18 @@
    +   +
    {$APP.LBL_IMPORT} {$APP.$MODULE} {$APP.LBL_EXPORT} {$APP.$MODULE}
    -
    +   From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:10:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:10:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6801 - /vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Message-ID: <20060531001030.444B17D7D97@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:10:26 2006 New Revision: 6801 Log: Button list1 updated - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 30 18:10:26 2006 @@ -28,37 +28,43 @@
    {$APP.LBL_ALL_MENU_ALT}
    - - - - - -
    {$APP.$CATEGORY} > {$APP.$MODULE} - + + + +
    {$APP.$CATEGORY} > {$APP.$MODULE} + + + + + + - - + - -
    + + + - - + +
    - {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} - {if $MODULE eq 'Activities'} - - {else} - - {/if} + {if $CHECK.EditView eq 'yes'} + {if $MODULE eq 'Activities'} + + {else} + + {/if} {else} - + {/if} - + +
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...
    -
    +
    +
      + - @@ -67,10 +73,11 @@
    {$APP.LBL_CALENDAR_ALT} {$APP.LBL_CLOCK_ALT}
    -
    - + + + -
      + + {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' } {if $CHECK.Import eq 'yes'} @@ -84,7 +91,7 @@ {/if} {elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'} - @@ -97,20 +104,19 @@ {/if} -
    {$APP.LBL_EXPORT} {$APP.$MODULE} + {if $CHECK.Export eq 'yes'} {$APP.LBL_IMPORT} {$APP.$MODULE} {$APP.LBL_EXPORT} {$APP.$MODULE}{$APP.LBL_EXPORT} {$APP.$MODULE}
    -
    +
    +
      +
    {$APP.LBL_ALL_MENU_ALT}
    -
    +
    From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:19:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:19:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6802 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060531001912.64BCF7D7D97@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:19:08 2006 New Revision: 6802 Log: Updated Header tpl for all menu button (event onclick) - ahmed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Tue May 30 18:19:08 2006 @@ -397,7 +397,7 @@ {/literal} {* Quick Access Functionality *} -
    +
    Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue May 30 18:38:31 2006 @@ -110,7 +110,7 @@
    From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:21:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:21:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6803 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060531002114.3CFDE7D7D97@vtiger.fosslabs.com> Author: don Date: Tue May 30 18:21:09 2006 New Revision: 6803 Log: Fixed Migration Issues Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 18:21:09 2006 @@ -68,13 +68,9 @@ } //Tables profile2globalpermissions, actionmapping creation -$create_sql1 = "CREATE TABLE `profile2globalpermissions` ( -`profileid` int(19) NOT NULL default '0', - `globalactionid` int(19) NOT NULL default '0', - `globalactionpermission` int(19) default NULL, - PRIMARY KEY (`profileid`,`globalactionid`), - CONSTRAINT `fk_profile2globalpermissions` FOREIGN KEY (`profileid`) REFERENCES `profile` (`profileid`) ON DELETE CASCADE - )"; + +$create_sql1 ="CREATE TABLE `profile2globalpermissions` (`profileid` int(19) NOT NULL, `globalactionid` int(19) NOT NULL, `globalactionpermission` int(19) default NULL, PRIMARY KEY (`profileid`,`globalactionid`), KEY `idx_profile2globalpermissions` (`profileid`,`globalactionid`)) ENGINE=InnoDB DEFAULT CHARSET=latin1"; + Execute($create_sql1); $create_sql2 = "CREATE TABLE `actionmapping` ( @@ -2831,6 +2827,8 @@ Execute($sec4); //Inserting into datashare related modules table + + Execute("insert into datashare_relatedmodules_seq values(1)"); //Lead Related Module Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)"); From vtiger-tickets at vtiger.fosslabs.com Tue May 30 20:23:35 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 00:23:35 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2368=3A_I?= =?utf-8?q?nstallation_=24host=5Fname_and_=24site=5FURL_are_wrong_in_confi?= =?utf-8?b?Zy5pbmMucGhw?= In-Reply-To: <076.5c4e73b14080d2612341b7e967fa0b2f@vtiger.fosslabs.com> References: <076.5c4e73b14080d2612341b7e967fa0b2f@vtiger.fosslabs.com> Message-ID: <085.78892d0f5a67293cd1dae6ba448ba61f@vtiger.fosslabs.com> #68: Installation $host_name and $site_URL are wrong in config.inc.php ----------------------------------+----------------------------------------- Reporter: m.jacquemes at neuf.fr | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: fixed | Keywords: ----------------------------------+----------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [6804]) $host_name doesn't appear to be used anywhere, removing from configureation. Closes #68. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:23:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:23:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6804 - in /vtigercrm/branches/4.2.4: config.inc.php config.template.php install/2setConfig.php Message-ID: <20060531002336.4CCF67D7DA7@vtiger.fosslabs.com> Author: allanbush Date: Tue May 30 18:23:33 2006 New Revision: 6804 Log: $host_name doesn't appear to be used anywhere, removing from configureation. Closes #68. Modified: vtigercrm/branches/4.2.4/config.inc.php vtigercrm/branches/4.2.4/config.template.php vtigercrm/branches/4.2.4/install/2setConfig.php Modified: vtigercrm/branches/4.2.4/config.inc.php ============================================================================== --- vtigercrm/branches/4.2.4/config.inc.php (original) +++ vtigercrm/branches/4.2.4/config.inc.php Tue May 30 18:23:33 2006 @@ -31,7 +31,6 @@ //$dbconfig['db_password'] = ''; //$dbconfig['db_name'] = 'vtigercrm'; -//$host_name = ''; //$site_URL = ''; //$root_directory = ''; Modified: vtigercrm/branches/4.2.4/config.template.php ============================================================================== --- vtigercrm/branches/4.2.4/config.template.php (original) +++ vtigercrm/branches/4.2.4/config.template.php Tue May 30 18:23:33 2006 @@ -73,8 +73,6 @@ // ssl default value = false $dbconfigoption['ssl'] = false; - -$host_name = $dbconfig['db_hostname']; $site_URL = '_SITE_URL_'; Modified: vtigercrm/branches/4.2.4/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2.4/install/2setConfig.php (original) +++ vtigercrm/branches/4.2.4/install/2setConfig.php Tue May 30 18:23:33 2006 @@ -112,9 +112,6 @@ !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; - if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; - else $host_name = $hostname; - if (isset($_REQUEST['site_URL'])) $site_URL = $_REQUEST['site_URL']; else $site_URL = $web_root; @@ -150,7 +147,6 @@ */ !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm4_2_4" : $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']); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:25:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:25:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6805 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060531002534.3974A7D7D97@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:25:30 2006 New Revision: 6805 Log: Homepage tpl updated - ahmed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue May 30 18:25:30 2006 @@ -48,7 +48,7 @@ - + + + + + + + -
    - -
      From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:32:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:32:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6806 - in /vtigercrm/trunk: Smarty/templates/RelatedLists.tpl modules/uploads/add2db.php modules/uploads/language/en_us.lang.php modules/uploads/upload.php Message-ID: <20060531003249.EA2EC7D7D97@vtiger.fosslabs.com> Author: don Date: Tue May 30 18:32:43 2006 New Revision: 6806 Log: New UI for attachments has been integrated Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl vtigercrm/trunk/modules/uploads/add2db.php vtigercrm/trunk/modules/uploads/language/en_us.lang.php vtigercrm/trunk/modules/uploads/upload.php Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Tue May 30 18:32:43 2006 @@ -114,7 +114,7 @@ {elseif $header eq 'Attachments'}   - + {elseif $header eq 'Quotes'} @@ -216,3 +216,9 @@
    {/if} + Modified: vtigercrm/trunk/modules/uploads/add2db.php ============================================================================== --- vtigercrm/trunk/modules/uploads/add2db.php (original) +++ vtigercrm/trunk/modules/uploads/add2db.php Tue May 30 18:32:43 2006 @@ -27,10 +27,8 @@ $uploaddir = $directory; $crmid = $_REQUEST['return_id']; -for ($filecount=0;$filecountquery($sql1); - header("Location: index.php?action=".$_REQUEST['return_action']."&module=".$_REQUEST['return_module']."&record=".$_REQUEST['return_id']."&filename=".$filename.""); + echo ''; } else { - include('themes/'.$theme.'/header.php'); $errormessage = "Error Message
    • Invalid file OR
    • File has no data @@ -92,7 +89,6 @@ if($errorCode == 4) { - include('themes/'.$theme.'/header.php'); $errormessage = "Kindly give a valid file for upload!
      " ; echo $errormessage; include "upload.php"; @@ -100,19 +96,16 @@ else if($errorCode == 2) { $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 1000000 bytes
      "; - include('themes/'.$theme.'/header.php'); echo $errormessage; include "upload.php"; //echo $errorCode; } else if($errorCode == 3 || $errorcode == '') { - include('themes/'.$theme.'/header.php'); echo "Problems in file upload. Please try again!
      "; include "upload.php"; } } -} ?> Modified: vtigercrm/trunk/modules/uploads/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/uploads/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/uploads/language/en_us.lang.php Tue May 30 18:32:43 2006 @@ -23,10 +23,11 @@ $mod_strings = Array( //Added fields for uploads (attach files) -'LBL_DESCRIPTION'=>'Description:', -'LBL_FILENAME'=>'File Name:', -'LBL_ATTACH_FILE'=>'File Attachment', -'LBL_UPLOAD'=>'Upload', +'LBL_ATTACH_FILE'=>'Attach File', +'LBL_STEP_SELECT_FILE'=>'Step 1 : Select File', +'LBL_BROWSE_FILES'=>'Click the browse button and select the file to be attached', +'LBL_DESCRIPTION'=>'Step 2 : Write some description', +'LBL_OPTIONAL'=>'(optional)', ); ?> Modified: vtigercrm/trunk/modules/uploads/upload.php ============================================================================== --- vtigercrm/trunk/modules/uploads/upload.php (original) +++ vtigercrm/trunk/modules/uploads/upload.php Tue May 30 18:32:43 2006 @@ -8,73 +8,57 @@ * ********************************************************************************/ --> + + + + - -
      + -
      *
      +
    + + + -
     
    - - - - - - -
    - - - - + + + + + + - - - - - - -
    -
    *
    -
    - -
    Files Maximum 6 - - - +


    + +
    -
    -
    -
    +
     
     
    - - - + + + +
    +   + +
     
    From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:33:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:33:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6807 - /vtigercrm/trunk/modules/uploads/uploadsAjax.php Message-ID: <20060531003321.EB9EA7D7D97@vtiger.fosslabs.com> Author: don Date: Tue May 30 18:33:17 2006 New Revision: 6807 Log: New UI for attachments has been integrated Added: vtigercrm/trunk/modules/uploads/uploadsAjax.php From vtiger-tickets at vtiger.fosslabs.com Tue May 30 20:33:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 00:33:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231088=3A?= =?utf-8?q?_Issue_in_Custom_view=2C_Reports=2C_Dashboard_Security_Implemen?= =?utf-8?q?tation?= In-Reply-To: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com> References: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com> Message-ID: <085.59f36bdb6d8d0b68af3f1db01fc8803b@vtiger.fosslabs.com> #1088: Issue in Custom view, Reports, Dashboard Security Implementation ------------------------+--------------------------------------------------- Reporter: don | Owner: philip Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * priority: blocker => critical * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 20:34:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 00:34:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23195=3A_?= =?utf-8?q?edit_picklist?= In-Reply-To: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> References: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> Message-ID: <085.20ff6a7b6aa26223ae86cd0fed932cb5@vtiger.fosslabs.com> #195: edit picklist ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * priority: blocker => critical -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 20:37:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 00:37:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23757=3A_?= =?utf-8?q?Update_to_new_adodb-4=2E81_release?= In-Reply-To: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> References: <076.715d570f4066021238d5e6f768b551b4@vtiger.fosslabs.com> Message-ID: <085.2d08fff9d448a032734092ea15379327@vtiger.fosslabs.com> #757: Update to new adodb-4.81 release ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: adodb database package ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * milestone: 4.2.4 => 5.0.0 * version: 4.2.4rc3 => 5.0.0 * status: reopened => closed Comment: This isn't going to happen for 4.2.4, and it's been done on all the other branches. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue May 30 20:38:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 00:38:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2331=3A_L?= =?utf-8?q?og_File_is_Not_Readable_on_Hosted_Server?= In-Reply-To: <076.9666e0579b8ace0baa3be4064a54cc5b@vtiger.fosslabs.com> References: <076.9666e0579b8ace0baa3be4064a54cc5b@vtiger.fosslabs.com> Message-ID: <085.0ba4217c753cdac59d59f571279bd412@vtiger.fosslabs.com> #31: Log File is Not Readable on Hosted Server ------------------------+--------------------------------------------------- Reporter: briand | Owner: mfedyk Type: defect | Status: closed Priority: minor | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: log read ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [6809]) Added patch from #31, closes #31. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:38:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:38:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6809 - in /vtigercrm/branches/4.2.4: config.inc.php config.template.php log4php/appenders/LoggerAppenderFile.php Message-ID: <20060531003839.97D117D7DB3@vtiger.fosslabs.com> Author: allanbush Date: Tue May 30 18:38:36 2006 New Revision: 6809 Log: Added patch from #31, closes #31. Modified: vtigercrm/branches/4.2.4/config.inc.php vtigercrm/branches/4.2.4/config.template.php vtigercrm/branches/4.2.4/log4php/appenders/LoggerAppenderFile.php Modified: vtigercrm/branches/4.2.4/config.inc.php ============================================================================== --- vtigercrm/branches/4.2.4/config.inc.php (original) +++ vtigercrm/branches/4.2.4/config.inc.php Tue May 30 18:38:36 2006 @@ -67,4 +67,12 @@ // this is for site specific special instructions $login_message = 'Please login to the application.'; +// access level for vtiger log files +// set to 1, the vtiger.log will be readable by the owner (chmod: 0600) +// set to 0, the vtiger.log will not be readable remotely (chmod: 0200) + +// 0 is recommended for security. +// You may need to set it to 1 to read it for certain hosted accounts. +$log_readable = 0; + ?> Modified: vtigercrm/branches/4.2.4/config.template.php ============================================================================== --- vtigercrm/branches/4.2.4/config.template.php (original) +++ vtigercrm/branches/4.2.4/config.template.php Tue May 30 18:38:36 2006 @@ -176,4 +176,12 @@ // translation_string_prefix default value = false $translation_string_prefix = false; +// access level for vtiger log files +// set to 1, the vtiger.log will be readable by the owner (chmod: 0600) +// set to 0, the vtiger.log will not be readable remotely (chmod: 0200) + +// 0 is recommended for security. +// You may need to set it to 1 to read it for certain hosted accounts. +$log_readable = 0; + ?> Modified: vtigercrm/branches/4.2.4/log4php/appenders/LoggerAppenderFile.php ============================================================================== --- vtigercrm/branches/4.2.4/log4php/appenders/LoggerAppenderFile.php (original) +++ vtigercrm/branches/4.2.4/log4php/appenders/LoggerAppenderFile.php Tue May 30 18:38:36 2006 @@ -26,6 +26,12 @@ require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); require_once(LOG4PHP_DIR . '/LoggerLog.php'); +if (!defined('ROOT_DIR')) define('ROOT_DIR', LOG4PHP_DIR . '/..'); +if (!defined('LOG_READ')) +{ + include(ROOT_DIR . '/config.php'); + define('LOG_READ', $log_readable); +} /** * FileAppender appends log events to a file. * @@ -77,7 +83,8 @@ $this->fp = @fopen($fileName, ($this->getAppend()? 'a':'w')); // Denying read option for log file. Added for Vulnerability fix - if (is_readable($fileName)) chmod ($fileName,0200); + if (is_readable($fileName) and (LOG_READ == 0)) chmod ($fileName,0200); + if (!is_readable($fileName) and (LOG_READ == 1)) chmod ($fileName,0600); if ($this->fp) { if ($this->getAppend()) From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 20:38:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 00:38:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6808 - in /vtigercrm/trunk: Smarty/templates/Buttons_List.tpl Smarty/templates/Buttons_List1.tpl Smarty/templates/HomePage.tpl modules/Calendar/header.php modules/Dashboard/display_charts.php modules/Dashboard/index.php Message-ID: <20060531003839.418477D7D97@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 18:38:31 2006 New Revision: 6808 Log: Updated tpl files - ahmed Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl vtigercrm/trunk/Smarty/templates/HomePage.tpl vtigercrm/trunk/modules/Calendar/header.php vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/index.php Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue May 30 18:38:31 2006 @@ -114,7 +114,7 @@ - +
    {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_ALL_MENU_ALT}
    - +
    {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_ALL_MENU_ALT}
    - +
    {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_ALL_MENU_ALT}
    - +
    {$APP.LBL_ALL_MENU_ALT}{$APP.LBL_ALL_MENU_ALT}
    - +
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?><? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    - +
    <? echo $app_strings['LBL_ALL_MENU_ALT']; ?><? echo $app_strings['LBL_ALL_MENU_ALT']; ?>
    4.2.3 Release Date:   (Current version)4.2.4 Release Date:   (Current version)
    4.2 Release Date:  18-7-20054.2.3 Release Date:  23 December 2005
    4.2.0 Release Date:  18 July 2005
    4.0.1 Release Date:  04-29-2005 29 April 2005
    4.0 Release Date:  03-29-20054.0.0 Release Date:  29 March 2005
    3.2 Release Date:  12-13-20043.2.0 Release Date:  13 December 2004
    - Modified: vtigercrm/branches/4.2.4/themes/Aqua/header.html ============================================================================== --- vtigercrm/branches/4.2.4/themes/Aqua/header.html (original) +++ vtigercrm/branches/4.2.4/themes/Aqua/header.html Tue May 30 19:13:27 2006 @@ -46,7 +46,7 @@ Modified: vtigercrm/branches/4.2.4/themes/blue/header.html ============================================================================== --- vtigercrm/branches/4.2.4/themes/blue/header.html (original) +++ vtigercrm/branches/4.2.4/themes/blue/header.html Tue May 30 19:13:27 2006 @@ -49,7 +49,7 @@ Modified: vtigercrm/branches/4.2.4/themes/nature/header.html ============================================================================== --- vtigercrm/branches/4.2.4/themes/nature/header.html (original) +++ vtigercrm/branches/4.2.4/themes/nature/header.html Tue May 30 19:13:27 2006 @@ -45,7 +45,7 @@ Modified: vtigercrm/branches/4.2.4/themes/orange/header.html ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/4.2.4/vtigerversion.php ============================================================================== --- vtigercrm/branches/4.2.4/vtigerversion.php (original) +++ vtigercrm/branches/4.2.4/vtigerversion.php Tue May 30 19:13:27 2006 @@ -11,6 +11,6 @@ $patch_version = ''; $modified_database = ''; -$vtiger_version = '4.2.3'; -$release_date = '23 December 2005'; +$vtiger_version = '4.2.4'; +$release_date = '1 June 2006'; ?> From vtiger-tickets at vtiger.fosslabs.com Tue May 30 21:13:32 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 01:13:32 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2352=3A_V?= =?utf-8?q?ersion_4=2E2=2E4_Updates?= In-Reply-To: <076.21057f15b1e83e134121e50411e2e24e@vtiger.fosslabs.com> References: <076.21057f15b1e83e134121e50411e2e24e@vtiger.fosslabs.com> Message-ID: <085.7621234e6432bd1de4f42402ab47a6f8@vtiger.fosslabs.com> #52: Version 4.2.4 Updates ------------------------+--------------------------------------------------- Reporter: briand | Owner: mfedyk Type: defect | Status: closed Priority: minor | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: fixed | Keywords: version 4.2.4 tags ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [6810]) Changes for 4.2.4 release as per #52. Added a few extra changes to the changelog that occured since that ticket was made. Closes #52. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 21:18:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 01:18:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6811 - /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Message-ID: <20060531011856.10D497D7D85@vtiger.fosslabs.com> Author: don Date: Tue May 30 19:18:52 2006 New Revision: 6811 Log: Fixed Migration issues Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue May 30 19:18:52 2006 @@ -2330,9 +2330,9 @@ "ALTER TABLE `mail_accounts` MODIFY COLUMN `user_id` INTEGER(11) NOT NULL", "ALTER TABLE `mail_accounts` ADD COLUMN `box_refresh` INTEGER(10) DEFAULT NULL", "ALTER TABLE `mail_accounts` ADD COLUMN `mails_per_page` INTEGER(10) DEFAULT NULL", -"ALTER TABLE `mail_accounts` ADD COLUMN `ssltype` VARCHAR(50) COLLATE latin1_swedish_ci DEFAULT NULL", -"ALTER TABLE `mail_accounts` ADD COLUMN `sslmeth` VARCHAR(50) COLLATE latin1_swedish_ci DEFAULT NULL", -"ALTER TABLE `mail_accounts` ADD COLUMN `showbody` VARCHAR(10) COLLATE latin1_swedish_ci DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `ssltype` VARCHAR(50) DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `sslmeth` VARCHAR(50) DEFAULT NULL", +"ALTER TABLE `mail_accounts` ADD COLUMN `showbody` VARCHAR(10) DEFAULT NULL", "ALTER TABLE `notes` MODIFY COLUMN `contact_id` INTEGER(19) DEFAULT '0'", "ALTER TABLE `notes` MODIFY COLUMN `notecontent` TEXT COLLATE latin1_swedish_ci", "ALTER TABLE `notificationscheduler` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci", @@ -2856,6 +2856,14 @@ //By Don Ends +//Added the tabel mail_accounts which has been added by mmbrich +$alter_query18 = "alter table mail_accounts add column int_mailer int(1) default '0'"; +Execute($alter_query18); + + + + + //Added to get the conversion rate and update for all records //include("modules/Migration/ModifyDatabase/updateCurrency.php"); From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 21:25:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 01:25:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6812 - in /vtigercrm/trunk: Smarty/templates/ReportsStep0.tpl modules/Reports/Report.js modules/Reports/language/en_us.lang.php Message-ID: <20060531012502.90EDA7D7DC5@vtiger.fosslabs.com> Author: don Date: Tue May 30 19:24:55 2006 New Revision: 6812 Log: issue in report has been fixed Modified: vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl vtigercrm/trunk/modules/Reports/Report.js vtigercrm/trunk/modules/Reports/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsStep0.tpl Tue May 30 19:24:55 2006 @@ -84,7 +84,7 @@
    {$MOD} : {$MOD.LBL_NEW_REP0_HDR2}   -   +  
    -
    +
    {$MOD.LBL_USERS} {$MOD.LBL_ROLES} {$MOD.LBL_PROFILES} @@ -44,10 +44,10 @@
    - From vtigercrm-commits at vtiger.fosslabs.com Tue May 30 23:47:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 03:47:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6814 - /vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Message-ID: <20060531034708.93B847D7DB3@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 21:47:05 2006 New Revision: 6814 Log: edit field block link has been disabled Modified: vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Tue May 30 21:47:05 2006 @@ -106,7 +106,7 @@
    -
    + From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 00:28:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 04:28:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6815 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060531042858.C76197D7DD9@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 22:28:49 2006 New Revision: 6815 Log: due date value added Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Tue May 30 22:28:49 2006 @@ -104,6 +104,7 @@ document.appSave.activitytype[1].checked = true; document.appSave.date_start.value = startdate; + document.appSave.due_date.value = enddate; document.appSave.starthr.value = starthr; document.appSave.startmin.value = startmin; document.appSave.startfmt.value = startfmt; From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 00:48:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 04:48:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6816 - in /vtigercrm/trunk: Smarty/templates/AddMailAccount.tpl modules/Settings/language/en_us.lang.php Message-ID: <20060531044812.3F2617D7DF3@vtiger.fosslabs.com> Author: mmbrich Date: Tue May 30 22:48:09 2006 New Revision: 6816 Log: separate required and unsupported markers in the webmail settings page Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl vtigercrm/trunk/modules/Settings/language/en_us.lang.php Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Tue May 30 22:48:09 2006 @@ -101,8 +101,8 @@ {$MOD.LBL_MAIL_PROTOCOL} -  {$MOD.LBL_POP} *  -  {$MOD.LBL_IMAP} *  +  {$MOD.LBL_POP} * *  +  {$MOD.LBL_IMAP} * *   {$MOD.LBL_IMAP2}  {$MOD.LBL_IMAP4} Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue May 30 22:48:09 2006 @@ -484,7 +484,7 @@ 'LBL_IMAP4'=>'IMAP4', 'LBL_POP'=>'POP', 'LBL_IMAP'=>'IMAP', -'LBL_MAIL_DISCLAIM'=>' Items marked with a * are not fully supported', +'LBL_MAIL_DISCLAIM'=>'Items marked with * are required
    Items marked with * * are not fully supported', 'LBL_SSL_OPTIONS'=>'SSL Options', 'LBL_TLS'=>'TLS', 'LBL_NO_TLS'=>'No TLS', From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 01:57:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 05:57:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6817 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060531055737.A72A07D56DA@vtiger.fosslabs.com> Author: saraj Date: Tue May 30 23:57:33 2006 New Revision: 6817 Log: changed query for word plugin Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Tue May 30 23:57:33 2006 @@ -551,7 +551,7 @@ { global $log; $log->debug("Entering getColumnNames() method ..."); - $sql1 = "select fieldlabel from field where tabid=4 and block <> 4"; + $sql1 = "select fieldlabel from field where tabid=4 and block <> 6 and block <> 75"; $result = $this->db->query($sql1); $numRows = $this->db->num_rows($result); for($i=0; $i < $numRows;$i++) From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 02:06:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 06:06:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6818 - /vtigercrm/trunk/modules/Contacts/Merge.php Message-ID: <20060531060622.ECD0A7D7A1F@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 00:06:19 2006 New Revision: 6818 Log: * modified for 5.0 beta Modified: vtigercrm/trunk/modules/Contacts/Merge.php Modified: vtigercrm/trunk/modules/Contacts/Merge.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Merge.php (original) +++ vtigercrm/trunk/modules/Contacts/Merge.php Wed May 31 00:06:19 2006 @@ -77,7 +77,7 @@ } //<<<<<<<<<<<<<<<
    >>>>>>>>>>>>>>>>>>>>>>> -$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 4 order by field.tablename"; +$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 6 and field.block <> 75 order by field.tablename"; $result = $adb->query($query1); $y=$adb->num_rows($result); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 02:12:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 06:12:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6819 - /vtigercrm/trunk/modules/Accounts/Merge.php Message-ID: <20060531061252.1853E7D7DF3@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 00:12:48 2006 New Revision: 6819 Log: * modified for 5.0 beta Modified: vtigercrm/trunk/modules/Accounts/Merge.php Modified: vtigercrm/trunk/modules/Accounts/Merge.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Merge.php (original) +++ vtigercrm/trunk/modules/Accounts/Merge.php Wed May 31 00:12:48 2006 @@ -93,7 +93,7 @@ //End setting accountid=0 for the contacts which are deleted //<<<<<<<<<<<<<<<
    >>>>>>>>>>>>>>>>>>>>>>> -$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 4 order by field.tablename"; +$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 6 and field.block <> 75 order by field.tablename"; $result = $adb->query($query1); $y=$adb->num_rows($result); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 02:14:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 06:14:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6820 - /vtigercrm/trunk/modules/HelpDesk/Merge.php Message-ID: <20060531061433.B9DDB7D7DF3@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 00:14:30 2006 New Revision: 6820 Log: modified for 5.0 beta Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/Merge.php (original) +++ vtigercrm/trunk/modules/HelpDesk/Merge.php Wed May 31 00:14:30 2006 @@ -71,7 +71,7 @@ } //<<<<<<<<<<<<<<<
    >>>>>>>>>>>>>>>>>>>>>>> -$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (13,4,6) and field.uitype <> 61 and (field.tablename <>'CustomerDetails' and block <> 6) and block <> 30 order by field.tablename"; +$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (13,4,6) and field.uitype <> 61 and (field.tablename <>'CustomerDetails' and block <> 6 and block <> 75) and block <> 30 order by field.tablename"; $result = $adb->query($query1); $y=$adb->num_rows($result); From vtiger-tickets at vtiger.fosslabs.com Wed May 31 02:21:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 06:21:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231179=3A?= =?utf-8?q?_Activity_Delete_issue?= In-Reply-To: <076.a2c2c663ffa4fa41b8ffbe8acd39e028@vtiger.fosslabs.com> References: <076.a2c2c663ffa4fa41b8ffbe8acd39e028@vtiger.fosslabs.com> Message-ID: <085.b725c549dc4835664ec55297b17d1ffd@vtiger.fosslabs.com> #1179: Activity Delete issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 02:21:12 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 06:21:12 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231107=3A?= =?utf-8?q?_Error_In_calendar?= In-Reply-To: <076.924adee6499b40eb86dddcd6dc28fd0e@vtiger.fosslabs.com> References: <076.924adee6499b40eb86dddcd6dc28fd0e@vtiger.fosslabs.com> Message-ID: <085.11e83eb379c7b107acaccfeec973646b@vtiger.fosslabs.com> #1107: Error In calendar ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed Comment: fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 02:21:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 06:21:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231103=3A?= =?utf-8?q?_Change_Owner_not_working_for_Events_in_Calendar?= In-Reply-To: <076.456354da9a057d9c87ee8cd8dca6b107@vtiger.fosslabs.com> References: <076.456354da9a057d9c87ee8cd8dca6b107@vtiger.fosslabs.com> Message-ID: <085.d83260521f94ad4e04ebefbf28840ea8@vtiger.fosslabs.com> #1103: Change Owner not working for Events in Calendar ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 02:26:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 06:26:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6821 - /vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas Message-ID: <20060531062624.8080C7D7E05@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 00:26:21 2006 New Revision: 6821 Log: * removed message box Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 02:44:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 06:44:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6822 - /vtigercrm/trunk/modules/Emails/Email.php Message-ID: <20060531064456.B20777D7E1B@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 00:44:52 2006 New Revision: 6822 Log: * modified for outlook plugin Modified: vtigercrm/trunk/modules/Emails/Email.php Modified: vtigercrm/trunk/modules/Emails/Email.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Email.php (original) +++ vtigercrm/trunk/modules/Emails/Email.php Wed May 31 00:44:52 2006 @@ -45,6 +45,10 @@ var $date_start; var $time_start; var $module_id="emailid"; + + var $rel_users_table = "salesmanactivityrel"; + var $rel_contacts_table = "cntactivityrel"; + var $rel_serel_table = "seactivityrel"; var $table_name = "activity"; var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel','attachments'); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 03:10:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:10:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6823 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060531071016.2CD9B7D7E09@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 01:10:12 2006 New Revision: 6823 Log: changes made to fix validation issue in calendar events Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Wed May 31 01:10:12 2006 @@ -204,7 +204,10 @@ { if(startformat == 'pm') { - starthour = eval(starthour) + 12; + if(starthour == '12') + starthour = 12; + else + starthour = eval(starthour) + 12; startmin = startmin; } else @@ -217,7 +220,10 @@ { if(endformat == 'pm') { - endhour = eval(endhour) + 12; + if(endhour == '12') + endhour = 12; + else + endhour = eval(endhour) + 12; endmin = endmin; } else @@ -226,13 +232,17 @@ endmin = endmin; } } - if((eval(endhour)*60+eval(endmin)) < (eval(starthour)*60+eval(startmin))) - { - alert("End Time should be greater than Start Time "); - document.appSave.endhr.focus(); - return false; - } - + if(dateComparison('due_date','End date','date_start','Start date','GE')) + { + if((eval(endhour)*60+eval(endmin)) < (eval(starthour)*60+eval(startmin))) + { + alert("End Time should be greater than Start Time "); + document.appSave.endhr.focus(); + return false; + } + } + else + return false; durationinmin = (eval(endhour)*60+eval(endmin)) - (eval(starthour)*60+eval(startmin)); if(durationinmin >= 60) { From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 03:10:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:10:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6824 - /vtigercrm/trunk/modules/Calendar/addEventUI.php Message-ID: <20060531071048.8BAC47D7E21@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 01:10:45 2006 New Revision: 6824 Log: changes made to include label Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Wed May 31 01:10:45 2006 @@ -352,7 +352,7 @@ - hours + hrs + minutes  From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 03:26:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:26:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6825 - in /vtigercrm/trunk/modules/Webmails: ListView.php MailParse.php Message-ID: <20060531072618.724737D7E26@vtiger.fosslabs.com> Author: mmbrich Date: Wed May 31 01:26:16 2006 New Revision: 6825 Log: check for IMAP and SSL support and either error out or handle connections different Modified: vtigercrm/trunk/modules/Webmails/ListView.php vtigercrm/trunk/modules/Webmails/MailParse.php Modified: vtigercrm/trunk/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/ListView.php (original) +++ vtigercrm/trunk/modules/Webmails/ListView.php Wed May 31 01:26:16 2006 @@ -12,7 +12,7 @@ if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} if($_REQUEST["start"] && $_REQUEST["start"] != "") {$start=$_REQUEST["start"];} else {$start="1";} -global $current_user; +global $current_user,$mods; require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); @@ -21,8 +21,10 @@ require_once('include/utils/UserInfoUtil.php'); require_once("modules/Webmails/MailParse.php"); +$mods = parsePHPModules(); $mailInfo = getMailServerInfo($current_user); -if($adb->num_rows($mailInfo) < 1) { + +if($adb->num_rows($mailInfo) < 1 || !isset($mods["imap"]) || $mods["imap"] == "") { echo "

    Please configure your mail settings

    "; exit(); } Modified: vtigercrm/trunk/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/MailParse.php (original) +++ vtigercrm/trunk/modules/Webmails/MailParse.php Wed May 31 01:26:16 2006 @@ -21,7 +21,7 @@ return (strlen($_tmp) % 4 == 0 ) ? "y" : "n"; } function getImapMbox($mailbox,$temprow,$readonly='') { - global $mbox; + global $mbox,$mods; $login_username= $temprow["mail_username"]; $secretkey=$temprow["mail_password"]; $imapServerAddress=$temprow["mail_servername"]; @@ -33,10 +33,18 @@ // first we will try a regular old IMAP connection: if($ssltype == "") {$ssltype = "notls";} if($sslmeth == "") {$sslmeth = "novalidate-cert";} - if($readonly == "true") + + if($readonly == "true") { + if($mods["imap"]["SSL Support"] == "enabled") $mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."/readonly}".$mailbox, $login_username, $secretkey); - else + else + $mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/readonly}".$mailbox, $login_username, $secretkey); + } else { + if($mods["imap"]["SSL Support"] == "enabled") $mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey); + else + $mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."}".$mailbox, $login_username, $secretkey); + } // next we'll try to make a port specific connection to see if that helps. // this may need to be updated to remove SSL/TLS since the c-client libs @@ -44,14 +52,21 @@ if(!$mbox) { if($mail_protocol == 'pop3') { if($readonly == "true") - $connectString = "{".$imapServerAddress."/".$mail_protocol.":110/".$ssltype."/readonly}".$mailbox; + $connectString = "{".$imapServerAddress."/".$mail_protocol.":110/readonly}".$mailbox; else - $connectString = "{".$imapServerAddress."/".$mail_protocol.":110/".$ssltype."}".$mailbox; + $connectString = "{".$imapServerAddress."/".$mail_protocol.":110/}".$mailbox; } else { - if($readonly == "true") - $connectString = "{".$imapServerAddress.":143/".$mail_protocol."/".$ssltype."/readonly}".$mailbox; - else - $connectString = "{".$imapServerAddress.":143/".$mail_protocol."/".$ssltype."}".$mailbox; + if($readonly == "true") { + if($mods["imap"]["SSL Support"] == "enabled") + $connectString = "{".$imapServerAddress.":143/".$mail_protocol."/".$ssltype."/".$sslmeth."/readonly}".$mailbox; + else + $connectString = "{".$imapServerAddress.":143/".$mail_protocol."/}".$mailbox; + } else { + if($mods["imap"]["SSL Support"] == "enabled") + $connectString = "{".$imapServerAddress.":143/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox; + else + $connectString = "{".$imapServerAddress.":143/".$mail_protocol."}".$mailbox; + } } $mbox = imap_open($connectString, $login_username, $secretkey) or die("Connection to server failed ".imap_last_error()); } @@ -103,4 +118,33 @@ } return false; } +function parsePHPModules() { + ob_start(); + phpinfo(INFO_MODULES); + $s = ob_get_contents(); + ob_end_clean(); + + $s = strip_tags($s,'

    '); + $s = preg_replace('/]*>([^<]+)<\/th>/',"\\1",$s); + $s = preg_replace('/]*>([^<]+)<\/td>/',"\\1",$s); + $vTmp = preg_split('/(

    [^<]+<\/h2>)/',$s,-1,PREG_SPLIT_DELIM_CAPTURE); + $vModules = array(); + for ($i=1;$i([^<]+)<\/h2>/',$vTmp[$i],$vMat)) { + $vName = trim($vMat[1]); + $vTmp2 = explode("\n",$vTmp[$i+1]); + foreach ($vTmp2 AS $vOne) { + $vPat = '([^<]+)<\/info>'; + $vPat3 = "/$vPat\s*$vPat\s*$vPat/"; + $vPat2 = "/$vPat\s*$vPat/"; + if (preg_match($vPat3,$vOne,$vMat)) { // 3cols + $vModules[$vName][trim($vMat[1])] = array(trim($vMat[2]),trim($vMat[3])); + } elseif (preg_match($vPat2,$vOne,$vMat)) { // 2cols + $vModules[$vName][trim($vMat[1])] = trim($vMat[2]); + } + } + } + } + return $vModules; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 03:28:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:28:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6826 - in /vtigercrm/trunk/modules/Webmails: ListView.php MailParse.php Message-ID: <20060531072841.9335C7D7E1B@vtiger.fosslabs.com> Author: mmbrich Date: Wed May 31 01:28:40 2006 New Revision: 6826 Log: call function locally since we'll have to @ each load anyways Modified: vtigercrm/trunk/modules/Webmails/ListView.php vtigercrm/trunk/modules/Webmails/MailParse.php Modified: vtigercrm/trunk/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/ListView.php (original) +++ vtigercrm/trunk/modules/Webmails/ListView.php Wed May 31 01:28:40 2006 @@ -12,7 +12,7 @@ if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} if($_REQUEST["start"] && $_REQUEST["start"] != "") {$start=$_REQUEST["start"];} else {$start="1";} -global $current_user,$mods; +global $current_user; require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); Modified: vtigercrm/trunk/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/MailParse.php (original) +++ vtigercrm/trunk/modules/Webmails/MailParse.php Wed May 31 01:28:40 2006 @@ -21,14 +21,15 @@ return (strlen($_tmp) % 4 == 0 ) ? "y" : "n"; } function getImapMbox($mailbox,$temprow,$readonly='') { - global $mbox,$mods; + global $mbox; $login_username= $temprow["mail_username"]; $secretkey=$temprow["mail_password"]; $imapServerAddress=$temprow["mail_servername"]; $mail_protocol=$temprow["mail_protocol"]; $ssltype=$temprow["ssltype"]; $sslmeth=$temprow["sslmeth"]; - + + $mods = parsePHPModules() // first we will try a regular old IMAP connection: if($ssltype == "") {$ssltype = "notls";} From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 03:29:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:29:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6827 - /vtigercrm/trunk/modules/Webmails/MailParse.php Message-ID: <20060531072916.3F39E7D779C@vtiger.fosslabs.com> Author: mmbrich Date: Wed May 31 01:29:15 2006 New Revision: 6827 Log: typo Modified: vtigercrm/trunk/modules/Webmails/MailParse.php Modified: vtigercrm/trunk/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/MailParse.php (original) +++ vtigercrm/trunk/modules/Webmails/MailParse.php Wed May 31 01:29:15 2006 @@ -29,7 +29,7 @@ $ssltype=$temprow["ssltype"]; $sslmeth=$temprow["sslmeth"]; - $mods = parsePHPModules() + $mods = parsePHPModules(); // first we will try a regular old IMAP connection: if($ssltype == "") {$ssltype = "notls";} From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 03:52:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 07:52:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6828 - /vtigercrm/trunk/modules/Webmails/webmails.js Message-ID: <20060531075239.C8A9D7D4899@vtiger.fosslabs.com> Author: mmbrich Date: Wed May 31 01:52:38 2006 New Revision: 6828 Log: some notes for myself or other developers venturing into this file Modified: vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Wed May 31 01:52:38 2006 @@ -55,10 +55,14 @@ window.open(url,"Download Attachments",'menubar=no,toolbar=no,location=no,status=no,resizable=no,width=450,height=450'); } function showRelationships(mid) { - // just add to vtiger for now + // TODO: present the user with a simple DHTML div to + // choose what type of relationship they would like to create + // before creating it. add_to_vtiger(mid); } function add_to_vtiger(mid) { + // TODO: update this function to allow you to set what entity type + // you would like to associate to $("status").style.display="block"; new Ajax.Request( 'index.php', @@ -81,6 +85,8 @@ } } function check_in_all_boxes(mymbox) { + // TODO: There is possibly still a bug in the mailbox counting code + // check for NaN new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, @@ -121,6 +127,8 @@ onComplete: function(t) { //alert(t.responseText); try { + // TODO: replace this at some point with prototype JSON + // tools var data = eval('(' + t.responseText + ')'); var read = parseInt($(mailbox+"_read").innerHTML); $(mailbox+"_read").innerHTML = (read+data.mails.length); @@ -228,6 +236,7 @@ ); tr.appendChild(del); + // TODO: this is ugly, replace using prototype child walker tools tr.style.display='none'; var tels = $("message_table").childNodes[1].childNodes; for(var j=0;j"; $("ndeleted_date_"+id).innerHTML = ""+$("ndeleted_date_"+id).innerHTML+""; @@ -403,6 +417,8 @@ function changeMbox(box) { location.href = "index.php?module=Webmails&action=index&mailbox="+box; } +// TODO: these two functions should be tied into a mailbox management panel of some kind. +// could be a DHTML div with AJAX calls to execute the commands on the mailbox. function show_addfolder() { var fldr = $("folderOpts"); if(fldr.style.display == 'none') From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 04:22:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 08:22:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6829 - /vtigercrm/trunk/modules/Webmails/webmails.js Message-ID: <20060531082238.9F2504C4A11@vtiger.fosslabs.com> Author: mmbrich Date: Wed May 31 02:22:36 2006 New Revision: 6829 Log: double nested function, may cause issues in IE, see function notes on reasoning Modified: vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/trunk/modules/Webmails/webmails.js (original) +++ vtigercrm/trunk/modules/Webmails/webmails.js Wed May 31 02:22:36 2006 @@ -263,15 +263,25 @@ window.setTimeout("periodic_event()",box_refresh); } function show_hidden() { - $("status").style.display="block"; + // prototype uses enumerable lists to queue events for execution. + // because of this, this function executes and returns imediately and + // the status spinner is never seen. The status spinner below is a hack + // and doesn't even attempt to pretend like it knows the event is finished. + // this cannot be fixed with the scriptaculous beforeStart and afterFinish + // event hooks for some reason, maybe because the event duration is too quick? + window.setTimeout(function() { + $("status").style.display="block"; + window.setTimeout(function() { + $("status").style.display="none"; + },2000); + },0); var els = document.getElementsByClassName("deletedRow"); for(var i=0;i Author: saraj Date: Wed May 31 03:19:33 2006 New Revision: 6830 Log: * added activitytype in addmsgto contact Modified: vtigercrm/trunk/soap/vtigerolservice.php Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Wed May 31 03:19:33 2006 @@ -308,7 +308,7 @@ $email->column_fields[assigned_user_id] = $user_id; $email->column_fields[date_start] = $date_sent; $email->column_fields[description] = $email_body; - + $email->column_fields[activitytype] = 'Emails'; $email->save("Emails"); $email->set_emails_contact_invitee_relationship($email->id,$contactid); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 05:40:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 09:40:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6831 - /vtigercrm/trunk/soap/vtigerolservice.php Message-ID: <20060531094022.143457D7E53@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 03:40:18 2006 New Revision: 6831 Log: added html entities Modified: vtigercrm/trunk/soap/vtigerolservice.php Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Wed May 31 03:40:18 2006 @@ -307,7 +307,7 @@ $email->column_fields[subject] = $email_subject; $email->column_fields[assigned_user_id] = $user_id; $email->column_fields[date_start] = $date_sent; - $email->column_fields[description] = $email_body; + $email->column_fields[description] = htmlentities($email_body); $email->column_fields[activitytype] = 'Emails'; $email->save("Emails"); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 05:42:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 09:42:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6832 - /vtigercrm/trunk/modules/Emails/DetailView.php Message-ID: <20060531094243.014ED7D7E4A@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 03:42:40 2006 New Revision: 6832 Log: removed from_html Modified: vtigercrm/trunk/modules/Emails/DetailView.php Modified: vtigercrm/trunk/modules/Emails/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/DetailView.php (original) +++ vtigercrm/trunk/modules/Emails/DetailView.php Wed May 31 03:42:40 2006 @@ -137,7 +137,7 @@ else { $entries['Email Information']['4']['Description']['value'] = from_html($entries['Email Information']['4']['Description']['value']); - $smarty->assign("BLOCKS" , from_html($entries['Email Information'])); + $smarty->assign("BLOCKS", $entries['Email Information']); } $smarty->assign("SINGLE_MOD",$app_strings['Email']); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 05:55:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 09:55:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6833 - /vtigercrm/trunk/modules/Calendar/calendarLayout.php Message-ID: <20060531095506.483D87D7E4A@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 03:55:01 2006 New Revision: 6833 Log: shared id has been included for listview in calendar Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Wed May 31 03:55:01 2006 @@ -975,6 +975,8 @@ $Entries = Array(); global $adb,$current_user,$mod_strings; $shared_ids = getSharedCalendarId($current_user->id); + if(empty($shared_ids)) + $shared_ids = $current_user->id; $query = "SELECT cntactivityrel.contactid, activity.* FROM activity INNER JOIN crmentity @@ -1058,6 +1060,8 @@ $Entries = Array(); global $adb,$current_user,$mod_strings; $shared_ids = getSharedCalendarId($current_user->id); + if(empty($shared_ids)) + $shared_ids = $current_user->id; $query = "SELECT cntactivityrel.contactid, activity.* FROM activity INNER JOIN crmentity From vtiger-tickets at vtiger.fosslabs.com Wed May 31 05:56:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 09:56:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231244=3A?= =?utf-8?q?_Support_=3E_HelpDesk_-_Ticket_Comments?= Message-ID: <076.37c737bcf82ff17f40eb1ca85dac14f6@vtiger.fosslabs.com> #1244: Support > HelpDesk - Ticket Comments -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- open a ticket, add a comment and a solution at the detail view (not at the edit view). Call the ticket list, open the ticket again: - solution is stored - comments disappeared -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 06:07:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 10:07:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6834 - /vtigercrm/trunk/soap/vtigerolservice.php Message-ID: <20060531100734.6E5D77D7E57@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 04:07:30 2006 New Revision: 6834 Log: added emaildetails entry for messagetocontact Modified: vtigercrm/trunk/soap/vtigerolservice.php Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Wed May 31 04:07:30 2006 @@ -287,7 +287,7 @@ function AddMessageToContact($username,$contactid,$msgdtls) { - //global $log; + global $adb; require_once('modules/Users/User.php'); require_once('modules/Emails/Email.php'); @@ -314,8 +314,16 @@ $email->set_emails_contact_invitee_relationship($email->id,$contactid); $email->set_emails_se_invitee_relationship($email->id,$contactid); $email->set_emails_user_invitee_relationship($email->id,$user_id); - - return $email->id; + $sql = "select email from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted =0 and contactdetails.contactid='".$contactid."'"; + $result = $adb->query($sql); + $camodulerow = $adb->fetch_array($result); + if(isset($camodulerow)) + { + $emailid = $camodulerow["email"]; + $query = 'insert into emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")'; + $adb->query($query); + } + return $email->id; } else { From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 06:43:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 10:43:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6835 - in /vtigercrm/trunk/Smarty/templates: DetailView.tpl Inventory/InventoryDetailView.tpl ListView.tpl Message-ID: <20060531104301.B87787D7E50@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 04:42:55 2006 New Revision: 6835 Log: issue in addtag and search div has been fixed Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Wed May 31 04:42:55 2006 @@ -64,7 +64,7 @@ - +
    [ {$ID} ] {$NAME} - {$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}   
    {$UPDATEINFO}
    {$UPDATEINFO}

    Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Wed May 31 04:42:55 2006 @@ -58,11 +58,11 @@ {$UPDATEINFO} Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Wed May 31 04:42:55 2006 @@ -117,7 +117,7 @@   - {$APP.LBL_GO_TO} {$APP.LNK_ADVANCED_SEARCH} + {$APP.LBL_GO_TO} {$APP.LNK_ADVANCED_SEARCH} @@ -138,7 +138,7 @@ {$APP.LNK_ADVANCED_SEARCH}  {$APP.LBL_ADV_SEARCH_MSG_ALL}  {$APP.LBL_ADV_SEARCH_MSG_ANY} - {$APP.LBL_GO_TO} {$APP.LNK_BASIC_SEARCH} + {$APP.LBL_GO_TO} {$APP.LNK_BASIC_SEARCH} From vtiger-tickets at vtiger.fosslabs.com Wed May 31 06:44:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:44:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23195=3A_?= =?utf-8?q?edit_picklist?= In-Reply-To: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> References: <076.2ce061c7989257e6a4907a4e0fdd829d@vtiger.fosslabs.com> Message-ID: <085.99121d4c705192c364cf1af49966af3b@vtiger.fosslabs.com> #195: edit picklist ------------------------+--------------------------------------------------- Reporter: richie | Owner: ela Type: defect | Status: new Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * priority: critical => major -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 06:44:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:44:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231100=3A?= =?utf-8?q?_Search_Issue?= In-Reply-To: <076.121568b45778e432f494a514491fb077@vtiger.fosslabs.com> References: <076.121568b45778e432f494a514491fb077@vtiger.fosslabs.com> Message-ID: <085.53c065be556ac4522b05d7d1e8458009@vtiger.fosslabs.com> #1100: Search Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: new Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * owner: philip => jerrydgeorge -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 06:44:45 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:44:45 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231100=3A?= =?utf-8?q?_Search_Issue?= In-Reply-To: <076.121568b45778e432f494a514491fb077@vtiger.fosslabs.com> References: <076.121568b45778e432f494a514491fb077@vtiger.fosslabs.com> Message-ID: <085.fb9a1dea589f8e32829d1013b7458771@vtiger.fosslabs.com> #1100: Search Issue ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 06:48:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:48:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231166=3A?= =?utf-8?q?_Move_Role_is_not_working_in_IE=2E=2E?= In-Reply-To: <076.a830516a48e8ac68dbcee16057ec5aab@vtiger.fosslabs.com> References: <076.a830516a48e8ac68dbcee16057ec5aab@vtiger.fosslabs.com> Message-ID: <085.c6f1d80428b2e4ec83cf9610401afbb7@vtiger.fosslabs.com> #1166: Move Role is not working in IE.. ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 06:51:16 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:51:16 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231241=3A?= =?utf-8?q?_error_in_showing_the_activities_in_Product_related_list?= In-Reply-To: <076.2e657a67594262ade3f99d3cf68d91c4@vtiger.fosslabs.com> References: <076.2e657a67594262ade3f99d3cf68d91c4@vtiger.fosslabs.com> Message-ID: <085.f76e24973c6f96606d2ba17beb2e1abf@vtiger.fosslabs.com> #1241: error in showing the activities in Product related list ------------------------+--------------------------------------------------- Reporter: mickie | Owner: developer Type: defect | Status: closed Priority: blocker | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 06:52:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 10:52:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231212=3A?= =?utf-8?q?_created_a_ticket_with_an_attachment_from_contacts_related_list?= =?utf-8?q?_but_no_attachment_shown_in_ticket?= In-Reply-To: <076.7d3ac6a99bec121b259fb52f3db9bfaa@vtiger.fosslabs.com> References: <076.7d3ac6a99bec121b259fb52f3db9bfaa@vtiger.fosslabs.com> Message-ID: <085.00eb50b507f1033d8cd7f2f9f6f4b728@vtiger.fosslabs.com> #1212: created a ticket with an attachment from contacts related list but no attachment shown in ticket ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mickie): * resolution: => fixed * status: new => closed Comment: This issue is fixed and when we look into the ticket the attachment is shown. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 06:58:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 10:58:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6836 - /vtigercrm/trunk/modules/Calendar/Appointment.php Message-ID: <20060531105825.79DD37D7E60@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 04:58:18 2006 New Revision: 6836 Log: visibility has been removed from query Modified: vtigercrm/trunk/modules/Calendar/Appointment.php Modified: vtigercrm/trunk/modules/Calendar/Appointment.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Appointment.php (original) +++ vtigercrm/trunk/modules/Calendar/Appointment.php Wed May 31 04:58:18 2006 @@ -58,7 +58,7 @@ $q.=" ((activity.date_start < '". $to_datetime->get_formatted_date() ."' AND activity.date_start >= '". $from_datetime->get_formatted_date()."')"; if(!is_admin($current_user)) { - $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.") and activity.visibility='Public'))"; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.")))"; } $q .= " AND crmentity.deleted = 0) AND recurringevents.activityid is NULL "; $q .= " ORDER by activity.date_start,activity.time_start"; @@ -86,7 +86,7 @@ $q .= " (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') "; if(!is_admin($current_user)) { - $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.") and activity.visibility='Public'))"; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.")))"; } $q .= " AND crmentity.deleted = 0 )" ; From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 07:06:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 11:06:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6837 - /vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Message-ID: <20060531110634.A2F8B7D7E63@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 05:06:30 2006 New Revision: 6837 Log: proxy removed Modified: vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Modified: vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc ============================================================================== --- vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc (original) +++ vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Wed May 31 05:06:30 2006 @@ -43,8 +43,8 @@ var $host = "www.php.net"; // host name we are connecting to var $port = 80; // port we are connecting to - var $proxy_host = "192.168.4.158"; // proxy host to use - var $proxy_port = "80"; // proxy port to use + var $proxy_host = ""; // proxy host to use + var $proxy_port = ""; // proxy port to use var $agent = "Snoopy v1.0"; // agent we masquerade as var $referer = ""; // referer info to pass var $cookies = array(); // array of cookies to pass @@ -63,8 +63,8 @@ // NOTE: this currently does not respect // dates, domains or paths. - var $user = "raj"; // user for http authentication - var $pass = "raj"; // password for http authentication + var $user = ""; // user for http authentication + var $pass = ""; // password for http authentication // http accept types var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 07:19:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 11:19:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6838 - /vtigercrm/trunk/soap/vtigerolservice.php Message-ID: <20060531111942.256D37D7E66@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 05:19:39 2006 New Revision: 6838 Log: * modified attachment function Modified: vtigercrm/trunk/soap/vtigerolservice.php Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Wed May 31 05:19:39 2006 @@ -365,6 +365,8 @@ { global $adb; require_once('modules/Users/User.php'); + require_once('include/utils/utils.php'); + $date_var = date('YmdHis'); $seed_user = new User(); @@ -372,6 +374,12 @@ $crmid = $adb->getUniqueID("crmentity"); + $upload_file_path = decideFilePath(); + + $handle = fopen($upload_file_path.$filename,"wb"); + fwrite($handle,base64_decode($filedata),$filesize); + fclose($handle); + $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$crmid.",".$user_id.",".$user_id.",'Emails Attachment',' ',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")"; @@ -380,26 +388,21 @@ if($entityresult != false) { - $sql2="insert into attachments(attachmentsid, name, description, type, attachmentsize, attachmentcontents) - values(".$crmid.",'".$filename."',' ','".$filetype."','".$filesize."','".$adb->getEmptyBlob()."')"; - - $result=$adb->query($sql2); - - if($result != false) + $sql2="insert into attachments(attachmentsid, name, description, type, path) + values(".$crmid.",'".$filename."',' ','".$filetype."','".$upload_file_path."')"; + + $result=$adb->query($sql2); + + $sql3='insert into seattachmentsrel values('.$emailid.','.$crmid.')'; + $adb->query($sql3); + + return $crmid; + } + else { - $result = $adb->updateBlob('attachments','attachmentcontents',"attachmentsid='".$crmid."' and name='".$filename."'",addslashes($filedata)); - } - - $sql3='insert into seattachmentsrel values('.$emailid.','.$crmid.')'; - $adb->query($sql3); - - return $crmid; - } - else - { //$server->setError("Invalid username and/or password"); return ""; - } + } } function GetContacts($username) From vtiger-tickets at vtiger.fosslabs.com Wed May 31 07:20:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 11:20:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231245=3A?= =?utf-8?q?_edit_and_del_links_are_not_exist_in_listview_and_relatedlists?= Message-ID: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com> #1245: edit and del links are not exist in listview and relatedlists -----------------------+---------------------------------------------------- Reporter: mickie | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- In 4.2.3 we have edit and del links are available. These links are not available now. for example i am in accounts related list where as i want to edit the contact then i want to go to the contact detialview and then edit. In the mean time, from accounts related list if i click on del link of contact then the account-contact relationship will be deleted. but now if i want to delete the relationship i want to go to the contact detailview and edit and now i should clear the relationship. This is an critical usability issue. Please provide these links. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 07:26:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 11:26:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6839 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060531112639.19C327D7E6A@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 05:26:35 2006 New Revision: 6839 Log: def activity view changed to this year Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Wed May 31 05:26:35 2006 @@ -81,6 +81,7 @@ // added by jeri to populate default image and tagcloud for admin $user->imagename = 'shanky.jpg'; $user->tagcloud = ''; + $user->activity_view = 'This Year'; $user->defhomeview = 'home_metrics'; //added by philip for default default admin emailid if($admin_email == '') @@ -142,6 +143,7 @@ $user->date_format = 'yyyy-mm-dd'; // added by jeri to populate default image and tagcloud for admin $user->imagename = 'ela.jpg'; + $user->activity_view = 'This Year'; $user->tagcloud = ''; $user->defhomeview = 'home_metrics'; //added by philip for default default admin emailid From vtiger-tickets at vtiger.fosslabs.com Wed May 31 07:27:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 11:27:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231246=3A?= =?utf-8?q?_email_not_displayed_in_contact_related_list?= Message-ID: <076.bb51c9882ca3da9b29e43b10d6709695@vtiger.fosslabs.com> #1246: email not displayed in contact related list -----------------------+---------------------------------------------------- Reporter: mickie | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- when i add new email from contact relatedlist where as the new email is not shown in the related list. but when i refresh the page the email is displayed. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 07:36:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 11:36:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6840 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060531113649.20C657D7E5E@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 05:36:40 2006 New Revision: 6840 Log: count of key metrics has been fixed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Wed May 31 05:36:40 2006 @@ -157,12 +157,14 @@ {foreach item=elements from=$tabledetail.Entries} - {if $tabledetail.Title.2 neq 'home_mytopinv' && $tabledetail.Title.2 neq 'home_mytopso' && $tabledetail.Title.2 neq 'home_mytopquote'} + {if $tabledetail.Title.2 neq 'home_mytopinv' && $tabledetail.Title.2 neq 'home_mytopso' && $tabledetail.Title.2 neq 'home_mytopquote' && $tabledetail.Title.2 neq 'home_metrics'} - {else} + {elseif $tabledetail.Title.2 eq 'home_metrics'} + + + {else} - {/if} - + {/if} {/foreach}
    {$elements.0} {$elements.0} {$elements.1} {$elements.1}
    From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 07:45:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 11:45:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6841 - in /vtigercrm/trunk/Smarty/templates: DetailView.tpl TagCloudDisplay.tpl Message-ID: <20060531114520.EFA817D7E5E@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 05:45:13 2006 New Revision: 6841 Log: new tag cloud has been integrated Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/TagCloudDisplay.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Wed May 31 05:45:13 2006 @@ -268,40 +268,17 @@ - - - - - - - - -
    Tag Cloud
    - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    -
    + + + + + + + + +
    {$ALL_TAG}
    + +
    {if $MERGEBUTTON eq 'permitted'} Modified: vtigercrm/trunk/Smarty/templates/TagCloudDisplay.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/TagCloudDisplay.tpl (original) +++ vtigercrm/trunk/Smarty/templates/TagCloudDisplay.tpl Wed May 31 05:45:13 2006 @@ -14,54 +14,13 @@ -
    - - - - - - -
    {$APP.LBL_TAG_CLOUD}
    - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - -
    - - - - - -
    - - - - - -
    -
    -
    + + + + + + + +
    {$ALL_TAG}
    + - From vtiger-tickets at vtiger.fosslabs.com Wed May 31 07:55:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 11:55:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231247=3A?= =?utf-8?q?_dashboard_not_printable?= Message-ID: <076.a3fd81704060a1a7525a1879e6b6b088@vtiger.fosslabs.com> #1247: dashboard not printable -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: dashboard | -----------------------+---------------------------------------------------- the dashboard, where you see all the graphics, is not printable. see File -> Print preview in browser -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 08:21:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 12:21:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6842 - in /vtigercrm/trunk: Smarty/templates/Header.tpl include/js/general.js Message-ID: <20060531122115.290C17D7E80@vtiger.fosslabs.com> Author: don Date: Wed May 31 06:21:09 2006 New Revision: 6842 Log: allmenu issue has been fixed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed May 31 06:21:09 2006 @@ -397,7 +397,7 @@ {/literal} {* Quick Access Functionality *} -
    +
    '; -$list_header .= ''; -$list_header .=''; -$list_header .= ''; -$list_header .= ''; -$list_header .=''; -$list_header .= ''; -$list_header .=''; -$list_header .= ''; -$list_header .=''; +$list_header .= ''; +$list_header .=''; +$list_header .= ''; +$list_header .= ''; +$list_header .= ''; $list_header .= ''; $xtpl->assign("LISTHEADER", $list_header); @@ -113,22 +106,13 @@ $entity_id = $adb->query_result($list_result,$i,"crmid"); if(! array_key_exists($entity_id, $pbk_array)) { - if (($i%2)==0) - $list_body .= ''; - else - $list_body .= ''; - + $list_body .= ''; $field_name=$entity_id."_listprice"; - - $list_body .= ''; - $list_body .= ''; - $list_body .= ''; - $list_body .= ''; - $list_body .=''; - $list_body .= ''; - $list_body .=''; - $list_body .= ''; - $list_body .=''; + $list_body .= ''; + $list_body .= ''; + $list_body .= ''; + $list_body .= ''; + $list_body .= ''; } } Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html (original) +++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html Wed May 31 07:46:20 2006 @@ -33,7 +33,7 @@ {PRODUCTLISTHEADER}
    Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Wed May 31 06:21:09 2006 @@ -1369,7 +1369,7 @@ var getVal = eval(leftSide) + eval(widthM); if(getVal > window.innerWidth ){ leftSide = eval(leftSide) - eval(widthM); - tagName.style.left = leftSide + 'px'; + tagName.style.left = leftSide + 34 + 'px'; } else tagName.style.left= leftSide + 'px'; From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 08:31:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 12:31:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6843 - /vtigercrm/trunk/modules/Home/index.php Message-ID: <20060531123102.E1F5C7D7E94@vtiger.fosslabs.com> Author: don Date: Wed May 31 06:30:58 2006 New Revision: 6843 Log: more link added in home page Modified: vtigercrm/trunk/modules/Home/index.php Modified: vtigercrm/trunk/modules/Home/index.php ============================================================================== --- vtigercrm/trunk/modules/Home/index.php (original) +++ vtigercrm/trunk/modules/Home/index.php Wed May 31 06:30:58 2006 @@ -78,14 +78,14 @@ if(isPermitted('Accounts','index') == "yes") { include("modules/Accounts/ListViewTop.php"); - $home_values[]=getTopAccounts(); + $home_values['Accounts']=getTopAccounts(); } break; case 'PLVT': if(isPermitted('Potentials','index') == "yes") { include("modules/Potentials/ListViewTop.php"); - $home_values[]=getTopPotentials(); + $home_values['Potentials']=getTopPotentials(); } break; @@ -93,46 +93,46 @@ if(isPermitted('Leads','index') == "yes") { include("modules/Leads/ListViewTop.php"); - $home_values[]=getNewLeads(); + $home_values['Leads']=getNewLeads(); } break; case 'GRT': if(isPermitted('Activities','index') == "yes") { - $home_values[]=getGroupTaskLists(); + $home_values['Activities']=getGroupTaskLists(); } break; case 'HLT': if(isPermitted('HelpDesk','index') == "yes") { require_once('modules/HelpDesk/ListTickets.php'); - $home_values[]=getMyTickets(); + $home_values['HelpDesk']=getMyTickets(); } break; case 'CVLVT': include("modules/CustomView/ListViewTop.php"); - $home_values[] = getKeyMetrics(); + $home_values['CustomView'] = getKeyMetrics(); break; case 'QLTQ': if(isPermitted('Quotes','index') == "yes") { require_once('modules/Quotes/ListTopQuotes.php'); - $home_values[]=getTopQuotes(); + $home_values['Quotes']=getTopQuotes(); } break; case 'OLTSO': if(isPermitted('SalesOrder','index') == "yes") { require_once('modules/SalesOrder/ListTopSalesOrder.php'); - $home_values[]=getTopSalesOrder(); + $home_values['SalesOrder']=getTopSalesOrder(); } break; case 'ILTI': if(isPermitted('Invoice','index') == "yes") { require_once('modules/Invoice/ListTopInvoice.php'); - $home_values[]=getTopInvoice(); + $home_values['Invoice']=getTopInvoice(); } break; } @@ -274,7 +274,8 @@ } $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); - return $values; + if(count($entries)>0) + return $values; } } ?> From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 08:37:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 12:37:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6844 - in /vtigercrm/trunk/Smarty/templates: Calculator.tpl Clock.tpl MySitesContents.tpl MySitesManage.tpl PopupContents.tpl SelectEmail.tpl SettingsSubMenu.tpl UserListViewContents.tpl Message-ID: <20060531123724.12D057D7EA1@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 06:37:15 2006 New Revision: 6844 Log: vtiger License added for template files - ahmed Modified: vtigercrm/trunk/Smarty/templates/Calculator.tpl vtigercrm/trunk/Smarty/templates/Clock.tpl vtigercrm/trunk/Smarty/templates/MySitesContents.tpl vtigercrm/trunk/Smarty/templates/MySitesManage.tpl vtigercrm/trunk/Smarty/templates/PopupContents.tpl vtigercrm/trunk/Smarty/templates/SelectEmail.tpl vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl Modified: vtigercrm/trunk/Smarty/templates/Calculator.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Calculator.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Calculator.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} +
    Modified: vtigercrm/trunk/Smarty/templates/Clock.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Clock.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Clock.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} +
    Modified: vtigercrm/trunk/Smarty/templates/MySitesContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MySitesContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MySitesContents.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} +
    + + +
    {$MOD.LBL_BOOKMARK_LIST} : Modified: vtigercrm/trunk/Smarty/templates/MySitesManage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/MySitesManage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/MySitesManage.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} +
    Modified: vtigercrm/trunk/Smarty/templates/PopupContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/PopupContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/PopupContents.tpl Wed May 31 06:37:15 2006 @@ -1,4 +1,15 @@ - +{**} +
    Modified: vtigercrm/trunk/Smarty/templates/SelectEmail.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SelectEmail.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SelectEmail.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} +
    Modified: vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Wed May 31 06:37:15 2006 @@ -1,3 +1,15 @@ +{**} + +
    Modified: vtigercrm/trunk/include/images/loginAlpha.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html (original) +++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html Wed May 31 07:46:20 2006 @@ -117,12 +117,15 @@ -
    -
    +

    Note : Please note that for each query the "Object" string will be displayed at the starting of the line if the query executed successfully. If the query fails then "Object" will not be displayed. we can find out the failed queries based on these Object display. @@ -219,7 +228,7 @@

    Failed Queries Log -
    +
    Author: don Date: Wed May 31 07:10:10 2006 New Revision: 6853 Log: Added License Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php vtigercrm/trunk/modules/Users/ListView.php vtigercrm/trunk/modules/Users/RoleDragDrop.php vtigercrm/trunk/modules/Users/about_us.php vtigercrm/trunk/modules/Users/profilePrivileges.php Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Wed May 31 07:10:10 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Wed May 31 07:10:14 2006 New Revision: 6854 Log: Image to display in the migration success screen Added: vtigercrm/trunk/themes/blue/images/migration_sucess.jpg (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 09:19:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:19:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6855 - /vtigercrm/trunk/include/quickcreate.php Message-ID: <20060531131955.C09007D7EC9@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:19:52 2006 New Revision: 6855 Log: Added license Modified: vtigercrm/trunk/include/quickcreate.php Modified: vtigercrm/trunk/include/quickcreate.php ============================================================================== --- vtigercrm/trunk/include/quickcreate.php (original) +++ vtigercrm/trunk/include/quickcreate.php Wed May 31 07:19:52 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Wed May 31 07:19:51 2006 New Revision: 6856 Log: License Added - ahmed Modified: vtigercrm/trunk/modules/Utilities/language/en_us.lang.php vtigercrm/trunk/modules/Webmails/DetailView.php vtigercrm/trunk/modules/Webmails/images/index.php vtigercrm/trunk/modules/Webmails/js/script.js vtigercrm/trunk/modules/Webmails/webmails.js Modified: vtigercrm/trunk/modules/Utilities/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Utilities/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Utilities/language/en_us.lang.php Wed May 31 07:19:51 2006 @@ -1,3 +1,13 @@ Modified: vtigercrm/trunk/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/DetailView.php (original) +++ vtigercrm/trunk/modules/Webmails/DetailView.php Wed May 31 07:19:51 2006 @@ -1,4 +1,13 @@ Author: saraj Date: Wed May 31 07:21:43 2006 New Revision: 6857 Log: * Removed the unwanted file Removed: vtigercrm/trunk/migration/migrate_functions.php From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 09:23:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:23:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6858 - in /vtigercrm/trunk/modules: Dashboard/accumulated_bargraph.php Home/home_rss.php Import/ImportSave.php Message-ID: <20060531132349.EC17D7D7EB0@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:23:43 2006 New Revision: 6858 Log: License Added - ahmed Modified: vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php vtigercrm/trunk/modules/Home/home_rss.php vtigercrm/trunk/modules/Import/ImportSave.php Modified: vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php (original) +++ vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php Wed May 31 07:23:43 2006 @@ -1,4 +1,13 @@ Author: saraj Date: Wed May 31 07:24:45 2006 New Revision: 6859 Log: * Modified the license because this is the file which contains our own codes not the mailer code Modified: vtigercrm/trunk/modules/Emails/mail.php Modified: vtigercrm/trunk/modules/Emails/mail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mail.php (original) +++ vtigercrm/trunk/modules/Emails/mail.php Wed May 31 07:24:45 2006 @@ -1,29 +1,16 @@ Author: saraj Date: Wed May 31 07:28:53 2006 New Revision: 6860 Log: license added Modified: vtigercrm/trunk/include/quickcreate.php Modified: vtigercrm/trunk/include/quickcreate.php ============================================================================== --- vtigercrm/trunk/include/quickcreate.php (original) +++ vtigercrm/trunk/include/quickcreate.php Wed May 31 07:28:53 2006 @@ -8,7 +8,6 @@ * All Rights Reserved. * ********************************************************************************/ - require_once("Smarty_setup.php"); require_once("include/utils/CommonUtils.php"); From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 09:30:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:30:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6861 - /vtigercrm/trunk/modules/Invoice/CreatePDF.php Message-ID: <20060531133019.136577D7EB0@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:30:14 2006 New Revision: 6861 Log: * Added license Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Wed May 31 07:30:14 2006 @@ -1,4 +1,15 @@ Author: don Date: Wed May 31 07:33:10 2006 New Revision: 6862 Log: window size of about us has been changed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed May 31 07:33:10 2006 @@ -424,7 +424,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 09:37:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:37:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6863 - /vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php Message-ID: <20060531133706.912FF7D7EE3@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:37:02 2006 New Revision: 6863 Log: * Added license Modified: vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php Modified: vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php ============================================================================== --- vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php (original) +++ vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php Wed May 31 07:37:02 2006 @@ -1,4 +1,15 @@ Author: saraj Date: Wed May 31 07:39:50 2006 New Revision: 6864 Log: Added license Modified: vtigercrm/trunk/modules/Invoice/pdf_templates/footer.php vtigercrm/trunk/modules/Invoice/pdf_templates/header.php vtigercrm/trunk/modules/Invoice/pdf_templates/lastpage/body.php vtigercrm/trunk/modules/Invoice/pdf_templates/lastpage/footer.php Modified: vtigercrm/trunk/modules/Invoice/pdf_templates/footer.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/pdf_templates/footer.php (original) +++ vtigercrm/trunk/modules/Invoice/pdf_templates/footer.php Wed May 31 07:39:50 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Wed May 31 07:41:51 2006 New Revision: 6865 Log: License added for missing report files - ahmed Modified: vtigercrm/trunk/modules/Reports/ReportsAjax.php vtigercrm/trunk/modules/Reports/SaveReport.php Modified: vtigercrm/trunk/modules/Reports/ReportsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportsAjax.php (original) +++ vtigercrm/trunk/modules/Reports/ReportsAjax.php Wed May 31 07:41:51 2006 @@ -1,3 +1,12 @@ - Modified: vtigercrm/trunk/modules/Reports/SaveReport.php ============================================================================== --- vtigercrm/trunk/modules/Reports/SaveReport.php (original) +++ vtigercrm/trunk/modules/Reports/SaveReport.php Wed May 31 07:41:51 2006 @@ -1,4 +1,13 @@ Author: saraj Date: Wed May 31 07:44:33 2006 New Revision: 6866 Log: Added license Modified: vtigercrm/trunk/modules/Products/UpdateListPrice.php vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Modified: vtigercrm/trunk/modules/Products/UpdateListPrice.php ============================================================================== --- vtigercrm/trunk/modules/Products/UpdateListPrice.php (original) +++ vtigercrm/trunk/modules/Products/UpdateListPrice.php Wed May 31 07:44:33 2006 @@ -1,4 +1,14 @@ Author: don Date: Wed May 31 07:46:20 2006 New Revision: 6867 Log: ui fixes and tax congiguration added,about us page has been changed Added: vtigercrm/trunk/themes/blue/images/aboutUS.jpg (with props) vtigercrm/trunk/themes/blue/images/about_btm.jpg (with props) vtigercrm/trunk/themes/blue/images/taxConfig_btm.gif (with props) vtigercrm/trunk/themes/blue/images/taxConfig_top.gif (with props) vtigercrm/trunk/themes/blue/images/taxConfiguration.gif (with props) Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/include/images/loginAlpha.gif vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php vtigercrm/trunk/modules/Settings/language/en_us.lang.php vtigercrm/trunk/modules/Users/about_us.php Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Wed May 31 07:46:20 2006 @@ -1,173 +1,175 @@ -{**} - - - - {include file='SettingsMenu.tpl'} - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_USER_MANAGEMENT}
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_CREATE_AND_MANAGE_USERS}
    -{$MOD.LBL_USERS}
    {$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}
    -{$MOD.LBL_ROLES} -
    {$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}
    -{$MOD.LBL_PROFILES} -
    {$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}
    -{$MOD.USERGROUPLIST}
     
    {$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}
    -{$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS} -
    {$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    -{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}
    {$MOD.LBL_ASSIGN_MODULE_OWNERS}
    -{$MOD.LBL_ASSIGN_MODULE_OWNERS} - -
    {$MOD.LBL_SETTING_ANNOUNCEMENT}
    -{$MOD.LBL_ANNOUNCEMENT}
     
    -
     
    {$MOD.LBL_STUDIO}
    - - - - - - - - - - - - - - - - -
    {$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}
    -{$MOD.LBL_CUSTOM_FIELD_SETTINGS}
    {$MOD.LBL_EDIT_PICKLIST_VALUES}
    -{$MOD.LBL_PICKLIST_SETTINGS}
     
     
    -
     
    {$MOD.LBL_COMMUNICATION_TEMPLATES}
    - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    -{$MOD.EMAILTEMPLATES}
    {$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}
    -{$MOD.WORDINTEGRATION}
    {$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}
    -{$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.LBL_INVENTORY_NOTIFICATIONS}
    -{$MOD.INVENTORYNOTIFICATION}
     
    {$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
    -{$MOD.INVENTORYTERMSANDCONDITIONS}
       
     
    -
     
    {$MOD.LBL_CONFIGURATION}
    - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_SPECIFY_COMPANY_DETAILS}
    -{$MOD.LBL_ORGANIZATION_DETAILS}
    {$MOD.LBL_CONFIGURE_MAIL_SERVER}
    -{$MOD.LBL_EMAIL_CONFIG}
    {$MOD.LBL_CONFIGURE_BACKUP_SERVER}
    -{$MOD.LBL_BACKUP_SERVER_CONFIGURATION}
    {$MOD.LBL_SYSTEM_CONFIGURATION}
    -{$MOD.LBL_SYSTEM_CONFIG}
     
    {$MOD.LBL_CURRENCY_CONFIGURATION}
    -{$MOD.LBL_CURRENCY_CONFIG}
    {$MOD.LBL_MIGRATION_INFO}
    -{$MOD.LBL_MIGRATION}
     
    -
    - {include file='SettingsSubMenu.tpl'} +{**} + + + + {include file='SettingsMenu.tpl'} + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_USER_MANAGEMENT}
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_CREATE_AND_MANAGE_USERS}
    +{$MOD.LBL_USERS}
    {$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}
    +{$MOD.LBL_ROLES} +
    {$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}
    +{$MOD.LBL_PROFILES} +
    {$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}
    +{$MOD.USERGROUPLIST}
     
    {$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}
    +{$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS} +
    {$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    +{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}
    {$MOD.LBL_ASSIGN_MODULE_OWNERS}
    +{$MOD.LBL_ASSIGN_MODULE_OWNERS} + +
    {$MOD.LBL_SETTING_ANNOUNCEMENT}
    +{$MOD.LBL_ANNOUNCEMENT}
     
    +
     
    {$MOD.LBL_STUDIO}
    + + + + + + + + + + + + + + + + +
    {$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}
    +{$MOD.LBL_CUSTOM_FIELD_SETTINGS}
    {$MOD.LBL_EDIT_PICKLIST_VALUES}
    +{$MOD.LBL_PICKLIST_SETTINGS}
     
     
    +
     
    {$MOD.LBL_COMMUNICATION_TEMPLATES}
    + + + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    +{$MOD.EMAILTEMPLATES}
    {$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}
    +{$MOD.WORDINTEGRATION}
    {$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}
    +{$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.LBL_INVENTORY_NOTIFICATIONS}
    +{$MOD.INVENTORYNOTIFICATION}
     
    {$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}
    +{$MOD.INVENTORYTERMSANDCONDITIONS}
       
     
    +
     
    {$MOD.LBL_CONFIGURATION}
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_SPECIFY_COMPANY_DETAILS}
    +{$MOD.LBL_ORGANIZATION_DETAILS}
    {$MOD.LBL_CONFIGURE_MAIL_SERVER}
    +{$MOD.LBL_EMAIL_CONFIG}
    {$MOD.LBL_CONFIGURE_BACKUP_SERVER}
    +{$MOD.LBL_BACKUP_SERVER_CONFIGURATION}
    {$MOD.LBL_SYSTEM_CONFIGURATION}
    +{$MOD.LBL_SYSTEM_CONFIG}
     
    {$MOD.LBL_CURRENCY_CONFIGURATION}
    +{$MOD.LBL_CURRENCY_CONFIG}
    {$MOD.LBL_INVENTORY_TAX_CONFIG}
    +{$MOD.LBL_INVENTORY_TAX_CONFIG}
    {$MOD.LBL_MIGRATION_INFO}
    +{$MOD.LBL_MIGRATION}
     
    +
    + {include file='SettingsSubMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl Wed May 31 07:46:20 2006 @@ -55,13 +55,18 @@
    - +
      + + + + +
     
    - +
    {$APP.LBL_TAX} {$MOD.LBL_CONFIGURATION}

     
     
    {$APP.LBL_VAT} : Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Wed May 31 07:46:20 2006 @@ -27,7 +27,7 @@
    + + + +
     
      {PRICEBOOKLISTHEADER} - +
    - - - {LISTHEADER} - - {LISTENTITY} + + + +
    + + {LISTHEADER} + {LISTENTITY} +
    +
     
    +
     
    Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php Wed May 31 07:46:20 2006 @@ -23,8 +23,6 @@ $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); $productname = getProductName($productid); -echo get_module_title($current_module_strings['LBL_MODULE_NAME'], $current_module_strings['LBL_ADD_PRODUCT_PRICEBOOKS'].": ".$productname, true); -echo "
    "; $xtpl=new XTemplate ('modules/Products/AddProductToPriceBooks.html'); $xtpl->assign("MOD", $mod_strings); @@ -33,18 +31,18 @@ $focus = new PriceBook(); -echo get_form_footer(); -$other_text = ' + +$other_text = '
    '; - $other_text .=''; - $other_text .=''; + $other_text .=''; $other_text .='
      '; + $other_text .='
    '; //Retreive the list from Database @@ -91,16 +89,11 @@ $list_header = ''; -$list_header .= '
    '.$mod_strings['LBL_PRICEBOOK'].''.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].''.$mod_strings['LBL_PB_LIST_PRICE'].'
    '.$mod_strings['LBL_PRICEBOOK'].''.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].''.$mod_strings['LBL_PB_LIST_PRICE'].'
    '.$adb->query_result($list_result,$i,"bookname").''.$unit_price.''.$adb->query_result($list_result,$i,"bookname").''.$unit_price.'
    - - + +
    @@ -42,10 +42,13 @@
     {RECORD_COUNTS}
    + {LISTHEADER} - {LISTENTITY} +
    +
     
    Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Wed May 31 07:46:20 2006 @@ -23,8 +23,6 @@ $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); $pricebookname = getPriceBookName($pricebook_id); -echo get_module_title($current_module_strings['LBL_MODULE_NAME'], $current_module_strings['LBL_ADD_PRODUCTS_PRICEBOOK'].": ".$pricebookname, true); -echo "
    "; $xtpl=new XTemplate ('modules/Products/AddProductsToPriceBook.html'); $xtpl->assign("MOD", $mod_strings); @@ -149,14 +147,14 @@ } -$other_text = ' +$other_text = '
    '; - $other_text .=''; - $other_text .=''; + $other_text .=''; $other_text .='
     '; + $other_text .=' 
    '; @@ -212,18 +210,12 @@ $xtpl->assign("FIELD_NAME_ARRAY",implode(",",$field_name_array)); $list_header = ''; -$list_header .= ''; -$list_header .= ''; -$list_header .=''; -$list_header .= ''; -$list_header .= ''.$mod_strings['LBL_LIST_PRODUCT_NAME'].''; -$list_header .=''; -$list_header .= ''.$mod_strings['LBL_PRODUCT_CODE'].''; -$list_header .=''; -$list_header .= ''.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].''; -$list_header .=''; -$list_header .= ''.$mod_strings['LBL_PB_LIST_PRICE'].''; -$list_header .=''; +$list_header .= ''; +$list_header .=''; +$list_header .= ''.$mod_strings['LBL_LIST_PRODUCT_NAME'].''; +$list_header .= ''.$mod_strings['LBL_PRODUCT_CODE'].''; +$list_header .= ''.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].''; +$list_header .= ''.$mod_strings['LBL_PB_LIST_PRICE'].''; $list_header .= ''; $xtpl->assign("LISTHEADER", $list_header); @@ -236,25 +228,15 @@ $entity_id = $adb->query_result($list_result,$i,"crmid"); if(! array_key_exists($entity_id, $prod_array)) { - if (($i%2)==0) - $list_body .= ''; - else - $list_body .= ''; - + $list_body .= ''; $unit_price = $adb->query_result($list_result,$i,"unit_price"); $field_name=$entity_id."_listprice"; - $list_body .= ''; - $list_body .= ''; - $list_body .= ''; - $list_body .= ''.$adb->query_result($list_result,$i,"productname").''; - $list_body .=''; - $list_body .= ''.$adb->query_result($list_result,$i,"productcode").''; - $list_body .=''; - $list_body .= ''.$unit_price.''; - $list_body .=''; - $list_body .= ''; - $list_body .=''; + $list_body .= ''; + $list_body .= ''.$adb->query_result($list_result,$i,"productname").''; + $list_body .= ''.$adb->query_result($list_result,$i,"productcode").''; + $list_body .= ''.$unit_price.''; + $list_body .= ''; } } Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Wed May 31 07:46:20 2006 @@ -596,6 +596,7 @@ 'LBL_EDIT_PICKLIST'=>'Edit Pick List', 'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.', 'LBL_SELECT_CRM_MODULE'=>'Select crm module', +'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration', ); Modified: vtigercrm/trunk/modules/Users/about_us.php ============================================================================== --- vtigercrm/trunk/modules/Users/about_us.php (original) +++ vtigercrm/trunk/modules/Users/about_us.php Wed May 31 07:46:20 2006 @@ -1,14 +1,4 @@ -<?php echo $app_strings['LBL_ABOUTUS_TITLE']?> - + + + + +vtiger CRM 5 - Free, Commercial grade Open Source CRM + + + - - - - - -
    vigercrm 

    - - - - - - - - - - - - - - - - - - - - - - - - - +
    Version:  
    Applied Patch Version:  
    4.2 Release Date:   (Current version)
    4.0.1 Release Date:  04-29-2005
    4.0 Release Date:  03-29-2005
    - - - - - - - - - - - - -
    3.2 Release Date:  12-13-2004
    Toll Free Number:  +1-877-788-4473
    vtiger Discussions:  

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

    vtiger offers an Open Source CRM solution for managing your organization's sales force automation, inventory management, and customer support & service requirements.

    vtiger also provides Open Source business productivity enhancement add-ons, such as Outlook Plug-in, Office Plug-in, and Thunderbird extension that can be used with vtiger CRM.
    -

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Team
    Ahmed
    Don
    Ela
    Gopal
    Jeri
    Mani
    Mickie
    Minnie
    Philip
    Richie
    Saint
    SRaj
     
    Credits
    Matthew Brichacek
    Michel JACQUEMES
    Mike Crowe
    Allan Bush
    Frank Piepiorra
    Dino Eberle and Jamie Jackson
    B??la??d A??ssa
    Sergio A. Kessler
    Jeff Kowalczyk
    Brian Devendorf
    Brian Laughlin
    Dennis Grant
    Fathi Boudra
    Jamie Jackson
    Joel Rydbeck
    Josh Lee
    Mike Fedyk
     
    And vtiger Community
    +
    +
     
     
    + + + + + +
    + Version : 5.0.0 Beta |  + Read License |  + Contact Us + + +
    +
    - + + From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 09:46:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:46:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6868 - in /vtigercrm/trunk/modules/PurchaseOrder/pdf_templates: footer.php header.php lastpage/body.php lastpage/footer.php Message-ID: <20060531134658.DF3035CE170@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:46:53 2006 New Revision: 6868 Log: * Added license Modified: vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/footer.php vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/lastpage/body.php vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/lastpage/footer.php Modified: vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/footer.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/footer.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/footer.php Wed May 31 07:46:53 2006 @@ -1,4 +1,14 @@ Author: saraj Date: Wed May 31 07:49:39 2006 New Revision: 6869 Log: * Added license Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php vtigercrm/trunk/modules/Quotes/pdf_templates/footer.php vtigercrm/trunk/modules/Quotes/pdf_templates/header.php vtigercrm/trunk/modules/Quotes/pdf_templates/lastpage/body.php vtigercrm/trunk/modules/Quotes/pdf_templates/lastpage/footer.php Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Wed May 31 07:49:39 2006 @@ -1,4 +1,15 @@ Author: don Date: Wed May 31 07:51:44 2006 New Revision: 6870 Log: change owner added for invoice Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Wed May 31 07:51:44 2006 @@ -85,7 +85,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> - +$smarty->assign("CHANGE_OWNER",getUserslist()); if(isPermitted('Invoice','Delete','') == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 09:52:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 13:52:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6871 - in /vtigercrm/trunk/modules/SalesOrder: CreateSOPDF.php pdf_templates/footer.php pdf_templates/header.php pdf_templates/lastpage/body.php pdf_templates/lastpage/footer.php Message-ID: <20060531135245.623947D79DB@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 07:52:37 2006 New Revision: 6871 Log: * Added license Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/footer.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/lastpage/body.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/lastpage/footer.php Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original) +++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Wed May 31 07:52:37 2006 @@ -1,4 +1,15 @@ Author: saraj Date: Wed May 31 07:55:27 2006 New Revision: 6872 Log: Added license Modified: vtigercrm/trunk/modules/Users/about_us.php Modified: vtigercrm/trunk/modules/Users/about_us.php ============================================================================== --- vtigercrm/trunk/modules/Users/about_us.php (original) +++ vtigercrm/trunk/modules/Users/about_us.php Wed May 31 07:55:27 2006 @@ -1,4 +1,15 @@ Author: saraj Date: Wed May 31 07:55:26 2006 New Revision: 6873 Log: Updated Licenses for all js files -ahmed Modified: vtigercrm/trunk/include/js/clock.js vtigercrm/trunk/include/js/customview.js vtigercrm/trunk/include/js/menu.js vtigercrm/trunk/include/js/popup.js vtigercrm/trunk/include/js/search.js vtigercrm/trunk/include/js/submenu.js Modified: vtigercrm/trunk/include/js/clock.js ============================================================================== --- vtigercrm/trunk/include/js/clock.js (original) +++ vtigercrm/trunk/include/js/clock.js Wed May 31 07:55:26 2006 @@ -1,3 +1,12 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ if (document.getElementById){ fCol='#000000'; //face/number colour. Modified: vtigercrm/trunk/include/js/customview.js ============================================================================== --- vtigercrm/trunk/include/js/customview.js (original) +++ vtigercrm/trunk/include/js/customview.js Wed May 31 07:55:26 2006 @@ -1,3 +1,13 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ + function splitValues() { var picklistObj=getObj("fldPickList") var pickListContent=picklistObj.value Modified: vtigercrm/trunk/include/js/menu.js ============================================================================== --- vtigercrm/trunk/include/js/menu.js (original) +++ vtigercrm/trunk/include/js/menu.js Wed May 31 07:55:26 2006 @@ -1,3 +1,12 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ // JavaScript Document //Layer Function /* NEW SCRIPT FOR MENU SLIDE */ Modified: vtigercrm/trunk/include/js/popup.js ============================================================================== --- vtigercrm/trunk/include/js/popup.js (original) +++ vtigercrm/trunk/include/js/popup.js Wed May 31 07:55:26 2006 @@ -1,3 +1,13 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ + function mypopup() { mywindow = window.open("copyright.html","mywindow", "height=115, width=575"); Modified: vtigercrm/trunk/include/js/search.js ============================================================================== --- vtigercrm/trunk/include/js/search.js (original) +++ vtigercrm/trunk/include/js/search.js Wed May 31 07:55:26 2006 @@ -1,3 +1,12 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ function searchshowhide(argg,argg2) { var x=document.getElementById(argg).style Modified: vtigercrm/trunk/include/js/submenu.js ============================================================================== --- vtigercrm/trunk/include/js/submenu.js (original) +++ vtigercrm/trunk/include/js/submenu.js Wed May 31 07:55:26 2006 @@ -1,3 +1,12 @@ +/********************************************************************************* + ** 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 + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * + ********************************************************************************/ var selTags=document.getElementsByTagName("SELECT") function showSubMenu() { getObj("subMenuBg").style.display=getObj("subMenu").style.display="block" From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 10:02:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 14:02:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6874 - /vtigercrm/trunk/modules/Users/ListView.php Message-ID: <20060531140218.E60F97D7EE3@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 08:02:15 2006 New Revision: 6874 Log: Added License - ahmed Modified: vtigercrm/trunk/modules/Users/ListView.php Modified: vtigercrm/trunk/modules/Users/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Users/ListView.php (original) +++ vtigercrm/trunk/modules/Users/ListView.php Wed May 31 08:02:15 2006 @@ -1,16 +1,12 @@ Author: saraj Date: Wed May 31 08:08:21 2006 New Revision: 6875 Log: new image added for logo Modified: vtigercrm/trunk/themes/blue/images/vtiger-crm.gif Modified: vtigercrm/trunk/themes/blue/images/vtiger-crm.gif ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 10:16:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 14:16:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6876 - /vtigercrm/trunk/themes/blue/images/loginAlpha.gif Message-ID: <20060531141627.040A67D7EE9@vtiger.fosslabs.com> Author: saraj Date: Wed May 31 08:16:24 2006 New Revision: 6876 Log: unwanted image removed Removed: vtigercrm/trunk/themes/blue/images/loginAlpha.gif From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 10:39:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 14:39:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6877 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060531143901.A56F27D7968@vtiger.fosslabs.com> Author: don Date: Wed May 31 08:38:57 2006 New Revision: 6877 Log: issue in home page has been fixed Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Wed May 31 08:38:57 2006 @@ -43,7 +43,7 @@ - +
    {$APP.$CATEGORY} > {$APP.$MODULE}{$APP.$CATEGORY} > {$APP.$MODULE} From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 10:49:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 14:49:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6878 - /vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Message-ID: <20060531144928.0C4447D7F05@vtiger.fosslabs.com> Author: don Date: Wed May 31 08:49:25 2006 New Revision: 6878 Log: add new emails and search icon made faded for emails and webmails Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Wed May 31 08:49:25 2006 @@ -43,7 +43,7 @@ @@ -540,13 +561,6 @@

    Jump-start to vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple,

    -

    Step 1: Browse through Live - Demo

    -

    Step 2: Download product from the vtiger.com - and install in your favorite Operating System.

    -

    Step 3: Post your suggestions & comments at - vtiger Discussions under : vtiger - CRM 5.x category

    Table of Contents

    1. Summary
    2. @@ -683,13 +697,6 @@

      Jump-start to vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple,

      -

      Step 1: Browse through Live - Demo

      -

      Step 2: Download product from the vtiger.com - and install in your favorite Operating System.

      -

      Step 3: Post your suggestions & comments at - vtiger Discussions under : vtiger - CRM 5.x category

      Table of Contents

      1. Summary
      2. @@ -1505,7 +1512,7 @@
        • UI interface has been redesigned based on Smarty template engine.
        • Bug fixes based on the Operation Consolidation list.
        • -
        • Security Management enhancements. For more detail refer to vtigercrm5_alpha_Security.html
        • +
        • Security Management enhancements. For more detail refer to vtigercrm5_alpha_Security.html

        3. Bug Fixes

        Refer to the following links:

        From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 15:26:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 19:26:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6882 - /tags/vtigercrm-5.0.0-beta/ Message-ID: <20060531192630.786837D7F90@vtiger.fosslabs.com> Author: richie Date: Wed May 31 13:26:24 2006 New Revision: 6882 Log: made a copy Added: tags/vtigercrm-5.0.0-beta/ - copied from r6881, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 16:48:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 20:48:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6883 - in /customerportal/trunk: ./ css/ images/ js/ language/ nusoap/ Message-ID: <20060531204859.1EDF07D7F9C@vtiger.fosslabs.com> Author: richie Date: Wed May 31 14:48:50 2006 New Revision: 6883 Log: old files deleted Removed: customerportal/trunk/Acknowledgment.txt customerportal/trunk/CustomerAuthenticate.php customerportal/trunk/INSTALLATION.txt customerportal/trunk/LICENSE_AGREEMENT.txt customerportal/trunk/PortalConfig.php customerportal/trunk/UserTickets.php customerportal/trunk/cp_index.php customerportal/trunk/css/ customerportal/trunk/customerportal.css customerportal/trunk/functions.php customerportal/trunk/general.php customerportal/trunk/images/ customerportal/trunk/index.php customerportal/trunk/js/ customerportal/trunk/language/ customerportal/trunk/nusoap/ customerportal/trunk/supportpage.php From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 16:51:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 20:51:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6884 - in /customerportal/trunk: ./ Faq/ Tickets/ css/ images/ js/ language/ nusoap/ nusoap/lib/ Message-ID: <20060531205121.8F9ED7D7F9C@vtiger.fosslabs.com> Author: richie Date: Wed May 31 14:50:45 2006 New Revision: 6884 Log: updated version Added: customerportal/trunk/Acknowledgment.txt customerportal/trunk/CustomerAuthenticate.php customerportal/trunk/Faq/ customerportal/trunk/Faq/FaqDetail.php customerportal/trunk/Faq/SaveFaqComment.php customerportal/trunk/Faq/Utils.php customerportal/trunk/Faq/index.html customerportal/trunk/Faq/index.php customerportal/trunk/INSTALLATION.txt customerportal/trunk/LICENSE_AGREEMENT.txt customerportal/trunk/MySettings.php customerportal/trunk/PortalConfig.php customerportal/trunk/Tickets/ customerportal/trunk/Tickets/NewTicket.php customerportal/trunk/Tickets/SaveTicket.php customerportal/trunk/Tickets/TicketDetail.php customerportal/trunk/Tickets/TicketSearch.php customerportal/trunk/Tickets/TicketsList.php customerportal/trunk/Tickets/Utils.php customerportal/trunk/Tickets/downloadfile.php customerportal/trunk/Tickets/index.html customerportal/trunk/Tickets/index.php customerportal/trunk/css/ customerportal/trunk/css/dropdown.css customerportal/trunk/css/style.css customerportal/trunk/footer.html customerportal/trunk/header.html customerportal/trunk/images/ customerportal/trunk/images/category.gif (with props) customerportal/trunk/images/email.gif (with props) customerportal/trunk/images/faq.gif (with props) customerportal/trunk/images/favorite.gif (with props) customerportal/trunk/images/loginAlpha.gif (with props) customerportal/trunk/images/loginBg.gif (with props) customerportal/trunk/images/loginBgbig.gif (with props) customerportal/trunk/images/loginBgbig.jpg (with props) customerportal/trunk/images/loginBottomBg.gif (with props) customerportal/trunk/images/loginBottomURL.gif (with props) customerportal/trunk/images/loginBtnSignin.gif (with props) customerportal/trunk/images/loginSIBottomLeft.gif (with props) customerportal/trunk/images/loginSIBottomRight.gif (with props) customerportal/trunk/images/loginSITopLeft.gif (with props) customerportal/trunk/images/loginSITopRight.gif (with props) customerportal/trunk/images/loginTopBg.gif (with props) customerportal/trunk/images/loginTopShade.gif (with props) customerportal/trunk/images/loginVtigerCRM.gif (with props) customerportal/trunk/images/minus.gif (with props) customerportal/trunk/images/plus.gif (with props) customerportal/trunk/images/print.gif (with props) customerportal/trunk/images/products.gif (with props) customerportal/trunk/images/tabSeperatorBg.gif (with props) customerportal/trunk/images/vtiger-crm.gif (with props) customerportal/trunk/include.php customerportal/trunk/index.php customerportal/trunk/js/ customerportal/trunk/js/acdropdown.js customerportal/trunk/js/cookies.js customerportal/trunk/js/general.js customerportal/trunk/js/getobject2.js customerportal/trunk/js/modomt.js customerportal/trunk/language/ customerportal/trunk/language/en_us.lang.php customerportal/trunk/login.php customerportal/trunk/nusoap/ customerportal/trunk/nusoap/lib/ customerportal/trunk/nusoap/lib/nusoap.php customerportal/trunk/supportpage.php From vtiger-tickets at vtiger.fosslabs.com Wed May 31 18:40:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 22:40:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231248=3A?= =?utf-8?q?_Invoice_/_SO_/_PO?= Message-ID: <076.e4d8f1e341c634b1bfe89089253ec586@vtiger.fosslabs.com> #1248: Invoice / SO / PO -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- on Product Details no Description on each line... Please add it Please... -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 18:48:25 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 22:48:25 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231249=3A?= =?utf-8?q?_Task_Information?= Message-ID: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com> #1249: Task Information -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Task Information cannot Select HelpDesk it can select leads, Accounts.... -- Ticket URL: vtiger development vtigerCRM
    - {if $CHECK.EditView eq 'yes'} + {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} {if $MODULE eq 'Activities'} {else} @@ -53,7 +53,7 @@ {/if} - {if $CHECK.index eq 'yes'} + {if $CHECK.index eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} {else} From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 10:56:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 14:56:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6879 - /vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl Message-ID: <20060531145642.6DDAC7D7F12@vtiger.fosslabs.com> Author: don Date: Wed May 31 08:56:38 2006 New Revision: 6879 Log: display field changed from Relative module to report type Modified: vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl Modified: vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ReportsStep1.tpl Wed May 31 08:56:38 2006 @@ -38,7 +38,7 @@
    {$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...{$APP.LBL_SEARCH_ALT}{$MODULE}...
    - + From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:03:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:03:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23308=3A_?= =?utf-8?q?Drilldown_for_leads_by_industry_shows_no_data?= In-Reply-To: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com> References: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com> Message-ID: <085.54860fca9238cbc5eca953e2865bbf37@vtiger.fosslabs.com> #308: Drilldown for leads by industry shows no data ------------------------+--------------------------------------------------- Reporter: richie | Owner: philip Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * owner: jerrydgeorge => philip -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:04:49 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:04:49 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231113=3A?= =?utf-8?q?_export_to_pdf_fails_from_quotes?= In-Reply-To: <076.431db81bc7b29e1e6bec57b2346fde3b@vtiger.fosslabs.com> References: <076.431db81bc7b29e1e6bec57b2346fde3b@vtiger.fosslabs.com> Message-ID: <085.bb3002f6e3bb0f7145d8c0779468d481@vtiger.fosslabs.com> #1113: export to pdf fails from quotes ------------------------+--------------------------------------------------- Reporter: richie | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: quote ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:05:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:05:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231087=3A?= =?utf-8?q?_Home_page=3A_KPIs_numbers_not_displayed?= In-Reply-To: <076.138e9c1830c9213d3cf54687d27e0598@vtiger.fosslabs.com> References: <076.138e9c1830c9213d3cf54687d27e0598@vtiger.fosslabs.com> Message-ID: <085.25166fbf85b14d988a9e31b3d50eef24@vtiger.fosslabs.com> #1087: Home page: KPIs numbers not displayed ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:06:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:06:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231193=3A?= =?utf-8?q?_Issue_in_sharing_calendar?= In-Reply-To: <076.774e42257b1b98382dcf56d4974ba9b6@vtiger.fosslabs.com> References: <076.774e42257b1b98382dcf56d4974ba9b6@vtiger.fosslabs.com> Message-ID: <085.4b216f2a183b575818676153bf268e99@vtiger.fosslabs.com> #1193: Issue in sharing calendar ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:07:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:07:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231194=3A?= =?utf-8?q?_Issue_in_calendar_sharing?= In-Reply-To: <076.b1ca2f924c00c8c74dcb02f25d9f19c6@vtiger.fosslabs.com> References: <076.b1ca2f924c00c8c74dcb02f25d9f19c6@vtiger.fosslabs.com> Message-ID: <085.4cb612ba862ac8e349410245a8443da1@vtiger.fosslabs.com> #1194: Issue in calendar sharing ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: mangai Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:07:55 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:07:55 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2381=3A_?= =?utf-8?q?=22Available_Merge_Fields=22_does_not_work_in_the_email_templat?= =?utf-8?q?es_=28adding_a_merge_field_to_a_template_does_not_result_in_tha?= =?utf-8?q?t_field_being_merged=29?= In-Reply-To: <076.247dfccd0d5a7f69c4c5016ef5f5c24b@vtiger.fosslabs.com> References: <076.247dfccd0d5a7f69c4c5016ef5f5c24b@vtiger.fosslabs.com> Message-ID: <085.7905b85deedf9509c4e6603f70ad7a86@vtiger.fosslabs.com> #81: "Available Merge Fields" does not work in the email templates (adding a merge field to a template does not result in that field being merged) ------------------------------------+--------------------------------------- Reporter: scott at crazycolour.com | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: merge fields not available in email template ------------------------------------+--------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Merge Fields results in the field being merged -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:09:03 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:09:03 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231223=3A?= =?utf-8?q?_Broken_Image_in_Migrate_from_Previous_Version_page?= In-Reply-To: <076.ed626e227471eb252b6e5bacaade56dc@vtiger.fosslabs.com> References: <076.ed626e227471eb252b6e5bacaade56dc@vtiger.fosslabs.com> Message-ID: <085.b505555621c5e2c69557c595dd1f7d99@vtiger.fosslabs.com> #1223: Broken Image in Migrate from Previous Version page ------------------------+--------------------------------------------------- Reporter: gopal | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:09:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:09:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231097=3A?= =?utf-8?q?_E_mail_template_not_functionning_in_demo_when_composing_a_new_?= =?utf-8?q?mail?= In-Reply-To: <076.e559e0d604cc2af8f811c0b6346408b6@vtiger.fosslabs.com> References: <076.e559e0d604cc2af8f811c0b6346408b6@vtiger.fosslabs.com> Message-ID: <085.7d2988bfb52fc2c64547ff46b2ea9a00@vtiger.fosslabs.com> #1097: E mail template not functionning in demo when composing a new mail ------------------------+--------------------------------------------------- Reporter: NonoFr | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: email template ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue fixed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:10:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:10:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231104=3A?= =?utf-8?q?_Issue_in_notes_attachment?= In-Reply-To: <076.72db068eaf2b283598eb7f6d6eae55de@vtiger.fosslabs.com> References: <076.72db068eaf2b283598eb7f6d6eae55de@vtiger.fosslabs.com> Message-ID: <085.05df16e3820ff14ef747fe03d2aacb62@vtiger.fosslabs.com> #1104: Issue in notes attachment ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: invalid | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => invalid * status: new => closed Comment: this is a vulnerability issue. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:11:15 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:11:15 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231131=3A?= =?utf-8?q?_Copy_Merge_Field_Value_is_not__replaced_with_value_and_parentt?= =?utf-8?q?ab_not_parsed_for_edit_template?= In-Reply-To: <076.bef32b69825917dc34da8cbc8db15847@vtiger.fosslabs.com> References: <076.bef32b69825917dc34da8cbc8db15847@vtiger.fosslabs.com> Message-ID: <085.dcbba482ea66344e54d18a6ddad400f2@vtiger.fosslabs.com> #1131: Copy Merge Field Value is not replaced with value and parenttab not parsed for edit template ------------------------+--------------------------------------------------- Reporter: mangai | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: Issue fixed - Merge field value is getting replaced -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:12:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:12:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23275=3A_?= =?utf-8?q?Old_UI_for_attachments?= In-Reply-To: <076.8f5bc7ae23373550435516f3f8ca4071@vtiger.fosslabs.com> References: <076.8f5bc7ae23373550435516f3f8ca4071@vtiger.fosslabs.com> Message-ID: <085.a7229ec4be282bb17d64a9bebc6787c9@vtiger.fosslabs.com> #275: Old UI for attachments ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: jerrydgeorge Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: attachments ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:17:37 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:17:37 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231187=3A?= =?utf-8?q?_Issue_in_email_templates?= In-Reply-To: <076.185b1400a90d3b7e7c77e617cab40e68@vtiger.fosslabs.com> References: <076.185b1400a90d3b7e7c77e617cab40e68@vtiger.fosslabs.com> Message-ID: <085.944d1fa79e5d2b4d24029e45d7dd68b1@vtiger.fosslabs.com> #1187: Issue in email templates ------------------------+--------------------------------------------------- Reporter: don | Owner: ahmed Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by ahmed): * resolution: => fixed * status: new => closed Comment: Issue Fixed - Text alignment is made proper -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:19:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:19:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23848=3A_?= =?utf-8?q?Issue_in_All_Menu?= In-Reply-To: <076.346ae4e7a4103125d315251e89b5686e@vtiger.fosslabs.com> References: <076.346ae4e7a4103125d315251e89b5686e@vtiger.fosslabs.com> Message-ID: <085.9b0c4ea3c4fcd13205695a78a05b24bb@vtiger.fosslabs.com> #848: Issue in All Menu ------------------------+--------------------------------------------------- Reporter: don | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:20:36 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:20:36 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23924=3A_?= =?utf-8?q?Report_Creator_Page_shows_inconsistent_List_Headings?= In-Reply-To: <076.829046d4246e195e3547bf92d6e9ca5c@vtiger.fosslabs.com> References: <076.829046d4246e195e3547bf92d6e9ca5c@vtiger.fosslabs.com> Message-ID: <085.9f51c6c69893be4d8fbb9f7552d653f8@vtiger.fosslabs.com> #924: Report Creator Page shows inconsistent List Headings ------------------------+--------------------------------------------------- Reporter: ahmed | Owner: Jeri Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: reports ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:21:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:21:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231106=3A?= =?utf-8?q?_Issue_in_Calendar_Quick_Access_link?= In-Reply-To: <076.c6e100f8424625fa3cd82a6c919480dd@vtiger.fosslabs.com> References: <076.c6e100f8424625fa3cd82a6c919480dd@vtiger.fosslabs.com> Message-ID: <085.a2b90e26f452270f35f1c7c8001fc004@vtiger.fosslabs.com> #1106: Issue in Calendar Quick Access link ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:21:07 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:21:07 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23934=3A_?= =?utf-8?q?issue_in_Open_All_Menu_button?= In-Reply-To: <076.52083af7ba9689e650dea5dfcd819408@vtiger.fosslabs.com> References: <076.52083af7ba9689e650dea5dfcd819408@vtiger.fosslabs.com> Message-ID: <085.df4d312f65e65752c78f9717cfbfedae@vtiger.fosslabs.com> #934: issue in Open All Menu button ------------------------+--------------------------------------------------- Reporter: mickie | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 11:21:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 15:21:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231191=3A?= =?utf-8?q?_Edit_field_blocks_is_not_removed_from_settings_menusubtab?= In-Reply-To: <076.01547e41e69b4f6064fc86b46e1b68dc@vtiger.fosslabs.com> References: <076.01547e41e69b4f6064fc86b46e1b68dc@vtiger.fosslabs.com> Message-ID: <085.ac4ee17850b46dada4c6caf94265c94c@vtiger.fosslabs.com> #1191: Edit field blocks is not removed from settings menusubtab ------------------------+--------------------------------------------------- Reporter: mangai | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mangai): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 12:55:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 16:55:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6880 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060531165550.EE5857D7F22@vtiger.fosslabs.com> Author: don Date: Wed May 31 10:55:44 2006 New Revision: 6880 Log: Release Notes for v5 beta Added: vtigercrm/trunk/Release_Notes.html From vtiger-tickets at vtiger.fosslabs.com Wed May 31 13:11:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:11:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=23966=3A_?= =?utf-8?q?Report_Creator?= In-Reply-To: <076.7b9a319c4401673d54f4041c4120473a@vtiger.fosslabs.com> References: <076.7b9a319c4401673d54f4041c4120473a@vtiger.fosslabs.com> Message-ID: <085.2ae377fbbe7405a25816e60e85b23a23@vtiger.fosslabs.com> #966: Report Creator ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 13:12:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:12:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231013=3A?= =?utf-8?q?_Home_=3E_Activities_List_View?= In-Reply-To: <076.9c54fa128df249b46893b8dd398eddf0@vtiger.fosslabs.com> References: <076.9c54fa128df249b46893b8dd398eddf0@vtiger.fosslabs.com> Message-ID: <085.0de4cb67de932595ebe361ce25ce6753@vtiger.fosslabs.com> #1013: Home > Activities List View ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 13:12:34 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:12:34 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231017=3A?= =?utf-8?q?_Helpdesk_-_File_upload_page_UI_is_in_old_format?= In-Reply-To: <076.192abdb76e706e9ecd0149341039ec5d@vtiger.fosslabs.com> References: <076.192abdb76e706e9ecd0149341039ec5d@vtiger.fosslabs.com> Message-ID: <085.795718350d617ec7db9edc15e16c5bc0@vtiger.fosslabs.com> #1017: Helpdesk - File upload page UI is in old format ------------------------+--------------------------------------------------- Reporter: saraj | Owner: mickie Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: helpdesk fileupload ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 13:13:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:13:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231021=3A?= =?utf-8?q?_Faq_-_Listview_Pagination_throws_javascript_exception?= In-Reply-To: <076.a1dc08db90d13c34fbf821d94e8e9d78@vtiger.fosslabs.com> References: <076.a1dc08db90d13c34fbf821d94e8e9d78@vtiger.fosslabs.com> Message-ID: <085.64b3e41c99745e3c4abab4cdf0bbe870@vtiger.fosslabs.com> #1021: Faq - Listview Pagination throws javascript exception ------------------------+--------------------------------------------------- Reporter: saraj | Owner: philip Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: faq pagination ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 13:13:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:13:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231042=3A?= =?utf-8?q?_Tag_Clould_should_be_changed?= In-Reply-To: <076.0b78bce2e9d0dbdad2f10faee2399413@vtiger.fosslabs.com> References: <076.0b78bce2e9d0dbdad2f10faee2399413@vtiger.fosslabs.com> Message-ID: <085.b4b1ee3c6c61aee83f6d9bf57a4c075e@vtiger.fosslabs.com> #1042: Tag Clould should be changed ---------------------------+------------------------------------------------ Reporter: jerrydgeorge | Owner: ela Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ---------------------------+------------------------------------------------ Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed May 31 13:14:19 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 31 May 2006 17:14:19 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231115=3A?= =?utf-8?q?_Report_Creator_=3E_Relative_Module_not_showing?= In-Reply-To: <076.bfc887d15993de2dff63a0499087006d@vtiger.fosslabs.com> References: <076.bfc887d15993de2dff63a0499087006d@vtiger.fosslabs.com> Message-ID: <085.18f8911d710840d78f64a286c4e0cc04@vtiger.fosslabs.com> #1115: Report Creator > Relative Module not showing ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by jerrydgeorge): * resolution: => fixed * status: new => closed -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed May 31 13:46:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 31 May 2006 17:46:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r6881 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060531174622.E14567D7F69@vtiger.fosslabs.com> Author: don Date: Wed May 31 11:46:18 2006 New Revision: 6881 Log: release notes for 5beta Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Wed May 31 11:46:18 2006 @@ -41,7 +41,7 @@

    Appeal to Developers, Testers, Analysts, Writers, and real end users!

    Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta,

    -

    Step 1: Browse through Live Demo

    +

    Step 1: Browse through Live Demo

    Step 2: Download product from the vtiger.com and install in your favorite Operating System.

    Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

    Table of Contents

    @@ -87,7 +87,7 @@
    @@ -211,6 +211,30 @@ + + + + + + + + + + + + + + + + + + + + + + + +
    1. {$MOD.LBL_REPORT_DETAILS}
    2. {$MOD.LBL_RELATIVE_MODULE}
    3.{$MOD.LBL_RELATIVE_MODULE}
    3.{$MOD.LBL_REPORT_TYPE}
    4.{$MOD.LBL_SELECT_COLUMNS}
    5. {$MOD.LBL_SPECIFY_GROUPING}
    6. {$MOD.LBL_CALCULATIONS}
    Product Documentation
    28 Mass Change owner option in various modules
    29Inventory Revamped
    30Advanced and Basic Search UI changed
    31Automatic Tax Calculator Integrated
    32Pagination to the related list added
    33Migration support from 4.2.3 to 5.0 Beta Integrated

     

    @@ -352,9 +376,6 @@

    Appeal to Developers, Testers, Analysts, Writers, and real end users!

    Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Alpha 5,

    -

    Step 1: Browse through Live Demo

    -

    Step 2: Download product from the vtiger.com and install in your favorite Operating System.

    -

    Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

    Table of Contents

    1. Summary
    2. @@ -403,7 +424,7 @@
    Product Documentation