[Vtigercrm-commits] [vtiger-commits] r9628 - in /vtigercrm/branches/5.0.2: ./ include/utils/ install/ modules/Accounts/ modules/Calendar/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/ modules/Vendors/ modules/Webmails/ soap/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Mon Oct 16 03:04:25 EDT 2006
Author: richie
Date: Mon Oct 16 01:02:11 2006
New Revision: 9628
Log:
module name ,File name ,Class name made unique --Jeri
Modified:
vtigercrm/branches/5.0.2/Popup.php
vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php
vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php
vtigercrm/branches/5.0.2/include/utils/export.php
vtigercrm/branches/5.0.2/include/utils/utils.php
vtigercrm/branches/5.0.2/index.php
vtigercrm/branches/5.0.2/install/5createTables.inc.php
vtigercrm/branches/5.0.2/install/populateSeedData.php
vtigercrm/branches/5.0.2/modules/Accounts/Account.php
vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/Accounts/Delete.php
vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php
vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/Accounts/EditView.php
vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php
vtigercrm/branches/5.0.2/modules/Accounts/ListView.php
vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php
vtigercrm/branches/5.0.2/modules/Accounts/Save.php
vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php
vtigercrm/branches/5.0.2/modules/Calendar/Activity.php
vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php
vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php
vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php
vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php
vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php
vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php
vtigercrm/branches/5.0.2/modules/Campaigns/Save.php
vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/Contacts/Contact.php
vtigercrm/branches/5.0.2/modules/Contacts/Delete.php
vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php
vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/Contacts/EditView.php
vtigercrm/branches/5.0.2/modules/Contacts/ListView.php
vtigercrm/branches/5.0.2/modules/Contacts/Save.php
vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php
vtigercrm/branches/5.0.2/modules/Emails/Delete.php
vtigercrm/branches/5.0.2/modules/Emails/DetailView.php
vtigercrm/branches/5.0.2/modules/Emails/EditView.php
vtigercrm/branches/5.0.2/modules/Emails/Email.php
vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php
vtigercrm/branches/5.0.2/modules/Emails/ListView.php
vtigercrm/branches/5.0.2/modules/Emails/Save.php
vtigercrm/branches/5.0.2/modules/Emails/mailsend.php
vtigercrm/branches/5.0.2/modules/Emails/sendmail.php
vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php
vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php
vtigercrm/branches/5.0.2/modules/Import/ImportContact.php
vtigercrm/branches/5.0.2/modules/Import/ImportLead.php
vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php
vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php
vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php
vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php
vtigercrm/branches/5.0.2/modules/Invoice/EditView.php
vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/Leads/Delete.php
vtigercrm/branches/5.0.2/modules/Leads/DetailView.php
vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/Leads/EditView.php
vtigercrm/branches/5.0.2/modules/Leads/Lead.php
vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php
vtigercrm/branches/5.0.2/modules/Leads/ListView.php
vtigercrm/branches/5.0.2/modules/Leads/Save.php
vtigercrm/branches/5.0.2/modules/Leads/result.php
vtigercrm/branches/5.0.2/modules/Notes/Delete.php
vtigercrm/branches/5.0.2/modules/Notes/DetailView.php
vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/Notes/EditView.php
vtigercrm/branches/5.0.2/modules/Notes/ListView.php
vtigercrm/branches/5.0.2/modules/Notes/Note.php
vtigercrm/branches/5.0.2/modules/Notes/Save.php
vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/Potentials/Charts.php
vtigercrm/branches/5.0.2/modules/Potentials/Delete.php
vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php
vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/Potentials/EditView.php
vtigercrm/branches/5.0.2/modules/Potentials/ListView.php
vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php
vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php
vtigercrm/branches/5.0.2/modules/Potentials/Save.php
vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php
vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php
vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php
vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php
vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php
vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php
vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php
vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php
vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/Products/Delete.php
vtigercrm/branches/5.0.2/modules/Products/DetailView.php
vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/Products/EditView.php
vtigercrm/branches/5.0.2/modules/Products/ListView.php
vtigercrm/branches/5.0.2/modules/Products/Product.php
vtigercrm/branches/5.0.2/modules/Products/Save.php
vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php
vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php
vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php
vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php
vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php
vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php
vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php
vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php
vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php
vtigercrm/branches/5.0.2/modules/Quotes/Delete.php
vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php
vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/Quotes/EditView.php
vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php
vtigercrm/branches/5.0.2/modules/Quotes/ListView.php
vtigercrm/branches/5.0.2/modules/Quotes/Quote.php
vtigercrm/branches/5.0.2/modules/Quotes/Save.php
vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php
vtigercrm/branches/5.0.2/modules/Users/Authenticate.php
vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php
vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php
vtigercrm/branches/5.0.2/modules/Users/DetailView.php
vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/Users/EditView.php
vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php
vtigercrm/branches/5.0.2/modules/Users/ListView.php
vtigercrm/branches/5.0.2/modules/Users/Logout.php
vtigercrm/branches/5.0.2/modules/Users/Save.php
vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php
vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php
vtigercrm/branches/5.0.2/modules/Users/User.php
vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php
vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php
vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/Vendors/Delete.php
vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php
vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php
vtigercrm/branches/5.0.2/modules/Vendors/EditView.php
vtigercrm/branches/5.0.2/modules/Vendors/ListView.php
vtigercrm/branches/5.0.2/modules/Vendors/Save.php
vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php
vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php
vtigercrm/branches/5.0.2/modules/Webmails/Save.php
vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php
vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php
vtigercrm/branches/5.0.2/soap/vtigerolservice.php
vtigercrm/branches/5.0.2/soap/webforms.php
vtigercrm/branches/5.0.2/soap/wordplugin.php
Modified: vtigercrm/branches/5.0.2/Popup.php
==============================================================================
--- vtigercrm/branches/5.0.2/Popup.php (original)
+++ vtigercrm/branches/5.0.2/Popup.php Mon Oct 16 01:02:11 2006
@@ -33,8 +33,8 @@
switch($currentModule)
{
case 'Contacts':
- require_once("modules/$currentModule/Contact.php");
- $focus = new Contact();
+ require_once("modules/$currentModule/Contacts.php");
+ $focus = new Contacts();
$log = LoggerManager::getLogger('contact_list');
$comboFieldNames = Array('leadsource'=>'leadsource_dom');
$comboFieldArray = getComboArray($comboFieldNames);
@@ -47,8 +47,8 @@
$alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","","");
break;
case 'Campaigns':
- require_once("modules/$currentModule/Campaign.php");
- $focus = new Campaign();
+ require_once("modules/$currentModule/Campaigns.php");
+ $focus = new Campaigns();
$log = LoggerManager::getLogger('campaign_list');
$comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom',
'campaigntype'=>'campaigntype_dom');
@@ -60,8 +60,8 @@
$alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","","");
break;
case 'Accounts':
- require_once("modules/$currentModule/Account.php");
- $focus = new Account();
+ require_once("modules/$currentModule/Accounts.php");
+ $focus = new Accounts();
$log = LoggerManager::getLogger('account_list');
$comboFieldNames = Array('accounttype'=>'account_type_dom'
,'industry'=>'industry_dom');
@@ -74,8 +74,8 @@
$alphabetical = AlphabeticalSearch($currentModule,'Popup','accountname','true','basic',$popuptype,"","","");
break;
case 'Leads':
- require_once("modules/$currentModule/Lead.php");
- $focus = new Lead();
+ require_once("modules/$currentModule/Leads.php");
+ $focus = new Leads();
$log = LoggerManager::getLogger('contact_list');
$comboFieldNames = Array('leadsource'=>'leadsource_dom'
,'leadstatus'=>'leadstatus_dom'
@@ -91,8 +91,8 @@
$alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","","");
break;
case 'Potentials':
- require_once("modules/$currentModule/Opportunity.php");
- $focus = new Potential();
+ require_once("modules/$currentModule/Potentials.php");
+ $focus = new Potentials();
$log = LoggerManager::getLogger('potential_list');
$comboFieldNames = Array('leadsource'=>'leadsource_dom'
,'opportunity_type'=>'opportunity_type_dom'
@@ -104,8 +104,8 @@
$alphabetical = AlphabeticalSearch($currentModule,'Popup','potentialname','true','basic',$popuptype,"","","");
break;
case 'Quotes':
- require_once("modules/$currentModule/Quote.php");
- $focus = new Quote();
+ require_once("modules/$currentModule/Quotes.php");
+ $focus = new Quotes();
$log = LoggerManager::getLogger('quotes_list');
$comboFieldNames = Array('quotestage'=>'quotestage_dom');
$comboFieldArray = getComboArray($comboFieldNames);
@@ -121,8 +121,8 @@
$alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","","");
break;
case 'Products':
- require_once("modules/$currentModule/Product.php");
- $focus = new Product();
+ require_once("modules/$currentModule/Products.php");
+ $focus = new Products();
$smarty->assign("SINGLE_MOD",'Product');
if(isset($_REQUEST['curr_row']))
{
@@ -135,8 +135,8 @@
$alphabetical = AlphabeticalSearch($currentModule,'Popup','productname','true','basic',$popuptype,"","","");
break;
case 'Vendors':
- require_once("modules/$currentModule/Vendor.php");
- $focus = new Vendor();
+ require_once("modules/$currentModule/Vendors.php");
+ $focus = new Vendors();
$smarty->assign("SINGLE_MOD",'Vendor');
$alphabetical = AlphabeticalSearch($currentModule,'Popup','vendorname','true','basic',$popuptype,"","","");
break;
@@ -150,15 +150,15 @@
break;
case 'PurchaseOrder':
require_once("modules/$currentModule/PurchaseOrder.php");
- $focus = new Order();
+ $focus = new PurchaseOrder();
$smarty->assign("SINGLE_MOD",'PurchaseOrder');
if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
$alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","","");
break;
case 'PriceBooks':
- require_once("modules/$currentModule/PriceBook.php");
- $focus = new PriceBook();
+ require_once("modules/$currentModule/PriceBooks.php");
+ $focus = new PriceBooks();
$smarty->assign("SINGLE_MOD",'PriceBook');
if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
@@ -175,8 +175,8 @@
$alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","","");
break;
case 'Users':
- require_once("modules/$currentModule/User.php");
- $focus = new User();
+ require_once("modules/$currentModule/Users.php");
+ $focus = new Users();
$smarty->assign("SINGLE_MOD",'Users');
if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
Modified: vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php Mon Oct 16 01:02:11 2006
@@ -863,15 +863,15 @@
$nemail=count($realid);
if ($pmodule=='Accounts'){
- require_once('modules/Accounts/Account.php');
- $myfocus = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $myfocus = new Accounts();
$myfocus->retrieve_entity_info($entityid,"Accounts");
$fullname=br2nl($myfocus->column_fields['accountname']);
$account_selected = 'selected';
}
elseif ($pmodule=='Contacts'){
- require_once('modules/Contacts/Contact.php');
- $myfocus = new Contact();
+ require_once('modules/Contacts/Contacts.php');
+ $myfocus = new Contacts();
$myfocus->retrieve_entity_info($entityid,"Contacts");
$fname=br2nl($myfocus->column_fields['firstname']);
$lname=br2nl($myfocus->column_fields['lastname']);
@@ -879,8 +879,8 @@
$contact_selected = 'selected';
}
elseif ($pmodule=='Leads'){
- require_once('modules/Leads/Lead.php');
- $myfocus = new Lead();
+ require_once('modules/Leads/Leads.php');
+ $myfocus = new Leads();
$myfocus->retrieve_entity_info($entityid,"Leads");
$fname=br2nl($myfocus->column_fields['firstname']);
$lname=br2nl($myfocus->column_fields['lastname']);
Modified: vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php Mon Oct 16 01:02:11 2006
@@ -1385,8 +1385,8 @@
}
elseif($popuptype == "specific_account_address")
{
- require_once('modules/Accounts/Account.php');
- $acct_focus = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $acct_focus = new Accounts();
$acct_focus->retrieve_entity_info($entity_id,"Accounts");
$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
@@ -1394,8 +1394,8 @@
}
elseif($popuptype == "specific_contact_account_address")
{
- require_once('modules/Accounts/Account.php');
- $acct_focus = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $acct_focus = new Accounts();
$acct_focus->retrieve_entity_info($entity_id,"Accounts");
$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_contact_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
@@ -1405,8 +1405,8 @@
elseif($popuptype == "specific_potential_account_address")
{
$acntid = $adb->query_result($list_result,$list_result_count,"accountid");
- require_once('modules/Accounts/Account.php');
- $acct_focus = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $acct_focus = new Accounts();
$acct_focus->retrieve_entity_info($acntid,"Accounts");
$account_name = getAccountName($acntid);
@@ -1461,8 +1461,8 @@
}
elseif($popuptype == "specific_vendor_address")
{
- require_once('modules/Vendors/Vendor.php');
- $acct_focus = new Vendor();
+ require_once('modules/Vendors/Vendors.php');
+ $acct_focus = new Vendors();
$acct_focus->retrieve_entity_info($entity_id,"Vendors");
$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['street']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'"); window.close()\'>'.$temp_val.'</a>';
Modified: vtigercrm/branches/5.0.2/include/utils/export.php
==============================================================================
--- vtigercrm/branches/5.0.2/include/utils/export.php (original)
+++ vtigercrm/branches/5.0.2/include/utils/export.php Mon Oct 16 01:02:11 2006
@@ -20,23 +20,23 @@
require_once('config.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
-require_once('modules/Accounts/Account.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Leads/Lead.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Emails/Email.php');
+require_once('modules/Accounts/Accounts.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Leads/Leads.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Emails/Emails.php');
require_once('modules/Calendar/Activity.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Users/User.php');
-require_once('modules/Products/Product.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Potentials/Potentials.php');
+require_once('modules/Users/Users.php');
+require_once('modules/Products/Products.php');
require_once('include/utils/UserInfoUtil.php');
global $allow_exports;
session_start();
-$current_user = new User();
+$current_user = new Users();
if(isset($_SESSION['authenticated_user_id']))
{
Modified: vtigercrm/branches/5.0.2/include/utils/utils.php
==============================================================================
--- vtigercrm/branches/5.0.2/include/utils/utils.php (original)
+++ vtigercrm/branches/5.0.2/include/utils/utils.php Mon Oct 16 01:02:11 2006
@@ -2048,9 +2048,9 @@
$log->debug("Entering getEmailParentsList(".$module.",".$id.") method ...");
global $adb;
if($module == 'Contacts')
- $focus = new Contact();
+ $focus = new Contacts();
if($module == 'Leads')
- $focus = new Lead();
+ $focus = new Leads();
$focus->retrieve_entity_info($id,$module);
$fieldid = 0;
Modified: vtigercrm/branches/5.0.2/index.php
==============================================================================
--- vtigercrm/branches/5.0.2/index.php (original)
+++ vtigercrm/branches/5.0.2/index.php Mon Oct 16 01:02:11 2006
@@ -101,7 +101,7 @@
set_default_config($default_config_values);
require_once('include/logging.php');
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
global $currentModule;
@@ -352,7 +352,7 @@
$lang_crm = (isset($_SESSION['authenticated_user_language'])) ? $_SESSION['authenticated_user_language'] : "";
$GLOBALS['request_string'] = "&module=$module&action=$action&record=$record&lang_crm=$lang_crm";
-$current_user = new User();
+$current_user = new Users();
if($use_current_login)
{
@@ -432,90 +432,22 @@
// Use the record to track the viewing.
// todo - Have a record of modules and thier primary object names.
//Getting the actual module
- $actualModule = $currentModule;
switch($currentModule)
{
- case 'Leads':
- require_once("modules/$currentModule/Lead.php");
- $focus = new Lead();
- break;
- case 'Contacts':
- require_once("modules/$currentModule/Contact.php");
- $focus = new Contact();
- break;
- case 'Accounts':
- require_once("modules/$currentModule/Account.php");
- $focus = new Account();
- break;
- case 'Potentials':
- require_once("modules/$currentModule/Opportunity.php");
- $focus = new Potential();
- break;
case 'Calendar':
require_once("modules/$currentModule/Activity.php");
$focus = new Activity();
break;
- case 'Notes':
- require_once("modules/$currentModule/Note.php");
- $focus = new Note();
- break;
- case 'Emails':
- require_once("modules/$currentModule/Email.php");
- $focus = new Email();
- break;
- case 'Users':
- require_once("modules/$currentModule/User.php");
- $focus = new User();
- break;
- case 'Products':
- require_once("modules/$currentModule/Product.php");
- $focus = new Product();
- break;
- case 'Vendors':
- require_once("modules/$currentModule/Vendor.php");
- $focus = new Vendor();
- $actualModule = 'Vendors';
- break;
- case 'PriceBooks':
- require_once("modules/$currentModule/PriceBook.php");
- $focus = new PriceBook();
- $actualModule = 'PriceBooks';
- break;
- case 'HelpDesk':
- require_once("modules/$currentModule/HelpDesk.php");
- $focus = new HelpDesk();
- break;
- case 'Faq':
- require_once("modules/$currentModule/Faq.php");
- $focus = new Faq();
- break;
- case 'Quotes':
- require_once("modules/$currentModule/Quote.php");
- $focus = new Quote();
- break;
- case 'PurchaseOrder':
- require_once("modules/$currentModule/PurchaseOrder.php");
- $focus = new Order();
- break;
- case 'SalesOrder':
- require_once("modules/$currentModule/SalesOrder.php");
- $focus = new SalesOrder();
- break;
-
- case 'Invoice':
- require_once("modules/$currentModule/Invoice.php");
- $focus = new Invoice();
- break;
- case 'Campaigns':
- require_once("modules/$currentModule/Campaign.php");
- $focus = new Campaign();
+ default:
+ require_once("modules/$currentModule/$currentModule.php");
+ $focus = new $currentModule();
break;
}
if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails")
{
// Only track a viewing if the record was retrieved.
- $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
+ $focus->track_view($current_user->id, $currentModule,$_REQUEST['record']);
}
}
Modified: vtigercrm/branches/5.0.2/install/5createTables.inc.php
==============================================================================
--- vtigercrm/branches/5.0.2/install/5createTables.inc.php (original)
+++ vtigercrm/branches/5.0.2/install/5createTables.inc.php Mon Oct 16 01:02:11 2006
@@ -22,14 +22,14 @@
require_once('config.php');
require_once('include/database/PearDatabase.php');
require_once('include/logging.php');
-require_once('modules/Leads/Lead.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Accounts/Account.php');
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Leads/Leads.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Accounts/Accounts.php');
+require_once('modules/Potentials/Potentials.php');
require_once('modules/Calendar/Activity.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Emails/Email.php');
-require_once('modules/Users/User.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Emails/Emails.php');
+require_once('modules/Users/Users.php');
require_once('modules/Import/ImportMap.php');
require_once('modules/Import/UsersLastImport.php');
require_once('modules/Users/LoginHistory.php');
@@ -66,7 +66,7 @@
global $default_user_is_admin;
// create default admin user
- $user = new User();
+ $user = new Users();
$user->column_fields["last_name"] = 'Administrator';
$user->column_fields["user_name"] = 'admin';
$user->column_fields["status"] = 'Active';
@@ -122,7 +122,7 @@
//Creating the Standard User
- $user = new User();
+ $user = new Users();
$user->column_fields["last_name"] = 'StandardUser';
$user->column_fields["user_name"] = 'standarduser';
$user->column_fields["is_admin"] = 'off';
Modified: vtigercrm/branches/5.0.2/install/populateSeedData.php
==============================================================================
--- vtigercrm/branches/5.0.2/install/populateSeedData.php (original)
+++ vtigercrm/branches/5.0.2/install/populateSeedData.php Mon Oct 16 01:02:11 2006
@@ -19,29 +19,29 @@
require_once('config.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
require_once('modules/Contacts/contactSeedData.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Accounts/Account.php');
-require_once('modules/Campaigns/Campaign.php');
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Accounts/Accounts.php');
+require_once('modules/Campaigns/Campaigns.php');
+require_once('modules/Potentials/Potentials.php');
require_once('modules/Calendar/Activity.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
require_once('include/language/en_us.lang.php');
require_once('include/ComboStrings.php');
require_once('include/ComboUtil.php');
-require_once('modules/Products/Product.php');
-require_once('modules/PriceBooks/PriceBook.php');
-require_once('modules/Vendors/Vendor.php');
+require_once('modules/Products/Products.php');
+require_once('modules/PriceBooks/PriceBooks.php');
+require_once('modules/Vendors/Vendors.php');
require_once('modules/Faq/Faq.php');
require_once('modules/HelpDesk/HelpDesk.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Quotes/Quotes.php');
require_once('modules/SalesOrder/SalesOrder.php');
require_once('modules/PurchaseOrder/PurchaseOrder.php');
require_once('modules/Invoice/Invoice.php');
-require_once('modules/Emails/Email.php');
+require_once('modules/Emails/Emails.php');
require_once('include/utils/InventoryUtils.php'); //Included to save inventory related products in demo data
global $first_name_array;
@@ -113,7 +113,7 @@
}
// Look up the user id for the assigned user
-$seed_user = new User();
+$seed_user = new Users();
//$adb->println("PSD assignname=".$assigned_user_name);
@@ -121,7 +121,7 @@
global $current_user;
-$current_user = new User();
+$current_user = new Users();
$result = $current_user->retrieve_entity_info($assigned_user_id,'Users');
$tagkey = 1;
@@ -147,7 +147,7 @@
$account_name = $company_name_array[$i];
// Create new accounts.
- $account = new Account();
+ $account = new Accounts();
$account->column_fields["accountname"] = $account_name;
$account->column_fields["phone"] = create_phone_number();
$account->column_fields["assigned_user_id"] = $assigned_user_id;
@@ -196,7 +196,7 @@
//Create new opportunities
- $opp = new Potential();
+ $opp = new Potentials();
$opp->column_fields["assigned_user_id"] = $assigned_user_id;
$opp->column_fields["potentialname"] = $account_name." - 1000 units";
@@ -235,7 +235,7 @@
for($i=0; $i<10; $i++)
{
- $contact = new Contact();
+ $contact = new Contacts();
$contact->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i]));
$contact->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i]));
$contact->column_fields["assigned_user_id"] = $assigned_user_id;
@@ -327,7 +327,7 @@
$company_count=0;
for($i=0; $i<10; $i++)
{
- $lead = new Lead();
+ $lead = new Leads();
$lead->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i]));
$lead->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i]));
@@ -404,7 +404,7 @@
//Populating Vendor Data
for($i=0; $i<10; $i++)
{
- $vendor = new Vendor();
+ $vendor = new Vendors();
$vendor->column_fields["vendorname"] = ucfirst(strtolower($first_name_array[$i]));
$vendor->column_fields["phone"] = create_phone_number();
$vendor->column_fields["email"] = strtolower($vendor->column_fields["vendorname"])."@company.com";
@@ -442,7 +442,7 @@
.jpeg###","product7.jpeg###product8.jpeg###product9.jpeg###product10.jpeg###");
for($i=0; $i<10; $i++)
{
- $product = new Product();
+ $product = new Products();
if($i>4)
{
$parent_key = array_rand($opportunity_ids);
@@ -579,7 +579,7 @@
$validtill_array = array ("2006-09-21", "2006-10-29", "2006-12-11", "2006-10-09", "2006-11-18");
for($i=0;$i<5;$i++)
{
- $quote = new Quote();
+ $quote = new Quotes();
$quote->column_fields["assigned_user_id"] = $assigned_user_id;
$account_key = array_rand($account_ids);
@@ -730,7 +730,7 @@
for($i=0;$i<5;$i++)
{
- $po = new Order();
+ $po = new PurchaseOrder();
$po->column_fields["assigned_user_id"] = $assigned_user_id;
$vendor_key = array_rand($vendor_ids);
@@ -896,7 +896,7 @@
for($i=0;$i<5;$i++)
{
- $email = new Email();
+ $email = new Emails();
$email->column_fields["assigned_user_id"] = $assigned_user_id;
@@ -923,7 +923,7 @@
//$num_array = array(0,1,2,3,4);
for($i=0;$i<12;$i++)
{
- $pricebook = new PriceBook();
+ $pricebook = new PriceBooks();
$rand = array_rand($num_array);
$pricebook->column_fields["bookname"] = $PB_array[$i];
@@ -940,7 +940,7 @@
for($i=0;$i<7;$i++)
{
- $notes = new Note();
+ $notes = new Notes();
$rand = array_rand($num_array);
$contact_key = array_rand($contact_ids);
@@ -1118,7 +1118,7 @@
//$expected_response = Array(null,null,null);
for($i=0;$i<count($campaign_name_array);$i++)
{
- $campaign = new Campaign();
+ $campaign = new Campaigns();
$campaign_name = $campaign_name_array[$i];
$campaign->column_fields["campaignname"] = $campaign_name;
$campaign->column_fields["campaigntype"] = $campaign_type_array[$i];
Modified: vtigercrm/branches/5.0.2/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/Account.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/Account.php Mon Oct 16 01:02:11 2006
@@ -13,7 +13,7 @@
* Contributor(s): ______________________________________.
********************************************************************************/
/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Account.php,v 1.53 2005/04/28 08:06:45 rank Exp $
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Accounts.php,v 1.53 2005/04/28 08:06:45 rank Exp $
* Description: Defines the Account SugarBean Account entity with the necessary
* methods and variables.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -26,11 +26,11 @@
require_once('include/database/PearDatabase.php');
require_once('data/SugarBean.php');
require_once('data/CRMEntity.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Potentials/Potentials.php');
require_once('modules/Calendar/Activity.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Emails/Email.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Emails/Emails.php');
require_once('include/utils/utils.php');
require_once('user_privileges/default_module_view.php');
@@ -96,7 +96,7 @@
var $default_order_by = 'accountname';
var $default_sort_order = 'ASC';
- function Account() {
+ function Accounts() {
$this->log =LoggerManager::getLogger('account');
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('Accounts');
@@ -147,7 +147,7 @@
$log->debug("Entering get_contacts(".$id.") method ...");
global $mod_strings;
- $focus = new Contact();
+ $focus = new Contacts();
$button = '';
if(isPermitted("Contacts",1,"") == 'yes')
@@ -191,7 +191,7 @@
$log->debug("Entering get_opportunities(".$id.") method ...");
global $mod_strings;
- $focus = new Potential();
+ $focus = new Potentials();
$button = '';
if(isPermitted("Potentials",1,"") == 'yes')
@@ -388,9 +388,9 @@
global $log, $singlepane_view;
$log->debug("Entering get_quotes(".$id.") method ...");
global $app_strings;
- require_once('modules/Quotes/Quote.php');
-
- $focus = new Quote();
+ require_once('modules/Quotes/Quotes.php');
+
+ $focus = new Quotes();
$button = '';
if(isPermitted("Quotes",1,"") == 'yes')
@@ -627,10 +627,10 @@
{
global $log, $singlepane_view;
$log->debug("Entering get_products(".$id.") method ...");
- require_once('modules/Products/Product.php');
+ require_once('modules/Products/Products.php');
global $app_strings;
- $focus = new Product();
+ $focus = new Products();
$button = '';
Modified: vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -11,7 +11,7 @@
require_once('Smarty_setup.php');
-require_once('modules/Accounts/Account.php');
+require_once('modules/Accounts/Accounts.php');
require_once('include/utils/utils.php');
//Redirecting Header for single page layout
require_once('user_privileges/default_module_view.php');
@@ -22,7 +22,7 @@
}
else
{
-$focus = new Account();
+$focus = new Accounts();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
if(isset($_REQUEST['record']) && $_REQUEST['record']!='') {
Modified: vtigercrm/branches/5.0.2/modules/Accounts/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/Delete.php Mon Oct 16 01:02:11 2006
@@ -18,13 +18,13 @@
* defined return URL.
********************************************************************************/
-require_once('modules/Accounts/Account.php');
+require_once('modules/Accounts/Accounts.php');
global $mod_strings;
require_once('include/logging.php');
$log = LoggerManager::getLogger('contact_delete');
-$focus = new Account();
+$focus = new Accounts();
if(!isset($_REQUEST['record']))
die($mod_strings['ERR_DELETE_RECORD']);
Modified: vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Accounts/Account.php');
+require_once('modules/Accounts/Accounts.php');
require_once('include/CustomFieldUtil.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
@@ -32,7 +32,7 @@
global $app_list_strings;
global $log, $currentModule, $singlepane_view;
-$focus = new Account();
+$focus = new Accounts();
if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
$focus->retrieve_entity_info($_REQUEST['record'],"Accounts");
$focus->id = $_REQUEST['record'];
Modified: vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Accounts/Account.php');
+require_once('modules/Accounts/Accounts.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -25,7 +25,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $acntObj = new Account();
+ $acntObj = new Accounts();
$acntObj->retrieve_entity_info($crmid,"Accounts");
$acntObj->column_fields[$fieldname] = $fieldvalue;
if($fieldname == 'annual_revenue')//annual revenue converted to dollar value while saving
Modified: vtigercrm/branches/5.0.2/modules/Accounts/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/EditView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Accounts/Account.php');
+require_once('modules/Accounts/Accounts.php');
require_once('include/CustomFieldUtil.php');
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
@@ -31,7 +31,7 @@
global $app_strings,$mod_strings,$currentModule,$theme;
$smarty=new vtigerCRM_Smarty;
-$focus = new Account();
+$focus = new Accounts();
if(isset($_REQUEST['record']))
{
Modified: vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php Mon Oct 16 01:02:11 2006
@@ -8,7 +8,7 @@
* All Rights Reserved.
*
********************************************************************************/
-include("modules/Accounts/Account.php");
+include("modules/Accounts/Accounts.php");
include("getCompanyProfile.php");
$variable = $_REQUEST['tickersymbol'];
$url = "http://finance.yahoo.com/q?s=".$variable;
Modified: vtigercrm/branches/5.0.2/modules/Accounts/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/ListView.php Mon Oct 16 01:02:11 2006
@@ -15,7 +15,7 @@
require_once('Smarty_setup.php');
require_once("data/Tracker.php");
-require_once('modules/Accounts/Account.php');
+require_once('modules/Accounts/Accounts.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
require_once('include/ListView/ListView.php');
@@ -43,7 +43,7 @@
$url_string = '';
-$focus = new Account();
+$focus = new Accounts();
$smarty = new vtigerCRM_Smarty;
$other_text = Array();
Modified: vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php Mon Oct 16 01:02:11 2006
@@ -28,7 +28,7 @@
$log = LoggerManager::getLogger('top accounts_list');
$log->debug("Entering getTopAccounts() method ...");
require_once("data/Tracker.php");
- require_once('modules/Potentials/Opportunity.php');
+ require_once('modules/Potentials/Potentials.php');
require_once('include/logging.php');
require_once('include/ListView/ListView.php');
global $app_strings;
Modified: vtigercrm/branches/5.0.2/modules/Accounts/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/Save.php Mon Oct 16 01:02:11 2006
@@ -21,14 +21,14 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/Accounts/Account.php');
+require_once('modules/Accounts/Accounts.php');
require_once('include/logging.php');
//require_once('database/DatabaseConnection.php');
require_once('include/database/PearDatabase.php');
$local_log =& LoggerManager::getLogger('index');
global $log;
-$focus = new Account();
+$focus = new Accounts();
global $current_user;
$currencyid=fetchCurrency($current_user->id);
$rate_symbol = getCurrencySymbolandCRate($currencyid);
Modified: vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php (original)
+++ vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php Mon Oct 16 01:02:11 2006
@@ -8,7 +8,7 @@
* All Rights Reserved.
*
********************************************************************************/
-require_once("modules/Accounts/Account.php");
+require_once("modules/Accounts/Accounts.php");
require_once("getCompanyProfile.php");
$variable = $_REQUEST['tickersymbol'];
$url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable);
Modified: vtigercrm/branches/5.0.2/modules/Calendar/Activity.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Calendar/Activity.php (original)
+++ vtigercrm/branches/5.0.2/modules/Calendar/Activity.php Mon Oct 16 01:02:11 2006
@@ -154,7 +154,7 @@
$log->debug("Entering get_contacts(".$id.") method ...");
global $app_strings;
- $focus = new Contact();
+ $focus = new Contacts();
$button = '';
@@ -177,7 +177,7 @@
$log->debug("Entering get_contacts(".$id.") method ...");
global $app_strings;
- $focus = new User();
+ $focus = new Users();
$button = '';
@@ -395,8 +395,8 @@
global $log,$adb;
$log->debug("Entering get_tasksforol(".$username.") method ...");
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -447,8 +447,8 @@
global $log,$adb;
$log->debug("Entering get_calendarsforol(".$user_name.") method ...");
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($user_name);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
Modified: vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php (original)
+++ vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php Mon Oct 16 01:02:11 2006
@@ -10,8 +10,8 @@
********************************************************************************/
require_once('include/RelatedListView.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Products/Product.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Products/Products.php');
require_once('include/utils/UserInfoUtil.php');
// functions added for group calendar -Jaguar
Modified: vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -11,7 +11,7 @@
require_once('Smarty_setup.php');
-require_once('modules/Campaigns/Campaign.php');
+require_once('modules/Campaigns/Campaigns.php');
require_once('modules/CustomView/CustomView.php');
require_once('include/utils/utils.php');
//Redirecting Header for single page layout
@@ -23,7 +23,7 @@
}
else
{
-$focus = new Campaign();
+$focus = new Campaigns();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
if(isset($_REQUEST['record']) && $_REQUEST['record']!='') {
Modified: vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php (original)
+++ vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php Mon Oct 16 01:02:11 2006
@@ -18,8 +18,8 @@
require_once('data/SugarBean.php');
require_once('data/CRMEntity.php');
require_once('include/utils/utils.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Leads/Leads.php');
require_once('user_privileges/default_module_view.php');
class Campaign extends CRMEntity {
@@ -66,7 +66,7 @@
'Campaign Type'=>'campaigntype',
);
- function Campaign()
+ function Campaigns()
{
$this->log =LoggerManager::getLogger('campaign');
$this->db = new PearDatabase();
@@ -120,7 +120,7 @@
$log->debug("Entering get_contacts(".$id.") method ...");
global $mod_strings;
- $focus = new Contact();
+ $focus = new Contacts();
$button = '';
if($singlepane_view == 'true')
@@ -145,7 +145,7 @@
$log->debug("Entering get_leads(".$id.") method ...");
global $mod_strings;
- $focus = new Lead();
+ $focus = new Leads();
$button = '';
if($singlepane_view == 'true')
@@ -169,7 +169,7 @@
$log->debug("Entering get_opportunities(".$id.") method ...");
global $mod_strings;
- $focus = new Potential();
+ $focus = new Potentials();
$button = '';
if($singlepane_view == 'true')
Modified: vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php Mon Oct 16 01:02:11 2006
@@ -18,13 +18,13 @@
* defined return URL.
********************************************************************************/
-require_once('modules/Campaigns/Campaign.php');
+require_once('modules/Campaigns/Campaigns.php');
global $mod_strings;
require_once('include/logging.php');
$log = LoggerManager::getLogger('ticket_delete');
-$focus = new Campaign();
+$focus = new Campaigns();
if(!isset($_REQUEST['record']))
die($mod_strings['ERR_DELETE_RECORD']);
Modified: vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php Mon Oct 16 01:02:11 2006
@@ -11,12 +11,12 @@
require_once('include/database/PearDatabase.php');
require_once('Smarty_setup.php');
-require_once('modules/Campaigns/Campaign.php');
+require_once('modules/Campaigns/Campaigns.php');
require_once('modules/CustomView/CustomView.php');
require_once('include/utils/utils.php');
require_once('user_privileges/default_module_view.php');
-$focus = new Campaign();
+$focus = new Campaigns();
if(isset($_REQUEST['record']) && $_REQUEST['record']!= null )
{
Modified: vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Campaigns/Campaign.php');
+require_once('modules/Campaigns/Campaigns.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -25,7 +25,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $modObj = new Campaign();
+ $modObj = new Campaigns();
$modObj->retrieve_entity_info($crmid,"Campaigns");
$modObj->column_fields[$fieldname] = $fieldvalue;
$modObj->id = $crmid;
Modified: vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php Mon Oct 16 01:02:11 2006
@@ -11,12 +11,12 @@
require_once('include/database/PearDatabase.php');
require_once('Smarty_setup.php');
require_once('include/utils/utils.php');
-require_once('modules/Campaigns/Campaign.php');
+require_once('modules/Campaigns/Campaigns.php');
require_once('include/FormValidationUtil.php');
global $app_strings,$mod_strings,$currentModule,$theme;
-$focus = new Campaign();
+$focus = new Campaigns();
$smarty = new vtigerCRM_Smarty();
if(isset($_REQUEST['record']) && $_REQUEST['record'] !='')
Modified: vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php Mon Oct 16 01:02:11 2006
@@ -8,7 +8,7 @@
* All Rights Reserved.
*
********************************************************************************/
-require_once('modules/Campaigns/Campaign.php');
+require_once('modules/Campaigns/Campaigns.php');
require_once('include/database/PearDatabase.php');
require_once('Smarty_setup.php');
require_once("data/Tracker.php");
@@ -28,7 +28,7 @@
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
-$focus = new Campaign();
+$focus = new Campaigns();
$category = getParentTab();
$smarty = new vtigerCRM_Smarty;
$other_text = Array();
Modified: vtigercrm/branches/5.0.2/modules/Campaigns/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Campaigns/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Campaigns/Save.php Mon Oct 16 01:02:11 2006
@@ -21,11 +21,11 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/Campaigns/Campaign.php');
+require_once('modules/Campaigns/Campaigns.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
-$focus = new Campaign();
+$focus = new Campaigns();
global $current_user;
$currencyid=fetchCurrency($current_user->id);
$rate_symbol = getCurrencySymbolandCRate($currencyid);
Modified: vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('Smarty_setup.php');
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
require_once('include/utils/utils.php');
//Redirecting Header for single page layout
@@ -22,7 +22,7 @@
}
else
{
-$focus = new Contact();
+$focus = new Contacts();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
Modified: vtigercrm/branches/5.0.2/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Contacts/Contact.php (original)
+++ vtigercrm/branches/5.0.2/modules/Contacts/Contact.php Mon Oct 16 01:02:11 2006
@@ -13,7 +13,7 @@
* Contributor(s): ______________________________________.
********************************************************************************/
/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contact.php,v 1.70 2005/04/27 11:21:49 rank Exp $
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contacts.php,v 1.70 2005/04/27 11:21:49 rank Exp $
* Description: TODO: To be written.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
* All Rights Reserved.
@@ -25,11 +25,11 @@
require_once('data/SugarBean.php');
require_once('data/CRMEntity.php');
require_once('include/utils/utils.php');
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Potentials/Potentials.php');
require_once('modules/Calendar/Activity.php');
-require_once('modules/Campaigns/Campaign.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Emails/Email.php');
+require_once('modules/Campaigns/Campaigns.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Emails/Emails.php');
require_once('modules/HelpDesk/HelpDesk.php');
require_once('user_privileges/default_module_view.php');
@@ -125,7 +125,7 @@
var $default_order_by = 'lastname';
var $default_sort_order = 'ASC';
- function Contact() {
+ function Contacts() {
$this->log = LoggerManager::getLogger('contact');
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('Contacts');
@@ -334,7 +334,7 @@
$log->debug("Entering get_opportunities(".$id.") method ...");
global $mod_strings;
- $focus = new Potential();
+ $focus = new Potentials();
$button = '';
if(isPermitted("Potentials",1,"") == 'yes')
@@ -486,8 +486,8 @@
global $log, $singlepane_view;
$log->debug("Entering get_quotes(".$id.") method ...");
global $app_strings;
- require_once('modules/Quotes/Quote.php');
- $focus = new Quote();
+ require_once('modules/Quotes/Quotes.php');
+ $focus = new Quotes();
$button = '';
if(isPermitted("Quotes",1,"") == 'yes')
@@ -540,8 +540,8 @@
global $log, $singlepane_view;
$log->debug("Entering get_products(".$id.") method ...");
global $app_strings;
- require_once('modules/Products/Product.php');
- $focus = new Product();
+ require_once('modules/Products/Products.php');
+ $focus = new Products();
$button = '';
if(isPermitted("Products",1,"") == 'yes')
@@ -570,7 +570,7 @@
$log->debug("Entering get_purchase_orders(".$id.") method ...");
global $app_strings;
require_once('modules/PurchaseOrder/PurchaseOrder.php');
- $focus = new Order();
+ $focus = new PurchaseOrder();
$button = '';
@@ -600,7 +600,7 @@
$log->debug("Entering get_emails(".$id.") method ...");
global $mod_strings;
- $focus = new Email();
+ $focus = new Emails();
$button = '';
@@ -631,7 +631,7 @@
$log->debug("Entering get_campaigns(".$id.") method ...");
global $mod_strings;
- $focus = new Campaign();
+ $focus = new Campaigns();
if($singlepane_view == 'true')
$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
else
@@ -735,8 +735,8 @@
{
global $log;
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -775,8 +775,8 @@
{
global $log,$adb;
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($user_name);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
Modified: vtigercrm/branches/5.0.2/modules/Contacts/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Contacts/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/Contacts/Delete.php Mon Oct 16 01:02:11 2006
@@ -17,13 +17,13 @@
* Description: TODO: To be written.
********************************************************************************/
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
global $mod_strings;
require_once('include/logging.php');
$log = LoggerManager::getLogger('contact_delete');
-$focus = new Contact();
+$focus = new Contacts();
if(!isset($_REQUEST['record']))
die($mod_strings['ERR_DELETE_RECORD']);
Modified: vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
require_once('include/CustomFieldUtil.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
@@ -33,7 +33,7 @@
global $app_strings;
global $currentModule, $singlepane_view;
-$focus = new Contact();
+$focus = new Contacts();
if(isset($_REQUEST['record']) && $_REQUEST['record']!='') {
Modified: vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -25,7 +25,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $cntObj = new Contact();
+ $cntObj = new Contacts();
$cntObj->retrieve_entity_info($crmid,"Contacts");
$cntObj->column_fields[$fieldname] = $fieldvalue;
$cntObj->id = $crmid;
Modified: vtigercrm/branches/5.0.2/modules/Contacts/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Contacts/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Contacts/EditView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
require_once('include/CustomFieldUtil.php');
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
@@ -39,7 +39,7 @@
$image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false";
//end
-$focus = new Contact();
+$focus = new Contacts();
$smarty = new vtigerCRM_Smarty;
if(isset($_REQUEST['record']) && isset($_REQUEST['record']))
@@ -68,9 +68,9 @@
if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='')
{
- require_once('modules/Accounts/Account.php');
+ require_once('modules/Accounts/Accounts.php');
$focus->column_fields['account_id'] = $_REQUEST['account_id'];
- $acct_focus = new Account();
+ $acct_focus = new Accounts();
$acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts");
$focus->column_fields['fax']=$acct_focus->column_fields['fax'];
$focus->column_fields['otherphone']=$acct_focus->column_fields['phone'];
Modified: vtigercrm/branches/5.0.2/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Contacts/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Contacts/ListView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once("data/Tracker.php");
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
require_once('include/ListView/ListView.php');
@@ -39,7 +39,7 @@
global $currentModule,$theme;
-$focus = new Contact();
+$focus = new Contacts();
$smarty = new vtigerCRM_Smarty;
$other_text = Array();
Modified: vtigercrm/branches/5.0.2/modules/Contacts/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Contacts/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Contacts/Save.php Mon Oct 16 01:02:11 2006
@@ -20,7 +20,7 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
require_once("modules/Emails/mail.php");
@@ -51,7 +51,7 @@
$local_log =& LoggerManager::getLogger('index');
global $log,$adb;
-$focus = new Contact();
+$focus = new Contacts();
setObjectValuesFromRequest(&$focus);
Modified: vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -11,10 +11,10 @@
require_once('Smarty_setup.php');
-require_once('modules/Emails/Email.php');
+require_once('modules/Emails/Emails.php');
require_once('include/utils/utils.php');
-$focus = new Email();
+$focus = new Emails();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
Modified: vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php Mon Oct 16 01:02:11 2006
@@ -29,20 +29,20 @@
if ($pmodule=='Accounts')
{
- require_once('modules/Accounts/Account.php');
- $myfocus = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $myfocus = new Accounts();
$myfocus->retrieve_entity_info($entityid,"Accounts");
}
elseif ($pmodule=='Contacts')
{
- require_once('modules/Contacts/Contact.php');
- $myfocus = new Contact();
+ require_once('modules/Contacts/Contacts.php');
+ $myfocus = new Contacts();
$myfocus->retrieve_entity_info($entityid,"Contacts");
}
elseif ($pmodule=='Leads')
{
- require_once('modules/Leads/Lead.php');
- $myfocus = new Lead();
+ require_once('modules/Leads/Leads.php');
+ $myfocus = new Leads();
$myfocus->retrieve_entity_info($entityid,"Leads");
}
?>
Modified: vtigercrm/branches/5.0.2/modules/Emails/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/Delete.php Mon Oct 16 01:02:11 2006
@@ -17,12 +17,12 @@
* Description: TODO: To be written.
********************************************************************************/
-require_once('modules/Emails/Email.php');
+require_once('modules/Emails/Emails.php');
require_once('include/logging.php');
$log = LoggerManager::getLogger('email_delete');
-$focus = new Email();
+$focus = new Emails();
if(!isset($_REQUEST['record']))
die("A record number must be specified to delete the email.");
Modified: vtigercrm/branches/5.0.2/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/DetailView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Emails/Email.php');
+require_once('modules/Emails/Emails.php');
require_once('include/upload_file.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
@@ -32,7 +32,7 @@
global $mod_strings;
global $currentModule;
-$focus = new Email();
+$focus = new Emails();
$smarty = new vtigerCRM_Smarty;
if(isset($_REQUEST['record']))
Modified: vtigercrm/branches/5.0.2/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/EditView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Emails/Email.php');
+require_once('modules/Emails/Emails.php');
require_once('include/utils/utils.php');
require_once('include/utils/UserInfoUtil.php');
require_once('include/FormValidationUtil.php');
@@ -34,7 +34,7 @@
global $current_user;
global $currentModule;
-$focus = new Email();
+$focus = new Emails();
$smarty = new vtigerCRM_Smarty();
if($_REQUEST['upload_error'] == true)
Modified: vtigercrm/branches/5.0.2/modules/Emails/Email.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/Email.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/Email.php Mon Oct 16 01:02:11 2006
@@ -13,7 +13,7 @@
* Contributor(s): ______________________________________.
********************************************************************************/
/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Email.php,v 1.41 2005/04/28 08:11:21 rank Exp $
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Emails.php,v 1.41 2005/04/28 08:11:21 rank Exp $
* Description: TODO: To be written.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
* All Rights Reserved.
@@ -25,10 +25,10 @@
require_once('include/database/PearDatabase.php');
require_once('data/SugarBean.php');
require_once('data/CRMEntity.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Accounts/Account.php');
-require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Users/User.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Accounts/Accounts.php');
+require_once('modules/Potentials/Potentials.php');
+require_once('modules/Users/Users.php');
// Email is used to store customer information.
class Email extends CRMEntity {
@@ -78,9 +78,9 @@
/** This function will set the columnfields for Email module
*/
- function Email() {
+ function Emails() {
$this->log = LoggerManager::getLogger('email');
- $this->log->debug("Entering Email() method ...");
+ $this->log->debug("Entering Emails() method ...");
$this->log = LoggerManager::getLogger('email');
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('Emails');
@@ -101,7 +101,7 @@
global $mod_strings;
global $app_strings;
- $focus = new Contact();
+ $focus = new Contacts();
$button = '';
$returnset = '&return_module=Emails&return_action=CallRelatedList&return_id='.$id;
Modified: vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Emails/Email.php');
+require_once('modules/Emails/Emails.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -25,7 +25,7 @@
$fieldvalue = $_REQUEST["fieldValue"];
if($crmid != "")
{
- $modObj = new Email();
+ $modObj = new Emails();
$modObj->retrieve_entity_info($crmid,"Emails");
$modObj->column_fields[$fieldname] = $fieldvalue;
$modObj->id = $crmid;
Modified: vtigercrm/branches/5.0.2/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/ListView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once("data/Tracker.php");
-require_once('modules/Emails/Email.php');
+require_once('modules/Emails/Emails.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
require_once('include/utils/utils.php');
@@ -42,7 +42,7 @@
$url_string = ''; // assigning http url string
-$focus = new Email();
+$focus = new Emails();
$smarty = new vtigerCRM_Smarty;
$other_text = Array();
Modified: vtigercrm/branches/5.0.2/modules/Emails/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/Save.php Mon Oct 16 01:02:11 2006
@@ -51,13 +51,13 @@
$mailbox = 'INBOX';
}
-require_once('modules/Emails/Email.php');
+require_once('modules/Emails/Emails.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
$local_log =& LoggerManager::getLogger('index');
-$focus = new Email();
+$focus = new Emails();
global $current_user;
setObjectValuesFromRequest(&$focus);
Modified: vtigercrm/branches/5.0.2/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/mailsend.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/mailsend.php Mon Oct 16 01:02:11 2006
@@ -124,20 +124,20 @@
$fresult=$adb->query($myquery);
if ($pmodule=='Contacts')
{
- require_once('modules/Contacts/Contact.php');
- $myfocus = new Contact();
+ require_once('modules/Contacts/Contacts.php');
+ $myfocus = new Contacts();
$myfocus->retrieve_entity_info($mycrmid,"Contacts");
}
elseif ($pmodule=='Accounts')
{
- require_once('modules/Accounts/Account.php');
- $myfocus = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $myfocus = new Accounts();
$myfocus->retrieve_entity_info($mycrmid,"Accounts");
}
elseif ($pmodule=='Leads')
{
- require_once('modules/Leads/Lead.php');
- $myfocus = new Lead();
+ require_once('modules/Leads/Leads.php');
+ $myfocus = new Leads();
$myfocus->retrieve_entity_info($mycrmid,"Leads");
}
$fldname=$adb->query_result($fresult,0,"columnname");
Modified: vtigercrm/branches/5.0.2/modules/Emails/sendmail.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Emails/sendmail.php (original)
+++ vtigercrm/branches/5.0.2/modules/Emails/sendmail.php Mon Oct 16 01:02:11 2006
@@ -18,7 +18,7 @@
* @copyright 2001 - 2003 Brent R. Matzelle
*/
-require_once('modules/Emails/Email.php');
+require_once('modules/Emails/Emails.php');
require_once('include/logging.php');
require("modules/Emails/class.phpmailer.php");
require_once('include/database/PearDatabase.php');
Modified: vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php Mon Oct 16 01:02:11 2006
@@ -21,18 +21,18 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Accounts/Account.php');
-require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Accounts/Accounts.php');
+require_once('modules/Potentials/Potentials.php');
+require_once('modules/Leads/Leads.php');
require_once('modules/Faq/Faq.php');
-require_once('modules/Vendors/Vendor.php');
-require_once('modules/PriceBooks/PriceBook.php');
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Vendors/Vendors.php');
+require_once('modules/PriceBooks/PriceBooks.php');
+require_once('modules/Quotes/Quotes.php');
require_once('modules/PurchaseOrder/PurchaseOrder.php');
require_once('modules/SalesOrder/SalesOrder.php');
require_once('modules/Invoice/Invoice.php');
-require_once('modules/Campaigns/Campaign.php');
+require_once('modules/Campaigns/Campaigns.php');
require_once('modules/Home/language/en_us.lang.php');
require_once('include/database/PearDatabase.php');
require_once('modules/CustomView/CustomView.php');
Modified: vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php (original)
+++ vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php Mon Oct 16 01:02:11 2006
@@ -22,11 +22,11 @@
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
require_once('data/SugarBean.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Emails/Email.php');
-require_once('modules/Accounts/Account.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Potentials/Potentials.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Emails/Emails.php');
+require_once('modules/Accounts/Accounts.php');
require_once('include/ComboUtil.php');
// Account is used to store vtiger_account information.
Modified: vtigercrm/branches/5.0.2/modules/Import/ImportContact.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Import/ImportContact.php (original)
+++ vtigercrm/branches/5.0.2/modules/Import/ImportContact.php Mon Oct 16 01:02:11 2006
@@ -18,7 +18,7 @@
********************************************************************************/
include_once('config.php');
require_once('include/logging.php');
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
require_once('modules/Import/UsersLastImport.php');
require_once('include/database/PearDatabase.php');
require_once('include/ComboUtil.php');
@@ -169,7 +169,7 @@
$arr = array();
// check if it already exists
- $focus = new Account();
+ $focus = new Accounts();
$query = '';
Modified: vtigercrm/branches/5.0.2/modules/Import/ImportLead.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Import/ImportLead.php (original)
+++ vtigercrm/branches/5.0.2/modules/Import/ImportLead.php Mon Oct 16 01:02:11 2006
@@ -26,13 +26,13 @@
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
require_once('data/SugarBean.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Emails/Email.php');
-require_once('modules/Accounts/Account.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Potentials/Potentials.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Emails/Emails.php');
+require_once('modules/Accounts/Accounts.php');
require_once('include/ComboUtil.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
class ImportLead extends Lead {
Modified: vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php (original)
+++ vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php Mon Oct 16 01:02:11 2006
@@ -22,11 +22,11 @@
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
require_once('data/SugarBean.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Emails/Email.php');
-require_once('modules/Accounts/Account.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Potentials/Potentials.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Emails/Emails.php');
+require_once('modules/Accounts/Accounts.php');
require_once('include/ComboUtil.php');
// Get _dom arrays from Database
@@ -131,7 +131,7 @@
$arr = array();
// check if it already exists
- $focus = new Account();
+ $focus = new Accounts();
$query = '';
Modified: vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php (original)
+++ vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php Mon Oct 16 01:02:11 2006
@@ -26,14 +26,14 @@
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
require_once('data/SugarBean.php');
-require_once('modules/Contacts/Contact.php');
-require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Emails/Email.php');
-require_once('modules/Accounts/Account.php');
-require_once('modules/Products/Product.php');
+require_once('modules/Contacts/Contacts.php');
+require_once('modules/Potentials/Potentials.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Emails/Emails.php');
+require_once('modules/Accounts/Accounts.php');
+require_once('modules/Products/Products.php');
require_once('include/ComboUtil.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
class ImportProduct extends Product {
Modified: vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php (original)
+++ vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php Mon Oct 16 01:02:11 2006
@@ -250,27 +250,27 @@
if($_REQUEST['module']=='Accounts')
{
$tablename='account';
- $focus1=new Account();
+ $focus1=new Accounts();
}
if($_REQUEST['module']=='Contacts')
{
$tablename='contactdetails';
- $focus1=new Contact();
+ $focus1=new Contacts();
}
if($_REQUEST['module']=='Leads')
{
$tablename='leaddetails';
- $focus1=new Lead();
+ $focus1=new Leads();
}
if($_REQUEST['module']=='Potentials')
{
$tablename='potential';
- $focus1=new Potential();
+ $focus1=new Potentials();
}
if($_REQUEST['module']=='Products')
{
$tablename='products';
- $focus1=new Product();
+ $focus1=new Products();
}
Modified: vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php (original)
+++ vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php Mon Oct 16 01:02:11 2006
@@ -26,7 +26,7 @@
require_once('modules/Import/UsersLastImport.php');
require_once('modules/Import/parse_utils.php');
require_once('include/ListView/ListView.php');
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
require_once('include/utils/utils.php');
global $mod_strings;
Modified: vtigercrm/branches/5.0.2/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Invoice/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Invoice/EditView.php Mon Oct 16 01:02:11 2006
@@ -23,9 +23,9 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
require_once('modules/Invoice/Invoice.php');
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Quotes/Quotes.php');
require_once('modules/SalesOrder/SalesOrder.php');
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Potentials/Potentials.php');
require_once('include/CustomFieldUtil.php');
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
@@ -43,7 +43,7 @@
if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice')
{
$quoteid = $_REQUEST['record'];
- $quote_focus = new Quote();
+ $quote_focus = new Quotes();
$quote_focus->id = $quoteid;
$quote_focus->retrieve_entity_info($quoteid,"Quotes");
$focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid);
@@ -179,7 +179,7 @@
}
if(isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] !='')
{
- $potfocus = new Potential();
+ $potfocus = new Potentials();
$potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id'];
$associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']);
@@ -194,8 +194,8 @@
if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && ($_REQUEST['record']=='' || $_REQUEST['convertmode'] == "potentoinvoice")){
- require_once('modules/Accounts/Account.php');
- $acct_focus = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $acct_focus = new Accounts();
$acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts");
$focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city'];
$focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city'];
Modified: vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -11,7 +11,7 @@
require_once('Smarty_setup.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
require_once('include/utils/utils.php');
//Redirecting Header for single page layout
require_once('user_privileges/default_module_view.php');
@@ -22,7 +22,7 @@
}
else
{
-$focus = new Lead();
+$focus = new Leads();
$MODULE = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
$currentmodule = $_REQUEST['module'];
Modified: vtigercrm/branches/5.0.2/modules/Leads/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Leads/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/Leads/Delete.php Mon Oct 16 01:02:11 2006
@@ -18,13 +18,13 @@
* defined return URL.
********************************************************************************/
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
global $mod_strings;
require_once('include/logging.php');
$log = LoggerManager::getLogger('lead_delete');
-$focus = new Lead();
+$focus = new Leads();
if(!isset($_REQUEST['record']))
die($mod_strings['ERR_DELETE_RECORD']);
Modified: vtigercrm/branches/5.0.2/modules/Leads/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Leads/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Leads/DetailView.php Mon Oct 16 01:02:11 2006
@@ -14,7 +14,7 @@
********************************************************************************/
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
require_once('include/database/PearDatabase.php');
require_once('include/CustomFieldUtil.php');
require_once('include/utils/utils.php');
@@ -25,7 +25,7 @@
global $app_strings;
global $currentModule, $singlepane_view;
global $log;
-$focus = new Lead();
+$focus = new Leads();
if(isset($_REQUEST['record']))
{
Modified: vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -24,7 +24,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $leadObj = new Lead();
+ $leadObj = new Leads();
$leadObj->retrieve_entity_info($crmid,"Leads");
$leadObj->column_fields[$fieldname] = $fieldvalue;
$leadObj->id = $crmid;
Modified: vtigercrm/branches/5.0.2/modules/Leads/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Leads/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Leads/EditView.php Mon Oct 16 01:02:11 2006
@@ -14,7 +14,7 @@
********************************************************************************/
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
require_once('include/database/PearDatabase.php');
require_once('include/CustomFieldUtil.php');
require_once('include/ComboUtil.php');
@@ -23,7 +23,7 @@
global $mod_strings,$app_strings,$theme,$currentModule;
-$focus = new Lead();
+$focus = new Leads();
$smarty = new vtigerCRM_Smarty;
if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
Modified: vtigercrm/branches/5.0.2/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Leads/Lead.php (original)
+++ vtigercrm/branches/5.0.2/modules/Leads/Lead.php Mon Oct 16 01:02:11 2006
@@ -19,9 +19,9 @@
require_once('data/SugarBean.php');
require_once('data/CRMEntity.php');
require_once('modules/Calendar/Activity.php');
-require_once('modules/Campaigns/Campaign.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Emails/Email.php');
+require_once('modules/Campaigns/Campaigns.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Emails/Emails.php');
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
require_once('user_privileges/default_module_view.php');
@@ -84,9 +84,9 @@
var $default_order_by = 'lastname';
var $default_sort_order = 'ASC';
- function Lead() {
+ function Leads() {
$this->log = LoggerManager::getLogger('lead');
- $this->log->debug("Entering Lead() method ...");
+ $this->log->debug("Entering Leads() method ...");
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('Leads');
$this->log->debug("Exiting Lead method ...");
@@ -230,7 +230,7 @@
global $log, $singlepane_view;
$log->debug("Entering get_campaigns(".$id.") method ...");
global $mod_strings;
- $focus = new Campaign();
+ $focus = new Campaigns();
$button = '';
if($singlepane_view == 'true')
@@ -258,7 +258,7 @@
global $mod_strings;
require_once('include/RelatedListView.php');
- $focus = new Email();
+ $focus = new Emails();
$button = '';
@@ -358,11 +358,11 @@
{
global $log, $singlepane_view;
$log->debug("Entering get_products(".$id.") method ...");
- require_once('modules/Products/Product.php');
+ require_once('modules/Products/Products.php');
global $mod_strings;
global $app_strings;
- $focus = new Product();
+ $focus = new Products();
$button = '';
Modified: vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/database/PearDatabase.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
//Getting the Parameters from the ConvertLead Form
$id = $_REQUEST["record"];
@@ -39,7 +39,7 @@
$potential_name = $check_unit[0];
//Retrieve info from all the vtiger_tables related to leads
-$focus = new Lead();
+$focus = new Leads();
$focus->retrieve_entity_info($id,"Leads");
//get all the lead related columns
Modified: vtigercrm/branches/5.0.2/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Leads/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Leads/ListView.php Mon Oct 16 01:02:11 2006
@@ -19,7 +19,7 @@
require_once('Smarty_setup.php');
require_once("data/Tracker.php");
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
require_once('include/ListView/ListView.php');
@@ -49,7 +49,7 @@
$url_string = ''; // assigning http url string
-$focus = new Lead();
+$focus = new Leads();
$smarty = new vtigerCRM_Smarty;
$other_text=Array();
Modified: vtigercrm/branches/5.0.2/modules/Leads/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Leads/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Leads/Save.php Mon Oct 16 01:02:11 2006
@@ -13,14 +13,14 @@
* Contributor(s): ______________________________________.
********************************************************************************/
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/UserInfoUtil.php');
$local_log =& LoggerManager::getLogger('index');
global $log,$adb;
-$focus = new Lead();
+$focus = new Leads();
global $current_user;
$currencyid=fetchCurrency($current_user->id);
$rate_symbol = getCurrencySymbolandCRate($currencyid);
Modified: vtigercrm/branches/5.0.2/modules/Leads/result.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Leads/result.php (original)
+++ vtigercrm/branches/5.0.2/modules/Leads/result.php Mon Oct 16 01:02:11 2006
@@ -12,7 +12,7 @@
require_once('include/utils/utils.php');
require_once 'Excel/reader.php';
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('include/database/PearDatabase.php');
$data = new Spreadsheet_Excel_Reader();
Modified: vtigercrm/branches/5.0.2/modules/Notes/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Notes/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/Notes/Delete.php Mon Oct 16 01:02:11 2006
@@ -17,12 +17,12 @@
* Description: TODO: To be written.
********************************************************************************/
-require_once('modules/Notes/Note.php');
+require_once('modules/Notes/Notes.php');
require_once('include/logging.php');
$log = LoggerManager::getLogger('note_delete');
-$focus = new Note();
+$focus = new Notes();
if(!isset($_REQUEST['record']))
die("A record number must be specified to delete the note.");
Modified: vtigercrm/branches/5.0.2/modules/Notes/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Notes/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Notes/DetailView.php Mon Oct 16 01:02:11 2006
@@ -22,14 +22,14 @@
require_once('data/Tracker.php');
require_once('Smarty_setup.php');
-require_once('modules/Notes/Note.php');
+require_once('modules/Notes/Notes.php');
require_once('include/upload_file.php');
require_once('include/utils/utils.php');
global $app_strings;
global $mod_strings;
global $currentModule;
-$focus = new Note();
+$focus = new Notes();
if(isset($_REQUEST['record'])) {
$focus->retrieve_entity_info($_REQUEST['record'],"Notes");
Modified: vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Notes/Note.php');
+require_once('modules/Notes/Notes.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -25,7 +25,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $modObj = new Note();
+ $modObj = new Notes();
$modObj->retrieve_entity_info($crmid,"Notes");
$modObj->column_fields[$fieldname] = $fieldvalue;
$modObj->id = $crmid;
Modified: vtigercrm/branches/5.0.2/modules/Notes/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Notes/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Notes/EditView.php Mon Oct 16 01:02:11 2006
@@ -22,12 +22,12 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Notes/Note.php');
+require_once('modules/Notes/Notes.php');
require_once('include/utils/utils.php');
global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule;
-$focus = new Note();
+$focus = new Notes();
$smarty = new vtigerCRM_Smarty();
if($_REQUEST['upload_error'] == true)
Modified: vtigercrm/branches/5.0.2/modules/Notes/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Notes/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Notes/ListView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once("data/Tracker.php");
-require_once('modules/Notes/Note.php');
+require_once('modules/Notes/Notes.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
require_once('include/ListView/ListView.php');
@@ -66,7 +66,7 @@
$url_string = ''; // assigning http url string
-$focus = new Note();
+$focus = new Notes();
$smarty = new vtigerCRM_Smarty;
$other_text = Array();
Modified: vtigercrm/branches/5.0.2/modules/Notes/Note.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Notes/Note.php (original)
+++ vtigercrm/branches/5.0.2/modules/Notes/Note.php Mon Oct 16 01:02:11 2006
@@ -13,7 +13,7 @@
* Contributor(s): ______________________________________..
********************************************************************************/
/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Note.php,v 1.15 2005/03/15 10:01:08 shaw Exp $
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Notes.php,v 1.15 2005/03/15 10:01:08 shaw Exp $
* Description: TODO: To be written.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
* All Rights Reserved.
@@ -70,9 +70,9 @@
var $default_order_by = 'modifiedtime';
var $default_sort_order = 'ASC';
- function Note() {
+ function Notes() {
$this->log = LoggerManager::getLogger('notes');
- $this->log->debug("Entering Note() method ...");
+ $this->log->debug("Entering Notes() method ...");
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('Notes');
$this->log->debug("Exiting Note method ...");
Modified: vtigercrm/branches/5.0.2/modules/Notes/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Notes/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Notes/Save.php Mon Oct 16 01:02:11 2006
@@ -21,13 +21,13 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/Notes/Note.php');
+require_once('modules/Notes/Notes.php');
require_once('include/logging.php');
require_once('include/upload_file.php');
$local_log =& LoggerManager::getLogger('index');
-$focus = new Note();
+$focus = new Notes();
setObjectValuesFromRequest(&$focus);
Modified: vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -11,7 +11,7 @@
require_once('Smarty_setup.php');
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Potentials/Potentials.php');
//Redirecting Header for single page layout
require_once('user_privileges/default_module_view.php');
global $singlepane_view;
@@ -21,7 +21,7 @@
}
else
{
-$focus = new Potential();
+$focus = new Potentials();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
Modified: vtigercrm/branches/5.0.2/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/Charts.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/Charts.php Mon Oct 16 01:02:11 2006
@@ -19,7 +19,7 @@
require_once('config.php');
require_once('include/logging.php');
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Potentials/Potentials.php');
require_once('Image/Graph.php');
require_once('include/utils/utils.php');
require_once('include/utils/GraphUtils.php');
@@ -102,7 +102,7 @@
//Now do the db queries
//query for opportunity data that matches $datay and $user
- $opp = new Potential();
+ $opp = new Potentials();
$opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where);
//build pipeline by sales stage data
@@ -441,7 +441,7 @@
//Now do the db queries
//query for opportunity data that matches $datay and $user
- $opp = new Potential();
+ $opp = new Potentials();
$opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where);
//build pipeline by sales stage data
@@ -779,7 +779,7 @@
//Now do the db queries
//query for opportunity data that matches $datax and $user
- $opp = new Potential();
+ $opp = new Potentials();
$opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where);
//build pipeline by sales stage data
@@ -1057,7 +1057,7 @@
$where .= ")";
}
- $opp = new Potential();
+ $opp = new Potentials();
$opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where);
//build pipeline by lead source data
Modified: vtigercrm/branches/5.0.2/modules/Potentials/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/Delete.php Mon Oct 16 01:02:11 2006
@@ -17,12 +17,12 @@
* Description: TODO: To be written.
********************************************************************************/
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Potentials/Potentials.php');
require_once('include/logging.php');
$log = LoggerManager::getLogger('contact_delete');
-$focus = new Potential();
+$focus = new Potentials();
if(!isset($_REQUEST['record']))
die("A record number must be specified to delete the opportunity.");
Modified: vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Potentials/Potentials.php');
require_once('include/CustomFieldUtil.php');
require_once('include/utils/utils.php');
require_once('user_privileges/default_module_view.php');
@@ -31,7 +31,7 @@
global $app_strings;
global $currentModule, $singlepane_view;
-$focus = new Potential();
+$focus = new Potentials();
$smarty = new vtigerCRM_Smarty;
if(isset($_REQUEST['record']) && $_REQUEST['record']!='') {
Modified: vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Potentials/Potentials.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -25,7 +25,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $modObj = new Potential();
+ $modObj = new Potentials();
$modObj->retrieve_entity_info($crmid,"Potentials");
$modObj->column_fields[$fieldname] = $fieldvalue;
$_REQUEST[$fieldname] = $fieldvalue;
Modified: vtigercrm/branches/5.0.2/modules/Potentials/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/EditView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Potentials/Potentials.php');
require_once('include/CustomFieldUtil.php');
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
@@ -30,7 +30,7 @@
global $app_strings;
global $mod_strings;
global $currentModule;
-$focus = new Potential();
+$focus = new Potentials();
$smarty = new vtigerCRM_Smarty();
if(isset($_REQUEST['record']) && $_REQUEST['record'] != '')
Modified: vtigercrm/branches/5.0.2/modules/Potentials/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/ListView.php Mon Oct 16 01:02:11 2006
@@ -15,7 +15,7 @@
require_once('Smarty_setup.php');
require_once("data/Tracker.php");
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Potentials/Potentials.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
require_once('include/ListView/ListView.php');
@@ -38,7 +38,7 @@
$url_string = ''; // assigning http url string
-$focus = new Potential();
+$focus = new Potentials();
$smarty = new vtigerCRM_Smarty();
$other_text = Array();
Modified: vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php Mon Oct 16 01:02:11 2006
@@ -28,7 +28,7 @@
$log = LoggerManager::getLogger('top opportunity_list');
$log->debug("Entering getTopPotentials() method ...");
require_once("data/Tracker.php");
- require_once('modules/Potentials/Opportunity.php');
+ require_once('modules/Potentials/Potentials.php');
require_once('include/logging.php');
require_once('include/ListView/ListView.php');
Modified: vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php Mon Oct 16 01:02:11 2006
@@ -13,7 +13,7 @@
* Contributor(s): ______________________________________.
********************************************************************************/
/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Opportunity.php,v 1.65 2005/04/28 08:08:27 rank Exp $
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Potentials.php,v 1.65 2005/04/28 08:08:27 rank Exp $
* Description: TODO: To be written.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
* All Rights Reserved.
@@ -25,10 +25,10 @@
require_once('include/database/PearDatabase.php');
require_once('data/SugarBean.php');
require_once('data/CRMEntity.php');
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
require_once('modules/Calendar/Activity.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Emails/Email.php');
+require_once('modules/Notes/Notes.php');
+require_once('modules/Emails/Emails.php');
require_once('include/utils/utils.php');
require_once('user_privileges/default_module_view.php');
@@ -96,7 +96,7 @@
var $default_order_by = 'potentialname';
var $default_sort_order = 'ASC';
- function Potential() {
+ function Potentials() {
$this->log = LoggerManager::getLogger('potential');
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('Potentials');
@@ -233,7 +233,7 @@
$log->debug("Entering get_contacts(".$id.") method ...");
global $app_strings;
- $focus = new Contact();
+ $focus = new Contacts();
$button = '';
@@ -294,10 +294,10 @@
{
global $log, $singlepane_view;
$log->debug("Entering get_products(".$id.") method ...");
- require_once('modules/Products/Product.php');
+ require_once('modules/Products/Products.php');
global $app_strings;
- $focus = new Product();
+ $focus = new Products();
$button = '';
@@ -446,10 +446,10 @@
global $log, $singlepane_view;
$log->debug("Entering get_quotes(".$id.") method ...");
global $app_strings;
- require_once('modules/Quotes/Quote.php');
+ require_once('modules/Quotes/Quotes.php');
if($this->column_fields['account_id']!='')
- $focus = new Quote();
+ $focus = new Quotes();
$button = '';
if(isPermitted("Quotes",1,"") == 'yes')
Modified: vtigercrm/branches/5.0.2/modules/Potentials/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/Save.php Mon Oct 16 01:02:11 2006
@@ -20,13 +20,13 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/Potentials/Opportunity.php');
+require_once('modules/Potentials/Potentials.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
$local_log =& LoggerManager::getLogger('index');
-$focus = new Potential();
+$focus = new Potentials();
global $current_user;
$currencyid=fetchCurrency($current_user->id);
$rate_symbol = getCurrencySymbolandCRate($currencyid);
Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('Smarty_setup.php');
-require_once('modules/PriceBooks/PriceBook.php');
+require_once('modules/PriceBooks/PriceBooks.php');
//Redirecting Header for single page layout
require_once('user_privileges/default_module_view.php');
global $singlepane_view;
@@ -22,7 +22,7 @@
{
global $currentModule;
-$focus = new PriceBook();
+$focus = new PriceBooks();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php Mon Oct 16 01:02:11 2006
@@ -18,13 +18,13 @@
* defined return URL.
********************************************************************************/
-require_once('modules/PriceBooks/PriceBook.php');
+require_once('modules/PriceBooks/PriceBooks.php');
global $mod_strings;
require_once('include/logging.php');
$log = LoggerManager::getLogger('product_delete');
-$focus = new PriceBook();
+$focus = new PriceBooks();
if(!isset($_REQUEST['record']))
die($mod_strings['ERR_DELETE_RECORD']);
Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php Mon Oct 16 01:02:11 2006
@@ -10,11 +10,11 @@
********************************************************************************/
require_once('include/database/PearDatabase.php');
require_once('Smarty_setup.php');
-require_once('modules/PriceBooks/PriceBook.php');
+require_once('modules/PriceBooks/PriceBooks.php');
require_once('include/utils/utils.php');
require_once('user_privileges/default_module_view.php');
-$focus = new PriceBook();
+$focus = new PriceBooks();
if(isset($_REQUEST['record']) && isset($_REQUEST['record']))
{
Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/PriceBooks/PriceBook.php');
+require_once('modules/PriceBooks/PriceBooks.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -25,7 +25,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $modObj = new PriceBook();
+ $modObj = new PriceBooks();
$modObj->retrieve_entity_info($crmid,"PriceBooks");
$modObj->column_fields[$fieldname] = $fieldvalue;
$modObj->id = $crmid;
Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php Mon Oct 16 01:02:11 2006
@@ -11,12 +11,12 @@
require_once('Smarty_setup.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
-require_once('modules/PriceBooks/PriceBook.php');
+require_once('modules/PriceBooks/PriceBooks.php');
require_once('include/FormValidationUtil.php');
global $app_strings,$mod_strings,$theme,$currentModule;
-$focus = new PriceBook();
+$focus = new PriceBooks();
$smarty = new vtigerCRM_Smarty();
if(isset($_REQUEST['record']) && $_REQUEST['record'] != '')
Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/database/PearDatabase.php');
require_once('Smarty_setup.php');
-require_once('modules/PriceBooks/PriceBook.php');
+require_once('modules/PriceBooks/PriceBooks.php');
require_once('include/ListView/ListView.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
@@ -33,7 +33,7 @@
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
-$focus = new PriceBook();
+$focus = new PriceBooks();
$other_text=Array();
if(!$_SESSION['lvs'][$currentModule])
Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php (original)
+++ vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php Mon Oct 16 01:02:11 2006
@@ -51,9 +51,9 @@
/** Constructor which will set the column_fields in this object
*/
- function PriceBook() {
+ function PriceBooks() {
$this->log =LoggerManager::getLogger('pricebook');
- $this->log->debug("Entering PriceBook() method ...");
+ $this->log->debug("Entering PriceBooks() method ...");
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('PriceBooks');
$this->log->debug("Exiting PriceBook method ...");
@@ -98,8 +98,8 @@
global $log,$singlepane_view;
$log->debug("Entering get_pricebook_products(".$id.") method ...");
global $app_strings;
- require_once('modules/Products/Product.php');
- $focus = new Product();
+ require_once('modules/Products/Products.php');
+ $focus = new Products();
$button = '';
Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php Mon Oct 16 01:02:11 2006
@@ -21,11 +21,11 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/PriceBooks/PriceBook.php');
+require_once('modules/PriceBooks/PriceBooks.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
-$focus = new PriceBook();
+$focus = new PriceBooks();
setObjectValuesFromRequest(&$focus);
Modified: vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php (original)
+++ vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/database/PearDatabase.php');
require_once('Smarty_setup.php');
-require_once('modules/PriceBooks/PriceBook.php');
+require_once('modules/PriceBooks/PriceBooks.php');
require_once('include/utils/utils.php');
require_once('include/ComboUtil.php');
@@ -30,7 +30,7 @@
$smarty->assign("APP", $app_strings);
$smarty->assign("IMAGE_PATH",$image_path);
-$focus = new PriceBook();
+$focus = new PriceBooks();
//Retreive the list of PriceBooks
$list_query = getListQuery("PriceBooks");
Modified: vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php (original)
+++ vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/database/PearDatabase.php');
require_once('Smarty_setup.php');
-require_once('modules/Products/Product.php');
+require_once('modules/Products/Products.php');
require_once('include/utils/utils.php');
require_once('include/utils/utils.php');
require_once('include/ComboUtil.php');
@@ -29,7 +29,7 @@
$smarty->assign("APP", $app_strings);
$smarty->assign("IMAGE_PATH",$image_path);
-$focus = new Product();
+$focus = new Products();
if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by'];
Modified: vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('Smarty_setup.php');
-require_once('modules/Products/Product.php');
+require_once('modules/Products/Products.php');
//Redirecting Header for single page layout
require_once('user_privileges/default_module_view.php');
@@ -21,7 +21,7 @@
}
else
{
-$focus = new Product();
+$focus = new Products();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
if(isset($_REQUEST['record']) && isset($_REQUEST['record']))
Modified: vtigercrm/branches/5.0.2/modules/Products/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Products/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/Products/Delete.php Mon Oct 16 01:02:11 2006
@@ -18,13 +18,13 @@
* defined return URL.
********************************************************************************/
-require_once('modules/Products/Product.php');
+require_once('modules/Products/Products.php');
global $mod_strings;
require_once('include/logging.php');
$log = LoggerManager::getLogger('product_delete');
-$focus = new Product();
+$focus = new Products();
if(!isset($_REQUEST['record']))
die($mod_strings['ERR_DELETE_RECORD']);
Modified: vtigercrm/branches/5.0.2/modules/Products/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Products/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Products/DetailView.php Mon Oct 16 01:02:11 2006
@@ -10,11 +10,11 @@
********************************************************************************/
require_once('include/database/PearDatabase.php');
require_once('Smarty_setup.php');
-require_once('modules/Products/Product.php');
+require_once('modules/Products/Products.php');
require_once('include/utils/utils.php');
require_once('user_privileges/default_module_view.php');
-$focus = new Product();
+$focus = new Products();
if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
//Display the error message
Modified: vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Products/Product.php');
+require_once('modules/Products/Products.php');
require_once('include/database/PearDatabase.php');
global $adb,$current_user;
@@ -25,7 +25,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $modObj = new Product();
+ $modObj = new Products();
$modObj->retrieve_entity_info($crmid,"Products");
$modObj->column_fields[$fieldname] = $fieldvalue;
if($fieldname == 'unit_price')//unit price converted to dollar value while saving
Modified: vtigercrm/branches/5.0.2/modules/Products/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Products/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Products/EditView.php Mon Oct 16 01:02:11 2006
@@ -11,7 +11,7 @@
require_once('Smarty_setup.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
-require_once('modules/Products/Product.php');
+require_once('modules/Products/Products.php');
require_once('include/FormValidationUtil.php');
global $app_strings;
@@ -28,7 +28,7 @@
-$focus = new Product();
+$focus = new Products();
$smarty = new vtigerCRM_Smarty();
if($_REQUEST['record']!="")
Modified: vtigercrm/branches/5.0.2/modules/Products/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Products/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Products/ListView.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/database/PearDatabase.php');
require_once('Smarty_setup.php');
-require_once('modules/Products/Product.php');
+require_once('modules/Products/Products.php');
require_once('include/ListView/ListView.php');
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
@@ -56,7 +56,7 @@
}
$url_string = '&smodule=PRODUCTS'; // assigning http url string
-$focus = new Product();
+$focus = new Products();
//<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
$sorder = $focus->getSortOrder();
Modified: vtigercrm/branches/5.0.2/modules/Products/Product.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Products/Product.php (original)
+++ vtigercrm/branches/5.0.2/modules/Products/Product.php Mon Oct 16 01:02:11 2006
@@ -72,9 +72,9 @@
/** Constructor which will set the column_fields in this object
*/
- function Product() {
+ function Products() {
$this->log =LoggerManager::getLogger('product');
- $this->log->debug("Entering Product() method ...");
+ $this->log->debug("Entering Products() method ...");
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('Products');
$this->log->debug("Exiting Product method ...");
@@ -301,8 +301,8 @@
global $log, $singlepane_view;
$log->debug("Entering get_quotes(".$id.") method ...");
global $app_strings;
- require_once('modules/Quotes/Quote.php');
- $focus = new Quote();
+ require_once('modules/Quotes/Quotes.php');
+ $focus = new Quotes();
$button = '';
if($singlepane_view == 'true')
@@ -345,7 +345,7 @@
$log->debug("Entering get_purchase_orders(".$id.") method ...");
global $app_strings;
require_once('modules/PurchaseOrder/PurchaseOrder.php');
- $focus = new Order();
+ $focus = new PurchaseOrder();
$button = '';
@@ -466,8 +466,8 @@
global $log,$singlepane_view;
$log->debug("Entering get_product_pricebooks(".$id.") method ...");
global $mod_strings;
- require_once('modules/PriceBooks/PriceBook.php');
- $focus = new PriceBook();
+ require_once('modules/PriceBooks/PriceBooks.php');
+ $focus = new PriceBooks();
$button = '';
if($singlepane_view == 'true')
$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
Modified: vtigercrm/branches/5.0.2/modules/Products/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Products/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Products/Save.php Mon Oct 16 01:02:11 2006
@@ -21,14 +21,14 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/Products/Product.php');
+require_once('modules/Products/Products.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
global $log,$current_user;
$currencyid=fetchCurrency($current_user->id);
$rate_symbol = getCurrencySymbolandCRate($currencyid);
$rate = $rate_symbol['rate'];
-$focus = new Product();
+$focus = new Products();
if(isset($_REQUEST['record']))
{
$focus->id = $_REQUEST['record'];
Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -21,7 +21,7 @@
}
else
{
-$focus = new Order();
+$focus = new PurchaseOrder();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
if(isset($_REQUEST['record']) && $_REQUEST['record']!='') {
Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php Mon Oct 16 01:02:11 2006
@@ -26,7 +26,7 @@
$id = $_REQUEST['record'];
//retreiving the vtiger_invoice info
-$focus = new Order();
+$focus = new PurchaseOrder();
$focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder");
$vendor_name = getVendorName($focus->column_fields[vendor_id]);
Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php Mon Oct 16 01:02:11 2006
@@ -24,7 +24,7 @@
require_once('include/logging.php');
$log = LoggerManager::getLogger('order_delete');
-$focus = new Order();
+$focus = new PurchaseOrder();
if(!isset($_REQUEST['record']))
die($mod_strings['ERR_DELETE_RECORD']);
Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php Mon Oct 16 01:02:11 2006
@@ -29,7 +29,7 @@
require_once('user_privileges/default_module_view.php');
global $mod_strings,$app_strings,$theme,$currentModule,$singlepane_view;
-$focus = new Order();
+$focus = new PurchaseOrder();
if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
$focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder");
Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -25,7 +25,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $modObj = new Order();
+ $modObj = new PurchaseOrder();
$modObj->retrieve_entity_info($crmid,"PurchaseOrder");
$modObj->column_fields[$fieldname] = $fieldvalue;
$modObj->id = $crmid;
Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php Mon Oct 16 01:02:11 2006
@@ -31,7 +31,7 @@
global $app_strings,$mod_strings,$log,$theme,$currentModule;
-$focus = new Order();
+$focus = new PurchaseOrder();
$smarty = new vtigerCRM_Smarty();
global $current_user;
$currencyid=fetchCurrency($current_user->id);
@@ -60,8 +60,8 @@
// Get vtiger_vendor address if vtiger_vendorid is given
if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){
- require_once('modules/Vendors/Vendor.php');
- $vend_focus = new Vendor();
+ require_once('modules/Vendors/Vendors.php');
+ $vend_focus = new Vendors();
$vend_focus->retrieve_entity_info($_REQUEST['vendor_id'],"Vendors");
$focus->column_fields['bill_city']=$vend_focus->column_fields['city'];
Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php Mon Oct 16 01:02:11 2006
@@ -47,7 +47,7 @@
$viewid = "0";
}
}
- $focus = new Order();
+ $focus = new PurchaseOrder();
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php Mon Oct 16 01:02:11 2006
@@ -35,7 +35,7 @@
$url_string = '&smodule=PO';
-$focus = new Order();
+$focus = new PurchaseOrder();
$smarty = new vtigerCRM_Smarty;
$other_text = Array();
Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php Mon Oct 16 01:02:11 2006
@@ -30,7 +30,7 @@
require_once('user_privileges/default_module_view.php');
// Account is used to store vtiger_account information.
-class Order extends CRMEntity {
+class PurchaseOrder extends CRMEntity {
var $log;
var $db;
@@ -94,7 +94,7 @@
* This function creates an instance of LoggerManager class using getLogger method
* creates an instance for PearDatabase class and get values for column_fields array of Order class.
*/
- function Order() {
+ function PurchaseOrder() {
$this->log =LoggerManager::getLogger('PurchaseOrder');
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('PurchaseOrder');
Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php Mon Oct 16 01:02:11 2006
@@ -27,7 +27,7 @@
$local_log =& LoggerManager::getLogger('index');
-$focus = new Order();
+$focus = new PurchaseOrder();
global $current_user;
$currencyid=fetchCurrency($current_user->id);
$rate_symbol = getCurrencySymbolandCRate($currencyid);
Modified: vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -11,7 +11,7 @@
require_once('Smarty_setup.php');
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Quotes/Quotes.php');
//Redirecting Header for single page layout
require_once('user_privileges/default_module_view.php');
global $singlepane_view;
@@ -21,7 +21,7 @@
}
else
{
-$focus = new Quote();
+$focus = new Quotes();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
if(isset($_REQUEST['record']) && $_REQUEST['record']!='') {
Modified: vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php Mon Oct 16 01:02:11 2006
@@ -11,7 +11,7 @@
require_once('include/fpdf/pdf.php');
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Quotes/Quotes.php');
require_once('include/database/PearDatabase.php');
global $adb,$app_strings;
@@ -25,7 +25,7 @@
global $products_per_page;
$products_per_page="6";
-$focus = new Quote();
+$focus = new Quotes();
$focus->retrieve_entity_info($_REQUEST['record'],"Quotes");
$account_name = getAccountName($focus->column_fields[account_id]);
Modified: vtigercrm/branches/5.0.2/modules/Quotes/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/Delete.php Mon Oct 16 01:02:11 2006
@@ -18,13 +18,13 @@
* defined return URL.
********************************************************************************/
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Quotes/Quotes.php');
global $mod_strings;
require_once('include/logging.php');
$log = LoggerManager::getLogger('quote_delete');
-$focus = new Quote();
+$focus = new Quotes();
if(!isset($_REQUEST['record']))
die($mod_strings['ERR_DELETE_RECORD']);
Modified: vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php Mon Oct 16 01:02:11 2006
@@ -22,13 +22,13 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Quotes/Quotes.php');
require_once('include/CustomFieldUtil.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
require_once('user_privileges/default_module_view.php');
global $mod_strings,$app_strings,$currentModule,$theme,$singlepane_view;
-$focus = new Quote();
+$focus = new Quotes();
if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
$focus->retrieve_entity_info($_REQUEST['record'],"Quotes");
Modified: vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Quotes/Quotes.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -25,7 +25,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $modObj = new Quote();
+ $modObj = new Quotes();
$modObj->retrieve_entity_info($crmid,"Quotes");
$modObj->column_fields[$fieldname] = $fieldvalue;
$modObj->id = $crmid;
Modified: vtigercrm/branches/5.0.2/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/EditView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Quotes/Quotes.php');
require_once('include/CustomFieldUtil.php');
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
@@ -32,7 +32,7 @@
$log->debug("Inside Quote EditView");
-$focus = new Quote();
+$focus = new Quotes();
$smarty = new vtigerCRM_Smarty;
$currencyid=fetchCurrency($current_user->id);
$rate_symbol = getCurrencySymbolandCRate($currencyid);
@@ -70,8 +70,8 @@
// Get Account address if vtiger_account is given
if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){
- require_once('modules/Accounts/Account.php');
- $acct_focus = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $acct_focus = new Accounts();
$acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts");
$focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city'];
$focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city'];
Modified: vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php Mon Oct 16 01:02:11 2006
@@ -19,7 +19,7 @@
function getTopQuotes()
{
require_once("data/Tracker.php");
- require_once('modules/Quotes/Quote.php');
+ require_once('modules/Quotes/Quotes.php');
require_once('include/logging.php');
require_once('include/ListView/ListView.php');
require_once('include/database/PearDatabase.php');
@@ -51,7 +51,7 @@
$viewid = "0";
}
}
- $focus = new Quote();
+ $focus = new Quotes();
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
Modified: vtigercrm/branches/5.0.2/modules/Quotes/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/ListView.php Mon Oct 16 01:02:11 2006
@@ -15,7 +15,7 @@
require_once('Smarty_setup.php');
require_once("data/Tracker.php");
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Quotes/Quotes.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
require_once('include/ListView/ListView.php');
@@ -33,7 +33,7 @@
$url_string = '';
-$focus = new Quote();
+$focus = new Quotes();
$smarty = new vtigerCRM_Smarty;
$other_text = Array();
Modified: vtigercrm/branches/5.0.2/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/Quote.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/Quote.php Mon Oct 16 01:02:11 2006
@@ -101,7 +101,7 @@
/** Constructor which will set the column_fields in this object
*/
- function Quote() {
+ function Quotes() {
$this->log =LoggerManager::getLogger('quote');
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('Quotes');
Modified: vtigercrm/branches/5.0.2/modules/Quotes/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/Save.php Mon Oct 16 01:02:11 2006
@@ -21,7 +21,7 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Quotes/Quotes.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
include("modules/Emails/mail.php");
@@ -34,7 +34,7 @@
$rate = $rate_symbol['rate'];
$log->debug("Inside Quote Save");
-$focus = new Quote();
+$focus = new Quotes();
setObjectValuesFromRequest(&$focus);
Modified: vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php Mon Oct 16 01:02:11 2006
@@ -23,7 +23,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
require_once('modules/SalesOrder/SalesOrder.php');
-require_once('modules/Quotes/Quote.php');
+require_once('modules/Quotes/Quotes.php');
require_once('include/CustomFieldUtil.php');
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
@@ -44,7 +44,7 @@
if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoso')
{
$quoteid = $_REQUEST['record'];
- $quote_focus = new Quote();
+ $quote_focus = new Quotes();
$quote_focus->id = $quoteid;
$quote_focus->retrieve_entity_info($quoteid,"Quotes");
$focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid);
@@ -80,7 +80,7 @@
$quoteid = $focus->column_fields['quote_id'];
$smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']);
- $quote_focus = new Quote();
+ $quote_focus = new Quotes();
$quote_focus->id = $quoteid;
$quote_focus->retrieve_entity_info($quoteid,"Quotes");
$focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid);
@@ -118,7 +118,7 @@
$focus->column_fields['duedate'] = getDBInsertDateValue($curr_due_date);
}
$quoteid = $focus->column_fields['quote_id'];
- $quote_focus = new Quote();
+ $quote_focus = new Quotes();
$quote_focus->id = $quoteid;
$quote_focus->retrieve_entity_info($quoteid,"Quotes");
$focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid);
@@ -161,8 +161,8 @@
// Get Account address if vtiger_account is given
if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){
- require_once('modules/Accounts/Account.php');
- $acct_focus = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $acct_focus = new Accounts();
$acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts");
$focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city'];
$focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city'];
Modified: vtigercrm/branches/5.0.2/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/Authenticate.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/Authenticate.php Mon Oct 16 01:02:11 2006
@@ -20,14 +20,14 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('modules/Users/CreateUserPrivilegeFile.php');
require_once('include/logging.php');
require_once('user_privileges/audit_trail.php');
global $mod_strings;
-$focus = new User();
+$focus = new Users();
// Add in defensive code here.
$focus->column_fields["user_name"] = to_html($_REQUEST['user_name']);
Modified: vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php Mon Oct 16 01:02:11 2006
@@ -23,7 +23,7 @@
// The popup_picker.html file is used for generating a list from which to find and choose one instance.
global $theme;
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
Modified: vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('config.php');
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('include/utils/UserInfoUtil.php');
require_once('include/utils/utils.php');
require_once('include/utils/GetUserGroups.php');
@@ -32,7 +32,7 @@
$newbuf .="<?php\n\n";
$newbuf .="\n";
$newbuf .= "//This is the access privilege file\n";
- $user_focus= new User();
+ $user_focus= new Users();
$user_focus->retrieve_entity_info($userid,"Users");
$userInfo=Array();
$user_focus->column_fields["id"] = '';
@@ -120,7 +120,7 @@
$newbuf .="<?php\n\n";
$newbuf .="\n";
$newbuf .= "//This is the sharing access privilege file\n";
- $user_focus= new User();
+ $user_focus= new Users();
$user_focus->retrieve_entity_info($userid,"Users");
if($user_focus->is_admin == 'on')
{
Modified: vtigercrm/branches/5.0.2/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/DetailView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('include/utils/utils.php');
require_once('include/utils/CommonUtils.php');
require_once('include/utils/UserInfoUtil.php');
@@ -37,7 +37,7 @@
global $app_strings;
global $mod_strings;
-$focus = new User();
+$focus = new Users();
if(!empty($_REQUEST['record'])) {
$focus->retrieve_entity_info($_REQUEST['record'],'Users');
Modified: vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -24,7 +24,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $userObj = new User();
+ $userObj = new Users();
$userObj->retrieve_entity_info($crmid,"Users");
$userObj->column_fields[$fieldname] = $fieldvalue;
$userObj->id = $crmid;
Modified: vtigercrm/branches/5.0.2/modules/Users/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/EditView.php Mon Oct 16 01:02:11 2006
@@ -22,7 +22,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('include/utils/UserInfoUtil.php');
require_once('modules/Users/Forms.php');
require_once('include/database/PearDatabase.php');
@@ -36,7 +36,7 @@
$smarty=new vtigerCRM_Smarty;
-$focus = new User();
+$focus = new Users();
if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
$smarty->assign("ID",$_REQUEST['record']);
Modified: vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php Mon Oct 16 01:02:11 2006
@@ -12,7 +12,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
require_once('modules/Users/LoginHistory.php');
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
Modified: vtigercrm/branches/5.0.2/modules/Users/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/ListView.php Mon Oct 16 01:02:11 2006
@@ -24,7 +24,7 @@
global $current_language;
$mod_strings = return_module_language($current_language,'Users');
$category = getParentTab();
-$focus = new User();
+$focus = new Users();
$smarty = new vtigerCRM_Smarty;
$no_of_users=UserCount();
//Retreiving the start value from request
Modified: vtigercrm/branches/5.0.2/modules/Users/Logout.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/Logout.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/Logout.php Mon Oct 16 01:02:11 2006
@@ -20,7 +20,7 @@
require_once('include/logging.php');
require_once('database/DatabaseConnection.php');
require_once('modules/Users/LoginHistory.php');
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('config.php');
require_once('include/db_backup/backup.php');
require_once('include/db_backup/ftp.php');
Modified: vtigercrm/branches/5.0.2/modules/Users/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/Save.php Mon Oct 16 01:02:11 2006
@@ -20,7 +20,7 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('include/logging.php');
require_once('include/utils/UserInfoUtil.php');
$log =& LoggerManager::getLogger('index');
@@ -46,7 +46,7 @@
if (isset($_POST['record']) && !is_admin($current_user) && $_POST['record'] != $current_user->id) echo ("Unauthorized access to user administration.");
elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration.");
-$focus = new User();
+$focus = new Users();
if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '')
{
$focus->mode='edit';
Modified: vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php Mon Oct 16 01:02:11 2006
@@ -12,7 +12,7 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
require_once('modules/Users/AuditTrail.php');
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
Modified: vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php Mon Oct 16 01:02:11 2006
@@ -12,11 +12,11 @@
require_once('Smarty_setup.php');
require_once('data/Tracker.php');
require_once('modules/Users/LoginHistory.php');
-require_once('modules/Users/User.php');
+require_once('modules/Users/Users.php');
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
-#require_once('modules/Users/User.php');
+#require_once('modules/Users/Users.php');
require_once('include/utils/utils.php');
global $app_strings;
Modified: vtigercrm/branches/5.0.2/modules/Users/User.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/User.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/User.php Mon Oct 16 01:02:11 2006
@@ -21,7 +21,7 @@
********************************************/
/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/User.php,v 1.10 2005/04/19 14:40:48 ray Exp $
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Users.php,v 1.10 2005/04/19 14:40:48 ray Exp $
* Description: TODO: To be written.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
* All Rights Reserved.
@@ -33,7 +33,7 @@
require_once('data/CRMEntity.php');
require_once('include/utils/UserInfoUtil.php');
require_once('modules/Calendar/Activity.php');
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
require_once('data/Tracker.php');
// User is used to store customer information.
@@ -155,11 +155,11 @@
*
*/
- function User() {
+ function Users() {
$this->log = LoggerManager::getLogger('user');
- $this->log->debug("Entering User() method ...");
+ $this->log->debug("Entering Users() method ...");
$this->db = new PearDatabase();
- $this->log->debug("Exiting User() method ...");
+ $this->log->debug("Exiting Users() method ...");
}
Modified: vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php Mon Oct 16 01:02:11 2006
@@ -15,12 +15,12 @@
require_once('include/ComboUtil.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
global $app_list_strings;
global $app_strings;
global $current_user;
-$focus = new Lead();
+$focus = new Leads();
$idlist = $_POST['idlist'];
//echo $idlist;
Modified: vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php (original)
+++ vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php Mon Oct 16 01:02:11 2006
@@ -10,9 +10,9 @@
********************************************************************************/
//query the specific vtiger_table and then get the data and write the data here
require_once('include/database/PearDatabase.php');
-include_once('modules/Contacts/Contact.php');
-include_once('modules/Leads/Lead.php');
-include_once('modules/Users/User.php');
+include_once('modules/Contacts/Contacts.php');
+include_once('modules/Leads/Leads.php');
+include_once('modules/Users/Users.php');
global $log;
//download the template file and store it in some specific location
@@ -60,11 +60,11 @@
//get the module
if($module == 'leads')
{
- $focus = new Lead();
+ $focus = new Leads();
}
else
{
- $focus = new Contact();
+ $focus = new Contacts();
}
$focus->retrieve_entity_info($recordid,$module);
Modified: vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('Smarty_setup.php');
-require_once('modules/Vendors/Vendor.php');
+require_once('modules/Vendors/Vendors.php');
//Redirecting Header for single page layout
require_once('user_privileges/default_module_view.php');
global $singlepane_view;
@@ -21,7 +21,7 @@
else
{
global $currentModule;
-$focus = new Vendor();
+$focus = new Vendors();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
Modified: vtigercrm/branches/5.0.2/modules/Vendors/Delete.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Vendors/Delete.php (original)
+++ vtigercrm/branches/5.0.2/modules/Vendors/Delete.php Mon Oct 16 01:02:11 2006
@@ -18,13 +18,13 @@
* defined return URL.
********************************************************************************/
-require_once('modules/Vendors/Vendor.php');
+require_once('modules/Vendors/Vendors.php');
global $mod_strings;
require_once('include/logging.php');
$log = LoggerManager::getLogger('product_delete');
-$focus = new Vendor();
+$focus = new Vendors();
if(!isset($_REQUEST['record']))
die($mod_strings['ERR_DELETE_RECORD']);
Modified: vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php Mon Oct 16 01:02:11 2006
@@ -10,11 +10,11 @@
********************************************************************************/
require_once('include/database/PearDatabase.php');
require_once('Smarty_setup.php');
-require_once('modules/Vendors/Vendor.php');
+require_once('modules/Vendors/Vendors.php');
require_once('include/utils/utils.php');
require_once('user_privileges/default_module_view.php');
-$focus = new Vendor();
+$focus = new Vendors();
if(isset($_REQUEST['record']) && isset($_REQUEST['record']))
{
Modified: vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php (original)
+++ vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php Mon Oct 16 01:02:11 2006
@@ -10,7 +10,7 @@
********************************************************************************/
require_once('include/logging.php');
-require_once('modules/Vendors/Vendor.php');
+require_once('modules/Vendors/Vendors.php');
require_once('include/database/PearDatabase.php');
global $adb;
@@ -25,7 +25,7 @@
$fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]);
if($crmid != "")
{
- $modObj = new Vendor();
+ $modObj = new Vendors();
$modObj->retrieve_entity_info($crmid,"Vendors");
$modObj->column_fields[$fieldname] = $fieldvalue;
$modObj->id = $crmid;
Modified: vtigercrm/branches/5.0.2/modules/Vendors/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Vendors/EditView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Vendors/EditView.php Mon Oct 16 01:02:11 2006
@@ -11,12 +11,12 @@
require_once('Smarty_setup.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
-require_once('modules/Vendors/Vendor.php');
+require_once('modules/Vendors/Vendors.php');
require_once('include/FormValidationUtil.php');
global $app_strings,$mod_strings,$theme,$currentModule;
-$focus = new Vendor();
+$focus = new Vendors();
$smarty = new vtigerCRM_Smarty();
if(isset($_REQUEST['record']) && $_REQUEST['record'] != '')
Modified: vtigercrm/branches/5.0.2/modules/Vendors/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Vendors/ListView.php (original)
+++ vtigercrm/branches/5.0.2/modules/Vendors/ListView.php Mon Oct 16 01:02:11 2006
@@ -11,7 +11,7 @@
require_once('include/database/PearDatabase.php');
require_once('include/database/Postgres8.php');
require_once('Smarty_setup.php');
-require_once('modules/Vendors/Vendor.php');
+require_once('modules/Vendors/Vendors.php');
require_once('include/ListView/ListView.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
@@ -32,7 +32,7 @@
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
-$focus = new Vendor();
+$focus = new Vendors();
$other_text = Array();
if(!$_SESSION['lvs'][$currentModule])
Modified: vtigercrm/branches/5.0.2/modules/Vendors/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Vendors/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Vendors/Save.php Mon Oct 16 01:02:11 2006
@@ -21,11 +21,11 @@
* Contributor(s): ______________________________________..
********************************************************************************/
-require_once('modules/Vendors/Vendor.php');
+require_once('modules/Vendors/Vendors.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
-$focus = new Vendor();
+$focus = new Vendors();
setObjectValuesFromRequest(&$focus);
$focus->save("Vendors");
Modified: vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php (original)
+++ vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php Mon Oct 16 01:02:11 2006
@@ -58,9 +58,9 @@
/** Constructor which will set the column_fields in this object
*/
- function Vendor() {
+ function Vendors() {
$this->log =LoggerManager::getLogger('vendor');
- $this->log->debug("Entering Vendor() method ...");
+ $this->log->debug("Entering Vendors() method ...");
$this->db = new PearDatabase();
$this->column_fields = getColumnFields('Vendors');
$this->log->debug("Exiting Vendor method ...");
@@ -75,8 +75,8 @@
global $log,$singlepane_view;
$log->debug("Entering get_products(".$id.") method ...");
global $app_strings;
- require_once('modules/Products/Product.php');
- $focus = new Product();
+ require_once('modules/Products/Products.php');
+ $focus = new Products();
$button = '';
@@ -100,7 +100,7 @@
$log->debug("Entering get_purchase_orders(".$id.") method ...");
global $app_strings;
require_once('modules/PurchaseOrder/PurchaseOrder.php');
- $focus = new Order();
+ $focus = new PurchaseOrder();
$button = '';
@@ -123,8 +123,8 @@
global $log,$singlepane_view;
$log->debug("Entering get_contacts(".$id.") method ...");
global $app_strings;
- require_once('modules/Contacts/Contact.php');
- $focus = new Contact();
+ require_once('modules/Contacts/Contacts.php');
+ $focus = new Contacts();
$button = '';
if($singlepane_view == 'true')
Modified: vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php Mon Oct 16 01:02:11 2006
@@ -11,7 +11,7 @@
global $current_user;
require_once('Smarty_setup.php');
-require_once('modules/Leads/Lead.php');
+require_once('modules/Leads/Leads.php');
require_once('include/utils/utils.php');
require_once('include/utils/UserInfoUtil.php');
require_once('data/Tracker.php');
Modified: vtigercrm/branches/5.0.2/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Webmails/Save.php (original)
+++ vtigercrm/branches/5.0.2/modules/Webmails/Save.php Mon Oct 16 01:02:11 2006
@@ -9,7 +9,7 @@
*
********************************************************************************/
-require_once('modules/Emails/Email.php');
+require_once('modules/Emails/Emails.php');
require_once('modules/Webmails/Webmail.php');
require_once('include/logging.php');
require_once('include/database/PearDatabase.php');
@@ -20,7 +20,7 @@
global $current_user;
$local_log =& LoggerManager::getLogger('index');
-$focus = new Email();
+$focus = new Emails();
$to_address = explode(";",$_REQUEST['to_list']);
$cc_address = explode(";",$_REQUEST['cc_list']);
@@ -61,8 +61,8 @@
add_attachment_to_contact($email->relationship["id"],$email);
}else {
//if relationship is not available create a contact and relate the email to the contact
- require_once('modules/Contacts/Contact.php');
- $contact_focus = new Contact();
+ require_once('modules/Contacts/Contacts.php');
+ $contact_focus = new Contacts();
$contact_focus->column_fields['lastname'] =$email->fromname;
$contact_focus->column_fields['email'] = $email->from;
$contact_focus->save("Contacts");
Modified: vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php
==============================================================================
--- vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php (original)
+++ vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php Mon Oct 16 01:02:11 2006
@@ -175,8 +175,8 @@
function CheckLeadPermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -193,8 +193,8 @@
function CheckContactPermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -211,8 +211,8 @@
function CheckAccountPermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -229,8 +229,8 @@
function CheckTicketPermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -247,8 +247,8 @@
function CheckVendorPermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -265,8 +265,8 @@
function CheckProductPermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -283,8 +283,8 @@
function CheckNotePermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -301,8 +301,8 @@
function CheckSitePermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -319,8 +319,8 @@
function CheckRssPermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -340,8 +340,8 @@
global $log;
global $adb;
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -365,11 +365,11 @@
function LogintoVtigerCRM($user_name,$password)
{
global $log;
- require_once('modules/Users/User.php');
+ require_once('modules/Users/Users.php');
$return_access = "FALSE";
- $objuser = new User();
+ $objuser = new Users();
if($password != "")
{
@@ -397,8 +397,8 @@
global $log;
global $adb;
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -436,15 +436,15 @@
global $log;
global $adb;
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
$adb->println("Create New Note from Web Form - Starts");
- require_once("modules/Notes/Note.php");
-
- $focus = new Note();
+ require_once("modules/Notes/Notes.php");
+
+ $focus = new Notes();
if(isPermitted("Notes","EditView") == "yes")
{
$focus->column_fields['notes_title'] = $subject;
@@ -473,17 +473,17 @@
global $log;
global $adb;
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
$adb->println("Create New Product from Web Form - Starts");
- require_once("modules/Products/Product.php");
+ require_once("modules/Products/Products.php");
if(isPermitted("Products","EditView") == "yes")
{
- $focus = new Product();
+ $focus = new Products();
$focus->column_fields['productname'] = $productname;
$focus->column_fields['productcode'] = $code;
$focus->column_fields['website'] = $website;
@@ -508,16 +508,16 @@
global $log;
global $adb;
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
$adb->println("Create New Vendor from Web Form - Starts");
- require_once("modules/Vendors/Vendor.php");
+ require_once("modules/Vendors/Vendors.php");
if(isPermitted("Vendors","EditView" ) == "yes")
{
- $focus = new Vendor();
+ $focus = new Vendors();
$focus->column_fields['vendorname'] = $vendorname;
$focus->column_fields['email'] = $email;
$focus->column_fields['phone'] = $phone;
@@ -547,8 +547,8 @@
global $log;
global $adb;
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -591,15 +591,15 @@
function create_account($username,$accountname,$email,$phone,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id,'Users');
- require_once("modules/Accounts/Account.php");
+ require_once("modules/Accounts/Accounts.php");
if(isPermitted("Accounts","EditView") == "yes")
{
- $account=new Account();
+ $account=new Accounts();
$account->column_fields['accountname']=$accountname;
$account->column_fields['email1']=$email;
$account->column_fields['phone']=$phone;
@@ -642,15 +642,15 @@
global $log;
global $adb;
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
$adb->println("Create New Lead from Web Form - Starts");
- require_once("modules/Leads/Lead.php");
-
- $focus = new Lead();
+ require_once("modules/Leads/Leads.php");
+
+ $focus = new Leads();
if(isPermitted("Leads","EditView") == "yes")
{
$focus->column_fields['lastname'] = $lastname;
@@ -689,16 +689,16 @@
{
global $adb,$log;
global $current_user;
- require_once('modules/Users/User.php');
- $seed_user = new User();
+ require_once('modules/Users/Users.php');
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($user_name);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,'Users');
- require_once('modules/Contacts/Contact.php');
+ require_once('modules/Contacts/Contacts.php');
if(isPermitted("Contacts","EditView") == "yes")
{
- $contact = new Contact();
+ $contact = new Contacts();
$contact->column_fields[firstname]= $first_name;
$contact->column_fields[lastname]= $last_name;
//$contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX
Modified: vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php (original)
+++ vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php Mon Oct 16 01:02:11 2006
@@ -13,7 +13,7 @@
require_once('include/logging.php');
require_once('include/nusoap/nusoap.php');
require_once('include/database/PearDatabase.php');
-require_once('modules/Contacts/Contact.php');
+require_once('modules/Contacts/Contacts.php');
$log = &LoggerManager::getLogger('thunderbirdplugin');
@@ -173,9 +173,9 @@
function SearchContactsByEmail($username,$emailaddress)
{
- require_once('modules/Contacts/Contact.php');
-
- $seed_contact = new Contact();
+ require_once('modules/Contacts/Contacts.php');
+
+ $seed_contact = new Contacts();
$output_list = Array();
$response = $seed_contact->get_searchbyemailid($username,$emailaddress);
@@ -201,13 +201,13 @@
function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body)
{
global $adb;
- require_once('modules/Users/User.php');
- require_once('modules/Emails/Email.php');
-
- $seed_user = new User();
+ require_once('modules/Users/Users.php');
+ require_once('modules/Emails/Emails.php');
+
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($user_name);
- $email = new Email();
+ $email = new Emails();
//$log->debug($msgdtls['contactid']);
$emailbody = str_replace("'", "''", $email_body);
$emailsubject = str_replace("'", "''",$email_subject);
@@ -241,9 +241,9 @@
{
global $adb;
global $log;
- require_once('modules/Contacts/Contact.php');
-
- $seed_contact = new Contact();
+ require_once('modules/Contacts/Contacts.php');
+
+ $seed_contact = new Contacts();
$output_list = Array();
$query = $seed_contact->get_contactsforol($username);
@@ -332,8 +332,8 @@
$rows_count = $db->getRowCount($result);
if($rows_count==0)
{
- require_once('modules/Accounts/Account.php');
- $account = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $account = new Accounts();
$account->column_fields[accountname] = $account_name;
$account->column_fields[assigned_user_id]=$user_id;
//$account->saveentity("Accounts");
@@ -360,10 +360,10 @@
{
global $adb;
global $current_user;
- require_once('modules/Users/User.php');
- require_once('modules/Contacts/Contact.php');
-
- $seed_user = new User();
+ require_once('modules/Users/Users.php');
+ require_once('modules/Contacts/Contacts.php');
+
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($user_name);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
@@ -384,7 +384,7 @@
$permitted_lists[] = $adb->query_result($result1,$i,'fieldname');
}
- $contact = new Contact();
+ $contact = new Contacts();
$contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : "";
$contact->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : "";
$contact->column_fields[birthday]=in_array('birthday',$permitted_lists) ? getDisplayDate("0000-00-00") : "";
@@ -418,10 +418,10 @@
{
global $adb;
global $current_user;
- require_once('modules/Users/User.php');
- require_once('modules/Leads/Lead.php');
-
- $seed_user = new User();
+ require_once('modules/Users/Users.php');
+ require_once('modules/Leads/Leads.php');
+
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($user_name);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
@@ -442,7 +442,7 @@
$permitted_lists[] = $adb->query_result($result1,$i,'fieldname');
}
- $Lead = new Lead();
+ $Lead = new Leads();
$Lead->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : "";
$Lead->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : "";
$Lead->column_fields[birthday]=in_array('birthday',$permitted_lists) ? getDisplayDate("0000-00-00") : "";
@@ -478,8 +478,8 @@
{
global $adb,$log;
$return_access = 'failure';
- require_once('modules/Users/User.php');
- $objuser = new User();
+ require_once('modules/Users/Users.php');
+ $objuser = new Users();
if($password != "" && $user_name != '')
{
$objuser->column_fields['user_name'] = $user_name;
@@ -511,8 +511,8 @@
function CheckContactPerm($user_name)
{
global $current_user;
- require_once('modules/Users/User.php');
- $seed_user = new User();
+ require_once('modules/Users/Users.php');
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($user_name);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
@@ -528,8 +528,8 @@
function CheckContactViewPerm($user_name)
{
global $current_user,$log;
- require_once('modules/Users/User.php');
- $seed_user = new User();
+ require_once('modules/Users/Users.php');
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($user_name);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
Modified: vtigercrm/branches/5.0.2/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/branches/5.0.2/soap/vtigerolservice.php (original)
+++ vtigercrm/branches/5.0.2/soap/vtigerolservice.php Mon Oct 16 01:02:11 2006
@@ -280,9 +280,9 @@
function SearchContactsByEmail($username,$emailaddress)
{
- require_once('modules/Contacts/Contact.php');
+ require_once('modules/Contacts/Contacts.php');
- $seed_contact = new Contact();
+ $seed_contact = new Contacts();
$output_list = Array();
$response = $seed_contact->get_searchbyemailid($username,$emailaddress);
@@ -308,17 +308,17 @@
function AddMessageToContact($username,$contactid,$msgdtls)
{
global $adb;
- require_once('modules/Users/User.php');
- require_once('modules/Emails/Email.php');
-
- $seed_user = new User();
+ require_once('modules/Users/Users.php');
+ require_once('modules/Emails/Emails.php');
+
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
foreach($msgdtls as $msgdtl)
{
if(isset($msgdtl))
{
- $email = new Email();
+ $email = new Emails();
//$log->debug($msgdtls['contactid']);
$email_body = str_replace("'", "''", $msgdtl['body']);
$email_subject = str_replace("'", "''",$msgdtl['subject']);
@@ -356,11 +356,11 @@
function LoginToVtiger($userid,$password)
{
global $adb;
- require_once('modules/Users/User.php');
+ require_once('modules/Users/Users.php');
$return_access = "FALSE";
- $objuser = new User();
+ $objuser = new Users();
if($password != "")
{
@@ -385,8 +385,8 @@
function CheckEmailPermission($username)
{
global $current_user,$log;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -403,8 +403,8 @@
function CheckContactPermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -421,8 +421,8 @@
function CheckActivityPermission($username)
{
global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -439,12 +439,12 @@
function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username)
{
global $adb;
- require_once('modules/Users/User.php');
+ require_once('modules/Users/Users.php');
require_once('include/utils/utils.php');
$date_var = date('YmdHis');
- $seed_user = new User();
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
$crmid = $adb->getUniqueID("vtiger_crmentity");
@@ -483,9 +483,9 @@
function GetContacts($username)
{
global $adb;
- require_once('modules/Contacts/Contact.php');
-
- $seed_contact = new Contact();
+ require_once('modules/Contacts/Contacts.php');
+
+ $seed_contact = new Contacts();
$output_list = Array();
$query = $seed_contact->get_contactsforol($username);
@@ -564,15 +564,15 @@
{
global $adb;
global $current_user;
- require_once('modules/Users/User.php');
- require_once('modules/Contacts/Contact.php');
-
- $seed_user = new User();
+ require_once('modules/Users/Users.php');
+ require_once('modules/Contacts/Contacts.php');
+
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
- $contact = new Contact();
+ $contact = new Contacts();
require('user_privileges/user_privileges_'.$current_user->id.'.php');
require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
@@ -646,15 +646,15 @@
{
global $adb;
global $current_user;
- require_once('modules/Users/User.php');
- require_once('modules/Contacts/Contact.php');
-
- $seed_user = new User();
+ require_once('modules/Users/Users.php');
+ require_once('modules/Contacts/Contacts.php');
+
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
- $contact = new Contact();
+ $contact = new Contacts();
require('user_privileges/user_privileges_'.$current_user->id.'.php');
require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
@@ -727,15 +727,15 @@
function DeleteContacts($username,$crmid)
{
global $current_user;
- require_once('modules/Users/User.php');
- require_once('modules/Contacts/Contact.php');
-
- $seed_user = new User();
+ require_once('modules/Users/Users.php');
+ require_once('modules/Contacts/Contacts.php');
+
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
- $contact = new Contact();
+ $contact = new Contacts();
$contact->id = $crmid;
$contact->mark_deleted($contact->id);
@@ -760,8 +760,8 @@
$rows_count = $db->getRowCount($result);
if($rows_count==0)
{
- require_once('modules/Accounts/Account.php');
- $account = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $account = new Accounts();
$account->column_fields[accountname] = $account_name;
$account->column_fields[assigned_user_id]=$user_id;
//$account->saveentity("Accounts");
@@ -856,10 +856,10 @@
function AddTasks($username,$taskdtls)
{
global $current_user,$adb;
- require_once('modules/Users/User.php');
+ require_once('modules/Users/Users.php');
require_once('modules/Calendar/Activity.php');
- $seed_user = new User();
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
@@ -937,10 +937,10 @@
function UpdateTasks($username,$taskdtls)
{
global $current_user,$adb;
- require_once('modules/Users/User.php');
+ require_once('modules/Users/Users.php');
require_once('modules/Calendar/Activity.php');
- $seed_user = new User();
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
@@ -1022,10 +1022,10 @@
function DeleteTasks($username,$crmid)
{
global $current_user;
- require_once('modules/Users/User.php');
+ require_once('modules/Users/Users.php');
require_once('modules/Calendar/Activity.php');
- $seed_user = new User();
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
@@ -1091,10 +1091,10 @@
function AddClndr($username,$clndrdtls)
{
global $current_user,$adb;
- require_once('modules/Users/User.php');
+ require_once('modules/Users/Users.php');
require_once('modules/Calendar/Activity.php');
- $seed_user = new User();
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
@@ -1159,10 +1159,10 @@
{
global $current_user;
global $adb,$log;
- require_once('modules/Users/User.php');
+ require_once('modules/Users/Users.php');
require_once('modules/Calendar/Activity.php');
- $seed_user = new User();
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
@@ -1228,10 +1228,10 @@
function DeleteClndr($username,$crmid)
{
global $current_user;
- require_once('modules/Users/User.php');
+ require_once('modules/Users/Users.php');
require_once('modules/Calendar/Activity.php');
- $seed_user = new User();
+ $seed_user = new Users();
$user_id = $seed_user->retrieve_user_id($username);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
Modified: vtigercrm/branches/5.0.2/soap/webforms.php
==============================================================================
--- vtigercrm/branches/5.0.2/soap/webforms.php (original)
+++ vtigercrm/branches/5.0.2/soap/webforms.php Mon Oct 16 01:02:11 2006
@@ -82,8 +82,8 @@
$assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id');
}
- require_once("modules/Leads/Lead.php");
- $focus = new Lead();
+ require_once("modules/Leads/Leads.php");
+ $focus = new Leads();
$focus->column_fields['lastname'] = $lastname;
$focus->column_fields['email'] = $email;
$focus->column_fields['phone'] = $phone;
@@ -126,8 +126,8 @@
$assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id');
}
- require_once('modules/Contacts/Contact.php');
- $focus = new Contact();
+ require_once('modules/Contacts/Contacts.php');
+ $focus = new Contacts();
$focus->column_fields['firstname'] = $first_name;
$focus->column_fields['lastname'] = $last_name;
Modified: vtigercrm/branches/5.0.2/soap/wordplugin.php
==============================================================================
--- vtigercrm/branches/5.0.2/soap/wordplugin.php (original)
+++ vtigercrm/branches/5.0.2/soap/wordplugin.php Mon Oct 16 01:02:11 2006
@@ -215,8 +215,8 @@
function get_tickets_columns($user_name, $password)
{
global $current_user,$log;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($user_name);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
@@ -237,15 +237,15 @@
function get_contacts_columns($user_name, $password)
{
global $current_user,$log;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($user_name);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
if(isPermitted("Contacts","index") == "yes")
{
- require_once('modules/Contacts/Contact.php');
- $contact = new Contact();
+ require_once('modules/Contacts/Contacts.php');
+ $contact = new Contacts();
$log->debug($contact->getColumnNames());
return $contact->getColumnNames();
}
@@ -261,15 +261,15 @@
function get_accounts_columns($user_name, $password)
{
global $current_user,$log;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($user_name);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
if(isPermitted("Accounts","index") == "yes")
{
- require_once('modules/Accounts/Account.php');
- $account = new Account();
+ require_once('modules/Accounts/Accounts.php');
+ $account = new Accounts();
$log->debug($account->getColumnNames_Acnt());
return $account->getColumnNames_Acnt();
}
@@ -285,16 +285,16 @@
function get_leads_columns($user_name, $password)
{
global $current_user,$log;
- require_once("modules/Users/User.php");
- $seed_user=new User();
+ require_once("modules/Users/Users.php");
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($user_name);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
if(isPermitted("Leads","index") == "yes")
{
- require_once('modules/Leads/Lead.php');
- $lead = new Lead();
+ require_once('modules/Leads/Leads.php');
+ $lead = new Leads();
$log->debug($lead->getColumnNames_Lead());
return $lead->getColumnNames_Lead();
}
@@ -309,12 +309,12 @@
function get_user_columns($user_name, $password)
{
global $current_user;
- require_once('modules/Users/User.php');
- $seed_user=new User();
+ require_once('modules/Users/Users.php');
+ $seed_user=new Users();
$user_id=$seed_user->retrieve_user_id($user_name);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
- $user = new User();
+ $user = new Users();
return $user->getColumnNames_User();
}
@@ -323,8 +323,8 @@
function create_session($user_name, $password)
{
global $adb,$log;
- require_once('modules/Users/User.php');
- $objuser = new User();
+ require_once('modules/Users/Users.php');
+ $objuser = new Users();
if($password != "" && $user_name != '')
{
$objuser->column_fields['user_name'] = $user_name;
More information about the vtigercrm-commits
mailing list