[Vtigercrm-commits] [vtiger-commits] r7150 - in /vtigercrm/trunk/modules/Emails: Choose.php ChooseEmail.php EditView.php ListView.php class.phpmailer.php mailSelect.php mailbox.php mailsend.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Thu Jun 15 12:51:24 EDT 2006
Author: don
Date: Thu Jun 15 10:51:15 2006
New Revision: 7150
Log:
prefixed vtiger_ in all table names
Modified:
vtigercrm/trunk/modules/Emails/Choose.php
vtigercrm/trunk/modules/Emails/ChooseEmail.php
vtigercrm/trunk/modules/Emails/EditView.php
vtigercrm/trunk/modules/Emails/ListView.php
vtigercrm/trunk/modules/Emails/class.phpmailer.php
vtigercrm/trunk/modules/Emails/mailSelect.php
vtigercrm/trunk/modules/Emails/mailbox.php
vtigercrm/trunk/modules/Emails/mailsend.php
Modified: vtigercrm/trunk/modules/Emails/Choose.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Choose.php (original)
+++ vtigercrm/trunk/modules/Emails/Choose.php Thu Jun 15 10:51:15 2006
@@ -16,15 +16,15 @@
if ($pmodule=='Accounts')
{
- $querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;";
+ $querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;";
}
elseif ($pmodule=='Contacts')
{
- $querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
+ $querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;";
}
elseif ($pmodule=='Leads')
{
- $querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
+ $querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;";
}
$result=$adb->query($querystr);
Modified: vtigercrm/trunk/modules/Emails/ChooseEmail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ChooseEmail.php (original)
+++ vtigercrm/trunk/modules/Emails/ChooseEmail.php Thu Jun 15 10:51:15 2006
@@ -14,15 +14,15 @@
if ($pmodule=='Accounts')
{
- $querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;";
+ $querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;";
}
elseif ($pmodule=='Contacts')
{
- $querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
+ $querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;";
}
elseif ($pmodule=='Leads')
{
- $querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
+ $querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;";
}
$result=$adb->query($querystr);
$numrows = $adb->num_rows($result);
Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/EditView.php (original)
+++ vtigercrm/trunk/modules/Emails/EditView.php Thu Jun 15 10:51:15 2006
@@ -96,7 +96,7 @@
elseif ($type == "Contacts")
$q = "select email as email1 from vtiger_contactdetails where contactid='".$rec_id."'";
elseif ($type == "Accounts")
- $q = "select email1,email2 from vtiger_account where vtiger_accountid='".$rec_id."'";
+ $q = "select email1,email2 from vtiger_account where accountid='".$rec_id."'";
$email1 = $adb->query_result($adb->query($q),0,"email1");
} elseif ($rec_type == "email_addy") {
@@ -252,7 +252,7 @@
if(isset($focus->parent_type) && $focus->parent_type != "")
{
- $change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' vtiger_tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
+ $change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
$smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
}
Modified: vtigercrm/trunk/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ListView.php (original)
+++ vtigercrm/trunk/modules/Emails/ListView.php Thu Jun 15 10:51:15 2006
@@ -122,7 +122,7 @@
}
if($_REQUEST['folderid'] =='3')
{
- $list_query .= "AND vtiger_seactivityrel.crmid in (select vtiger_accountid from vtiger_account)";
+ $list_query .= "AND vtiger_seactivityrel.crmid in (select accountid from vtiger_account)";
}
if($_REQUEST['folderid'] =='4')
{
Modified: vtigercrm/trunk/modules/Emails/class.phpmailer.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/class.phpmailer.php (original)
+++ vtigercrm/trunk/modules/Emails/class.phpmailer.php Thu Jun 15 10:51:15 2006
@@ -1089,7 +1089,7 @@
}
$magic_quotes = get_magic_quotes_runtime();
set_magic_quotes_runtime(0);
- $file_buffer = fread($fd, vtiger_filesize($path));
+ $file_buffer = fread($fd, filesize($path));
$file_buffer = $this->EncodeString($file_buffer, $encoding);
fclose($fd);
set_magic_quotes_runtime($magic_quotes);
@@ -1496,4 +1496,4 @@
}
}
-?>
+?>
Modified: vtigercrm/trunk/modules/Emails/mailSelect.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailSelect.php (original)
+++ vtigercrm/trunk/modules/Emails/mailSelect.php Thu Jun 15 10:51:15 2006
@@ -24,15 +24,15 @@
$smarty = new vtigerCRM_Smarty;
if ($pmodule=='Accounts')
{
- $querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;";
+ $querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;";
}
elseif ($pmodule=='Contacts')
{
- $querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
+ $querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;";
}
elseif ($pmodule=='Leads')
{
- $querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
+ $querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;";
}
$result=$adb->query($querystr);
$numrows = $adb->num_rows($result);
Modified: vtigercrm/trunk/modules/Emails/mailbox.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailbox.php (original)
+++ vtigercrm/trunk/modules/Emails/mailbox.php Thu Jun 15 10:51:15 2006
@@ -73,7 +73,7 @@
function handleFile(nr) {
if (b != "ie") {
- alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ vtiger_users\n\nWait for an update!");
+ alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait for an update!");
} else {
check = confirm("Do you want to download the file ?");
if (check) {
Modified: vtigercrm/trunk/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/mailsend.php Thu Jun 15 10:51:15 2006
@@ -120,7 +120,7 @@
for ($j=1;$j<$nemail;$j++)
{
$temp=$realid[$j];
- $myquery='Select columnname from vtiger_field where vtiger_fieldid='.$adb->quote($temp);
+ $myquery='Select columnname from vtiger_field where fieldid='.$adb->quote($temp);
$fresult=$adb->query($myquery);
if ($pmodule=='Contacts')
{
@@ -180,7 +180,7 @@
{
global $adb;
$date_var = date('Ymd');
- $query = 'update vtiger_activity set date_start ='.$date_var.' where vtiger_activityid = '.$returnid;
+ $query = 'update vtiger_activity set date_start ='.$date_var.' where activityid = '.$returnid;
$adb->query($query);
}
//The following function call is used to parse and form a encoded error message and then pass to result page
More information about the vtigercrm-commits
mailing list