Modified: vtigercrm/trunk/modules/System/templates/classic/form.tpl
==============================================================================
--- vtigercrm/trunk/modules/System/templates/classic/form.tpl (original)
+++ vtigercrm/trunk/modules/System/templates/classic/form.tpl Fri Aug 18 07:44:35 2006
@@ -1,4 +1,4 @@
-{**}
+// phpsysinfo release version number
+-->
{errors}
From vtigercrm-commits at vtiger.fosslabs.com Fri Aug 18 10:48:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 18 Aug 2006 14:48:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9036 -
/vtigercrm/trunk/modules/System/templates/classic/form.tpl
Message-ID: <20060818144834.1785075120A@vtiger.fosslabs.com>
Author: richie
Date: Fri Aug 18 08:48:26 2006
New Revision: 9036
Log:
Removed braces from sysinfo -- Ahmed
Modified:
vtigercrm/trunk/modules/System/templates/classic/form.tpl
Modified: vtigercrm/trunk/modules/System/templates/classic/form.tpl
==============================================================================
--- vtigercrm/trunk/modules/System/templates/classic/form.tpl (original)
+++ vtigercrm/trunk/modules/System/templates/classic/form.tpl Fri Aug 18 08:48:26 2006
@@ -24,7 +24,6 @@
{vitals} {memory} {filesystems} {hardware} \n"
. " " . $text['dversion'] . " " . $XPath->getData("/phpsysinfo/Vitals/Distro") . " " . $XPath->getData("/phpsysinfo/Vitals/Distro") . " \n"
. " \n"
. " " . $text['uptime'] . "
-
+
From vtigercrm-commits at vtiger.fosslabs.com Fri Aug 18 11:25:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 18 Aug 2006 15:25:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9038 -
/vtigercrm/trunk/modules/System/includes/common_functions.php
Message-ID: <20060818152547.EEBFB750143@vtiger.fosslabs.com>
Author: richie
Date: Fri Aug 18 09:25:41 2006
New Revision: 9038
Log:
Image path made proper for sys info -- Ahmed
Modified:
vtigercrm/trunk/modules/System/includes/common_functions.php
Modified: vtigercrm/trunk/modules/System/includes/common_functions.php
==============================================================================
--- vtigercrm/trunk/modules/System/includes/common_functions.php (original)
+++ vtigercrm/trunk/modules/System/includes/common_functions.php Fri Aug 18 09:25:41 2006
@@ -32,17 +32,17 @@
$textdir = direction();
- $imgpath = getcwd().'/modules/System/templates/' . TEMPLATE_SET . '/images/';
+ $imgpath = '/modules/System/templates/' . TEMPLATE_SET . '/images/';
$maximum == 0 ? $barwidth = 0 : $barwidth = round((100 / $maximum) * $value) * $b;
$red = 90 * $b;
$yellow = 75 * $b;
- if (!file_exists(getcwd()."/modules/System/templates/" . TEMPLATE_SET . "/images/nobar_left.gif")) {
+ if (!file_exists("/modules/System/templates/" . TEMPLATE_SET . "/images/nobar_left.gif")) {
if ($barwidth == 0) {
return '';
global $adb;
- $sql = "select * from vtiger_currency_info";
+ $sql = "select * from vtiger_currency_info where currency_status = 'Active'";
$result = $adb->query($sql);
$temprow = $adb->fetch_array($result);
do
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 02:04:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 06:04:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9043 -
/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060821060421.C6F097511C1@vtiger.fosslabs.com>
Author: saraj
Date: Mon Aug 21 00:04:17 2006
New Revision: 9043
Log:
changes made to fix the issue 1915 --Minnie
Modified:
vtigercrm/trunk/include/utils/EditViewUtils.php
Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Aug 21 00:04:17 2006
@@ -1118,7 +1118,7 @@
elseif($uitype == 116)
{
$editview_label[]=$mod_strings[$fieldlabel];
- $pick_query="select * from vtiger_currency_info";
+ $pick_query="select * from vtiger_currency_info where currency_status = 'Active'";
$pickListResult = $adb->query($pick_query);
$noofpickrows = $adb->num_rows($pickListResult);
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 03:18:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 07:18:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9044 -
/vtigercrm/trunk/Smarty/templates/SysInformation.tpl
Message-ID: <20060821071819.9638675A20D@vtiger.fosslabs.com>
Author: saraj
Date: Mon Aug 21 01:18:16 2006
New Revision: 9044
Log:
Adjusted the frame height of system info to remove inner scroll -- ahmed
Modified:
vtigercrm/trunk/Smarty/templates/SysInformation.tpl
Modified: vtigercrm/trunk/Smarty/templates/SysInformation.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SysInformation.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SysInformation.tpl Mon Aug 21 01:18:16 2006
@@ -34,7 +34,7 @@
-
+
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 05:29:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 09:29:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9045 -
/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060821092933.4F77775A228@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 21 03:29:08 2006
New Revision: 9045
Log:
plugin_save variable has been set to true when save from outlook --Jeri
Modified:
vtigercrm/trunk/soap/vtigerolservice.php
Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Mon Aug 21 03:29:08 2006
@@ -309,6 +309,7 @@
$email->column_fields[date_start] = $date_sent;
$email->column_fields[description] = htmlentities($email_body);
$email->column_fields[activitytype] = 'Emails';
+ $email->plugin_save = true;
$email->save("Emails");
$email->set_emails_contact_invitee_relationship($email->id,$contactid);
@@ -320,7 +321,7 @@
if(isset($camodulerow))
{
$emailid = $camodulerow["email"];
- $query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")';
+ $query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contactid."@77|".'","OUTLOOK")';
$adb->query($query);
}
return $email->id;
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 05:35:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 09:35:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9046 -
/vtigercrm/trunk/modules/Emails/Email.php
Message-ID: <20060821093513.B979275A790@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 21 03:34:48 2006
New Revision: 9046
Log:
plugin_save variable has been added and set to false by default to check for plugin save--Jeri
Modified:
vtigercrm/trunk/modules/Emails/Email.php
Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Mon Aug 21 03:34:48 2006
@@ -36,7 +36,9 @@
var $db;
// Stored vtiger_fields
- var $module_id="emailid";
+ var $module_id="emailid";
+ // added to check email save from plugin or not
+ var $plugin_save = false;
var $rel_users_table = "vtiger_salesmanactivityrel";
var $rel_contacts_table = "vtiger_cntactivityrel";
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 05:39:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 09:39:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9047 -
/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060821093937.377E175A7AC@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 21 03:39:07 2006
New Revision: 9047
Log:
plugin_save variable checked for inserting into seactiivityrel --Jeri
Modified:
vtigercrm/trunk/data/CRMEntity.php
Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Mon Aug 21 03:39:07 2006
@@ -79,10 +79,9 @@
//added by raju
elseif($table_name=="vtiger_seactivityrel" )
{
- if($module=="Emails" && $_REQUEST['smodule']!='webmails')
- //modified by Richie as raju's implementation broke the feature for addition of webmail to vtiger_crmentity.need to be more careful in future while integrating code
- //if($_REQUEST['smodule']!='webmails' && $_REQUEST['smodule'] != '')
- {
+ //modified by Richie as raju's implementation broke the feature for addition of webmail to vtiger_crmentity.need to be more careful in future while integrating code
+ if($module=="Emails" && $_REQUEST['smodule']!='webmails' && (!$this->plugin_save))
+ {
if($_REQUEST['currentid']!='')
{
$actid=$_REQUEST['currentid'];
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 06:28:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 10:28:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9048 -
/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060821102855.BD1F975A7BA@vtiger.fosslabs.com>
Author: saraj
Date: Mon Aug 21 04:28:51 2006
New Revision: 9048
Log:
Retained navigation page after sorting. Fixes #1923
Modified:
vtigercrm/trunk/include/utils/ListViewUtils.php
Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon Aug 21 04:28:51 2006
@@ -162,13 +162,13 @@
$lbl_name .=': (in '.$curr_symbol.')';
}
if($relatedlist !='' && $relatedlist != 'global')
- $name = "";
+ $name = "";
elseif($module == 'Users' && $name == 'User Name')
$name = "";
elseif($relatedlist == "global")
$name = $lbl_name;
else
- $name = "";
+ $name = "";
$arrow = '';
}
else
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 06:50:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 10:50:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9049 -
/vtigercrm/trunk/include/Ajax/TagCloud.php
Message-ID: <20060821105013.C6E6675A7BD@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 21 04:50:02 2006
New Revision: 9049
Log:
SQL Injection in tagcloud has been fixed --Jeri
Modified:
vtigercrm/trunk/include/Ajax/TagCloud.php
Modified: vtigercrm/trunk/include/Ajax/TagCloud.php
==============================================================================
--- vtigercrm/trunk/include/Ajax/TagCloud.php (original)
+++ vtigercrm/trunk/include/Ajax/TagCloud.php Mon Aug 21 04:50:02 2006
@@ -1,53 +1,60 @@
-id;
-if($ajaxaction == "SAVETAG")
-{
-
- require_once('include/freetag/freetag.class.php');
- $tagfields = $_REQUEST["tagfields"];
- $freetag = new freetag();
- if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "")
- {
- $freetag->tag_object($userid,$crmid,$tagfields,$module);
- $tagcloud = $freetag->get_tag_cloud_html($module,$userid,$crmid);
- echo $tagcloud;
- }
-
-}
-elseif($ajaxaction == 'GETTAGCLOUD')
-{
- require_once('include/freetag/freetag.class.php');
- $freetag = new freetag();
- if(trim($module) != "")
- {
- $tagcloud = $freetag->get_tag_cloud_html($module,$userid,$crmid);
- echo $tagcloud;
- }else
- {
- $tagcloud = $freetag->get_tag_cloud_html("",$userid);
- echo $tagcloud;
- }
-}elseif($ajaxaction == 'DELETETAG')
-{
- $tagid = $_REQUEST['tagid'];
- global $adb;
- $query="delete from vtiger_freetagged_objects where tag_id=".$tagid;
- $result=$adb->query($query);
- $query="delete from vtiger_freetags where id=".$tagid;
- $result=$adb->query($query);
- echo 'SUCESS';
-}
-?>
+id;
+if($ajaxaction == "SAVETAG")
+{
+
+ require_once('include/freetag/freetag.class.php');
+ $tagfields = $_REQUEST["tagfields"];
+ $freetag = new freetag();
+ if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "")
+ {
+ $freetag->tag_object($userid,$crmid,$tagfields,$module);
+ $tagcloud = $freetag->get_tag_cloud_html($module,$userid,$crmid);
+ echo $tagcloud;
+ }
+
+}
+elseif($ajaxaction == 'GETTAGCLOUD')
+{
+ require_once('include/freetag/freetag.class.php');
+ $freetag = new freetag();
+ if(trim($module) != "")
+ {
+ $tagcloud = $freetag->get_tag_cloud_html($module,$userid,$crmid);
+ echo $tagcloud;
+ }else
+ {
+ $tagcloud = $freetag->get_tag_cloud_html("",$userid);
+ echo $tagcloud;
+ }
+}elseif($ajaxaction == 'DELETETAG')
+{
+ if(is_numeric($_REQUEST['tagid']))
+ {
+ $tagid = $_REQUEST['tagid'];
+ global $adb;
+ $query="delete from vtiger_freetagged_objects where tag_id=".$tagid;
+ $result=$adb->query($query);
+ $query="delete from vtiger_freetags where id=".$tagid;
+ $result=$adb->query($query);
+ echo 'SUCESS';
+ }else
+ {
+ die("An invalid tagid to delete.");
+ }
+
+}
+?>
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 07:42:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 11:42:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9050 -
/vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl
Message-ID: <20060821114225.6C74175A7C5@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 21 05:42:15 2006
New Revision: 9050
Log:
Include Settings submenu has been removed --Jeri
Modified:
vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl
Modified: vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl Mon Aug 21 05:42:15 2006
@@ -98,5 +98,4 @@
{rdelim}
-{include file='SettingsSubMenu.tpl'}
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 10:11:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 14:11:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9051 -
/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060821141145.9A3EE75A7F6@vtiger.fosslabs.com>
Author: saraj
Date: Mon Aug 21 08:11:41 2006
New Revision: 9051
Log:
changes made to get jscalendar popup in qcreate --Minnie
Modified:
vtigercrm/trunk/Smarty/templates/Header.tpl
Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon Aug 21 08:11:41 2006
@@ -28,6 +28,10 @@
+
@@ -205,6 +209,7 @@
$("status").style.display="none";
$("qcform").style.display="inline";
$("qcform").innerHTML = response.responseText;
+ eval($("date_calpopup").innerHTML);
eval($("qcform"));
{rdelim}
{rdelim}
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 10:15:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 14:15:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9052 -
/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060821141544.CE65975A7F6@vtiger.fosslabs.com>
Author: saraj
Date: Mon Aug 21 08:15:41 2006
New Revision: 9052
Log:
changes made to get jscalendar popup in convertlead --Minnie
Modified:
vtigercrm/trunk/Smarty/templates/DetailView.tpl
Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Mon Aug 21 08:15:41 2006
@@ -37,6 +37,7 @@
postBody: 'module=Leads&action=LeadsAjax&file=ConvertLead&record='+id,
onComplete: function(response) {
$("convertleaddiv").innerHTML=response.responseText;
+ eval($("conv_leadcal").innerHTML);
}
}
);
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 10:21:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 14:21:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9053 -
/vtigercrm/trunk/Smarty/templates/QuickCreate.tpl
Message-ID: <20060821142141.C488675A7DE@vtiger.fosslabs.com>
Author: saraj
Date: Mon Aug 21 08:21:38 2006
New Revision: 9053
Log:
changes made to get jscalendar popup in qcreate --Minnie
Modified:
vtigercrm/trunk/Smarty/templates/QuickCreate.tpl
Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Mon Aug 21 08:21:38 2006
@@ -224,6 +224,7 @@
{assign var=time_val value="$time_value"}
{/foreach}
({$dateStr})
-
{foreach key=labelval item=selectval from=$secondvalue}
{$labelval}
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 10:24:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 14:24:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9054 -
/vtigercrm/trunk/include/js/general.js
Message-ID: <20060821142400.D932875A7FE@vtiger.fosslabs.com>
Author: saraj
Date: Mon Aug 21 08:23:57 2006
New Revision: 9054
Log:
js function getCalendarPopup has been added --Minnie
Modified:
vtigercrm/trunk/include/js/general.js
Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Mon Aug 21 08:23:57 2006
@@ -1710,3 +1710,11 @@
function fnHideDrop(obj){
document.getElementById(obj).style.display = 'none';
}
+
+function getCalendarPopup(imageid,fieldid,dateformat)
+{
+ Calendar.setup ({
+ inputField : fieldid, ifFormat : dateformat, showsTime : false, button : imageid, singleClick : true, step : 1
+ });
+}
+
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 21 10:29:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 21 Aug 2006 14:29:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9055 -
/vtigercrm/trunk/modules/Leads/ConvertLead.php
Message-ID: <20060821142913.638E975A7DE@vtiger.fosslabs.com>
Author: saraj
Date: Mon Aug 21 08:29:09 2006
New Revision: 9055
Log:
changes made to get jscalendar popup in convertlead --Minnie
Modified:
vtigercrm/trunk/modules/Leads/ConvertLead.php
Modified: vtigercrm/trunk/modules/Leads/ConvertLead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ConvertLead.php (original)
+++ vtigercrm/trunk/modules/Leads/ConvertLead.php Mon Aug 21 08:29:09 2006
@@ -68,13 +68,7 @@
$sales_stage_fld.= ''.$sales_stageValue.' ';
}
-$convertlead = '
- {if $FIELD_PRIVILEGES[$tabid] neq NULL}
-
+ {if $FIELD_PRIVILEGES[$tabid] neq NULL || $modulename eq 'Emails'}
+
{/if}
@@ -190,6 +190,7 @@
+ {if $FIELD_PRIVILEGES[$tabid] neq ''}
{if $modulename eq 'Calendar'}
@@ -197,6 +198,7 @@
{/if}
+ {/if}
{foreach item=row_values from=$FIELD_PRIVILEGES[$tabid]}
{foreach item=element from=$row_values}
Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Mon Aug 21 23:40:13 2006
@@ -170,8 +170,8 @@
{$STANDARD_PRIV[$tabid][2]}
- {if $FIELD_PRIVILEGES[$tabid] neq NULL}
-
+ {if $FIELD_PRIVILEGES[$tabid] neq NULL || $modulename eq 'Emails'}
+
{/if}
@@ -179,6 +179,7 @@
+ {if $FIELD_PRIVILEGES[$tabid] neq ''}
{if $modulename eq 'Calendar'}
@@ -186,6 +187,7 @@
{/if}
+ {/if}
{foreach item=row_values from=$FIELD_PRIVILEGES[$tabid]}
{foreach item=element from=$row_values}
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 06:03:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 10:03:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9063 -
/customerportal/trunk/PortalConfig.php
Message-ID: <20060822100336.F371475E0E3@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 22 04:03:33 2006
New Revision: 9063
Log:
* Modified the command to configure the path variables
Modified:
customerportal/trunk/PortalConfig.php
Modified: customerportal/trunk/PortalConfig.php
==============================================================================
--- customerportal/trunk/PortalConfig.php (original)
+++ customerportal/trunk/PortalConfig.php Tue Aug 22 04:03:33 2006
@@ -13,11 +13,13 @@
global $Server_Path;
global $Portal_Path;
-//This is the vtigerCRM Server Path where contactserialize.php file is located
-$Server_Path = ""; //for eg. http://vtiger-server:90
+//This is the vtiger server path ie., the url to access the vtiger server in browser
+//Ex. i access my vtiger as http://mickie:90/vtiger/index.php so i will give as http://mickie:90/vtiger
+$Server_Path = "";
-//This is the Customer Portal path where CustomerAuthenticate.php file is located
-$Authenticate_Path = ""; //for eg. http://your-server/vtiger_customerportal
+//This is the customer portal path ie., url to access the customer portal in browser
+//Ex. i access my portal as http://mickie:90/customerportal/login.php so i will give as http://mickie:90/customerportal
+$Authenticate_Path = "";
//Give a temporary directory path which is used when we upload attachment
$upload_dir = '/tmp';
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 06:18:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 10:18:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9064 -
/vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php
Message-ID: <20060822101854.C193775E354@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 22 04:18:51 2006
New Revision: 9064
Log:
file does not exist error fixed
Modified:
vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php
Modified: vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php
==============================================================================
--- vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php (original)
+++ vtigercrm/trunk/modules/System/includes/os/class.Linux.inc.php Tue Aug 22 04:18:51 2006
@@ -347,7 +347,7 @@
$bufr = execute_program('lsscsi', '-c', false);
if( is_null( $bufr )) {
- $bufr = rfts( '/proc/scsi/scsi' );
+ $bufr = rfts( '/proc/scsi/scsi', 0, 4096, false );
}
if ( $bufr != "ERROR" ) {
$bufe = explode("\n", $bufr);
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 06:47:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 10:47:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9065 -
/vtigercrm/trunk/modules/Import/ImportStep2.php
Message-ID: <20060822104728.EA27B75E5E4@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 22 04:47:24 2006
New Revision: 9065
Log:
* Added double quotes with the fieldnames, becuase it did not allow import when we import otherphone first and phone second
Modified:
vtigercrm/trunk/modules/Import/ImportStep2.php
Modified: vtigercrm/trunk/modules/Import/ImportStep2.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep2.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep2.php Tue Aug 22 04:47:24 2006
@@ -375,10 +375,10 @@
if(optionData != -1)
{
- tmp = seq_string.indexOf(optionData);
+ tmp = seq_string.indexOf("\""+optionData+"\"");
if(tmp == -1)
{
- seq_string = seq_string + optionData;
+ seq_string = seq_string + "\""+optionData+"\"";
}
else
{
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 08:17:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 12:17:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9066 -
/vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060822121734.52F8F75E5EE@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 22 06:17:30 2006
New Revision: 9066
Log:
Field name changed from Part Number to Product Code
Modified:
vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Aug 22 06:17:30 2006
@@ -426,7 +426,7 @@
//Block31-36 -- Start
$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcode','vtiger_products',1,'1','productcode','Part Number',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 08:39:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 12:39:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9067 - in
/vtigercrm/trunk/pkg/bin: startvTiger.bat startvTiger.sh stopvTiger.bat
uninstallvtiger.sh
Message-ID: <20060822123916.3F38D75E5F8@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 22 06:39:10 2006
New Revision: 9067
Log:
removed rc
Modified:
vtigercrm/trunk/pkg/bin/startvTiger.bat
vtigercrm/trunk/pkg/bin/startvTiger.sh
vtigercrm/trunk/pkg/bin/stopvTiger.bat
vtigercrm/trunk/pkg/bin/uninstallvtiger.sh
Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat
==============================================================================
--- vtigercrm/trunk/pkg/bin/startvTiger.bat (original)
+++ vtigercrm/trunk/pkg/bin/startvTiger.bat Tue Aug 22 06:39:10 2006
@@ -43,23 +43,23 @@
echo ""
echo "making an attempt to kill any existing vtigercrm service"
echo ""
-bin\apache -k stop -n vtigercrm5_rc
-bin\apache -k uninstall -n vtigercrm5_rc
+bin\apache -k stop -n vtigercrm5_0
+bin\apache -k uninstall -n vtigercrm5_0
echo "Uninstalling apache service again for confirmation after sleeping for 10 seconds"
echo ""
%SLEEP_STR% -n 10 127.0.0.1>nul
-bin\apache -k stop -n vtigercrm5_rc
-bin\apache -k uninstall -n vtigercrm5_rc
+bin\apache -k stop -n vtigercrm5_0
+bin\apache -k uninstall -n vtigercrm5_0
echo ""
echo ""
-echo "Installing vtigercrm5_rc apache service after sleeping for 10 seconds"
+echo "Installing vtigercrm5_0 apache service after sleeping for 10 seconds"
echo ""
%SLEEP_STR% -n 10 127.0.0.1>nul
-bin\apache -k install -n vtigercrm5_rc -f conf\httpd.conf
+bin\apache -k install -n vtigercrm5_0 -f conf\httpd.conf
echo ""
-echo "Starting vtigercrm5_rc apache service"
+echo "Starting vtigercrm5_0 apache service"
echo ""
-bin\apache -n vtigercrm5_rc -k start
+bin\apache -n vtigercrm5_0 -k start
IF ERRORLEVEL 1 goto stopservice
goto checkmysql
@@ -117,27 +117,27 @@
:checkdatabase
echo ""
-echo "check to see if vtigercrm5_rc database already exists"
+echo "check to see if vtigercrm5_0 database already exists"
echo ""
-mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5_rc'" | "%WINDIR%\system32\find.exe" "vtigercrm5_rc" > NUL
+mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5_0'" | "%WINDIR%\system32\find.exe" "vtigercrm5_0" > NUL
IF ERRORLEVEL 1 goto dbnotexists
echo ""
-ECHO "vtigercrm5_rc database exists"
+ECHO "vtigercrm5_0 database exists"
echo ""
goto end
:dbnotexists
echo ""
-ECHO "vtigercrm5_rc database does not exist"
+ECHO "vtigercrm5_0 database does not exist"
echo ""
echo %cd%
echo ""
-echo "Proceeding to create database vtigercrm5_rc and populate the same"
+echo "Proceeding to create database vtigercrm5_0 and populate the same"
echo ""
-mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5_rc"
+mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5_0"
echo ""
-echo "vtigercrm5_rc database created"
+echo "vtigercrm5_0 database created"
echo ""
goto end
Modified: vtigercrm/trunk/pkg/bin/startvTiger.sh
==============================================================================
--- vtigercrm/trunk/pkg/bin/startvTiger.sh (original)
+++ vtigercrm/trunk/pkg/bin/startvTiger.sh Tue Aug 22 06:39:10 2006
@@ -111,20 +111,20 @@
fi
echo ""
-echo "Checking if the vtigercrm5_rc database already exists"
+echo "Checking if the vtigercrm5_0 database already exists"
echo ""
-echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5_rc >/dev/null
+echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5_0 >/dev/null
if [ $? -ne 0 ]; then
echo ""
- echo "Database vtigercrm5_rc does not exist. Creating database vtigercrm5_rc"
+ echo "Database vtigercrm5_0 does not exist. Creating database vtigercrm5_0"
echo ""
- ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5_rc"
+ ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5_0"
fi
host=`hostname`
echo "*****************************************************************************************************"
if [ $apache_bundled == 'false' ];then
- echo "Please access the product at http://${host}:/vtigerCRM5_rc/vtigerCRM"
+ echo "Please access the product at http://${host}:/vtigerCRM5/vtigerCRM"
else
echo "Please access the product at http://${host}:"
echo "*****************************************************************************************************"
Modified: vtigercrm/trunk/pkg/bin/stopvTiger.bat
==============================================================================
--- vtigercrm/trunk/pkg/bin/stopvTiger.bat (original)
+++ vtigercrm/trunk/pkg/bin/stopvTiger.bat Tue Aug 22 06:39:10 2006
@@ -32,13 +32,13 @@
cd /d %apache_dir%
rem shut down apache
echo ""
-echo "stopping vtigercrm5_rc apache service"
+echo "stopping vtigercrm5_0 apache service"
echo ""
-bin\apache -n vtigercrm5_rc -k stop
+bin\apache -n vtigercrm5_0 -k stop
echo ""
-echo "uninstalling vtigercrm5_rc apache service"
+echo "uninstalling vtigercrm5_0 apache service"
echo ""
-bin\apache -k uninstall -n vtigercrm5_rc
+bin\apache -k uninstall -n vtigercrm5_0
rem .\bin\ShutdownApache.exe logs\httpd.pid
goto StopMySQL
Modified: vtigercrm/trunk/pkg/bin/uninstallvtiger.sh
==============================================================================
--- vtigercrm/trunk/pkg/bin/uninstallvtiger.sh (original)
+++ vtigercrm/trunk/pkg/bin/uninstallvtiger.sh Tue Aug 22 06:39:10 2006
@@ -17,42 +17,42 @@
cd ${PREV_DIR}
if [ ${APACHE_STATUS} == "false" ]
then
- diff conf/httpd.conf conf/vtiger_conf/vtigerCRM5_rc/httpd.conf > /dev/null;
+ diff conf/httpd.conf conf/vtiger_conf/vtigerCRM5/httpd.conf > /dev/null;
if [ $? -eq 0 ]
then
- cp conf/vtigerCRMBackup/vtigerCRM5_rc/httpd.vtiger.crm.conf conf/httpd.conf
+ cp conf/vtigerCRMBackup/vtigerCRM5/httpd.vtiger.crm.conf conf/httpd.conf
echo "The httpd.conf file successfully reverted"
else
- echo "The httpd.conf file under apache/conf has been edited since installation. Hence the uninstallation will not revert the httpd.conf file. The original httpd.conf file is present in /conf/vtigerCRMBackup/vtigerCRM5_rc/httpd.vtiger.crm.conf. Kindly revert the same manually"
+ echo "The httpd.conf file under apache/conf has been edited since installation. Hence the uninstallation will not revert the httpd.conf file. The original httpd.conf file is present in /conf/vtigerCRMBackup/vtigerCRM5/httpd.vtiger.crm.conf. Kindly revert the same manually"
fi
- diff modules/libphp4.so modules/vtiger_modules/vtigerCRM5_rc/libphp4.so > /dev/null;
+ diff modules/libphp4.so modules/vtiger_modules/vtigerCRM5/libphp4.so > /dev/null;
if [ $? -eq 0 ]
then
- cp modules/vtigerCRMBackup/vtigerCRM5_rc/libphp4.vtiger.crm.so modules/libphp4.so
+ cp modules/vtigerCRMBackup/vtigerCRM5/libphp4.vtiger.crm.so modules/libphp4.so
echo "The libphp4.so file successfully reverted"
else
- echo "The libphp4.so file under apache/modules has been edited since installation. Hence the uninstallation will not revert the libphp4.so file. The original libphp4.so file is present in /modules/vtigerCRMBackup/vtigerCRM5_rc/libphp4.vtiger.crm.so. Kindly revert the same manually"
+ echo "The libphp4.so file under apache/modules has been edited since installation. Hence the uninstallation will not revert the libphp4.so file. The original libphp4.so file is present in /modules/vtigerCRMBackup/vtigerCRM5/libphp4.vtiger.crm.so. Kindly revert the same manually"
fi
cd -
- if [ -d $PWD/vtigerCRM5_rc ]; then
+ if [ -d $PWD/vtigerCRM5 ]; then
echo "Uninstalling vtigerCRM from the system..."
- rm -rf ../conf/vtiger_conf/vtigerCRM5_rc
- rm -rf ../modules/vtiger_modules/vtigerCRM5_rc
- rm -rf vtigerCRM5_rc
+ rm -rf ../conf/vtiger_conf/vtigerCRM5
+ rm -rf ../modules/vtiger_modules/vtigerCRM5
+ rm -rf vtigerCRM5
echo "Uninstallation of vtigerCRM completed"
cd ${HOME}
fi
else
cd -
- if [ -d $PWD/vtigerCRM5_rc ]; then
+ if [ -d $PWD/vtigerCRM5 ]; then
echo "Uninstalling vtigerCRM from the system..."
- rm -rf ../conf/vtiger_conf/vtigerCRM5_rc
- rm -rf ../modules/vtiger_modules/vtigerCRM5_rc
- rm -rf vtigerCRM5_rc
+ rm -rf ../conf/vtiger_conf/vtigerCRM5
+ rm -rf ../modules/vtiger_modules/vtigerCRM5
+ rm -rf vtigerCRM5
echo "Uninstallation of vtigerCRM completed"
cd ${HOME}
fi
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 09:04:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 13:04:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9068 - in
/customerportal/trunk: Tickets/TicketDetail.php index.php
Message-ID: <20060822130439.A717A75E5FC@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 22 07:04:35 2006
New Revision: 9068
Log:
* Modified to handle the attachments
Modified:
customerportal/trunk/Tickets/TicketDetail.php
customerportal/trunk/index.php
Modified: customerportal/trunk/Tickets/TicketDetail.php
==============================================================================
--- customerportal/trunk/Tickets/TicketDetail.php (original)
+++ customerportal/trunk/Tickets/TicketDetail.php Tue Aug 22 07:04:35 2006
@@ -180,7 +180,7 @@
$list .= '
'.$attachments_title.'
- '.ltrim($filename,$ticketid.'_').' '.ltrim($filename,$ticketid.'_').' ';
}
}
Modified: customerportal/trunk/index.php
==============================================================================
--- customerportal/trunk/index.php (original)
+++ customerportal/trunk/index.php Tue Aug 22 07:04:35 2006
@@ -46,6 +46,27 @@
if($_SESSION['customer_id'] != '')
{
$is_logged = 1;
+
+ //Added to download attachments
+ if($_REQUEST['downloadfile'] == 'true')
+ {
+ $filename = $_REQUEST['filename'];
+ $fileType = $_REQUEST['filetype'];
+ $fileid = $_REQUEST['fileid'];
+ $filesize = $_REQUEST['filesize'];
+
+ $contentname = $fileid.'_filecontents';
+ $fileContent = $_SESSION[$contentname];
+
+ header("Content-type: $fileType");
+ header("Content-length: $filesize");
+ header("Cache-Control: private");
+ header("Content-Disposition: attachment; filename=$filename");
+ header("Content-Description: PHP Generated Data");
+ echo base64_decode($fileContent);
+
+ exit;
+ }
if($_REQUEST['module'] != '' && $_REQUEST['action'] != '')
{
$module = $_REQUEST['module']."/";
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 09:06:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 13:06:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9069 -
/customerportal/trunk/Tickets/downloadfile.php
Message-ID: <20060822130621.3FBA975E5FF@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 22 07:06:17 2006
New Revision: 9069
Log:
* Removed this file where as we have handle the download attachment in index.php itself
Removed:
customerportal/trunk/Tickets/downloadfile.php
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 09:11:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 13:11:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9070 - in
/vtigercrm/trunk/pkg/bin: startvTiger.bat startvTiger.sh stopvTiger.bat
Message-ID: <20060822131129.54A4175E605@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 22 07:11:24 2006
New Revision: 9070
Log:
db name changed
Modified:
vtigercrm/trunk/pkg/bin/startvTiger.bat
vtigercrm/trunk/pkg/bin/startvTiger.sh
vtigercrm/trunk/pkg/bin/stopvTiger.bat
Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat
==============================================================================
--- vtigercrm/trunk/pkg/bin/startvTiger.bat (original)
+++ vtigercrm/trunk/pkg/bin/startvTiger.bat Tue Aug 22 07:11:24 2006
@@ -43,23 +43,23 @@
echo ""
echo "making an attempt to kill any existing vtigercrm service"
echo ""
-bin\apache -k stop -n vtigercrm5_0
-bin\apache -k uninstall -n vtigercrm5_0
+bin\apache -k stop -n vtigercrm5
+bin\apache -k uninstall -n vtigercrm5
echo "Uninstalling apache service again for confirmation after sleeping for 10 seconds"
echo ""
%SLEEP_STR% -n 10 127.0.0.1>nul
-bin\apache -k stop -n vtigercrm5_0
-bin\apache -k uninstall -n vtigercrm5_0
+bin\apache -k stop -n vtigercrm5
+bin\apache -k uninstall -n vtigercrm5
echo ""
echo ""
-echo "Installing vtigercrm5_0 apache service after sleeping for 10 seconds"
+echo "Installing vtigercrm5 apache service after sleeping for 10 seconds"
echo ""
%SLEEP_STR% -n 10 127.0.0.1>nul
-bin\apache -k install -n vtigercrm5_0 -f conf\httpd.conf
+bin\apache -k install -n vtigercrm5 -f conf\httpd.conf
echo ""
-echo "Starting vtigercrm5_0 apache service"
+echo "Starting vtigercrm5 apache service"
echo ""
-bin\apache -n vtigercrm5_0 -k start
+bin\apache -n vtigercrm5 -k start
IF ERRORLEVEL 1 goto stopservice
goto checkmysql
@@ -117,27 +117,27 @@
:checkdatabase
echo ""
-echo "check to see if vtigercrm5_0 database already exists"
+echo "check to see if vtigercrm5 database already exists"
echo ""
-mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5_0'" | "%WINDIR%\system32\find.exe" "vtigercrm5_0" > NUL
+mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5'" | "%WINDIR%\system32\find.exe" "vtigercrm5" > NUL
IF ERRORLEVEL 1 goto dbnotexists
echo ""
-ECHO "vtigercrm5_0 database exists"
+ECHO "vtigercrm5 database exists"
echo ""
goto end
:dbnotexists
echo ""
-ECHO "vtigercrm5_0 database does not exist"
+ECHO "vtigercrm5 database does not exist"
echo ""
echo %cd%
echo ""
-echo "Proceeding to create database vtigercrm5_0 and populate the same"
+echo "Proceeding to create database vtigercrm5 and populate the same"
echo ""
-mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5_0"
+mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5"
echo ""
-echo "vtigercrm5_0 database created"
+echo "vtigercrm5 database created"
echo ""
goto end
Modified: vtigercrm/trunk/pkg/bin/startvTiger.sh
==============================================================================
--- vtigercrm/trunk/pkg/bin/startvTiger.sh (original)
+++ vtigercrm/trunk/pkg/bin/startvTiger.sh Tue Aug 22 07:11:24 2006
@@ -111,14 +111,14 @@
fi
echo ""
-echo "Checking if the vtigercrm5_0 database already exists"
+echo "Checking if the vtigercrm5 database already exists"
echo ""
-echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5_0 >/dev/null
+echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5 >/dev/null
if [ $? -ne 0 ]; then
echo ""
- echo "Database vtigercrm5_0 does not exist. Creating database vtigercrm5_0"
+ echo "Database vtigercrm5 does not exist. Creating database vtigercrm5"
echo ""
- ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5_0"
+ ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5"
fi
host=`hostname`
Modified: vtigercrm/trunk/pkg/bin/stopvTiger.bat
==============================================================================
--- vtigercrm/trunk/pkg/bin/stopvTiger.bat (original)
+++ vtigercrm/trunk/pkg/bin/stopvTiger.bat Tue Aug 22 07:11:24 2006
@@ -32,13 +32,13 @@
cd /d %apache_dir%
rem shut down apache
echo ""
-echo "stopping vtigercrm5_0 apache service"
+echo "stopping vtigercrm5 apache service"
echo ""
-bin\apache -n vtigercrm5_0 -k stop
+bin\apache -n vtigercrm5 -k stop
echo ""
-echo "uninstalling vtigercrm5_0 apache service"
+echo "uninstalling vtigercrm5 apache service"
echo ""
-bin\apache -k uninstall -n vtigercrm5_0
+bin\apache -k uninstall -n vtigercrm5
rem .\bin\ShutdownApache.exe logs\httpd.pid
goto StopMySQL
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 09:15:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 13:15:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9071 -
/vtigercrm/trunk/install/2setConfig.php
Message-ID: <20060822131507.6C17C75E605@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 22 07:15:01 2006
New Revision: 9071
Log:
rc removed
Modified:
vtigercrm/trunk/install/2setConfig.php
Modified: vtigercrm/trunk/install/2setConfig.php
==============================================================================
--- vtigercrm/trunk/install/2setConfig.php (original)
+++ vtigercrm/trunk/install/2setConfig.php Tue Aug 22 07:15:01 2006
@@ -99,7 +99,7 @@
elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_')
$db_name = $dbconfig['db_name'];
else
- $db_name = 'vtigercrm5_rc';
+ $db_name = 'vtigercrm5';
!isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables'];
if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name'];
@@ -133,7 +133,7 @@
}
else {
!isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname'];
- !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm5_rc" : $db_name = $_REQUEST['db_name'];
+ !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm5" : $db_name = $_REQUEST['db_name'];
!isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables'];
!isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name'];
!isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL'];
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 10:19:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 14:19:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9072 -
/vtigercrm/trunk/modules/Products/language/en_us.lang.php
Message-ID: <20060822141942.3A7D975E611@vtiger.fosslabs.com>
Author: richie
Date: Tue Aug 22 08:19:38 2006
New Revision: 9072
Log:
* Modified the Product Code to Part Number because the fieldlabel in field table is Part Number
Modified:
vtigercrm/trunk/modules/Products/language/en_us.lang.php
Modified: vtigercrm/trunk/modules/Products/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Products/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Products/language/en_us.lang.php Tue Aug 22 08:19:38 2006
@@ -94,7 +94,7 @@
//Added for 4GA
'Product Name'=>'Product Name',
-'Product Code'=>'Part Number',
+'Part Number'=>'Part Number',
'Product Active'=>'Product Active',
'Commission Rate'=>'Commission Rate (%)',
'Qty/Unit'=>'Qty/Unit',
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 10:21:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 14:21:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9073 -
/vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060822142101.F170D75E612@vtiger.fosslabs.com>
Author: richie
Date: Tue Aug 22 08:20:57 2006
New Revision: 9073
Log:
* Reverted the query from Part Number to Product Code because when we do migration in old db the fieldlable will be Product Code which is in where condition
Modified:
vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Tue Aug 22 08:20:57 2006
@@ -226,7 +226,7 @@
"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 13 and fieldlabel = 'Priority'",
"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 14 and fieldlabel = 'Product Name'",
- "UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 14 and fieldlabel = 'Part Number'",
+ "UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 14 and fieldlabel = 'Product Code'",
"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 14 and fieldlabel = 'Product Category'",
"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 16 and fieldlabel = 'Subject'",
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 12:46:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 16:46:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9074 -
/vtigercrm/trunk/modules/Calendar/Activity.php
Message-ID: <20060822164624.D821B75E621@vtiger.fosslabs.com>
Author: richie
Date: Tue Aug 22 10:46:17 2006
New Revision: 9074
Log:
vtiger_ issue has been fixed --Jeri
Modified:
vtigercrm/trunk/modules/Calendar/Activity.php
Modified: vtigercrm/trunk/modules/Calendar/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Activity.php (original)
+++ vtigercrm/trunk/modules/Calendar/Activity.php Tue Aug 22 10:46:17 2006
@@ -397,7 +397,7 @@
$log->debug("Entering get_tasksforol(".$username.") method ...");
$query = "select vtiger_activity.subject,vtiger_activity.date_start startdate,
vtiger_activity.activityid as taskid,vtiger_activity.status,
- vtiger_crmentity.description,vtiger_activity.priority as vtiger_priority,vtiger_activity.due_date as duedate,
+ vtiger_crmentity.description,vtiger_activity.priority as priority,vtiger_activity.due_date as duedate,
vtiger_contactdetails.firstname, vtiger_contactdetails.lastname
from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
inner join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 22 13:39:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 22 Aug 2006 17:39:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9075 -
/vtigercrm/trunk/modules/Reports/ReportRun.php
Message-ID: <20060822173909.0FBBB75E61F@vtiger.fosslabs.com>
Author: richie
Date: Tue Aug 22 11:39:00 2006
New Revision: 9075
Log:
vtiger_ issue has been fixed --Jeri
Modified:
vtigercrm/trunk/modules/Reports/ReportRun.php
Modified: vtigercrm/trunk/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportRun.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportRun.php Tue Aug 22 11:39:00 2006
@@ -893,7 +893,7 @@
left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid
left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
left join vtiger_crmentity as vtiger_crmentityRel on vtiger_crmentityRel.crmid = vtiger_seproductsrel.crmid
- left join vtiger_account as vtiger_accountRel on vtiger_accountRel.accountid=crmentityRel.crmid
+ left join vtiger_account as vtiger_accountRel on vtiger_accountRel.accountid=vtiger_crmentityRel.crmid
left join vtiger_leaddetails as vtiger_leaddetailsRel on vtiger_leaddetailsRel.leadid = vtiger_crmentityRel.crmid
left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_crmentityRel.crmid ";
}
From vtigercrm-commits at vtiger.fosslabs.com Wed Aug 23 06:18:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 23 Aug 2006 10:18:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9076 -
/vtigercrm/trunk/modules/Products/language/en_us.lang.php
Message-ID: <20060823101808.D002775E6CE@vtiger.fosslabs.com>
Author: saraj
Date: Wed Aug 23 04:18:05 2006
New Revision: 9076
Log:
* Modified the Part Number to Product Code as this entry is reverted as Product Code in field table
Modified:
vtigercrm/trunk/modules/Products/language/en_us.lang.php
Modified: vtigercrm/trunk/modules/Products/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Products/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Products/language/en_us.lang.php Wed Aug 23 04:18:05 2006
@@ -94,7 +94,7 @@
//Added for 4GA
'Product Name'=>'Product Name',
-'Part Number'=>'Part Number',
+'Product Code'=>'Part Number',
'Product Active'=>'Product Active',
'Commission Rate'=>'Commission Rate (%)',
'Qty/Unit'=>'Qty/Unit',
From vtigercrm-commits at vtiger.fosslabs.com Wed Aug 23 09:56:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 23 Aug 2006 13:56:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9077 -
/vtigercrm/trunk/soap/wordplugin.php
Message-ID: <20060823135627.6718175E6ED@vtiger.fosslabs.com>
Author: richie
Date: Wed Aug 23 07:56:13 2006
New Revision: 9077
Log:
Security has been implemented --Jeri
Modified:
vtigercrm/trunk/soap/wordplugin.php
Modified: vtigercrm/trunk/soap/wordplugin.php
==============================================================================
--- vtigercrm/trunk/soap/wordplugin.php (original)
+++ vtigercrm/trunk/soap/wordplugin.php Wed Aug 23 07:56:13 2006
@@ -1,341 +1,354 @@
-configureWSDL('vtigersoap');
-
-$server->wsdl->addComplexType(
- 'contact_column_detail',
- 'complexType',
- 'array',
- '',
- array(
- 'email_address' => array('name'=>'email_address','type'=>'xsd:string'),
- 'first_name' => array('name'=>'first_name','type'=>'xsd:string'),
- 'last_name' => array('name'=>'last_name','type'=>'xsd:string'),
- 'primary_address_city' => array('name'=>'primary_address_city','type'=>'xsd:string'),
- 'account_name' => array('name'=>'account_name','type'=>'xsd:string'),
- 'id' => array('name'=>'id','type'=>'xsd:string'),
- 'salutation' => array('name'=>'salutation','type'=>'xsd:string'),
- 'title'=> array('name'=>'title','type'=>'xsd:string'),
- 'phone_mobile'=> array('name'=>'phone_mobile','type'=>'xsd:string'),
- 'reports_to'=> array('name'=>'reports_to','type'=>'xsd:string'),
- 'primary_address_city'=> array('name'=>'primary_address_city','type'=>'xsd:string'),
- 'primary_address_street'=> array('name'=>'primary_address_street','type'=>'xsd:string'),
- 'primary_address_state'=> array('name'=>'primary_address_state','type'=>'xsd:string'),
- 'primary_address_postalcode'=> array('name'=>'primary_address_postalcode','type'=>'xsd:string'),
- 'primary_address_country'=> array('name'=>'primary_address_country','type'=>'xsd:string'),
- 'alt_address_city'=> array('name'=>'alt_address_city','type'=>'xsd:string'),
- 'alt_address_street'=> array('name'=>'alt_address_street','type'=>'xsd:string'),
- 'alt_address_state'=> array('name'=>'alt_address_state','type'=>'xsd:string'),
- 'alt_address_postalcode'=> array('name'=>'alt_address_postalcode','type'=>'xsd:string'),
- 'alt_address_country'=> array('name'=>'alt_address_country','type'=>'xsd:string'),
- )
-);
-
-$server->wsdl->addComplexType(
- 'account_column_detail',
- 'complexType',
- 'array',
- '',
- array(
- 'accountid' => array('name'=>'accountid','type'=>'xsd:string'),
- 'accountname' => array('name'=>'accountname','type'=>'xsd:string'),
- 'parentid' => array('name'=>'parentid','type'=>'xsd:string'),
- 'account_type' => array('name'=>'account_type','type'=>'xsd:string'),
- 'industry' => array('name'=>'industry','type'=>'xsd:string'),
- 'annualrevenue' => array('name'=>'annualrevenue','type'=>'xsd:string'),
- 'rating'=> array('name'=>'rating','type'=>'xsd:string'),
- 'ownership' => array('name'=>'ownership','type'=>'xsd:string'),
- 'siccode' => array('name'=>'siccode','type'=>'xsd:string'),
- 'tickersymbol' => array('name'=>'tickersymbol','type'=>'xsd:string'),
- 'phone' => array('name'=>'phone','type'=>'xsd:string'),
- 'otherphone' => array('name'=>'otherphone','type'=>'xsd:string'),
- 'email1' => array('name'=>'email1','type'=>'xsd:string'),
- 'email2' => array('name'=>'email2','type'=>'xsd:string'),
- 'website' => array('name'=>'website','type'=>'xsd:string'),
- 'fax' => array('name'=>'fax','type'=>'xsd:string'),
- //'employees' => array('name'=>'employees','type'=>'xsd:string'),
- )
-);
-
-$server->wsdl->addComplexType(
- 'lead_column_detail',
- 'complexType',
- 'array',
- '',
- array(
- 'id' => array('name'=>'id','type'=>'xsd:string'),
- 'date_entered' => array('name'=>'date_entered','type'=>'xsd:string'),
- 'date_modified' => array('name'=>'date_modified','type'=>'xsd:string'),
- 'modified_user_id' => array('name'=>'modified_user_id','type'=>'xsd:string'),
- 'assigned_user_id' => array('name'=>'assigned_user_id','type'=>'xsd:string'),
- 'salutation' => array('name'=>'salutation','type'=>'xsd:string'),
- 'first_name' => array('name'=>'first_name','type'=>'xsd:string'),
- 'last_name' => array('name'=>'last_name','type'=>'xsd:string'),
- 'company' => array('name'=>'company','type'=>'xsd:string'),
- 'designation' => array('name'=>'designation','type'=>'xsd:string'),
- 'lead_source' => array('name'=>'lead_source','type'=>'xsd:string'),
- 'industry' => array('name'=>'industry','type'=>'xsd:string'),
- 'annual_revenue' => array('name'=>'annual_revenue','type'=>'xsd:string'),
- 'license_key' => array('name'=>'license_key','type'=>'xsd:string'),
- 'phone' => array('name'=>'phone','type'=>'xsd:string'),
- 'mobile' => array('name'=>'mobile','type'=>'xsd:string'),
- 'fax' => array('name'=>'fax','type'=>'xsd:string'),
- 'email' => array('name'=>'email','type'=>'xsd:string'),
- 'yahoo_id' => array('name'=>'yahoo_id','type'=>'xsd:string'),
- 'website' => array('name'=>'website','type'=>'xsd:string'),
- 'lead_status' => array('name'=>'lead_status','type'=>'xsd:string'),
- 'rating' => array('name'=>'rating','type'=>'xsd:string'),
- 'employees' => array('name'=>'employees','type'=>'xsd:string'),
- 'address_street' => array('name'=>'address_street','type'=>'xsd:string'),
- 'address_city' => array('name'=>'address_city','type'=>'xsd:string'),
- 'address_state' => array('name'=>'address_state','type'=>'xsd:string'),
- 'address_postalcode' => array('name'=>'address_postalcode','type'=>'xsd:string'),
- 'address_country' => array('name'=>'address_country','type'=>'xsd:string'),
- 'description' => array('name'=>'description','type'=>'xsd:string'),
- 'deleted' => array('name'=>'deleted','type'=>'xsd:string'),
- 'converted' => array('name'=>'converted','type'=>'xsd:string'),
- )
-);
-
-$server->wsdl->addComplexType(
- 'user_column_detail',
- 'complexType',
- 'array',
- '',
- array(
- 'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
- 'lastname' => array('name'=>'lastname','type'=>'xsd:string'),
- 'username' => array('name'=>'username','type'=>'xsd:string'),
- 'yahooid' => array('name'=>'yahooid','type'=>'xsd:string'),
- 'title' => array('name'=>'title','type'=>'xsd:string'),
- 'workphone' => array('name'=>'workphone','type'=>'xsd:string'),
- 'department' => array('name'=>'department','type'=>'xsd:string'),
- 'mobilephone' => array('name'=>'mobilephone','type'=>'xsd:string'),
- 'otherphone'=> array('name'=>'otherphone','type'=>'xsd:string'),
- 'fax' => array('name'=>'fax','type'=>'xsd:string'),
- 'email' => array('name'=>'email','type'=>'xsd:string'),
- 'homephone' => array('name'=>'homephone','type'=>'xsd:string'),
- 'otheremail' => array('name'=>'otheremail','type'=>'xsd:string'),
- 'street' => array('name'=>'street','type'=>'xsd:string'),
- 'city' => array('name'=>'city','type'=>'xsd:string'),
- 'state' => array('name'=>'state','type'=>'xsd:string'),
- 'code' => array('name'=>'code','type'=>'xsd:string'),
- 'country' => array('name'=>'country','type'=>'xsd:string'),
- )
-);
-
-$server->wsdl->addComplexType(
- 'tickets_list_array',
- 'complexType',
- 'array',
- '',
- array(
- 'ticketid' => array('name'=>'ticketid','type'=>'xsd:string'),
- 'title' => array('name'=>'title','type'=>'xsd:string'),
- 'groupname' => array('name'=>'groupname','type'=>'xsd:string'),
- 'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
- 'lastname' => array('name'=>'lastname','type'=>'xsd:string'),
- 'parent_id' => array('name'=>'parent_id','type'=>'xsd:string'),
- 'productid' => array('name'=>'productid','type'=>'xsd:string'),
- 'productname' => array('name'=>'productname','type'=>'xsd:string'),
- 'priority' => array('name'=>'priority','type'=>'xsd:string'),
- 'severity' => array('name'=>'severity','type'=>'xsd:string'),
- 'status' => array('name'=>'status','type'=>'xsd:string'),
- 'category' => array('name'=>'category','type'=>'xsd:string'),
- 'description' => array('name'=>'description','type'=>'xsd:string'),
- 'solution' => array('name'=>'solution','type'=>'xsd:string'),
- 'createdtime' => array('name'=>'createdtime','type'=>'xsd:string'),
- 'modifiedtime' => array('name'=>'modifiedtime','type'=>'xsd:string'),
- )
-);
-
-$server->register(
- 'get_contacts_columns',
- array('user_name'=>'xsd:string','password'=>'xsd:string'),
- array('return'=>'tns:contact_column_detail'),
- $NAMESPACE);
-
-$server->register(
- 'get_accounts_columns',
- array('user_name'=>'xsd:string','password'=>'xsd:string'),
- array('return'=>'tns:account_column_detail'),
- $NAMESPACE);
-
-$server->register(
- 'get_leads_columns',
- array('user_name'=>'xsd:string','password'=>'xsd:string'),
- array('return'=>'tns:lead_column_detail'),
- $NAMESPACE);
-
-$server->register(
- 'get_user_columns',
- array('user_name'=>'xsd:string','password'=>'xsd:string'),
- array('return'=>'tns:user_column_detail'),
- $NAMESPACE);
-
-$server->register(
- 'get_tickets_columns',
- array('user_name'=>'xsd:string','password'=>'xsd:string'),
- array('return'=>'tns:tickets_list_array'),
- $NAMESPACE);
-
-$server->register(
- 'create_session',
- array('user_name'=>'xsd:string','password'=>'xsd:string'),
- array('return'=>'xsd:string'),
- $NAMESPACE);
-
-$server->register(
- 'end_session',
- array('user_name'=>'xsd:string'),
- array('return'=>'xsd:string'),
- $NAMESPACE);
-
-
-function get_tickets_columns($user_name, $password)
-{
- global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
- $user_id=$seed_user->retrieve_user_id($user_name);
- $current_user=$seed_user;
- $current_user->retrieve_entity_info($user_id, 'Users');
- if(isPermitted("HelpDesk","index") == "yes")
- {
- require_once('modules/HelpDesk/HelpDesk.php');
- $helpdesk = new HelpDesk();
- return $helpdesk->getColumnNames_Hd();
- }
- else
- return null;
-}
-
-function get_contacts_columns($user_name, $password)
-{
- global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
- $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();
- return $contact->getColumnNames();
- }
- else
- return null;
-
-}
-
-
-function get_accounts_columns($user_name, $password)
-{
- global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
- $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();
- return $account->getColumnNames_Acnt();
- }
- else
- return null;
-
-}
-
-
-function get_leads_columns($user_name, $password)
-{
- global $current_user;
- require_once("modules/Users/User.php");
- $seed_user=new User();
- $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();
- return $lead->getColumnNames_Lead();
- }
- else
- return null;
-}
-
-function get_user_columns($user_name, $password)
-{
- global $current_user;
- require_once('modules/Users/User.php');
- $seed_user=new User();
- $user_id=$seed_user->retrieve_user_id($user_name);
- $current_user=$seed_user;
- $current_user->retrieve_entity_info($user_id, 'Users');
- if(isPermitted("Users","index") == "yes")
- {
- $user = new User();
- return $user->getColumnNames_User();
- }
- else
- return null;
-}
-
-
-function create_session($user_name, $password)
-{
- global $adb;
- require_once('modules/Users/User.php');
- $objuser = new User();
- if($password != "" && $user_name != '')
- {
- $objuser->column_fields['user_name'] = $user_name;
- $objuser->load_user($password);
- if($objuser->is_authenticated())
- {
- return "TempSessionID";
- }else
- {
- return "false";
- }
- }else
- {
- return "false";
- }
-}
-
-function end_session($user_name)
-{
- return "Success";
-}
-
-
-
-
-$server->service($HTTP_RAW_POST_DATA);
-exit();
-?>
+configureWSDL('vtigersoap');
+
+$server->wsdl->addComplexType(
+ 'contact_column_detail',
+ 'complexType',
+ 'array',
+ '',
+ array(
+ 'email_address' => array('name'=>'email_address','type'=>'xsd:string'),
+ 'first_name' => array('name'=>'first_name','type'=>'xsd:string'),
+ 'last_name' => array('name'=>'last_name','type'=>'xsd:string'),
+ 'primary_address_city' => array('name'=>'primary_address_city','type'=>'xsd:string'),
+ 'account_name' => array('name'=>'account_name','type'=>'xsd:string'),
+ 'id' => array('name'=>'id','type'=>'xsd:string'),
+ 'salutation' => array('name'=>'salutation','type'=>'xsd:string'),
+ 'title'=> array('name'=>'title','type'=>'xsd:string'),
+ 'phone_mobile'=> array('name'=>'phone_mobile','type'=>'xsd:string'),
+ 'reports_to'=> array('name'=>'reports_to','type'=>'xsd:string'),
+ 'primary_address_city'=> array('name'=>'primary_address_city','type'=>'xsd:string'),
+ 'primary_address_street'=> array('name'=>'primary_address_street','type'=>'xsd:string'),
+ 'primary_address_state'=> array('name'=>'primary_address_state','type'=>'xsd:string'),
+ 'primary_address_postalcode'=> array('name'=>'primary_address_postalcode','type'=>'xsd:string'),
+ 'primary_address_country'=> array('name'=>'primary_address_country','type'=>'xsd:string'),
+ 'alt_address_city'=> array('name'=>'alt_address_city','type'=>'xsd:string'),
+ 'alt_address_street'=> array('name'=>'alt_address_street','type'=>'xsd:string'),
+ 'alt_address_state'=> array('name'=>'alt_address_state','type'=>'xsd:string'),
+ 'alt_address_postalcode'=> array('name'=>'alt_address_postalcode','type'=>'xsd:string'),
+ 'alt_address_country'=> array('name'=>'alt_address_country','type'=>'xsd:string'),
+ )
+);
+
+$server->wsdl->addComplexType(
+ 'account_column_detail',
+ 'complexType',
+ 'array',
+ '',
+ array(
+ 'accountid' => array('name'=>'accountid','type'=>'xsd:string'),
+ 'accountname' => array('name'=>'accountname','type'=>'xsd:string'),
+ 'parentid' => array('name'=>'parentid','type'=>'xsd:string'),
+ 'account_type' => array('name'=>'account_type','type'=>'xsd:string'),
+ 'industry' => array('name'=>'industry','type'=>'xsd:string'),
+ 'annualrevenue' => array('name'=>'annualrevenue','type'=>'xsd:string'),
+ 'rating'=> array('name'=>'rating','type'=>'xsd:string'),
+ 'ownership' => array('name'=>'ownership','type'=>'xsd:string'),
+ 'siccode' => array('name'=>'siccode','type'=>'xsd:string'),
+ 'tickersymbol' => array('name'=>'tickersymbol','type'=>'xsd:string'),
+ 'phone' => array('name'=>'phone','type'=>'xsd:string'),
+ 'otherphone' => array('name'=>'otherphone','type'=>'xsd:string'),
+ 'email1' => array('name'=>'email1','type'=>'xsd:string'),
+ 'email2' => array('name'=>'email2','type'=>'xsd:string'),
+ 'website' => array('name'=>'website','type'=>'xsd:string'),
+ 'fax' => array('name'=>'fax','type'=>'xsd:string'),
+ //'employees' => array('name'=>'employees','type'=>'xsd:string'),
+ )
+);
+
+$server->wsdl->addComplexType(
+ 'lead_column_detail',
+ 'complexType',
+ 'array',
+ '',
+ array(
+ 'id' => array('name'=>'id','type'=>'xsd:string'),
+ 'date_entered' => array('name'=>'date_entered','type'=>'xsd:string'),
+ 'date_modified' => array('name'=>'date_modified','type'=>'xsd:string'),
+ 'modified_user_id' => array('name'=>'modified_user_id','type'=>'xsd:string'),
+ 'assigned_user_id' => array('name'=>'assigned_user_id','type'=>'xsd:string'),
+ 'salutation' => array('name'=>'salutation','type'=>'xsd:string'),
+ 'first_name' => array('name'=>'first_name','type'=>'xsd:string'),
+ 'last_name' => array('name'=>'last_name','type'=>'xsd:string'),
+ 'company' => array('name'=>'company','type'=>'xsd:string'),
+ 'designation' => array('name'=>'designation','type'=>'xsd:string'),
+ 'lead_source' => array('name'=>'lead_source','type'=>'xsd:string'),
+ 'industry' => array('name'=>'industry','type'=>'xsd:string'),
+ 'annual_revenue' => array('name'=>'annual_revenue','type'=>'xsd:string'),
+ 'license_key' => array('name'=>'license_key','type'=>'xsd:string'),
+ 'phone' => array('name'=>'phone','type'=>'xsd:string'),
+ 'mobile' => array('name'=>'mobile','type'=>'xsd:string'),
+ 'fax' => array('name'=>'fax','type'=>'xsd:string'),
+ 'email' => array('name'=>'email','type'=>'xsd:string'),
+ 'yahoo_id' => array('name'=>'yahoo_id','type'=>'xsd:string'),
+ 'website' => array('name'=>'website','type'=>'xsd:string'),
+ 'lead_status' => array('name'=>'lead_status','type'=>'xsd:string'),
+ 'rating' => array('name'=>'rating','type'=>'xsd:string'),
+ 'employees' => array('name'=>'employees','type'=>'xsd:string'),
+ 'address_street' => array('name'=>'address_street','type'=>'xsd:string'),
+ 'address_city' => array('name'=>'address_city','type'=>'xsd:string'),
+ 'address_state' => array('name'=>'address_state','type'=>'xsd:string'),
+ 'address_postalcode' => array('name'=>'address_postalcode','type'=>'xsd:string'),
+ 'address_country' => array('name'=>'address_country','type'=>'xsd:string'),
+ 'description' => array('name'=>'description','type'=>'xsd:string'),
+ 'deleted' => array('name'=>'deleted','type'=>'xsd:string'),
+ 'converted' => array('name'=>'converted','type'=>'xsd:string'),
+ )
+);
+
+$server->wsdl->addComplexType(
+ 'user_column_detail',
+ 'complexType',
+ 'array',
+ '',
+ array(
+ 'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
+ 'lastname' => array('name'=>'lastname','type'=>'xsd:string'),
+ 'username' => array('name'=>'username','type'=>'xsd:string'),
+ 'yahooid' => array('name'=>'yahooid','type'=>'xsd:string'),
+ 'title' => array('name'=>'title','type'=>'xsd:string'),
+ 'workphone' => array('name'=>'workphone','type'=>'xsd:string'),
+ 'department' => array('name'=>'department','type'=>'xsd:string'),
+ 'mobilephone' => array('name'=>'mobilephone','type'=>'xsd:string'),
+ 'otherphone'=> array('name'=>'otherphone','type'=>'xsd:string'),
+ 'fax' => array('name'=>'fax','type'=>'xsd:string'),
+ 'email' => array('name'=>'email','type'=>'xsd:string'),
+ 'homephone' => array('name'=>'homephone','type'=>'xsd:string'),
+ 'otheremail' => array('name'=>'otheremail','type'=>'xsd:string'),
+ 'street' => array('name'=>'street','type'=>'xsd:string'),
+ 'city' => array('name'=>'city','type'=>'xsd:string'),
+ 'state' => array('name'=>'state','type'=>'xsd:string'),
+ 'code' => array('name'=>'code','type'=>'xsd:string'),
+ 'country' => array('name'=>'country','type'=>'xsd:string'),
+ )
+);
+
+$server->wsdl->addComplexType(
+ 'tickets_list_array',
+ 'complexType',
+ 'array',
+ '',
+ array(
+ 'ticketid' => array('name'=>'ticketid','type'=>'xsd:string'),
+ 'title' => array('name'=>'title','type'=>'xsd:string'),
+ 'groupname' => array('name'=>'groupname','type'=>'xsd:string'),
+ 'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
+ 'lastname' => array('name'=>'lastname','type'=>'xsd:string'),
+ 'parent_id' => array('name'=>'parent_id','type'=>'xsd:string'),
+ 'productid' => array('name'=>'productid','type'=>'xsd:string'),
+ 'productname' => array('name'=>'productname','type'=>'xsd:string'),
+ 'priority' => array('name'=>'priority','type'=>'xsd:string'),
+ 'severity' => array('name'=>'severity','type'=>'xsd:string'),
+ 'status' => array('name'=>'status','type'=>'xsd:string'),
+ 'category' => array('name'=>'category','type'=>'xsd:string'),
+ 'description' => array('name'=>'description','type'=>'xsd:string'),
+ 'solution' => array('name'=>'solution','type'=>'xsd:string'),
+ 'createdtime' => array('name'=>'createdtime','type'=>'xsd:string'),
+ 'modifiedtime' => array('name'=>'modifiedtime','type'=>'xsd:string'),
+ )
+);
+
+$server->register(
+ 'get_contacts_columns',
+ array('user_name'=>'xsd:string','password'=>'xsd:string'),
+ array('return'=>'tns:contact_column_detail'),
+ $NAMESPACE);
+
+$server->register(
+ 'get_accounts_columns',
+ array('user_name'=>'xsd:string','password'=>'xsd:string'),
+ array('return'=>'tns:account_column_detail'),
+ $NAMESPACE);
+
+$server->register(
+ 'get_leads_columns',
+ array('user_name'=>'xsd:string','password'=>'xsd:string'),
+ array('return'=>'tns:lead_column_detail'),
+ $NAMESPACE);
+
+$server->register(
+ 'get_user_columns',
+ array('user_name'=>'xsd:string','password'=>'xsd:string'),
+ array('return'=>'tns:user_column_detail'),
+ $NAMESPACE);
+
+$server->register(
+ 'get_tickets_columns',
+ array('user_name'=>'xsd:string','password'=>'xsd:string'),
+ array('return'=>'tns:tickets_list_array'),
+ $NAMESPACE);
+
+$server->register(
+ 'create_session',
+ array('user_name'=>'xsd:string','password'=>'xsd:string'),
+ array('return'=>'xsd:string'),
+ $NAMESPACE);
+
+$server->register(
+ 'end_session',
+ array('user_name'=>'xsd:string'),
+ array('return'=>'xsd:string'),
+ $NAMESPACE);
+
+
+function get_tickets_columns($user_name, $password)
+{
+ global $current_user,$log;
+ require_once("modules/Users/User.php");
+ $seed_user=new User();
+ $user_id=$seed_user->retrieve_user_id($user_name);
+ $current_user=$seed_user;
+ $current_user->retrieve_entity_info($user_id, 'Users');
+ if(isPermitted("HelpDesk","index") == "yes")
+ {
+ require_once('modules/HelpDesk/HelpDesk.php');
+ $helpdesk = new HelpDesk();
+ $log->debug($helpdesk->getColumnNames_Hd());
+ return $helpdesk->getColumnNames_Hd();
+ }
+ else
+ {
+ $return_array = array();
+ return $return_array;
+ }
+}
+
+function get_contacts_columns($user_name, $password)
+{
+ global $current_user,$log;
+ require_once("modules/Users/User.php");
+ $seed_user=new User();
+ $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();
+ $log->debug($contact->getColumnNames());
+ return $contact->getColumnNames();
+ }
+ else
+ {
+ $return_array = array();
+ return $return_array;
+ }
+
+}
+
+
+function get_accounts_columns($user_name, $password)
+{
+ global $current_user,$log;
+ require_once("modules/Users/User.php");
+ $seed_user=new User();
+ $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();
+ $log->debug($account->getColumnNames_Acnt());
+ return $account->getColumnNames_Acnt();
+ }
+ else
+ {
+ $return_array = array();
+ return $return_array;
+ }
+
+}
+
+
+function get_leads_columns($user_name, $password)
+{
+ global $current_user,$log;
+ require_once("modules/Users/User.php");
+ $seed_user=new User();
+ $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();
+ $log->debug($lead->getColumnNames_Lead());
+ return $lead->getColumnNames_Lead();
+ }
+ else
+ {
+ $return_array = array();
+ return $return_array;
+ }
+
+}
+
+function get_user_columns($user_name, $password)
+{
+ global $current_user;
+ require_once('modules/Users/User.php');
+ $seed_user=new User();
+ $user_id=$seed_user->retrieve_user_id($user_name);
+ $current_user=$seed_user;
+ $current_user->retrieve_entity_info($user_id, 'Users');
+ $user = new User();
+ return $user->getColumnNames_User();
+
+}
+
+
+function create_session($user_name, $password)
+{
+ global $adb;
+ require_once('modules/Users/User.php');
+ $objuser = new User();
+ if($password != "" && $user_name != '')
+ {
+ $objuser->column_fields['user_name'] = $user_name;
+ $objuser->load_user($password);
+ if($objuser->is_authenticated())
+ {
+ return "TempSessionID";
+ }else
+ {
+ return "false";
+ }
+ }else
+ {
+ return "false";
+ }
+}
+
+function end_session($user_name)
+{
+ return "Success";
+}
+
+
+
+
+$server->service($HTTP_RAW_POST_DATA);
+exit();
+?>
From vtigercrm-commits at vtiger.fosslabs.com Wed Aug 23 10:01:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 23 Aug 2006 14:01:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9078 - in
/vtigercrm/trunk/modules: Accounts/Account.php Contacts/Contact.php
HelpDesk/HelpDesk.php Leads/Lead.php
Message-ID: <20060823140135.0FAFE75E6EF@vtiger.fosslabs.com>
Author: richie
Date: Wed Aug 23 08:00:50 2006
New Revision: 9078
Log:
Security implemented for WordPlugin
Modified:
vtigercrm/trunk/modules/Accounts/Account.php
vtigercrm/trunk/modules/Contacts/Contact.php
vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
vtigercrm/trunk/modules/Leads/Lead.php
Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Wed Aug 23 08:00:50 2006
@@ -1,743 +1,751 @@
-'crmid','vtiger_account'=>'accountid','vtiger_accountbillads'=>'accountaddressid','vtiger_accountshipads'=>'accountaddressid','vtiger_accountscf'=>'accountid');
-
- var $entity_table = "vtiger_crmentity";
-
- var $billadr_table = "vtiger_accountbillads";
-
- var $object_name = "Accounts";
- // Mike Crowe Mod --------------------------------------------------------added for general search
- var $base_table_name = "vtiger_account";
- var $cf_table_name = "vtiger_accountscf";
-
- var $new_schema = true;
-
- var $module_id = "accountid";
-
- var $column_fields = Array();
-
- var $sortby_fields = Array('accountname','city','website','phone','smownerid');
-
-
- // This is the list of vtiger_fields that are in the lists.
- var $list_fields = Array(
- 'Account Name'=>Array('vtiger_account'=>'accountname'),
- 'City'=>Array('vtiger_accountbillads'=>'city'),
- 'Website'=>Array('vtiger_account'=>'website'),
- 'Phone'=>Array('vtiger_account'=> 'phone'),
- 'Assigned To'=>Array('vtiger_crmentity'=>'smownerid')
- );
-
- var $list_fields_name = Array(
- 'Account Name'=>'accountname',
- 'City'=>'bill_city',
- 'Website'=>'website',
- 'Phone'=>'phone',
- 'Assigned To'=>'assigned_user_id'
- );
- var $list_link_field= 'accountname';
-
- var $search_fields = Array(
- 'Account Name'=>Array('vtiger_account'=>'accountname'),
- 'City'=>Array('vtiger_accountbillads'=>'city'),
- );
-
- var $search_fields_name = Array(
- 'Account Name'=>'accountname',
- 'City'=>'bill_city',
- );
-
- // This is the list of vtiger_fields that are required.
- var $required_fields = array("accountname"=>1);
-
- //Added these variables which are used as default order by and sortorder in ListView
- var $default_order_by = 'accountname';
- var $default_sort_order = 'ASC';
-
- function Account() {
- $this->log =LoggerManager::getLogger('account');
- $this->db = new PearDatabase();
- $this->column_fields = getColumnFields('Accounts');
- }
-
- // Mike Crowe Mod --------------------------------------------------------Default ordering for us
- /**
- * Function to get sort order
- * return string $sorder - sortorder string either 'ASC' or 'DESC'
- */
- function getSortOrder()
- {
- global $log;
- $log->debug("Entering getSortOrder() method ...");
- if(isset($_REQUEST['sorder']))
- $sorder = $_REQUEST['sorder'];
- else
- $sorder = (($_SESSION['ACCOUNTS_SORT_ORDER'] != '')?($_SESSION['ACCOUNTS_SORT_ORDER']):($this->default_sort_order));
- $log->debug("Exiting getSortOrder() method ...");
- return $sorder;
- }
- /**
- * Function to get order by
- * return string $order_by - fieldname(eg: 'accountname')
- */
- function getOrderBy()
- {
- global $log;
- $log->debug("Entering getOrderBy() method ...");
- if (isset($_REQUEST['order_by']))
- $order_by = $_REQUEST['order_by'];
- else
- $order_by = (($_SESSION['ACCOUNTS_ORDER_BY'] != '')?($_SESSION['ACCOUNTS_ORDER_BY']):($this->default_order_by));
- $log->debug("Exiting getOrderBy method ...");
- return $order_by;
- }
- // Mike Crowe Mod --------------------------------------------------------
-
-
- /** Returns a list of the associated contacts
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
- * All Rights Reserved..
- * Contributor(s): ______________________________________..
- */
- function get_contacts($id)
- {
- global $log;
- $log->debug("Entering get_contacts(".$id.") method ...");
- global $mod_strings;
-
- $focus = new Contact();
-
- $button = '';
- if(isPermitted("Contacts",1,"") == 'yes')
- {
- $button .= '';
- for($i=0;$i<$noofrows;$i++)
- {
- if($adb->query_result($result,$i,'comments') != '')
- {
- //this div is to display the comment
- $list .= '
';
- $list .= make_clickable(nl2br($adb->query_result($result,$i,'comments')));
-
- $list .= '
';
-
- //this div is to display the author and time
- $list .= '
';
- $list .= $mod_strings['LBL_AUTHOR'].' : ';
-
- if($adb->query_result($result,$i,'ownertype') == 'user')
- $list .= getUserName($adb->query_result($result,$i,'ownerid'));
- else
- $list .= $this->getCustomerName($ticketid);
-
- $list .= ' on '.$adb->query_result($result,$i,'createdtime').' ';
-
- $list .= '
';
- }
- }
- $list .= '
';
+ for($i=0;$i<$noofrows;$i++)
+ {
+ if($adb->query_result($result,$i,'comments') != '')
+ {
+ //this div is to display the comment
+ $list .= '
';
+ $list .= make_clickable(nl2br($adb->query_result($result,$i,'comments')));
+
+ $list .= '
';
+
+ //this div is to display the author and time
+ $list .= '
';
+ $list .= $mod_strings['LBL_AUTHOR'].' : ';
+
+ if($adb->query_result($result,$i,'ownertype') == 'user')
+ $list .= getUserName($adb->query_result($result,$i,'ownerid'));
+ else
+ $list .= $this->getCustomerName($ticketid);
+
+ $list .= ' on '.$adb->query_result($result,$i,'createdtime').' ';
+
+ $list .= '
';
+ }
+ }
+ $list .= '
'.$temp_val.' ';
@@ -1541,6 +1541,8 @@
}
elseif($fieldname == 'hdnGrandTotal' || $fieldname == 'expectedroi' || $fieldname == 'actualroi' || $fieldname == 'actualcost' || $fieldname == 'budgetcost' || $fieldname == 'expectedrevenue')
{
+ $rate_symbol=getCurrencySymbolandCRate($user_info['currency_id']);
+ $rate = $rate_symbol['rate'];
$value = convertFromDollar($temp_val,$rate);
}
else
From vtigercrm-commits at vtiger.fosslabs.com Thu Aug 24 00:39:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 24 Aug 2006 04:39:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9083 -
/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060824043956.31E7975E73D@vtiger.fosslabs.com>
Author: richie
Date: Wed Aug 23 22:39:52 2006
New Revision: 9083
Log:
changes made to reduce the no. of currency query --Minnie
Modified:
vtigercrm/trunk/include/utils/EditViewUtils.php
Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Wed Aug 23 22:39:52 2006
@@ -58,11 +58,6 @@
$custfld = '';
$ui_type[]= $uitype;
$editview_fldname[] = $fieldname;
-
- $currencyid=fetchCurrency($current_user->id);
- $rate_symbol = getCurrencySymbolandCRate($currencyid);
- $rate = $rate_symbol['rate'];
- $currency= $rate_symbol['symbol'];
if($generatedtype == 2)
$mod_strings[$fieldlabel] = $fieldlabel;
@@ -983,6 +978,9 @@
elseif($uitype == 71 || $uitype == 72)
{
+ $rate_symbol = getCurrencySymbolandCRate($user_info['currency_id']);
+ $rate = $rate_symbol['rate'];
+ $currency= $rate_symbol['symbol'];
$editview_label[]=$mod_strings[$fieldlabel].': ('.$currency.')';
if($value!='')
$fieldvalue[] = convertFromDollar($value,$rate);
From vtigercrm-commits at vtiger.fosslabs.com Thu Aug 24 00:42:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 24 Aug 2006 04:42:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9084 -
/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060824044223.C288375E74E@vtiger.fosslabs.com>
Author: richie
Date: Wed Aug 23 22:42:09 2006
New Revision: 9084
Log:
Updated ListviewUtils to get the sorting of header proper for singlepane view -- ahmed
Modified:
vtigercrm/trunk/include/utils/ListViewUtils.php
Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Wed Aug 23 22:42:09 2006
@@ -23,6 +23,7 @@
require_once('include/database/PearDatabase.php');
require_once('include/ComboUtil.php'); //new
require_once('include/utils/CommonUtils.php'); //new
+require_once('user_privileges/default_module_view.php'); //new
/**This function is used to get the list view header values in a list view
*Param $focus - module object
@@ -36,7 +37,7 @@
*/
function getListViewHeader($focus, $module,$sort_qry='',$sorder='',$order_by='',$relatedlist='',$oCv='',$relatedmodule='')
{
- global $log;
+ global $log, $singlepane_view;
$log->debug("Entering getListViewHeader(".$focus.",". $module.",".$sort_qry.",".$sorder.",".$order_by.",".$relatedlist.",".$oCv.") method ...");
global $adb;
global $theme;
@@ -161,7 +162,10 @@
$lbl_name .=': (in '.$curr_symbol.')';
}
if($relatedlist !='' && $relatedlist != 'global')
- $name = "";
+ if($singlepane_view == 'true')
+ $name = "";
+ else
+ $name = "";
elseif($module == 'Users' && $name == 'User Name')
$name = "";
elseif($relatedlist == "global")
@@ -2738,14 +2742,18 @@
*/
//Temp function to be be deleted
-function getRelatedTableHeaderNavigation($navigation_array, $url_qry,$module='',$action_val='CallRelatedList',$viewid='')
+function getRelatedTableHeaderNavigation($navigation_array, $url_qry,$module='',$action_val='',$viewid='')
{
- global $log;
+ global $log, $singlepane_view;
$log->debug("Entering getTableHeaderNavigation(".$navigation_array.",". $url_qry.",".$module.",".$action_val.",".$viewid.") method ...");
global $theme;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
$output = '';
+ if($singlepane_view == 'true')
+ $action_val = 'DetailView';
+ else
+ $action_val = 'CallRelatedList';
if(($navigation_array['prev']) != 0)
{
$output .= ' ';
}
- $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
+ if($singlepane_view == 'true')
+ $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+ else
+ $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
$query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
$log->debug("Exiting get_quotes method ...");
return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset);
@@ -434,7 +447,7 @@
*/
function get_salesorder($id)
{
- global $log;
+ global $log, $singlepane_view;
$log->debug("Entering get_salesorder(".$id.") method ...");
require_once('modules/SalesOrder/SalesOrder.php');
global $app_strings;
@@ -446,7 +459,10 @@
$button .= '
- {if $ACTIVITY_TYPE eq 'Meeting'}
- {assign var='meetcheck' value='checked'}
- {assign var='callcheck' value=''}
- {else}
- {assign var='meetcheck' value=''}
- {assign var='callcheck' value='checked'}
- {/if}
+ {foreach key=tyeparrkey item=typearr from=$ACTIVITYDATA.activitytype}
+ {foreach key=sel_value item=value from=$typearr}
+ {if $value eq 'selected' && $sel_value eq 'Meeting'}
+ {assign var='meetcheck' value='checked'}
+ {assign var='callcheck' value=''}
+ {else}
+ {assign var='meetcheck' value=''}
+ {assign var='callcheck' value='checked'}
+ {/if}
+ {/foreach}
+ {/foreach}
{$APP.Call}
{$APP.Meeting}
From vtigercrm-commits at vtiger.fosslabs.com Thu Aug 24 01:21:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 24 Aug 2006 05:21:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9101 - in
/vtigercrm/trunk/modules/HelpDesk: CallRelatedList.php DetailView.php
HelpDesk.php
Message-ID: <20060824052142.A06D875E76C@vtiger.fosslabs.com>
Author: richie
Date: Wed Aug 23 23:21:26 2006
New Revision: 9101
Log:
Updated the single pane view feature for detailview in HelpDesk Module -- ahmed
Modified:
vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php
vtigercrm/trunk/modules/HelpDesk/DetailView.php
vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
Modified: vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php Wed Aug 23 23:21:26 2006
@@ -50,8 +50,7 @@
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
-$smarty->assign("id",$focus->id);
-$smarty->assign("ID",$RECORD );
+$smarty->assign("ID",$focus->id);
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD",$app_strings['Ticket']);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/DetailView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/DetailView.php Wed Aug 23 23:21:26 2006
@@ -1,109 +1,119 @@
-retrieve_entity_info($_REQUEST['record'],"HelpDesk");
- $focus->name=$focus->column_fields['ticket_title'];
-}
-
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
-{
- $focus->id = "";
-}
-
-//Added code for Error display in sending mail to assigned to user when ticket is created or updated.
-if($_REQUEST['mail_error'] != '')
-{
- require_once("modules/Emails/mail.php");
- echo parseEmailErrorString($_REQUEST['mail_error']);
-}
-
-global $app_strings;
-global $mod_strings;
-global $currentModule;
-
-global $theme;
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-require_once($theme_path.'layout_utils.php');
-
-$smarty = new vtigerCRM_Smarty;
-$smarty->assign("MOD", $mod_strings);
-$smarty->assign("APP", $app_strings);
-
-if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-else $smarty->assign("NAME", "");
-$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
-$smarty->assign("TICKETID", $_REQUEST['record']);
-
-$smarty->assign("CUSTOMFIELD", $cust_fld);
-$smarty->assign("SINGLE_MOD", 'HelpDesk');
-$category = getParentTab();
-$smarty->assign("CATEGORY",$category);
-$smarty->assign("UPDATEINFO",updateInfo($_REQUEST['record']));
-
-if(isPermitted("HelpDesk","EditView",$_REQUEST['record']) == 'yes')
- $smarty->assign("EDIT_DUPLICATE","permitted");
-
-if(isPermitted("HelpDesk","Delete",$_REQUEST['record']) == 'yes')
- $smarty->assign("DELETE","permitted");
-
-//Added button for Convert the ticket to FAQ
-if(isPermitted("Faq","EditView",'') == 'yes')
- $smarty->assign("CONVERTASFAQ","permitted");
-
-$smarty->assign("IMAGE_PATH", $image_path);
-$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("ID", $_REQUEST['record']);
-if(isPermitted("HelpDesk","Merge",'') == 'yes')
-{
- $smarty->assign("MERGEBUTTON","permitted");
- require_once('include/utils/UserInfoUtil.php');
- $wordTemplateResult = fetchWordTemplateList("HelpDesk");
- $tempCount = $adb->num_rows($wordTemplateResult);
- $tempVal = $adb->fetch_array($wordTemplateResult);
- for($templateCount=0;$templateCount<$tempCount;$templateCount++)
- {
- $optionString[$tempVal["templateid"]]=$tempVal["filename"];
- $tempVal = $adb->fetch_array($wordTemplateResult);
- }
- $smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
- $smarty->assign("TOPTIONS",$optionString);
-}
-
-$check_button = Button_Check($module);
-$smarty->assign("CHECK", $check_button);
-
-$tabid = getTabid("HelpDesk");
-$validationData = getDBValidationData($focus->tab_name,$tabid);
-$data = split_validationdataArray($validationData);
-$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
-$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
-$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
-
-//Added to display the ticket comments information
-$smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record']));
-
-$smarty->assign("MODULE",$currentModule);
-$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
-$smarty->display("DetailView.tpl");
-$focus->id = $_REQUEST['record'];
-
-
-?>
+retrieve_entity_info($_REQUEST['record'],"HelpDesk");
+ $focus->name=$focus->column_fields['ticket_title'];
+}
+
+if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
+{
+ $focus->id = "";
+}
+
+//Added code for Error display in sending mail to assigned to user when ticket is created or updated.
+if($_REQUEST['mail_error'] != '')
+{
+ require_once("modules/Emails/mail.php");
+ echo parseEmailErrorString($_REQUEST['mail_error']);
+}
+
+global $app_strings;
+global $mod_strings;
+global $currentModule, $singlepane_view;
+
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
+$smarty = new vtigerCRM_Smarty;
+$smarty->assign("MOD", $mod_strings);
+$smarty->assign("APP", $app_strings);
+
+$focus->id = $_REQUEST['record'];
+if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
+else $smarty->assign("NAME", "");
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
+$smarty->assign("TICKETID", $_REQUEST['record']);
+
+$smarty->assign("CUSTOMFIELD", $cust_fld);
+$smarty->assign("SINGLE_MOD", 'HelpDesk');
+$category = getParentTab();
+$smarty->assign("CATEGORY",$category);
+$smarty->assign("UPDATEINFO",updateInfo($_REQUEST['record']));
+
+if(isPermitted("HelpDesk","EditView",$_REQUEST['record']) == 'yes')
+ $smarty->assign("EDIT_DUPLICATE","permitted");
+
+if(isPermitted("HelpDesk","Delete",$_REQUEST['record']) == 'yes')
+ $smarty->assign("DELETE","permitted");
+
+//Added button for Convert the ticket to FAQ
+if(isPermitted("Faq","EditView",'') == 'yes')
+ $smarty->assign("CONVERTASFAQ","permitted");
+
+$smarty->assign("IMAGE_PATH", $image_path);
+$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
+$smarty->assign("ID", $_REQUEST['record']);
+if(isPermitted("HelpDesk","Merge",'') == 'yes')
+{
+ $smarty->assign("MERGEBUTTON","permitted");
+ require_once('include/utils/UserInfoUtil.php');
+ $wordTemplateResult = fetchWordTemplateList("HelpDesk");
+ $tempCount = $adb->num_rows($wordTemplateResult);
+ $tempVal = $adb->fetch_array($wordTemplateResult);
+ for($templateCount=0;$templateCount<$tempCount;$templateCount++)
+ {
+ $optionString[$tempVal["templateid"]]=$tempVal["filename"];
+ $tempVal = $adb->fetch_array($wordTemplateResult);
+ }
+ $smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
+ $smarty->assign("TOPTIONS",$optionString);
+}
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
+
+$tabid = getTabid("HelpDesk");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
+$data = split_validationdataArray($validationData);
+$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
+$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
+$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
+
+//Added to display the ticket comments information
+$smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record']));
+
+$smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
+
+if($singlepane_view == 'true')
+{
+ $related_array = getRelatedLists($currentModule,$focus);
+ $smarty->assign("RELATEDLISTS", $related_array);
+}
+
+$smarty->assign("SinglePane_View", $singlepane_view);
+
+$smarty->display("DetailView.tpl");
+
+
+?>
Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Wed Aug 23 23:21:26 2006
@@ -18,7 +18,7 @@
require_once('data/SugarBean.php');
require_once('data/CRMEntity.php');
require_once('include/utils/utils.php');
-
+require_once('user_privileges/default_module_view.php');
class HelpDesk extends CRMEntity {
var $log;
@@ -119,7 +119,7 @@
**/
function get_activities($id)
{
- global $log;
+ global $log, $singlepane_view;
$log->debug("Entering get_activities(".$id.") method ...");
global $mod_strings;
global $app_strings;
@@ -128,7 +128,10 @@
$button = '';
- $returnset = '&return_module=HelpDesk&return_action=CallRelatedList&return_id='.$id;
+ if($singlepane_view == 'true')
+ $returnset = '&return_module=HelpDesk&return_action=DetailView&return_id='.$id;
+ else
+ $returnset = '&return_module=HelpDesk&return_action=CallRelatedList&return_id='.$id;
$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held')";
$log->debug("Exiting get_activities method ...");
@@ -350,14 +353,14 @@
global $log,$current_user;
$log->debug("Entering getColumnNames_Hd() method ...");
require('user_privileges/user_privileges_'.$current_user->id.'.php');
- if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
- {
- $sql1 = "select fieldlabel from vtiger_field where tabid=13 and block <> 30 ";
+ if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+ {
+ $sql1 = "select fieldlabel from vtiger_field where tabid=13 and block <> 30 ";
}else
{
- $profileList = getCurrentUserProfileList();
- $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=13 and vtiger_field.block <> 30 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
- }
+ $profileList = getCurrentUserProfileList();
+ $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=13 and vtiger_field.block <> 30 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ }
$result = $this->db->query($sql1);
$numRows = $this->db->num_rows($result);
for($i=0; $i < $numRows;$i++)
From vtigercrm-commits at vtiger.fosslabs.com Thu Aug 24 01:23:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 24 Aug 2006 05:23:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9102 - in
/vtigercrm/trunk/modules/Invoice: CallRelatedList.php DetailView.php
Invoice.php
Message-ID: <20060824052305.05F4575E76C@vtiger.fosslabs.com>
Author: richie
Date: Wed Aug 23 23:22:53 2006
New Revision: 9102
Log:
Updated the single pane view feature for detailview in Invoice Module -- ahmed
Modified:
vtigercrm/trunk/modules/Invoice/CallRelatedList.php
vtigercrm/trunk/modules/Invoice/DetailView.php
vtigercrm/trunk/modules/Invoice/Invoice.php
Modified: vtigercrm/trunk/modules/Invoice/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Invoice/CallRelatedList.php Wed Aug 23 23:22:53 2006
@@ -44,8 +44,7 @@
$smarty->assign("OP_MODE",$_REQUEST['mode']);
}
-$smarty->assign("id",$focus->id);
-$smarty->assign("ID",$RECORD );
+$smarty->assign("ID",$focus->id);
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD",$app_strings['Invoice']);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
Modified: vtigercrm/trunk/modules/Invoice/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/DetailView.php (original)
+++ vtigercrm/trunk/modules/Invoice/DetailView.php Wed Aug 23 23:22:53 2006
@@ -26,7 +26,8 @@
require_once('include/CustomFieldUtil.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
-global $mod_strings,$app_strings,$currentModule,$theme;
+require_once('user_privileges/default_module_view.php');
+global $mod_strings,$app_strings,$currentModule,$theme,$singlepane_view;
$focus = new Invoice();
if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
@@ -88,6 +89,15 @@
$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
+
+if($singlepane_view == 'true')
+{
+ $related_array = getRelatedLists($currentModule,$focus);
+ $smarty->assign("RELATEDLISTS", $related_array);
+}
+
+$smarty->assign("SinglePane_View", $singlepane_view);
+
$smarty->display("Inventory/InventoryDetailView.tpl");
?>
Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Wed Aug 23 23:22:53 2006
@@ -27,6 +27,7 @@
require_once('data/SugarBean.php');
require_once('data/CRMEntity.php');
require_once('include/utils/utils.php');
+require_once('user_privileges/default_module_view.php');
// Account is used to store vtiger_account information.
class Invoice extends CRMEntity {
@@ -151,7 +152,7 @@
*/
function get_activities($id)
{
- global $log;
+ global $log,$singlepane_view;
$log->debug("Entering get_activities(".$id.") method ...");
global $app_strings;
require_once('modules/Calendar/Activity.php');
@@ -159,7 +160,10 @@
$button = '';
- $returnset = '&return_module=Invoice&return_action=CallRelatedList&return_id='.$id;
+ if($singlepane_view == 'true')
+ $returnset = '&return_module=Invoice&return_action=DetailView&return_id='.$id;
+ else
+ $returnset = '&return_module=Invoice&return_action=CallRelatedList&return_id='.$id;
$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred')";
$log->debug("Exiting get_activities method ...");
From vtigercrm-commits at vtiger.fosslabs.com Thu Aug 24 01:27:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 24 Aug 2006 05:27:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9103 - in
/vtigercrm/trunk/modules/Leads: CallRelatedList.php DetailView.php Lead.php
updateRelations.php
Message-ID: <20060824052731.B0D5175E76C@vtiger.fosslabs.com>
Author: richie
Date: Wed Aug 23 23:27:04 2006
New Revision: 9103
Log:
Updated the single pane view feature for detailview in Leads Module -- ahmed
Modified:
vtigercrm/trunk/modules/Leads/CallRelatedList.php
vtigercrm/trunk/modules/Leads/DetailView.php
vtigercrm/trunk/modules/Leads/Lead.php
vtigercrm/trunk/modules/Leads/updateRelations.php
Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Wed Aug 23 23:27:04 2006
@@ -55,14 +55,13 @@
$parent_email = getEmailParentsList('Leads',$focus->id);
$smarty->assign("HIDDEN_PARENTS_LIST",$parent_email);
-$smarty->assign("id",$focus->id);
+$smarty->assign("ID",$focus->id);
$smarty->assign("NAME",$focus->lastname.' '.$focus->firstname);
$related_array = getRelatedLists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
$smarty->assign("SINGLE_MOD",$app_strings['Lead']);
$smarty->assign("REDIR_MOD","leads");
$smarty->assign("MODULE", $currentmodule);
-$smarty->assign("ID",$RECORD );
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
Modified: vtigercrm/trunk/modules/Leads/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/DetailView.php (original)
+++ vtigercrm/trunk/modules/Leads/DetailView.php Wed Aug 23 23:27:04 2006
@@ -19,10 +19,11 @@
require_once('include/CustomFieldUtil.php');
require_once('include/utils/utils.php');
require_once('include/utils/UserInfoUtil.php');
+require_once('user_privileges/default_module_view.php');
global $mod_strings;
global $app_strings;
-global $currentModule;
+global $currentModule, $singlepane_view;
global $log;
$focus = new Lead();
@@ -123,6 +124,15 @@
$smarty->assign("MODULE", $currentModule);
$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
+
+if($singlepane_view == 'true')
+{
+ $related_array = getRelatedLists($currentModule,$focus);
+ $smarty->assign("RELATEDLISTS", $related_array);
+}
+
+$smarty->assign("SinglePane_View", $singlepane_view);
+
$smarty->display("DetailView.tpl");
?>
Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Wed Aug 23 23:27:04 2006
@@ -24,6 +24,7 @@
require_once('modules/Emails/Email.php');
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
+require_once('user_privileges/default_module_view.php');
class Lead extends CRMEntity {
var $log;
@@ -193,7 +194,7 @@
*/
function get_activities($id)
{
- global $log;
+ global $log, $singlepane_view;
$log->debug("Entering get_activities(".$id.") method ...");
global $app_strings;
@@ -205,7 +206,10 @@
$button .= '{$MOD.LBL_BACKUP_SERVER_SETTINGS} ({$MOD.LBL_FTP})
-
{else}
@@ -57,61 +58,9 @@
- {if $BKP_SERVER_MODE eq 'edit'}
-
-
-
- {else}
-
-
-
-
- {$MOD.LBL_SERVER_ADDRESS} {$FTPSERVER}
-
- {$MOD.LBL_USERNAME} {$FTPUSER}
-
-
- {$MOD.LBL_PASWRD}
- {if $FTPPASSWORD neq ''}
- ******
- {/if}
-
-
-
-
- {/if}
-
-
-
+
+ {include file="Settings/BackupServerContents.tpl"}
+
@@ -141,5 +90,18 @@
return true;
}
+
+function clearBackupServer()
+{
+new Ajax.Request('index.php',
+ {queue: {position: 'end', scope: 'command'},
+ method: 'post',
+ postBody: 'module=Settings&action=SettingsAjax&ajax=true&file=BackupServerConfig&opmode=del',
+ onComplete: function(response) {
+ $("BackupServerContents").innerHTML=response.responseText;
+ }
+ }
+ );
+}
{/literal}
From vtigercrm-commits at vtiger.fosslabs.com Thu Aug 24 01:49:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 24 Aug 2006 05:49:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9114 -
/vtigercrm/trunk/Smarty/templates/Settings/BackupServerContents.tpl
Message-ID: <20060824054922.9BB8F75E78B@vtiger.fosslabs.com>
Author: richie
Date: Wed Aug 23 23:48:45 2006
New Revision: 9114
Log:
Added a new file for clear exising backup server data -- ahmed
Added:
vtigercrm/trunk/Smarty/templates/Settings/BackupServerContents.tpl
From vtigercrm-commits at vtiger.fosslabs.com Thu Aug 24 01:53:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 24 Aug 2006 05:53:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9115 -
/vtigercrm/trunk/modules/Settings/BackupServerConfig.php
Message-ID: <20060824055301.2AEAD75E792@vtiger.fosslabs.com>
Author: richie
Date: Wed Aug 23 23:52:51 2006
New Revision: 9115
Log:
Updated BackupServerConfig.php for adding a feature to clear existing data -- ahmed
Modified:
vtigercrm/trunk/modules/Settings/BackupServerConfig.php
Modified: vtigercrm/trunk/modules/Settings/BackupServerConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/BackupServerConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/BackupServerConfig.php Wed Aug 23 23:52:51 2006
@@ -1,53 +1,62 @@
-assign("ERROR_MSG",''.$_REQUEST["error"].' '.$_REQUEST["error"].'
+
#
# Possible values for the Options directive are "None", "All",
@@ -554,9 +554,9 @@
# We include the /icons/ alias for FancyIndexed directory listings. If you
# do not use FancyIndexing, you may comment this out.
#
-Alias /icons/ "VTIGERCRM/vtigerCRM5_rc/apache/icons/"
-
-
+Alias /icons/ "VTIGERCRM/apache/icons/"
+
+
Options Indexes MultiViews
AllowOverride None
Order allow,deny
@@ -568,9 +568,9 @@
# the manual, even if you choose to move your DocumentRoot. You may comment
# this out if you do not care for the documentation.
#
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "VTIGERCRM/vtigerCRM5_rc/apache/manual$1"
-
-
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "VTIGERCRM/apache/manual$1"
+
+
Options Indexes
AllowOverride None
Order allow,deny
@@ -592,7 +592,7 @@
# The same rules about trailing "/" apply to ScriptAlias directives as to
# Alias.
#
-ScriptAlias /cgi-bin/ "VTIGERCRM/vtigerCRM5_rc/apache/cgi-bin/"
+ScriptAlias /cgi-bin/ "VTIGERCRM/apache/cgi-bin/"
#
@@ -603,10 +603,10 @@
#
-# "VTIGERCRM/vtigerCRM5_rc/apache/cgi-bin" should be changed to whatever your ScriptAliased
+# "VTIGERCRM/apache/cgi-bin" should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
#
-
+
AllowOverride None
Options None
Order allow,deny
@@ -922,7 +922,7 @@
# Alias /error/include/ "/your/include/path/"
#
# which allows you to create your own set of files by starting with the
-# VTIGERCRM/vtigerCRM5_rc/apache/error/include/ files and copying them to /your/include/path/,
+# VTIGERCRM/apache/error/include/ files and copying them to /your/include/path/,
# even on a per-VirtualHost basis. The default include files will display
# your Apache version number and your ServerAdmin email address regardless
# of the setting of ServerSignature.
@@ -930,9 +930,9 @@
# The internationalized error documents require mod_alias, mod_include
# and mod_negotiation. To activate them, uncomment the following 30 lines.
-# Alias /error/ "VTIGERCRM/vtigerCRM5_rc/apache/error/"
-#
-#
+# Alias /error/ "VTIGERCRM/apache/error/"
+#
+#
# AllowOverride None
# Options IncludesNoExec
# AddOutputFilter Includes html
From vtigercrm-commits at vtiger.fosslabs.com Thu Aug 24 06:25:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 24 Aug 2006 10:25:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9120 -
/vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060824102503.CB6DB75E7BE@vtiger.fosslabs.com>
Author: saraj
Date: Thu Aug 24 04:24:59 2006
New Revision: 9120
Log:
* Modified to handle the sequence number in inventory product details
Modified:
vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Thu Aug 24 04:24:59 2006
@@ -3429,17 +3429,26 @@
{
$res = $conn->query("select * from $tablename order by $idname");
$count = $conn->num_rows($res);
+
+ $id = $oldid = 0;
+ $seqno = 0;
+
for($i=0;$i<$count;$i++)
{
+ $oldid = $id;
$id = $conn->query_result($res,$i,$idname);
+
+ //for every new PO/SO/Quotes/Invoice entity we should set the sequence start value as 1
+ if($id != $oldid)
+ $seqno = 1;
+
$productid = $conn->query_result($res,$i,'productid');
$quantity = $conn->query_result($res,$i,'quantity');
$listprice = $conn->query_result($res,$i,'listprice');
- // DG 15 Aug 2006
- // Support sequence_no
- $seqno = $conn->query_result($res, $i, 'sequence_no');
+
$query1 = "insert into vtiger_inventoryproductrel(id,productid,sequence_no,quantity,listprice) values($id, $productid,$seqno, $quantity, $listprice)";
Execute($query1);
+ $seqno++;
}
}
From vtigercrm-commits at vtiger.fosslabs.com Thu Aug 24 06:26:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 24 Aug 2006 10:26:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9121 -
/vtigercrm/trunk/modules/Migration/Migration.php
Message-ID: <20060824102646.D03B175E7BE@vtiger.fosslabs.com>
Author: saraj
Date: Thu Aug 24 04:26:43 2006
New Revision: 9121
Log:
* Modified to handle the dump file size ie., if the dump taken is not valid file then skip migration and go to step1
Modified:
vtigercrm/trunk/modules/Migration/Migration.php
Modified: vtigercrm/trunk/modules/Migration/Migration.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/Migration.php (original)
+++ vtigercrm/trunk/modules/Migration/Migration.php Thu Aug 24 04:26:43 2006
@@ -91,7 +91,7 @@
*/
function takeDatabaseDump($host_name,$mysql_port,$mysql_username,$mysql_password,$dbname)
{
- $this->conn->println("Inside the function takeDatabaseDump. Going to take the old database dump...");
+ $this->conn->println("Inside the function takeDatabaseDump. Going to take the specified database dump...");
$dump_filename = 'dump_'.$dbname.'.txt';
if($mysql_password != '')
@@ -322,6 +322,18 @@
//Take the dump of the old Database
$this->conn->println("Going to take the old Database Dump.");
$dump_file = $this->takeDatabaseDump($old_host_name,$old_mysql_port,$old_mysql_username,$old_mysql_password,$old_dbname);
+
+ //check the file size is greater than 10000 bytes (~app) and if yes then continue else goto step1
+ if(is_file($dump_file) && filesize($dump_file) > 10000)
+ {
+ $_SESSION['migration_log'] .= "Source database dump taken successfully.";
+ }
+ else
+ {
+ echo 'The Source database dump taken may not contain all values. So please use other option. The Current database dump taken may not contain all values. So may not be reload the current database if any problem occurs in migration. If the migration not completed please rename the install.php and install folder and run the install.php
-
From vtigercrm-commits at vtiger.fosslabs.com Fri Aug 25 07:07:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 25 Aug 2006 11:07:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9136 - in /vtigercrm/trunk:
Smarty/templates/MigrationStep1.tpl modules/Migration/MigrationCheck.php
modules/Migration/MigrationStep1.php
Message-ID: <20060825110758.BFD0675E88E@vtiger.fosslabs.com>
Author: saraj
Date: Fri Aug 25 05:07:51 2006
New Revision: 9136
Log:
* Added changes to avoid to get the MySQL server path for the option 3 and added check user_privileges folder write permission
Modified:
vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
vtigercrm/trunk/modules/Migration/MigrationCheck.php
vtigercrm/trunk/modules/Migration/MigrationStep1.php
Modified: vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl Fri Aug 25 05:07:51 2006
@@ -264,6 +264,18 @@
document.getElementById('mnuTab1').style.display = 'none';
document.getElementById('mnuTab2').style.display = 'block';
{rdelim}
+
+ //show/hide MySQL server path
+ if(document.getElementById('getmysqlpath').value == 1 && document.getElementById('mnuTab2').style.display == 'none')
+ {ldelim}
+ //show MySQL server path
+ document.getElementById('mnuTab3').style.display = 'block';
+ {rdelim}
+ else
+ {ldelim}
+ //hide MySQL server path
+ document.getElementById('mnuTab3').style.display = 'none';
+ {rdelim}
{rdelim}
//function to validate the input values based on the radio option selected
@@ -343,7 +355,7 @@
//this is added to check whether the getmysql path is true and the user has entered the path or not
if(error != true)
{ldelim}
- if(document.getElementById("getmysqlpath").value == 1 && trim(formname.server_mysql_path.value) == '')
+ if(document.getElementById("getmysqlpath").value == 1 && trim(formname.server_mysql_path.value) == '' && document.getElementById("alter_db_details").checked != true)
{ldelim}
//alert(document.getElementById("getmysqlpath").value+" Enter the mysql path");
error_msg = "Please enter the Correct MySQL Path";
Modified: vtigercrm/trunk/modules/Migration/MigrationCheck.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/MigrationCheck.php (original)
+++ vtigercrm/trunk/modules/Migration/MigrationCheck.php Fri Aug 25 05:07:51 2006
@@ -20,6 +20,14 @@
$new_mysql_password = $dbconfig['db_password'];
$new_dbname = $dbconfig['db_name'];
+//this is to check whether the user_privileges folder has write permission
+if(!is_writable($root_directory."user_privileges/"))
+{
+ echo "Please give read/write permission to user_privileges folder. MySQL dump file is not exist in the specified MySQL Server Path
Email *
+
+ Master Currency *
+ EURO
+ United States Dollar
+ United Kingdom Pounds
+ Canada Dollars
+ Australia Dollars
+ Japan Yen
+ Indian Rupee
+ New Zealand Dollars
+ South Africa Rand
+
+
+
+
+
Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later after logging-in.
Modified: vtigercrm/trunk/install/3confirmConfig.php
==============================================================================
--- vtigercrm/trunk/install/3confirmConfig.php (original)
+++ vtigercrm/trunk/install/3confirmConfig.php Fri Aug 25 12:49:50 2006
@@ -25,7 +25,7 @@
if (isset($_REQUEST['site_URL'])) $site_URL= $_REQUEST['site_URL'];
if (isset($_REQUEST['admin_email'])) $admin_email= $_REQUEST['admin_email'];
if (isset($_REQUEST['admin_password'])) $admin_password = $_REQUEST['admin_password'];
-if (isset($_REQUEST['admin_email'])) $admin_email = $_REQUEST['admin_email'];
+if (isset($_REQUEST['currency'])) $currency = $_REQUEST['currency'];
if (isset($_REQUEST['cache_dir'])) $cache_dir= $_REQUEST['cache_dir'];
if (isset($_REQUEST['mail_server'])) $mail_server= $_REQUEST['mail_server'];
if (isset($_REQUEST['mail_server_username'])) $mail_server_username= $_REQUEST['mail_server_username'];
@@ -234,6 +234,10 @@
Admin Password
+
+ Master Currency
+
$contact["id"],
- "title" => $contact["salutation"],
- "firstname" => $contact["first_name"],
- "middlename" => trim($middlename),
- "lastname" => trim($contact["last_name"]),
- "birthdate" => $contact["birthdate"],
- "emailaddress" => $contact["email"],
- "jobtitle" => $contact["title"],
- "department" => $contact["department"],
- "accountname" => $contact["account_name"],
- "officephone" => $contact["phone"],
- "homephone" => $contact["homephone"],
- "otherphone" => $contact["otherphone"],
- "fax" => $contact["fax"],
- "mobile" => $contact["mobile"],
- "asstname" => $contact["assistant_name"],
- "asstphone" => $contact["assistantphone"],
- "reportsto" => $contact["reports_to_name"],
- "mailingstreet" => $contact["mailingstreet"],
- "mailingcity" => $contact["mailingcity"],
- "mailingstate" => $contact["mailingstate"],
- "mailingzip" => $contact["mailingzip"],
- "mailingcountry" => $contact["mailingcountry"],
- "otherstreet" => $contact["otherstreet"],
- "othercity" => $contact["othercity"],
- "otherstate" => $contact["otherstate"],
- "otherzip" => $contact["otherzip"],
- "othercountry" => $contact["othercountry"],
- "description" => "",
- "category" => "",
- );
- }
- $log->debug("*******************");
- $log->fatal($output_list);
-
- //to remove an erroneous compiler warning
- $seed_contact = $seed_contact;
- return $output_list;
-}
-
-function retrieve_account_id($account_name,$user_id)
-{
-
- if($account_name=="")
- {
- return null;
- }
-
- $query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'";
-
-
- $db = new PearDatabase();
- $result= $db->query($query) or die ("Not able to execute insert");
-
- $rows_count = $db->getRowCount($result);
- if($rows_count==0)
- {
- require_once('modules/Accounts/Account.php');
- $account = new Account();
- $account->column_fields[accountname] = $account_name;
- $account->column_fields[assigned_user_id]=$user_id;
- //$account->saveentity("Accounts");
- $account->save("Accounts");
- //mysql_close();
- return $account->id;
- }
- else if ($rows_count==1)
- {
- $row = $db->fetchByAssoc($result, 0);
- //mysql_close();
- return $row["accountid"];
- }
- else
- {
- $row = $db->fetchByAssoc($result, 0);
- //mysql_close();
- return $row["accountid"];
- }
-
-}
-
-function AddContact($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="")
-{
- global $adb;
- global $current_user;
- require_once('modules/Users/User.php');
- require_once('modules/Contacts/Contact.php');
-
- $seed_user = new User();
- $user_id = $seed_user->retrieve_user_id($user_name);
- $current_user = $seed_user;
- $current_user->retrieve_entity_info($user_id,"Users");
-
- $contact = new Contact();
- $contact->column_fields[firstname]=$first_name;
- $contact->column_fields[lastname]=$last_name;
- $contact->column_fields[birthday]= getDisplayDate("0000-00-00");
- $contact->column_fields[email]=$email_address;
- $contact->column_fields[title]=$title;
- $contact->column_fields[department]=$department;
- $contact->column_fields[account_id]= retrieve_account_id($account_name,$user_id);
- $contact->column_fields[phone]= $office_phone;
- $contact->column_fields[homephone]= $home_phone;
- $contact->column_fields[fax]= $fax;
- $contact->column_fields[mobile]=$phone_mobile;
- $contact->column_fields[mailingstreet]=$primary_address_street;
- $contact->column_fields[mailingcity]=$primary_address_city;
- $contact->column_fields[mailingstate]=$primary_address_state;
- $contact->column_fields[mailingzip]=$primary_address_postalcode;
- $contact->column_fields[mailingcountry]=$primary_address_country;
- $contact->column_fields[otherstreet]=$alt_address_street;
- $contact->column_fields[othercity]=$alt_address_city;
- $contact->column_fields[otherstate]=$alt_address_state;
- $contact->column_fields[otherzip]=$alt_address_postalcode;
- $contact->column_fields[othercountry]=$alt_address_country;
- $contact->column_fields[assigned_user_id]=$user_id;
- $contact->column_fields[description]= "";
- $contact->save("Contacts");
-
- $contact = $contact;
- return $contact->id;
-}
-
-function create_session($user_name, $password)
-{
- return "TempSessionID";
-}
-
-function end_session($user_name)
-{
- return "Success";
-}
-
-
-$server->service($HTTP_RAW_POST_DATA);
-exit();
-?>
+configureWSDL('vtigersoap');
+
+$server->register(
+ 'create_session',
+ array('user_name'=>'xsd:string','password'=>'xsd:string'),
+ array('return'=>'xsd:string'),
+ $NAMESPACE);
+
+$server->register(
+ 'end_session',
+ array('user_name'=>'xsd:string'),
+ array('return'=>'xsd:string'),
+ $NAMESPACE);
+
+$server->register(
+ 'SearchContactsByEmail',
+ array('username'=>'xsd:string','emailaddress'=>'xsd:string'),
+ array('return'=>'tns:contactdetails'),
+ $NAMESPACE);
+
+$server->register(
+ 'GetContacts',
+ array('username'=>'xsd:string'),
+ array('return'=>'tns:contactdetails'),
+ $NAMESPACE);
+
+$server->register(
+ 'AddContact',
+ array('user_name'=>'xsd:string',
+ 'first_name'=>'xsd:string',
+ 'last_name'=>'xsd:string',
+ 'email_address'=>'xsd:string',
+ 'account_name'=>'xsd:string',
+ 'salutation'=>'xsd:string',
+ 'title'=>'xsd:string',
+ 'phone_mobile'=>'xsd:string',
+ 'reports_to'=>'xsd:string',
+ 'primary_address_street'=>'xsd:string',
+ 'primary_address_city'=>'xsd:string',
+ 'primary_address_state'=>'xsd:string' ,
+ 'primary_address_postalcode'=>'xsd:string',
+ 'primary_address_country'=>'xsd:string',
+ 'alt_address_city'=>'xsd:string',
+ 'alt_address_street'=>'xsd:string',
+ 'alt_address_state'=>'xsd:string',
+ 'alt_address_postalcode'=>'xsd:string',
+ 'alt_address_country'=>'xsd:string',
+ 'office_phone'=>'xsd:string',
+ 'home_phone'=>'xsd:string',
+ 'fax'=>'xsd:string',
+ 'department'=>'xsd:string',
+ 'description'=>'xsd:string'),
+ array('return'=>'xsd:string'),
+ $NAMESPACE);
+
+
+$server->register(
+ 'track_email',
+ array('user_name'=>'xsd:string', 'contact_ids'=>'xsd:string', 'date_sent'=>'xsd:date', 'email_subject'=>'xsd:string', 'email_body'=>'xsd:string'),
+ array('return'=>'xsd:string'),
+ $NAMESPACE);
+
+$server->wsdl->addComplexType(
+ 'contactdetail',
+ 'complexType',
+ 'struct',
+ 'all',
+ '',
+ array(
+ 'id' => array('name'=>'id','type'=>'xsd:string'),
+ 'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
+ 'lastname' => array('name'=>'lastname','type'=>'xsd:string'),
+ 'emailaddress' => array('name'=>'emailaddress','type'=>'xsd:string'),
+ 'accountname' => array('name'=>'accountname','type'=>'xsd:string'),
+ 'middlename' => array('name'=>'middlename','type'=>'xsd:string'),
+ 'birthdate'=> array('name'=>'birthdate','type'=>'xsd:string'),
+ 'jobtitle'=> array('name'=>'jobtitle','type'=>'xsd:string'),
+ 'department'=> array('name'=>'department','type'=>'xsd:string'),
+ 'title' => array('name'=>'title','type'=>'xsd:string'),
+ 'officephone'=> array('name'=>'officephone','type'=>'xsd:string'),
+ 'homephone'=> array('name'=>'homephone','type'=>'xsd:string'),
+ 'otherphone'=> array('name'=>'otherphone','type'=>'xsd:string'),
+ 'fax'=> array('name'=>'fax','type'=>'xsd:string'),
+ 'mobile'=> array('name'=>'mobile','type'=>'xsd:string'),
+ 'asstname'=> array('name'=>'asstname','type'=>'xsd:string'),
+ 'asstphone'=> array('name'=>'asstphone','type'=>'xsd:string'),
+ 'reportsto'=> array('name'=>'reportsto','type'=>'xsd:string'),
+ 'mailingstreet'=> array('name'=>'mailingstreet','type'=>'xsd:string'),
+ 'mailingcity'=> array('name'=>'mailingcity','type'=>'xsd:string'),
+ 'mailingstate'=> array('name'=>'mailingstate','type'=>'xsd:string'),
+ 'mailingzip'=> array('name'=>'mailingzip','type'=>'xsd:string'),
+ 'mailingcountry'=> array('name'=>'mailingcountry','type'=>'xsd:string'),
+ 'otherstreet'=> array('name'=>'otherstreet','type'=>'xsd:string'),
+ 'othercity'=> array('name'=>'othercity','type'=>'xsd:string'),
+ 'otherstate'=> array('name'=>'otherstate','type'=>'xsd:string'),
+ 'otherzip'=> array('name'=>'otherzip','type'=>'xsd:string'),
+ 'othercountry'=> array('name'=>'othercountry','type'=>'xsd:string'),
+ 'description'=> array('name'=>'description','type'=>'xsd:string'),
+ 'category'=> array('name'=>'category','type'=>'xsd:string'),
+ )
+);
+
+$server->wsdl->addComplexType(
+ 'contactdetails',
+ 'complexType',
+ 'array',
+ '',
+ 'SOAP-ENC:Array',
+ array(),
+ array(
+ array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:contactdetail[]')
+ ),
+ 'tns:contactdetail'
+);
+
+
+function SearchContactsByEmail($username,$emailaddress)
+{
+ require_once('modules/Contacts/Contact.php');
+
+ $seed_contact = new Contact();
+ $output_list = Array();
+
+ $response = $seed_contact->get_searchbyemailid($username,$emailaddress);
+ $contactList = $response['list'];
+
+ // create a return array of names and email addresses.
+ foreach($contactList as $contact)
+ {
+ $output_list[] = Array(
+ "id" => $contact[contactid],
+ "firstname" => $contact[firstname],
+ "lastname" => $contact[lastname],
+ "emailaddress" => $contact[email],
+ "accountname" => $contact[accountname],
+ );
+ }
+
+ //to remove an erroneous compiler warning
+ $seed_contact = $seed_contact;
+ return $output_list;
+}
+
+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();
+ $user_id = $seed_user->retrieve_user_id($user_name);
+
+ $email = new Email();
+ //$log->debug($msgdtls['contactid']);
+ $emailbody = str_replace("'", "''", $email_body);
+ $emailsubject = str_replace("'", "''",$email_subject);
+ $datesent = getDisplayDate($date_sent);
+
+ $email->column_fields[subject] = $emailsubject;
+ $email->column_fields[assigned_user_id] = $user_id;
+ $email->column_fields[date_start] = $datesent;
+ $email->column_fields[description] = htmlentities($emailbody);
+ $email->column_fields[activitytype] = 'Emails';
+ $email->save("Emails");
+
+ $email->set_emails_contact_invitee_relationship($email->id,$contact_ids);
+ $email->set_emails_se_invitee_relationship($email->id,$contact_ids);
+ $email->set_emails_user_invitee_relationship($email->id,$user_id);
+ $sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contact_ids."'";
+ $result = $adb->query($sql);
+ $camodulerow = $adb->fetch_array($result);
+ if(isset($camodulerow))
+ {
+ $emailid = $camodulerow["email"];
+ $query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contact_ids."@77|".'","OUTLOOK")';
+ $adb->query($query);
+ }
+ return $email->id;
+}
+
+
+function GetContacts($username)
+{
+ global $adb;
+ global $log;
+ require_once('modules/Contacts/Contact.php');
+
+ $seed_contact = new Contact();
+ $output_list = Array();
+
+ $query = $seed_contact->get_contactsforol($username);
+ $result = $adb->query($query);
+
+ while($contact = $adb->fetch_array($result))
+ {
+ if($contact["birthdate"] == "0000-00-00")
+ {
+ $contact["birthdate"] = "";
+ }
+ if($contact["salutation"] == "--None--")
+ {
+ $contact["salutation"] = "";
+ }
+
+ $namelist = explode(" ", $contact["lastname"]);
+ if(isset($namelist))
+ {
+ if(count($namelist) >= 2)
+ {
+ $contact["lastname"] = $namelist[count($namelist)-1];
+ for($i=0; $i $contact["id"],
+ "title" => $contact["salutation"],
+ "firstname" => $contact["firstname"],
+ "middlename" => trim($middlename),
+ "lastname" => trim($contact["lastname"]),
+ "birthdate" => $contact["birthday"],
+ "emailaddress" => $contact["email"],
+ "jobtitle" => $contact["title"],
+ "department" => $contact["department"],
+ "accountname" => $contact["accountname"],
+ "officephone" => $contact["phone"],
+ "homephone" => $contact["homephone"],
+ "otherphone" => $contact["otherphone"],
+ "fax" => $contact["fax"],
+ "mobile" => $contact["mobile"],
+ "asstname" => $contact["assistant"],
+ "asstphone" => $contact["assistantphone"],
+ "reportsto" => $contact["reports_to_name"],
+ "mailingstreet" => $contact["mailingstreet"],
+ "mailingcity" => $contact["mailingcity"],
+ "mailingstate" => $contact["mailingstate"],
+ "mailingzip" => $contact["mailingzip"],
+ "mailingcountry" => $contact["mailingcountry"],
+ "otherstreet" => $contact["otherstreet"],
+ "othercity" => $contact["othercity"],
+ "otherstate" => $contact["otherstate"],
+ "otherzip" => $contact["otherzip"],
+ "othercountry" => $contact["othercountry"],
+ "description" => "",
+ "category" => "",
+ );
+ }
+ //to remove an erroneous compiler warning
+ $seed_contact = $seed_contact;
+ return $output_list;
+}
+
+function retrieve_account_id($account_name,$user_id)
+{
+
+ if($account_name=="")
+ {
+ return null;
+ }
+
+ $query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'";
+
+
+ $db = new PearDatabase();
+ $result= $db->query($query) or die ("Not able to execute insert");
+
+ $rows_count = $db->getRowCount($result);
+ if($rows_count==0)
+ {
+ require_once('modules/Accounts/Account.php');
+ $account = new Account();
+ $account->column_fields[accountname] = $account_name;
+ $account->column_fields[assigned_user_id]=$user_id;
+ //$account->saveentity("Accounts");
+ $account->save("Accounts");
+ //mysql_close();
+ return $account->id;
+ }
+ else if ($rows_count==1)
+ {
+ $row = $db->fetchByAssoc($result, 0);
+ //mysql_close();
+ return $row["accountid"];
+ }
+ else
+ {
+ $row = $db->fetchByAssoc($result, 0);
+ //mysql_close();
+ return $row["accountid"];
+ }
+
+}
+
+function AddContact($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="")
+{
+ global $adb;
+ global $current_user;
+ require_once('modules/Users/User.php');
+ require_once('modules/Contacts/Contact.php');
+
+ $seed_user = new User();
+ $user_id = $seed_user->retrieve_user_id($user_name);
+ $current_user = $seed_user;
+ $current_user->retrieve_entity_info($user_id,"Users");
+ require('user_privileges/user_privileges_'.$current_user->id.'.php');
+ require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+
+ if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+ {
+ $sql1 = "select fieldname,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and block <> 5";
+ }else
+ {
+ $profileList = getCurrentUserProfileList();
+ $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ }
+ $result1 = $adb->query($sql1);
+ for($i=0;$i < $adb->num_rows($result1);$i++)
+ {
+ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname');
+ }
+
+ $contact = new Contact();
+ $contact->column_fields[firstname]=in_array('salutation',$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") : "";
+ $contact->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : "";
+ $contact->column_fields[title]=in_array('title',$permitted_lists) ? $title : "";
+ $contact->column_fields[department]=in_array('department',$permitted_lists) ? $department : "";
+ $contact->column_fields[account_id]=in_array('account_id',$permitted_lists) ? retrieve_account_id($account_name,$user_id) : "";
+ $contact->column_fields[phone]=in_array('phone',$permitted_lists) ? $office_phone : "";
+ $contact->column_fields[homephone]=in_array('homephone',$permitted_lists) ? $home_phone : "";
+ $contact->column_fields[fax]=in_array('fax',$permitted_lists) ? $fax : "";
+ $contact->column_fields[mobile]=in_array('mobile',$permitted_lists) ? $phone_mobile : "";
+ $contact->column_fields[mailingstreet]=in_array('mailingstreet',$permitted_lists) ? $primary_address_street : "";
+ $contact->column_fields[mailingcity]=in_array('mailingcity',$permitted_lists) ? $primary_address_city : "";
+ $contact->column_fields[mailingstate]=in_array('mailingstate',$permitted_lists) ? $primary_address_state : "";
+ $contact->column_fields[mailingzip]=in_array('mailingzip',$permitted_lists) ? $primary_address_postalcode : "";
+ $contact->column_fields[mailingcountry]=in_array('mailingcountry',$permitted_lists) ? $primary_address_country : "";
+ $contact->column_fields[otherstreet]=in_array('otherstreet',$permitted_lists) ? $alt_address_street : "";
+ $contact->column_fields[othercity]=in_array('othercity',$permitted_lists) ? $alt_address_city : "";
+ $contact->column_fields[otherstate]=in_array('otherstate',$permitted_lists) ? $alt_address_state : "";
+ $contact->column_fields[otherzip]=in_array('otherzip',$permitted_lists) ? $alt_address_postalcode : "";
+ $contact->column_fields[othercountry]=in_array('othercountry',$permitted_lists) ? $alt_address_country : "";
+ $contact->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : "";
+ $contact->column_fields[description]= "";
+ $contact->save("Contacts");
+
+ $contact = $contact;
+ return $contact->id;
+}
+
+function create_session($user_name, $password)
+{
+ return "TempSessionID";
+}
+
+function end_session($user_name)
+{
+ return "Success";
+}
+
+
+$server->service($HTTP_RAW_POST_DATA);
+exit();
+?>
Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Mon Aug 28 02:30:11 2006
@@ -292,11 +292,11 @@
foreach($contactList as $contact)
{
$output_list[] = Array(
- "id" => $contact[id],
- "firstname" => $contact[first_name],
- "lastname" => $contact[last_name],
- "accountname" => $contact[account_name],
- "emailaddress" => $contact[email1],
+ "id" => $contact[contactid],
+ "firstname" => $contact[firstname],
+ "lastname" => $contact[lastname],
+ "accountname" => $contact[accountname],
+ "emailaddress" => $contact[email],
);
}
@@ -316,35 +316,35 @@
foreach($msgdtls as $msgdtl)
{
- if(isset($msgdtl))
- {
- $email = new Email();
- //$log->debug($msgdtls['contactid']);
- $email_body = str_replace("'", "''", $msgdtl['body']);
- $email_subject = str_replace("'", "''",$msgdtl['subject']);
- $date_sent = getDisplayDate($msgdtl['datesent']);
-
- $email->column_fields[subject] = $email_subject;
- $email->column_fields[assigned_user_id] = $user_id;
- $email->column_fields[date_start] = $date_sent;
- $email->column_fields[description] = htmlentities($email_body);
- $email->column_fields[activitytype] = 'Emails';
- $email->plugin_save = true;
- $email->save("Emails");
-
- $email->set_emails_contact_invitee_relationship($email->id,$contactid);
- $email->set_emails_se_invitee_relationship($email->id,$contactid);
- $email->set_emails_user_invitee_relationship($email->id,$user_id);
- $sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contactid."'";
- $result = $adb->query($sql);
- $camodulerow = $adb->fetch_array($result);
- if(isset($camodulerow))
- {
- $emailid = $camodulerow["email"];
- $query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contactid."@77|".'","OUTLOOK")';
- $adb->query($query);
- }
- return $email->id;
+ if(isset($msgdtl))
+ {
+ $email = new Email();
+ //$log->debug($msgdtls['contactid']);
+ $email_body = str_replace("'", "''", $msgdtl['body']);
+ $email_subject = str_replace("'", "''",$msgdtl['subject']);
+ $date_sent = getDisplayDate($msgdtl['datesent']);
+
+ $email->column_fields[subject] = $email_subject;
+ $email->column_fields[assigned_user_id] = $user_id;
+ $email->column_fields[date_start] = $date_sent;
+ $email->column_fields[description] = htmlentities($email_body);
+ $email->column_fields[activitytype] = 'Emails';
+ $email->plugin_save = true;
+ $email->save("Emails");
+
+ $email->set_emails_contact_invitee_relationship($email->id,$contactid);
+ $email->set_emails_se_invitee_relationship($email->id,$contactid);
+ $email->set_emails_user_invitee_relationship($email->id,$user_id);
+ $sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contactid."'";
+ $result = $adb->query($sql);
+ $camodulerow = $adb->fetch_array($result);
+ if(isset($camodulerow))
+ {
+ $emailid = $camodulerow["email"];
+ $query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contactid."@77|".'","OUTLOOK")';
+ $adb->query($query);
+ }
+ return $email->id;
}
else
{
@@ -409,7 +409,7 @@
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
- if(isPermitted("Contacts","EditView") == "yes")
+ if(isPermitted("Contacts","Delete") == "yes")
{
return "allowed";
}else
@@ -427,7 +427,7 @@
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
- if(isPermitted("Calendar","EditView") == "yes")
+ if(isPermitted("Calendar","Delete") == "yes")
{
return "allowed";
}else
@@ -502,12 +502,12 @@
$contact["salutation"] = "";
}
- $namelist = explode(" ", $contact["last_name"]);
+ $namelist = explode(" ", $contact["lastname"]);
if(isset($namelist))
{
if(count($namelist) >= 2)
{
- $contact["last_name"] = $namelist[count($namelist)-1];
+ $contact["lastname"] = $namelist[count($namelist)-1];
for($i=0; $i $contact["id"],
"title" => $contact["salutation"],
- "firstname" => $contact["first_name"],
+ "firstname" => $contact["firstname"],
"middlename" => trim($middlename),
- "lastname" => trim($contact["last_name"]),
- "birthdate" => $contact["birthdate"],
+ "lastname" => trim($contact["lastname"]),
+ "birthdate" => $contact["birthday"],
"emailaddress" => $contact["email"],
"jobtitle" => $contact["title"],
"department" => $contact["department"],
- "accountname" => $contact["account_name"],
+ "accountname" => $contact["accountname"],
"officephone" => $contact["phone"],
"homephone" => $contact["homephone"],
"otherphone" => $contact["otherphone"],
"fax" => $contact["fax"],
"mobile" => $contact["mobile"],
- "asstname" => $contact["assistant_name"],
+ "asstname" => $contact["assistant"],
"asstphone" => $contact["assistantphone"],
"reportsto" => $contact["reports_to_name"],
"mailingstreet" => $contact["mailingstreet"],
@@ -550,7 +550,7 @@
"othercountry" => $contact["othercountry"],
"description" => "",
"category" => "",
- );
+ );
}
//to remove an erroneous compiler warning
@@ -572,48 +572,69 @@
$contact = new Contact();
+ require('user_privileges/user_privileges_'.$current_user->id.'.php');
+ require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+
+ if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+ {
+ $sql1 = "select fieldname,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and block <> 5";
+ }else
+ {
+ $profileList = getCurrentUserProfileList();
+ $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ }
+ $result1 = $adb->query($sql1);
+ for($i=0;$i < $adb->num_rows($result1);$i++)
+ {
+ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname');
+ }
+
foreach($cntdtls as $cntrow)
{
if(isset($cntrow))
{
- $contact->column_fields[salutation]=$cntrow["title"];
- $contact->column_fields[firstname]=$cntrow["firstname"];
-
- if($cntrow["middlename"] != "")
- {
- $contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
- }else
- {
- $contact->column_fields[lastname]=$cntrow["lastname"];
- }
-
- $contact->column_fields[birthday]= getDisplayDate($cntrow["birthdate"]);
- $contact->column_fields[email]=$cntrow["emailaddress"];
- $contact->column_fields[title]=$cntrow["jobtitle"];
- $contact->column_fields[department]=$cntrow["department"];
- $contact->column_fields[account_id]= retrieve_account_id($cntrow["accountname"],$user_id);
- $contact->column_fields[phone]= $cntrow["officephone"];
- $contact->column_fields[homephone]= $cntrow["homephone"];
- $contact->column_fields[otherphone]= $cntrow["otherphone"];
- $contact->column_fields[fax]= $cntrow["fax"];
- $contact->column_fields[mobile]=$cntrow["mobile"];
- $contact->column_fields[assistant]= $cntrow["asstname"];
- $contact->column_fields[assistantphone]= $cntrow["asstphone"];
- //$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
- $contact->column_fields[mailingstreet]=$cntrow["mailingstreet"];
- $contact->column_fields[mailingcity]=$cntrow["mailingcity"];
- $contact->column_fields[mailingstate]=$cntrow["mailingstate"];
- $contact->column_fields[mailingzip]=$cntrow["mailingzip"];
- $contact->column_fields[mailingcountry]=$cntrow["mailingcountry"];
- $contact->column_fields[otherstreet]=$cntrow["otherstreet"];
- $contact->column_fields[othercity]=$cntrow["othercity"];
- $contact->column_fields[otherstate]=$cntrow["otherstate"];
- $contact->column_fields[otherzip]=$cntrow["otherzip"];
- $contact->column_fields[othercountry]=$cntrow["othercountry"];
- $contact->column_fields[assigned_user_id]=$user_id;
- $contact->column_fields[description]= $cntrow["description"];
- $contact->save("Contacts");
- }
+ $contact->column_fields[salutation]=in_array('salutation',$permitted_lists) ? $cntrow["title"] : "";
+ $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $cntrow["firstname"] : "";
+
+ if($cntrow["middlename"] != "")
+ {
+ $contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
+ }elseif($cntrow["middlename"] != "")
+ {
+ $contact->column_fields[lastname]=$cntrow["lastname"];
+ }else
+ {
+ $contact->column_fields[lastname]=$cntrow["firstname"]." ".$cntrow["middlename"]." ".$cntrow["lastname"];
+ }
+
+ $contact->column_fields[birthday]= in_array('birthday',$permitted_lists) ? getDisplayDate($cntrow["birthdate"]) : "";
+ $contact->column_fields[email]=in_array('email',$permitted_lists) ? $cntrow["emailaddress"] : "";
+ $contact->column_fields[title]=in_array('title',$permitted_lists) ? $cntrow["jobtitle"] : "";
+ $contact->column_fields[department]=in_array('department',$permitted_lists) ? $cntrow["department"] : "";
+ $contact->column_fields[account_id]= in_array('account_id',$permitted_lists) ? retrieve_account_id($cntrow["accountname"],$user_id) : "";
+ $contact->column_fields[phone]= in_array('phone',$permitted_lists) ? $cntrow["officephone"] : "";
+ $contact->column_fields[homephone]= in_array('homephone',$permitted_lists) ? $cntrow["homephone"] : "";
+ $contact->column_fields[otherphone]= in_array('otherphone',$permitted_lists) ? $cntrow["otherphone"] : "";
+ $contact->column_fields[fax]= in_array('fax',$permitted_lists) ? $cntrow["fax"] : "";
+ $contact->column_fields[mobile]=in_array('mobile',$permitted_lists) ? $cntrow["mobile"] : "";
+ $contact->column_fields[assistant]= in_array('assistant',$permitted_lists) ? $cntrow["asstname"] : "";
+ $contact->column_fields[assistantphone]= in_array('assistantphone',$permitted_lists) ? $cntrow["asstphone"] : "";
+ //$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
+ $contact->column_fields[mailingstreet]=in_array('mailingstreet',$permitted_lists) ? $cntrow["mailingstreet"] : "";
+ $contact->column_fields[mailingcity]=in_array('mailingcity',$permitted_lists) ? $cntrow["mailingcity"] : "";
+ $contact->column_fields[mailingstate]=in_array('mailingstate',$permitted_lists) ? $cntrow["mailingstate"] : "";
+ $contact->column_fields[mailingzip]=in_array('mailingzip',$permitted_lists) ? $cntrow["mailingzip"] : "";
+ $contact->column_fields[mailingcountry]=in_array('mailingcountry',$permitted_lists) ? $cntrow["mailingcountry"] : "";
+ $contact->column_fields[otherstreet]=in_array('otherstreet',$permitted_lists) ? $cntrow["otherstreet"] : "";
+ $contact->column_fields[othercity]=in_array('othercity',$permitted_lists) ? $cntrow["othercity"] : "";
+ $contact->column_fields[otherstate]=in_array('otherstate',$permitted_lists) ? $cntrow["otherstate"] : "";
+ $contact->column_fields[otherzip]=in_array('otherzip',$permitted_lists) ? $cntrow["otherzip"] : "";
+ $contact->column_fields[othercountry]=in_array('othercountry',$permitted_lists) ? $cntrow["othercountry"] : "";
+ $contact->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : "";
+ $contact->column_fields[description]= in_array('description',$permitted_lists) ? $cntrow["description"] : "";
+ $contact->save("Contacts");
+
+ }
}
$contact = $contact;
return $contact->id;
@@ -632,46 +653,66 @@
$current_user->retrieve_entity_info($user_id,"Users");
$contact = new Contact();
+ require('user_privileges/user_privileges_'.$current_user->id.'.php');
+ require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+
+ if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+ {
+ $sql1 = "select fieldname,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and block <> 5";
+ }else
+ {
+ $profileList = getCurrentUserProfileList();
+ $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ }
+ $result1 = $adb->query($sql1);
+ for($i=0;$i < $adb->num_rows($result1);$i++)
+ {
+ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname');
+ }
foreach($cntdtls as $cntrow)
{
if(isset($cntrow))
{
$contact->retrieve_entity_info($cntrow["id"],"Contacts");
- $contact->column_fields[salutation]=$cntrow["title"];
- $contact->column_fields[firstname]=$cntrow["firstname"];
+ $contact->column_fields[salutation]=in_array('salutation',$permitted_lists) ? $cntrow["title"] : "";
+ $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $cntrow["firstname"] : "";
if($cntrow["middlename"] != "")
{
$contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
+ }elseif($cntrow["lastname"] != "")
+ {
+ $contact->column_fields[lastname]=$cntrow["lastname"];
}else
{
- $contact->column_fields[lastname]=$cntrow["lastname"];
- }
- $contact->column_fields[birthday]= getDisplayDate($cntrow["birthdate"]);
- $contact->column_fields[email]=$cntrow["emailaddress"];
- $contact->column_fields[title]=$cntrow["jobtitle"];
- $contact->column_fields[department]=$cntrow["department"];
- $contact->column_fields[account_id]= retrieve_account_id($cntrow["accountname"],$user_id);
- $contact->column_fields[phone]= $cntrow["officephone"];
- $contact->column_fields[homephone]= $cntrow["homephone"];
- $contact->column_fields[otherphone]= $cntrow["otherphone"];
- $contact->column_fields[fax]= $cntrow["fax"];
- $contact->column_fields[mobile]=$cntrow["mobile"];
- $contact->column_fields[assistant]= $cntrow["asstname"];
- $contact->column_fields[assistantphone]= $cntrow["asstphone"];
+ $contact->column_fields[lastname]=$cntrow["firstname"]." ".$cntrow["middlename"]." ".$cntrow["lastname"];
+ }
+
+ $contact->column_fields[birthday]= in_array('birthday',$permitted_lists) ? getDisplayDate($cntrow["birthdate"]) : "";
+ $contact->column_fields[email]= in_array('email',$permitted_lists) ? $cntrow["emailaddress"] : "";
+ $contact->column_fields[title]= in_array('title',$permitted_lists) ? $cntrow["jobtitle"] : "";
+ $contact->column_fields[department]= in_array('department',$permitted_lists) ? $cntrow["department"] : "";
+ $contact->column_fields[account_id]= in_array('account_id',$permitted_lists) ? retrieve_account_id($cntrow["accountname"],$user_id) : "";
+ $contact->column_fields[phone]= in_array('phone',$permitted_lists) ? $cntrow["officephone"] : "";
+ $contact->column_fields[homephone]= in_array('homephone',$permitted_lists) ? $cntrow["homephone"] : "";
+ $contact->column_fields[otherphone]= in_array('otherphone',$permitted_lists) ? $cntrow["otherphone"] : "";
+ $contact->column_fields[fax]= in_array('fax',$permitted_lists) ? $cntrow["fax"] : "";
+ $contact->column_fields[mobile]= in_array('mobile',$permitted_lists) ? $cntrow["mobile"] : "";
+ $contact->column_fields[assistant]= in_array('assistant',$permitted_lists) ? $cntrow["asstname"] : "";
+ $contact->column_fields[assistantphone]= in_array('assistantphone',$permitted_lists) ? $cntrow["asstphone"] : "";
//$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
- $contact->column_fields[mailingstreet]=$cntrow["mailingstreet"];
- $contact->column_fields[mailingcity]=$cntrow["mailingcity"];
- $contact->column_fields[mailingstate]=$cntrow["mailingstate"];
- $contact->column_fields[mailingzip]=$cntrow["mailingzip"];
- $contact->column_fields[mailingcountry]=$cntrow["mailingcountry"];
- $contact->column_fields[otherstreet]=$cntrow["otherstreet"];
- $contact->column_fields[othercity]=$cntrow["othercity"];
- $contact->column_fields[otherstate]=$cntrow["otherstate"];
- $contact->column_fields[otherzip]=$cntrow["otherzip"];
- $contact->column_fields[othercountry]=$cntrow["othercountry"];
- $contact->column_fields[assigned_user_id]=$user_id;
- $contact->column_fields[description]= $cntrow["description"];
+ $contact->column_fields[mailingstreet]= in_array('mailingstreet',$permitted_lists) ? $cntrow["mailingstreet"] : "";
+ $contact->column_fields[mailingcity]= in_array('mailingcity',$permitted_lists) ? $cntrow["mailingcity"] : "";
+ $contact->column_fields[mailingstate]= in_array('mailingstate',$permitted_lists) ? $cntrow["mailingstate"] : "";
+ $contact->column_fields[mailingzip]= in_array('mailingzip',$permitted_lists) ? $cntrow["mailingzip"] : "";
+ $contact->column_fields[mailingcountry]= in_array('mailingcountry',$permitted_lists) ? $cntrow["mailingcountry"] : "";
+ $contact->column_fields[otherstreet]= in_array('otherstreet',$permitted_lists) ? $cntrow["otherstreet"] : "";
+ $contact->column_fields[othercity]= in_array('othercity',$permitted_lists) ? $cntrow["othercity"] : "";
+ $contact->column_fields[otherstate]= in_array('otherstate',$permitted_lists) ? $cntrow["otherstate"] : "";
+ $contact->column_fields[otherzip]= in_array('otherzip',$permitted_lists) ? $cntrow["otherzip"] : "";
+ $contact->column_fields[othercountry]= in_array('othercountry',$permitted_lists) ? $cntrow["othercountry"] : "";
+ $contact->column_fields[assigned_user_id]= in_array('assigned_user_id',$permitted_lists) ? $user_id : "";
+ $contact->column_fields[description]= in_array('description',$permitted_lists) ? $cntrow["description"] : "";
$contact->id = $cntrow["id"];
$contact->mode = "edit";
$contact->save("Contacts");
@@ -743,7 +784,7 @@
function GetTasks($username)
{
- global $adb;
+ global $adb,$log;
require_once('modules/Calendar/Activity.php');
$seed_task = new Activity();
@@ -754,11 +795,11 @@
while($task = $adb->fetch_array($result))
{
- if($task["startdate"] == "0000-00-00" || $task["startdate"] == NULL)
+ if($task["date_start"] == "0000-00-00" || $task["date_start"] == NULL)
{
$task["startdate"] = "";
}
- if($task["duedate"] == "0000-00-00" || $task["duedate"] == NULL)
+ if($task["due_date"] == "0000-00-00" || $task["due_date"] == NULL)
{
$task["duedate"] = "";
}
@@ -821,15 +862,30 @@
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
+ require('user_privileges/user_privileges_'.$current_user->id.'.php');
+ require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+
+ if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+ {
+ $sql1 = "select fieldname,columnname from vtiger_field where tabid=9";
+ }else
+ {
+ $profileList = getCurrentUserProfileList();
+ $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=9 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ }
+ $result1 = $adb->query($sql1);
+ for($i=0;$i < $adb->num_rows($result1);$i++)
+ {
+ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname');
+ }
+
$task = new Activity();
foreach($taskdtls as $taskrow)
{
-
-
//Currently only 3 status avail Note ************************************************
- if(isset($taskrow))
- {
+ if(isset($taskrow))
+ {
if($taskrow["status"] == "0")
{
$taskrow["status"] = "Not Started";
@@ -861,17 +917,17 @@
$taskrow["priority"] = "Medium";
}
- $task->column_fields[subject] = $taskrow["subject"];
- $task->column_fields[date_start]=getDisplayDate($taskrow["startdate"]);
- $task->column_fields[due_date]=getDisplayDate($taskrow["duedate"]);
- $task->column_fields[taskstatus]=$taskrow["status"];
- $task->column_fields[taskpriority]=$taskrow["priority"];
- $task->column_fields[description]=$taskrow["description"];
+ $task->column_fields[subject] = in_array('subject',$permitted_lists) ? $taskrow["subject"] : "";
+ $task->column_fields[date_start]= in_array('date_start',$permitted_lists) ? getDisplayDate($taskrow["startdate"]) : "";
+ $task->column_fields[due_date]= in_array('due_date',$permitted_lists) ? getDisplayDate($taskrow["duedate"]) : "";
+ $task->column_fields[taskstatus]= in_array('taskstatus',$permitted_lists) ? $taskrow["status"] : "";
+ $task->column_fields[taskpriority]= in_array('taskpriority',$permitted_lists) ? $taskrow["priority"] : "";
+ $task->column_fields[description]= in_array('description',$permitted_lists) ? $taskrow["description"] : "";
$task->column_fields[activitytype]="Task";
//$task->column_fields[contact_id]= retrievereportsto($contact_name,$user_id,null);
- $task->column_fields[assigned_user_id]=$user_id;
+ $task->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : "";
$task->save("Calendar");
- }
+ }
}
return $task->id;
}
@@ -887,6 +943,23 @@
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
+ require('user_privileges/user_privileges_'.$current_user->id.'.php');
+ require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+
+ if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+ {
+ $sql1 = "select fieldname,columnname from vtiger_field where tabid=9";
+ }else
+ {
+ $profileList = getCurrentUserProfileList();
+ $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=9 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ }
+ $result1 = $adb->query($sql1);
+ for($i=0;$i < $adb->num_rows($result1);$i++)
+ {
+ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname');
+ }
+
$task = new Activity();
foreach($taskdtls as $taskrow)
@@ -913,24 +986,24 @@
$taskrow["status"] = "Not Started";
}
- if($taskrow["priority"] == "2")
- {
- $taskrow["priority"] = "High";
- }else if($taskrow["priority"] == "0")
- {
- $taskrow["priority"] = "Low";
- }else if($taskrow["priority"] == "1")
- {
- $taskrow["priority"] = "Medium";
- }
-
+ if($taskrow["priority"] == "2")
+ {
+ $taskrow["priority"] = "High";
+ }else if($taskrow["priority"] == "0")
+ {
+ $taskrow["priority"] = "Low";
+ }else if($taskrow["priority"] == "1")
+ {
+ $taskrow["priority"] = "Medium";
+ }
+
$task->retrieve_entity_info($taskrow["id"],"Calendar");
- $task->column_fields[subject] = $taskrow["subject"];
- $task->column_fields[date_start] = getDisplayDate($taskrow["startdate"]);
- $task->column_fields[due_date] = getDisplayDate($taskrow["duedate"]);
- $task->column_fields[taskstatus] = $taskrow["status"];
- $task->column_fields[taskpriority] = $taskrow["priority"];
- $task->column_fields[description] = $taskrow["description"];
+ $task->column_fields[subject] = in_array('subject',$permitted_lists) ? $taskrow["subject"] : "";
+ $task->column_fields[date_start] = in_array('date_start',$permitted_lists) ? getDisplayDate($taskrow["startdate"]) : "";
+ $task->column_fields[due_date] = in_array('due_date',$permitted_lists) ? getDisplayDate($taskrow["duedate"]) : "";
+ $task->column_fields[taskstatus] = in_array('taskstatus',$permitted_lists) ? $taskrow["status"] : "";
+ $task->column_fields[taskpriority] = in_array('taskpriority',$permitted_lists) ? $taskrow["priority"] : "";
+ $task->column_fields[description] = in_array('description',$permitted_lists) ? $taskrow["description"] : "";
$task->column_fields[activitytype] = "Task";
//$task->column_fields[contact_id]= retrievereportsto($contact_name,$user_id,null);
$task->column_fields[assigned_user_id] = $user_id;
@@ -963,7 +1036,7 @@
function GetClndr($username)
{
- global $adb;
+ global $adb,$log;
require_once('modules/Calendar/Activity.php');
$seed_clndr = new Activity();
@@ -974,34 +1047,34 @@
while($clndr = $adb->fetch_array($result))
{
- if($clndr["startdate"] == "0000-00-00" || $clndr["startdate"] == NULL)
+ if($clndr["date_start"] == "0000-00-00" || $clndr["date_start"] == NULL)
{
- $clndr["startdate"] = "";
+ $clndr["date_start"] = "";
}
- if($clndr["duedate"] == "0000-00-00" || $clndr["duedate"] == NULL)
+ if($clndr["due_date"] == "0000-00-00" || $clndr["due_date"] == NULL)
{
- $clndr["duedate"] = "";
+ $clndr["due_date"] = "";
}
//this seperates the $$clndr["startdate"] into an array - YYYY-MM-DD
- $expldstartdate = explode("-", $clndr["startdate"]);
- $expldtimestart = explode(":", $clndr["startime"]);
-
- $expldduedate = explode("-", $clndr["duedate"]);
+ $expldstartdate = explode("-", $clndr["date_start"]);
+ $expldtimestart = explode(":", $clndr["time_start"]);
+
+ $expldduedate = explode("-", $clndr["due_date"]);
//this makes a timestamp out of the exploded date this number is in seconds
$startdtm = mktime($expldtimestart[0], $expldtimestart[1], 0, $expldstartdate[1], $expldstartdate[2], $expldstartdate[0]);
- $duedtm = mktime($expldtimestart[0]+$clndr["duehours"], $expldtimestart[1]+$clndr["dueminutes"], 0, $expldduedate[1], $expldduedate[2], $expldduedate[0]);
-
- $clndr["startdate"] = date("Y-m-d H:i:s", $startdtm);
- $clndr["duedate"] = date("Y-m-d H:i:s", $duedtm);
+ $duedtm = mktime($expldtimestart[0]+$clndr["duration_hours"], $expldtimestart[1]+$clndr["duration_minutes"], 0, $expldduedate[1], $expldduedate[2], $expldduedate[0]);
+
+ $clndr["date_start"] = date("Y-m-d H:i:s", $startdtm);
+ $clndr["due_date"] = date("Y-m-d H:i:s", $duedtm);
$output_list[] = Array(
"id" => $clndr["clndrid"],
"subject" => $clndr["subject"],
- "startdate" => $clndr["startdate"],
- "duedate" => $clndr["duedate"],
+ "startdate" => $clndr["date_start"],
+ "duedate" => $clndr["due_date"],
"location" => $clndr["location"],
"description" => $clndr["description"],
"contactname" => $clndr["firstname"]." ".$clndr["lastname"],
@@ -1014,7 +1087,7 @@
function AddClndr($username,$clndrdtls)
{
- global $current_user;
+ global $current_user,$adb;
require_once('modules/Users/User.php');
require_once('modules/Calendar/Activity.php');
@@ -1023,6 +1096,23 @@
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
+ require('user_privileges/user_privileges_'.$current_user->id.'.php');
+ require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+
+ if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+ {
+ $sql1 = "select fieldname,columnname from vtiger_field where tabid=16";
+ }else
+ {
+ $profileList = getCurrentUserProfileList();
+ $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=16 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ }
+ $result1 = $adb->query($sql1);
+ for($i=0;$i < $adb->num_rows($result1);$i++)
+ {
+ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname');
+ }
+
$clndr = new Activity();
foreach($clndrdtls as $clndrow)
@@ -1044,16 +1134,16 @@
$stimeduemin = sprintf('%02d',$diff['minutes']);
}
- $clndr->column_fields[subject] = $clndrow["subject"];
- $clndr->column_fields[date_start]=getDisplayDate(trim($astartdtm[0]));
- $clndr->column_fields[due_date]=getDisplayDate(trim($aduedtm[0]));
- $clndr->column_fields[time_start]=$stimestart;
- $clndr->column_fields[duration_hours]=$stimeduehr;
- $clndr->column_fields[duration_minutes]=$stimeduemin;
- $clndr->column_fields[location]=$clndrow["location"];
- $clndr->column_fields[description]=$clndrow["description"];
+ $clndr->column_fields[subject] = in_array('subject',$permitted_lists) ? $clndrow["subject"] : "";
+ $clndr->column_fields[date_start]= in_array('date_start',$permitted_lists) ? getDisplayDate(trim($astartdtm[0])) : "";
+ $clndr->column_fields[due_date]= in_array('due_date',$permitted_lists) ? getDisplayDate(trim($aduedtm[0])) : "";
+ $clndr->column_fields[time_start]= in_array('time_start',$permitted_lists) ? $stimestart : "";
+ $clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";
+ $clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";
+ $clndr->column_fields[location]= in_array('location',$permitted_lists) ? $clndrow["location"] : "";
+ $clndr->column_fields[description]= in_array('description',$permitted_lists) ? $clndrow["description"] : "";
$clndr->column_fields[activitytype]="Meeting";
- $clndr->column_fields[assigned_user_id]=$user_id;
+ $clndr->column_fields[assigned_user_id]= in_array('assigned_user_id',$permitted_lists) ? $user_id : "";
$clndr->save("Calendar");
}
}
@@ -1063,7 +1153,7 @@
function UpdateClndr($username,$clndrdtls)
{
global $current_user;
- global $adb;
+ global $adb,$log;
require_once('modules/Users/User.php');
require_once('modules/Calendar/Activity.php');
@@ -1071,6 +1161,23 @@
$user_id = $seed_user->retrieve_user_id($username);
$current_user = $seed_user;
$current_user->retrieve_entity_info($user_id,"Users");
+
+ require('user_privileges/user_privileges_'.$current_user->id.'.php');
+ require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+
+ if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+ {
+ $sql1 = "select fieldname,columnname from vtiger_field where tabid=16";
+ }else
+ {
+ $profileList = getCurrentUserProfileList();
+ $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=16 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ }
+ $result1 = $adb->query($sql1);
+ for($i=0;$i < $adb->num_rows($result1);$i++)
+ {
+ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname');
+ }
$clndr = new Activity();
@@ -1094,16 +1201,16 @@
}
$clndr->retrieve_entity_info($clndrow["id"],"Calendar");
- $clndr->column_fields[subject] = $clndrow["subject"];
- $clndr->column_fields[date_start]=getDisplayDate(trim($astartdtm[0]));
- $clndr->column_fields[due_date]=getDisplayDate(trim($aduedtm[0]));
- $clndr->column_fields[time_start]=$stimestart;
- $clndr->column_fields[duration_hours]=$stimeduehr;
- $clndr->column_fields[duration_minutes]=$stimeduemin;
- $clndr->column_fields[location]=$clndrow["location"];
- $clndr->column_fields[description]=$clndrow["description"];
+ $clndr->column_fields[subject] = in_array('subject',$permitted_lists) ? $clndrow["subject"] : "";
+ $clndr->column_fields[date_start]= in_array('date_start',$permitted_lists) ? getDisplayDate(trim($astartdtm[0])) : "";
+ $clndr->column_fields[due_date]= in_array('due_date',$permitted_lists) ? getDisplayDate(trim($aduedtm[0])) : "";
+ $clndr->column_fields[time_start]= in_array('time_start',$permitted_lists) ? $stimestart : "";
+ $clndr->column_fields[duration_hours]= in_array('duration_hours',$permitted_lists) ? $stimeduehr : "";
+ $clndr->column_fields[duration_minutes]= in_array('duration_minutes',$permitted_lists) ? $stimeduemin : "";
+ $clndr->column_fields[location]= in_array('location',$permitted_lists) ? $clndrow["location"] : "";
+ $clndr->column_fields[description]= in_array('description',$permitted_lists) ? $clndrow["description"] : "";
$clndr->column_fields[activitytype]="Meeting";
- $clndr->column_fields[assigned_user_id]=$user_id;
+ $clndr->column_fields[assigned_user_id]= in_array('assigned_user_id',$permitted_lists) ? $user_id : "";
$clndr->id = $clndrow["id"];
$clndr->mode="edit";
$clndr->save("Calendar");
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 08:09:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 12:09:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9142 - in
/vtigercrm/trunk/modules: Settings/BackupServerConfig.php Users/Logout.php
Message-ID: <20060828120916.6109C6B520C@vtiger.fosslabs.com>
Author: saraj
Date: Mon Aug 28 06:09:11 2006
New Revision: 9142
Log:
backup server filename changed
Modified:
vtigercrm/trunk/modules/Settings/BackupServerConfig.php
vtigercrm/trunk/modules/Users/Logout.php
Modified: vtigercrm/trunk/modules/Settings/BackupServerConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/BackupServerConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/BackupServerConfig.php Mon Aug 28 06:09:11 2006
@@ -29,7 +29,7 @@
$smarty = new vtigerCRM_Smarty;
if($_REQUEST['error'] != '')
{
- $smarty->assign("ERROR_MSG",''.$_REQUEST["error"].' '.$_REQUEST["error"].' '.$dbname.' Database Dump has been taken and the file is ==> '.$dump_filename;
+ $migrationlog->debug(" $dbname Database Dump has been taken and the file is ==> $dump_filename");
return $dump_filename;
}
@@ -139,10 +156,12 @@
*/
function dropDatabase($conn,$dbname)
{
- $this->conn->println("Inside the function dropDatabase. Going to drop the new database...");
+ global $migrationlog;
+ $migrationlog->debug("Inside the function dropDatabase($conn,$dbname). Going to drop the database - $dbname");
$sql = "drop database ".$dbname;
$conn->query($sql);
+ $migrationlog->debug("Database ($dbname) has been dropped.");
$_SESSION['migration_log'] .= ''.$dbname.' Database has been dropped.';
}
@@ -153,12 +172,15 @@
*/
function createDatabase($conn,$dbname)
{
- $this->conn->println("Inside the function createDatabase. Going to create the new database...");
+ global $migrationlog;
+ $migrationlog->debug("Inside the function createDatabase($conn, $dbname). Going to create the database - $dbname");
+
$sql = "create database ".$dbname;
$conn->query($sql);
$_SESSION['migration_log'] .= ''.$dbname.' Database has been created.';
-
+ $migrationlog->debug("Database ($dbname) has been dropped.");
+
//Added to avoid the No Database Selected error when execute the queries
$conn->connect();
}
@@ -174,8 +196,9 @@
*/
function applyDumpData($host_name,$mysql_port,$mysql_username,$mysql_password,$dbname,$dumpfile)
{
- $this->conn->println("Inside the function applyDumpData.");
- $this->conn->println("hostname=$host_name&port=$mysql_port&username=$mysql_username&password=$mysql_password& dump file = $dumpfile");
+ global $migrationlog;
+ $migrationlog->debug("Inside the function applyDumpData($host_name,$mysql_port,$mysql_username,$mysql_password,$dbname,$dumpfile).");
+
if($mysql_password != '')
{
$password_str = " --password=".$mysql_password;
@@ -190,8 +213,9 @@
{
$current_working_dir = getcwd();
$server_mysql_path = $_SESSION['set_server_mysql_path'];
-
+
$dump_str = "mysql --user=".$mysql_username.$password_str." -h ".$host_name." --force --port=".$mysql_port." ".$dbname." < ".$dumpfile;
+ $migrationlog->debug("MySQL server path set. Dump string to apply ==> $dump_str");
//exec("path = $server_mysql_path");
chdir ($server_mysql_path);
@@ -203,9 +227,11 @@
else
{
exec("mysql --user=".$mysql_username." -h ".$host_name." --force --port=".$mysql_port.$password_str." ".$dbname." < ".$dumpfile);
+ $migrationlog->debug("Dump string to apply ==> mysql --user=$mysql_username -h $host_name --force --port=$mysql_port $password_str $dbname < $dumpfile");
}
$_SESSION['migration_log'] .= ''.$dbname.' Database from '.$dumpfile.' ';
+ $migrationlog->debug(" $dbname database from $dumpfile ");
}
@@ -229,11 +255,12 @@
*/
function getTablesCountInNewDatabase()
{
- $this->conn->println("Inside the function getTablesCountInNewDatabase");
+ global $migrationlog;
+ $migrationlog->debug("Inside the function getTablesCountInNewDatabase()");
$newconn = @mysql_connect($this->new_hostname.':'.$this->new_mysql_port,$this->new_mysql_username,$this->new_mysql_password);
$tables = @mysql_num_rows(mysql_list_tables($this->new_dbname,$newconn));
- $this->conn->println("Number of Tables in New Database = ".$tables);
+ $migrationlog->debug("Number of Tables in New Database = $tables");
return $tables;
}
@@ -242,11 +269,12 @@
*/
function getTablesCountInOldDatabase()
{
- $this->conn->println("Inside the function getTablesCountInOldDatabase");
+ global $migrationlog;
+ $migrationlog->debug("Inside the function getTablesCountInOldDatabase()");
$oldconn = @mysql_connect($this->old_hostname.':'.$this->old_mysql_port,$this->old_mysql_username,$this->old_mysql_password);
$tables = @mysql_num_rows(mysql_list_tables($this->old_dbname,$oldconn));
- $this->conn->println("Number of Tables in Old Database = ".$tables);
+ $migrationlog->debug("Number of Tables in Old Database = $tables");
return $tables;
}
@@ -256,8 +284,9 @@
*/
function modifyDatabase($conn)
{
- $this->conn->println("Inside the function modifyDatabase");
- $conn->println("\n\n\nMickie ---- Starts");
+ global $migrationlog;
+ $migrationlog->debug("Inside the function modifyDatabase($conn)");
+ $migrationlog->debug("\n\n\nMickie ---- Starts");
$_SESSION['migration_log'] .= "Database Modifications for 5.0(Alpha) Dev3 ==> 5.0 Alpha starts here..... '.$query.'
';
$success_query_array[$success_query_count++] = $query;
+ $migrationlog->debug("Query Success ==> $query");
}
else
{
@@ -3698,11 +3702,13 @@
'.$query.'
';
$failure_query_array[$failure_query_count++] = $query;
+ $migrationlog->debug("Query Failed ==> $query");
+ //$migrationlog->debug("Error is ==> ".$conn->ErrorMsg());
}
}
//Added on 23-12-2005 which is used to populate the vtiger_profile2field and vtiger_def_org_field table entries for the field per tab
-//if we enter a vtiger_field in vtiger_field table then we must populate that vtiger_field in these table for security access
+//if we enter a field in vtiger_field table then we must populate that field in these table for security access
function populateFieldForSecurity($tabid,$fieldid)
{
global $conn;
Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/rename_tables.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/rename_tables.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/rename_tables.php Mon Aug 28 06:09:50 2006
@@ -10,9 +10,10 @@
********************************************************************************/
global $conn;
+global $migrationlog;
$prefix = "vtiger_";
-$conn->println("Inside the file rename_tables.php to rename the table names with prefix vtiger_");
+$migrationlog->debug("Inside the file rename_tables.php to rename the table names with prefix vtiger_");
//Rename all the tables with prefix vtiger_
$tables_list = $conn->get_tables();
@@ -66,5 +67,5 @@
}
-$conn->println("End of file rename_tables.php. The table names renamed with prefix vtiger_");
+$migrationlog->debug("End of file rename_tables.php. The table names renamed with prefix vtiger_");
?>
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 10:04:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 14:04:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9144 - in
/vtigercrm/trunk/Smarty/templates: Inventory/InventoryEditView.tpl
salesEditView.tpl
Message-ID: <20060828140422.ECEC36B5506@vtiger.fosslabs.com>
Author: saraj
Date: Mon Aug 28 08:04:18 2006
New Revision: 9144
Log:
Removed the more information tab pertaining to related lists from edit view -- ahmed
Modified:
vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
vtigercrm/trunk/Smarty/templates/salesEditView.tpl
Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl Mon Aug 28 08:04:18 2006
@@ -78,11 +78,6 @@
{$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
-
- {if $OP_MODE neq 'create_view'}
- {$APP.LBL_MORE} {$APP.LBL_INFORMATION}
Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Mon Aug 28 08:04:18 2006
@@ -73,20 +73,9 @@
-
- {if $MODULE eq 'Notes' || $MODULE eq 'Faq'}
- {$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
-
- {else}
{$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
-
- {if $OP_MODE neq 'create_view'}
- {$APP.LBL_MORE} {$APP.LBL_INFORMATION}
- {/if}
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 14:32:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 18:32:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9145 -
/vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php
Message-ID: <20060828183216.266EE7081EB@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 12:32:07 2006
New Revision: 9145
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php
Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php Mon Aug 28 12:32:07 2006
@@ -169,13 +169,25 @@
}
- // returns true/false
- function BeginTrans()
- {
- if ($this->transOff) return true;
- $this->transCnt += 1;
- return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
- }
+ function SetTransactionMode( $transaction_mode )
+ {
+ if (empty($transaction_mode)) {
+ $transaction_mode = 'ISOLATION LEVEL SERIALIZABLE';
+ }
+ if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+ $this->_transmode = $transaction_mode;
+ return( @pg_Exec($this->_connectionID, "SET SESSION TRANSACTION ".$transaction_mode));
+ }
+
+ function BeginTrans()
+ {
+ if ($this->transOff) return true;
+ $this->transCnt += 1;
+ if( $this->SetTransactionMode($this->_transmode))
+ return @pg_Exec($this->_connectionID, "begin");
+ else
+ return(0);
+ }
function RowLock($tables,$where,$flds='1 as ignore')
{
@@ -1051,4 +1063,4 @@
}
}
-?>
+?>
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 14:33:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 18:33:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9146 -
/vtigercrm/trunk/adodb/adodb-datadict.inc.php
Message-ID: <20060828183319.3D5187081EE@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 12:33:12 2006
New Revision: 9146
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/adodb/adodb-datadict.inc.php
Modified: vtigercrm/trunk/adodb/adodb-datadict.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-datadict.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-datadict.inc.php Mon Aug 28 12:33:12 2006
@@ -267,7 +267,7 @@
foreach($sql as $line) {
if ($this->debug) $conn->debug = true;
- $log->fatal($line);
+ $log->debug($line);
$ok = $conn->Execute($line);
$conn->debug = $saved;
if (!$ok) {
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 14:34:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 18:34:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9147 -
/vtigercrm/trunk/include/freetag/freetag.class.php
Message-ID: <20060828183441.C86517081FA@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 12:34:34 2006
New Revision: 9147
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/include/freetag/freetag.class.php
Modified: vtigercrm/trunk/include/freetag/freetag.class.php
==============================================================================
--- vtigercrm/trunk/include/freetag/freetag.class.php (original)
+++ vtigercrm/trunk/include/freetag/freetag.class.php Mon Aug 28 12:34:34 2006
@@ -984,7 +984,7 @@
ON (${prefix}freetags.id = tag_id)
WHERE 1=1
$tagger_sql
- GROUP BY tag
+ GROUP BY tag,tag_id
ORDER BY quantity DESC";
//echo $sql;
$rs = $adb->limitQuery($sql, 0, $max) or die("Syntax Error: $sql");
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 14:37:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 18:37:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9148 -
/vtigercrm/trunk/include/database/PearDatabase.php
Message-ID: <20060828183727.63C8A708208@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 12:37:19 2006
New Revision: 9148
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/include/database/PearDatabase.php
Modified: vtigercrm/trunk/include/database/PearDatabase.php
==============================================================================
--- vtigercrm/trunk/include/database/PearDatabase.php (original)
+++ vtigercrm/trunk/include/database/PearDatabase.php Mon Aug 28 12:37:19 2006
@@ -20,766 +20,775 @@
$log =& LoggerManager::getLogger('VT');
class PearDatabase{
- var $database = null;
- var $dieOnError = false;
- var $dbType = null;
- var $dbHostName = null;
- var $dbName = null;
- var $dbOptions = null;
- var $userName=null;
- var $userPassword=null;
- var $query_time = 0;
- var $log = null;
- var $lastmysqlrow = -1;
- var $enableSQLlog = false;
-
- function isMySQL() { return dbType=='mysql'; }
- function isOracle() { return dbType=='oci8'; }
+ var $database = null;
+ var $dieOnError = false;
+ var $dbType = null;
+ var $dbHostName = null;
+ var $dbName = null;
+ var $dbOptions = null;
+ var $userName=null;
+ var $userPassword=null;
+ var $query_time = 0;
+ var $log = null;
+ var $lastmysqlrow = -1;
+ var $enableSQLlog = false;
+
+ function isMySQL() { return dbType=='mysql'; }
+ function isOracle() { return dbType=='oci8'; }
+
+ function println($msg)
+ {
+ require_once('include/logging.php');
+ $log1 =& LoggerManager::getLogger('VT');
+ if(is_array($msg))
+ {
+ $log1->info("PearDatabse ->".print_r($msg,true));
+ }
+ else
+ {
+ $log1->info("PearDatabase ->".$msg);
+ }
+ return $msg;
+ }
+
+ function setDieOnError($value){
+ $this->dieOnError = $value;
+ }
+
+ function setDatabaseType($type){
+ $this->dbType = $type;
+ }
+
+ function setUserName($name){
+ $this->userName = $name;
+ }
+
+ function setOption($name, $value){
+ if(isset($this->dbOptions))
+ $this->dbOptions[$name] = $value;
+ if(isset($this->database))
+ $this->database->setOption($name, $value);
+ }
+
+ function setUserPassword($pass){
+ $this->userPassword = $pass;
+ }
+
+ function setDatabaseName($db){
+ $this->dbName = $db;
+ }
+
+ function setDatabaseHost($host){
+ $this->dbHostName = $host;
+ }
+
+ function getDataSourceName(){
+ return $this->dbType. "://".$this->userName.":".$this->userPassword."@". $this->dbHostName . "/". $this->dbName;
+ }
+
+ function startTransaction()
+ {
+ $this->checkConnection();
+ $this->println("TRANS Started");
+ $this->database->StartTrans();
+ }
+
+ function completeTransaction()
+ {
+ if($this->database->HasFailedTrans())
+ $this->println("TRANS Rolled Back");
+ else
+ $this->println("TRANS Commited");
- function println($msg)
- {
- require_once('include/logging.php');
- $log1 =& LoggerManager::getLogger('VT');
- if(is_array($msg))
- {
- $log1->info("PearDatabse ->".print_r($msg,true));
- }
- else
- {
- $log1->info("PearDatabase ->".$msg);
- }
- return $msg;
- }
-
- function setDieOnError($value){
- $this->dieOnError = $value;
- }
+ $this->database->CompleteTrans();
+ $this->println("TRANS Completed");
+ }
+
+/* ADODB converted
+ * function checkError($msg='', $dieOnError=false)
+ * {
+ * if($this->dbType == "mysql")
+ * {
+ * if (mysql_errno())
+ * {
+ * if($this->dieOnError || $dieOnError)
+ * {
+ * $this->log->fatal("MySQL error ".mysql_errno().": ".mysql_error());
+ * die ($msg."MySQL error ".mysql_errno().": ".mysql_error());
+ * } else {
+ * $this->log->error("MySQL error ".mysql_errno().": ".mysql_error());
+ * }
+ * return true;
+ * }
+ * return false;
+ * }
+ * else
+ * {
+ * if(!isset($this->database))
+ * {
+ * $this->log->error("Database Is Not Connected");
+ * return true;
+ * }
+ * if(DB::isError($this->database))
+ * {
+ * if($this->dieOnError || $dieOnError)
+ * {
+ * $this->log->fatal($msg.$this->database->getMessage());
+ * die ($msg.$this->database->getMessage());
+ * } else {
+ * $this->log->error($msg.$this->database->getMessage());
+ * }
+ * return true;
+ * }
+ * }
+ * return false;
+ * }
+ */
+
+ function checkError($msg='', $dieOnError=false)
+ {
+/*
+ * if($this->database->ErrorNo())
+ * {
+ * if($this->dieOnError || $dieOnError)
+ * {
+ * $this->println("ADODB error ".$this->database->ErrorNo());
+ * die ($msg."ADODB error ".$this->database->ErrorNo());
+ * } else {
+ * $this->log->error("MySQL error ".mysql_errno().": ".mysql_error());
+ * }
+ * return true;
+ * }
+ */
- function setDatabaseType($type){
- $this->dbType = $type;
- }
+ if($this->dieOnError || $dieOnError)
+ {
+ $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg());
+ die ($msg."ADODB error ".$msg."->".$this->database->ErrorMsg());
+ }
+ else
+ {
+ $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg());
+ }
+ return false;
+ }
+
+ function change_key_case($arr)
+ {
+ return is_array($arr)?array_change_key_case($arr):$arr;
+ }
+
+ var $req_flist;
+
+ /**
+ * @return void
+ * @desc checks if a connection exists if it does not it closes the connection
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+ * All Rights Reserved..
+ * Contributor(s): ______________________________________..
+ */
+ function checkConnection(){
+ global $log;
+
+ if(!isset($this->database))
+ {
+ $this->println("TRANS creating new connection");
+/*
+ * $flist=get_included_files();
+ * foreach($flist as $key=>$value)
+ * {
+ * if(!strstr($value,'\\modules') && !strstr($value,'\\data'))
+ * unset($flist[$key]);
+ * }
+ * $this->println($flist);
+ */
+ $this->connect(false);
+ }
+ else
+ {
+ //$this->println("checkconnect using old connection");
+ }
+ }
+
+/* ADODB converted
+ * function query($sql, $dieOnError=false, $msg='')
+ * {
+ * $this->println("query ".$sql);
+ * $this->log->info('Query:' . $sql);
+ * $this->checkConnection();
+ * $this->query_time = microtime();
+ * if($this->dbType == "mysql")
+ * {
+ * $result =& mysql_query($sql);
+ * $this->lastmysqlrow = -1;
+ * } else {
+ * $result =& $this->database->query($sql);
+ * }
+ * $this->query_time = microtime() - $this->query_time;
+ * $this->log->info('Query Execution Time:'.$this->query_time);
+ * $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+ * return $result;
+ * }
+ */
+
+ function query($sql, $dieOnError=false, $msg='')
+ {
+ global $log;
+ //$this->println("ADODB query ".$sql);
+ $log->debug('query being executed : '.$sql);
+ $this->checkConnection();
+ $result = & $this->database->Execute($sql);
+ $this->lastmysqlrow = -1;
+ if(!$result)$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+ return $result;
+ }
+
+ function getEmptyBlob()
+ {
+ //if(dbType=="oci8") return 'empty_blob()';
+ //else return 'null';
+ return 'null';
+ }
+
+ function updateBlob($tablename, $colname, $id, $data)
+ {
+ $this->println("updateBlob t=".$tablename." c=".$colname." id=".$id);
+ $this->checkConnection();
+ $result = $this->database->UpdateBlob($tablename, $colname, $data, $id);
+ $this->println("updateBlob t=".$tablename." c=".$colname." id=".$id." status=".$result);
+ return $result;
+ }
+
+ function updateBlobFile($tablename, $colname, $id, $filename)
+ {
+ $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename);
+ $this->checkConnection();
+ $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id);
+ $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename." status=".$result);
+ return $result;
+ }
+
+/* ADODB converted
+ * function limitQuery($sql,$start,$count, $dieOnError=false, $msg='')
+ * {
+ * if($this->dbType == "mysql")
+ * return $this->query("$sql LIMIT $start,$count", $dieOnError, $msg);
+ * $this->log->info('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
+ * $this->lastsql = $sql;
+ *
+ * $this->checkConnection();
+ * $this->query_time = microtime();
+ * $result =& $this->database->limitQuery($sql,$start, $count);
+ * $this->query_time = microtime() - $this->query_time;
+ * $this->log->info('Query Execution Time:'.$this->query_time);
+ * $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+ * return $result;
+ * }
+ */
+
+ function limitQuery($sql,$start,$count, $dieOnError=false, $msg='')
+ {
+ global $log;
+ //$this->println("ADODB limitQuery sql=".$sql." st=".$start." co=".$count);
+ $log->debug(' limitQuery sql = '.$sql .' st = '.$start .' co = '.$count);
+ $this->checkConnection();
+ $result =& $this->database->SelectLimit($sql,$count,$start);
+ if(!$result) $this->checkError($msg.' Limit Query Failed:' . $sql . '::', $dieOnError);
+ return $result;
+ }
+
+/* ADODB converted
+ * function getOne($sql, $dieOnError=false, $msg='')
+ * {
+ * $this->log->info('Get One:' . $sql);
+ * $this->checkConnection();
+ * if($this->dbType == "mysql"){
+ * $queryresult =& $this->query($sql, $dieOnError, $msg);
+ * $result =& mysql_result($queryresult,0);
+ * } else {
+ * $result =& $this->database->getOne($sql);
+ * }
+ * $this->checkError($msg.' Get One Failed:' . $sql . '::', $dieOnError);
+ * return $result;
+ * }
+ */
+
+ function getOne($sql, $dieOnError=false, $msg='')
+ {
+ $this->println("ADODB getOne sql=".$sql);
+ $this->checkConnection();
+ $result =& $this->database->GetOne($sql);
+ if(!$result) $this->checkError($msg.' Get one Query Failed:' . $sql . '::', $dieOnError);
+ return $result;
+ }
+
+/* ADODB converted
+ * function getFieldsArray(&$result)
+ * {
+ * $field_array = array();
+ *
+ * if(! isset($result) || empty($result))
+ * {
+ * return 0;
+ * }
+ *
+ * if($this->dbType == "mysql")
+ * {
+ * $i = 0;
+ * while ($i < mysql_num_fields($result))
+ * {
+ * $meta = mysql_fetch_field($result, $i);
+ *
+ * if (!$meta)
+ * {
+ * return 0;
+ * }
+ *
+ * array_push($field_array,$meta->name);
+ *
+ * $i++;
+ * }
+ * }
+ * else
+ * {
+ * $arr = tableInfo($result);
+ * foreach ($arr as $index=>$subarr)
+ * {
+ * array_push($field_array,$subarr['name']);
+ * }
+ * }
+ *
+ * return $field_array;
+ * }
+ */
+
+ function getFieldsArray(&$result)
+ {
+ //$this->println("ADODB getFieldsArray");
+ $field_array = array();
+ if(! isset($result) || empty($result))
+ {
+ return 0;
+ }
+
+ $i = 0;
+ $n = $result->FieldCount();
+ while ($i < $n)
+ {
+ $meta = $result->FetchField($i);
+ if (!$meta)
+ {
+ return 0;
+ }
+ array_push($field_array,$meta->name);
+ $i++;
+ }
+
+ //$this->println($field_array);
+ return $field_array;
+ }
+
+/* ADODB Converted
+ * function getRowCount(&$result)
+ * {
+ * if(isset($result) && !empty($result))
+ * if($this->dbType == "mysql"){
+ * return mysql_numrows($result);
+ * } else {
+ * return $result->numRows();
+ * }
+ * return 0;
+ * }
+ */
+
+ function getRowCount(&$result){
+ global $log;
+ //$this->println("ADODB getRowCount");
+ if(isset($result) && !empty($result))
+ $rows= $result->RecordCount();
+ //$this->println("ADODB getRowCount rows=".$rows);
+ //$log->debug('getRowCount rows= '.$rows);
+ return $rows;
+ }
+
+ /* ADODB newly added. replacement for mysql_num_rows */
+ function num_rows(&$result)
+ {
+ return $this->getRowCount($result);
+ }
+
+ /* ADODB newly added. replacement form mysql_num_fields */
+ function num_fields(&$result)
+ {
+ return $result->FieldCount();
+ }
+
+ /* ADODB newly added. replacement for mysql_fetch_array() */
+ function fetch_array(&$result)
+ {
+ if($result->EOF)
+ {
+ //$this->println("ADODB fetch_array return null");
+ return NULL;
+ }
+ return $this->change_key_case($result->FetchRow());
+ }
+
+ /* ADODB newly added. replacement for mysql_result() */
+ function query_result(&$result, $row, $col=0)
+ {
+ //$this->println("ADODB query_result r=".$row." c=".$col);
+ $result->Move($row);
+ $rowdata = $this->change_key_case($result->FetchRow());
+ //$this->println($rowdata);
+ $coldata = strip_selected_tags($rowdata[$col],'script');
+ //$this->println("ADODB query_result ". $coldata);
+ return $coldata;
+ }
+
+/* ADODB Converted
+ * function getAffectedRowCount(&$result)
+ * {
+ * if($this->dbType == "mysql"){
+ * return mysql_affected_rows();
+ * }
+ * else {
+ * return $result->affectedRows();
+ * }
+ * return 0;
+ * }
+ */
+
+ function getAffectedRowCount(&$result)
+ {
+ global $log;
+ //$this->println("ADODB getAffectedRowCount");
+ $log->debug('getAffectedRowCount');
+ $rows =$this->database->Affected_Rows();
+ //$this->println("ADODB getAffectedRowCount rows=".rows);
+ $log->debug('getAffectedRowCount rows = '.$rows);
+ return $rows;
+ }
+
+/* ADODB converted
+ * function requireSingleResult($sql, $dieOnError=false,$msg='', $encode=true){
+ * $result = $this->query($sql, $dieOnError, $msg);
+ *
+ * if($this->getRowCount($result ) == 1)
+ * return to_html($result, $encode);
+ * $this->log->error('Rows Returned:'. $this->getRowCount($result) .' More than 1 row returned for '. $sql);
+ * return '';
+ * }
+ */
+
+ function requireSingleResult($sql, $dieOnError=false,$msg='', $encode=true)
+ {
+ $result = $this->query($sql, $dieOnError, $msg);
+
+ if($this->getRowCount($result ) == 1)
+ return $result;
+ $this->log->error('Rows Returned:'. $this->getRowCount($result) .' More than 1 row returned for '. $sql);
+ return '';
+ }
+
+
+/* ADODB converted
+ * function fetchByAssoc(&$result, $rowNum = -1, $encode=true)
+ * {
+ * if(isset($result) && $rowNum < 0)
+ * {
+ * if($this->dbType == "mysql"){
+ * $row = mysql_fetch_assoc($result);
+ *
+ * if($encode&& is_array($row))
+ * return array_map('to_html', $row);
+ * return $row;
+ * }
+ * $row = $result->fetchRow(DB_FETCHMODE_ASSOC);
+ * }
+ * if($this->dbType == "mysql"){
+ * if($this->getRowCount($result) > $rowNum){
+ * mysql_data_seek($result, $rowNum);
+ * }
+ * $this->lastmysqlrow = $rowNum;
+ *
+ * $row = mysql_fetch_assoc($result);
+ *
+ * if($encode&& is_array($row))
+ * return array_map('to_html', $row);
+ * return $row;
+ * }
+ * $row = $result->fetchRow(DB_FETCHMODE_ASSOC, $rowNum);
+ * if($encode)
+ * return array_map('to_html', $row);
+ * return $row;
+ * }
+ */
+
+ function fetchByAssoc(&$result, $rowNum = -1, $encode=true)
+ {
+ //$this->println("ADODB fetchByAssoc ".$rowNum." fetch mode=".$adb->database->$ADODB_FETCH_MODE);
+ if($result->EOF)
+ {
+ $this->println("ADODB fetchByAssoc return null");
+ return NULL;
+ }
+ if(isset($result) && $rowNum < 0)
+ {
+ $row = $this->change_key_case($result->GetRowAssoc(false));
+ $result->MoveNext();
+ //print_r($row);
+ //$this->println("ADODB fetchByAssoc r< 0 isarray r=".is_array($row)." r1=".is_array($row[1]));
+ //$this->println($row);
+ if($encode&& is_array($row))
+ return array_map('to_html', $row);
+ //$this->println("ADODB fetchByAssoc r< 0 not array r1=".$row[1]);
+ return $row;
+ }
+
+ //$this->println("ADODB fetchByAssoc after if ".$rowNum);
- function setUserName($name){
- $this->userName = $name;
- }
+ if($this->getRowCount($result) > $rowNum)
+ {
+ $result->Move($rowNum);
+ }
+
+ $this->lastmysqlrow = $rowNum; //srini - think about this
+ $row = $this->change_key_case($result->GetRowAssoc(false));
+ $result->MoveNext();
+ //print_r($row);
+ $this->println($row);
+
+ if($encode&& is_array($row))
+ return array_map('to_html', $row);
+ return $row;
+ }
+
+/* ADODB converted
+ * function getNextRow(&$result, $encode=true)
+ * {
+ * if(isset($result)){
+ * $row = $result->fetchRow();
+ * if($encode&& is_array($row))
+ * return array_map('to_html', $row);
+ * return $row;
+ * }
+ * return null;
+ * }
+ */
+
+ function getNextRow(&$result, $encode=true){
+ global $log;
+
+ //$this->println("ADODB getNextRow");
+ $log->info('getNextRow');
+ if(isset($result)){
+ $row = $this->change_key_case($result->FetchRow());
+ if($row && $encode&& is_array($row))
+ return array_map('to_html', $row);
+ return $row;
+ }
+ return null;
+ }
+
+ function fetch_row(&$result, $encode=true)
+ {
+ return $this->getNextRow($result);
+ }
+
+ function field_name(&$result, $col)
+ {
+ return $result->FetchField($col);
+ }
+
+ function getQueryTime(){
+ return $this->query_time;
+ }
+
+/*
+ * function execute($stmt, $data, $dieOnError=false, $msg=''){
+ * $this->log->info('Executing:'.$stmt);
+ * $this->checkConnection();
+ * $this->query_time = microtime();
+ * $prepared = $this->database->prepare($stmt);
+ * $result = execute($stmt, $data);
+ * $this->query_time = microtime() - $this->query_time;
+ * //$this->log->info('Query Execution Time:'.$this->query_time);
+ * $this->checkError('Execute Failed:' . $stmt. '::', $dieOnError);
+ * return $result;
+ * }
+ */
+
+
+/* adodb converted
+ * function connect($dieOnError = false){
+ * $this->println("connect");
+ * global $dbconfigoption;
+ * if($this->dbType == "mysql" && $dbconfigoption['persistent'] == true){
+ * $this->database =@mysql_pconnect($this->dbHostName,$this->userName,$this->userPassword);
+ * @mysql_select_db($this->dbName) or die( "Unable to select database");
+ * if(!$this->database){
+ * $this->connection = mysql_connect($this->dbHostName,$this->userName,$this->userPassword) or die("Could not connect to server ".$this->dbHostName." as ".$this->userName.".".mysql_error());
+ * if($this->connection == false && $dbconfigoption['persistent'] == true){
+ * $_SESSION['administrator_error'] = "Severe Performance Degradation: Persistent Database Connections not working. Please set \$dbconfigoption['persistent'] to false in your config.php file ";
+ * }
+ * }
+ * }
+ * else $this->database = DB::connect($this->getDataSourceName(), $this->dbOptions);
+ * if($this->checkError('Could Not Connect:', $dieOnError))
+ * $this->log->info("connected to db");
+ *
+ * }
+ */
+
+ function connect($dieOnError = false)
+ {
+ //$this->println("ADODB connect");
+ global $dbconfigoption,$dbconfig;
+ //$this->println("ADODB type=".$this->dbType." host=".$this->dbHostName." dbname=".$this->dbName." user=".$this->userName." password=".$this->userPassword);
+
+/*
+ * $driver='mysql';
+ * $server='srinivasan';
+ * $user='root';
+ * $password='';
+ * $database='vtigercrm3_2';
+ *
+ * $this->database = ADONewConnection($driver);
+ *
+ * #$this->database->debug = true;
+ * $this->println("ADODB status=".$this->database->PConnect($server, $user, $password, $database));
+ */
+
+/*
+ * $this->dbHostName="srinivasan:1521";
+ * $this->userName="vt4";
+ * $this->userPassword="vt4";
+ * $this->dbName="srini";
+ * $this->dbType="oci8";
+ */
- function setOption($name, $value){
- if(isset($this->dbOptions))
- $this->dbOptions[$name] = $value;
- if(isset($this->database))
- $this->database->setOption($name, $value);
- }
+ if(!isset($this->dbType))
+ {
+ $this->println("ADODB Connect : DBType not specified");
+ return;
+ }
- function setUserPassword($pass){
- $this->userPassword = $pass;
- }
+ $this->database = ADONewConnection($this->dbType);
+ //$this->database->debug = true;
- function setDatabaseName($db){
- $this->dbName = $db;
- }
-
- function setDatabaseHost($host){
- $this->dbHostName = $host;
- }
-
- function getDataSourceName(){
- return $this->dbType. "://".$this->userName.":".$this->userPassword."@". $this->dbHostName . "/". $this->dbName;
- }
-
- function startTransaction()
- {
- //$this->println("TRANS Started");
- $this->checkConnection();
- $this->database->StartTrans();
- }
-
- function completeTransaction()
- {
- if($this->database->HasFailedTrans())
- $this->println("TRANS Rolled Back");
- else
- $this->println("TRANS Commited");
-
- $this->database->CompleteTrans();
- $this->println("TRANS Completed");
- }
-
- /* ADODB converted
- function checkError($msg='', $dieOnError=false){
- if($this->dbType == "mysql"){
- if (mysql_errno()){
- if($this->dieOnError || $dieOnError){
- $this->log->fatal("MySQL error ".mysql_errno().": ".mysql_error());
- die ($msg."MySQL error ".mysql_errno().": ".mysql_error());
-
- }else{
- $this->log->error("MySQL error ".mysql_errno().": ".mysql_error());
- }
- return true;
- }
- return false;
- }
- else{
- if(!isset($this->database)){
- $this->log->error("Database Is Not Connected");
- return true;
- }
- if(DB::isError($this->database)){
-
- if($this->dieOnError || $dieOnError){
- $this->log->fatal($msg.$this->database->getMessage());
- die ($msg.$this->database->getMessage());
- }else{
- $this->log->error($msg.$this->database->getMessage());
- }
- return true;
- }
- }return false;
-
- }
- */
-
- function checkError($msg='', $dieOnError=false)
- {
- /*if($this->database->ErrorNo())
- {
- if($this->dieOnError || $dieOnError)
- {
- $this->println("ADODB error ".$this->database->ErrorNo());
- die ($msg."ADODB error ".$this->database->ErrorNo());
-
- }else{
- $this->log->error("MySQL error ".mysql_errno().": ".mysql_error());
- }
- return true;
- }*/
-
- if($this->dieOnError || $dieOnError)
- {
- $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg());
- die ($msg."ADODB error ".$msg."->".$this->database->ErrorMsg());
- }
- else
- {
- $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg());
-
- }
- return false;
- }
-
- function change_key_case($arr)
- {
- return is_array($arr)?array_change_key_case($arr):$arr;
- }
-
- var $req_flist;
-
-
- /**
- * @return void
- * @desc checks if a connection exists if it does not it closes the connection
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
- * All Rights Reserved..
- * Contributor(s): ______________________________________..
- */
- function checkConnection(){
-global $log;
- if(!isset($this->database))
- {
- $this->println("TRANS creating new connection");
- /*$flist=get_included_files();
- foreach($flist as $key=>$value)
- {
- if(!strstr($value,'\\modules') && !strstr($value,'\\data'))
- unset($flist[$key]);
-
- }
- $this->println($flist);*/
- $this->connect(false);
- }
- else
- {
- // $this->println("checkconnect using old connection");
- /*** Delibrately commented as per Richie's advice(printed frequently)***/
- // $log->debug('checkconnect using old connection');
- }
- }
-
- /* ADODB converted
- function query($sql, $dieOnError=false, $msg=''){
- $this->println("query ".$sql);
- $this->log->info('Query:' . $sql);
- $this->checkConnection();
- $this->query_time = microtime();
- if($this->dbType == "mysql"){
- $result =& mysql_query($sql);
- $this->lastmysqlrow = -1;
- }else{
- $result =& $this->database->query($sql);
- }
- $this->query_time = microtime() - $this->query_time;
- $this->log->info('Query Execution Time:'.$this->query_time);
- $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
- return $result;
- }
- */
-
- function query($sql, $dieOnError=false, $msg='')
- {
- global $log;
- //$this->println("ADODB query ".$sql);
- $log->debug('query being executed : '.$sql);
- $this->checkConnection();
- $result = & $this->database->Execute($sql);
- $this->lastmysqlrow = -1;
- if(!$result)$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
- return $result;
- }
-
-
- function getEmptyBlob()
- {
- //if(dbType=="oci8") return 'empty_blob()';
- //else return 'null';
- return 'null';
- }
-
- function updateBlob($tablename, $colname, $id, $data)
- {
- $this->println("updateBlob t=".$tablename." c=".$colname." id=".$id);
- $this->checkConnection();
- $result = $this->database->UpdateBlob($tablename, $colname, $data, $id);
- $this->println("updateBlob t=".$tablename." c=".$colname." id=".$id." status=".$result);
- return $result;
- }
-
- function updateBlobFile($tablename, $colname, $id, $filename)
- {
- $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename);
- $this->checkConnection();
- $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id);
- $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename." status=".$result);
- return $result;
- }
-
- /* ADODB converted
- function limitQuery($sql,$start,$count, $dieOnError=false, $msg=''){
- if($this->dbType == "mysql")
- return $this->query("$sql LIMIT $start,$count", $dieOnError, $msg);
- $this->log->info('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
- $this->lastsql = $sql;
-
- $this->checkConnection();
- $this->query_time = microtime();
- $result =& $this->database->limitQuery($sql,$start, $count);
- $this->query_time = microtime() - $this->query_time;
- $this->log->info('Query Execution Time:'.$this->query_time);
- $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
- return $result;
- }
- */
-
- function limitQuery($sql,$start,$count, $dieOnError=false, $msg='')
- {
- global $log;
- //$this->println("ADODB limitQuery sql=".$sql." st=".$start." co=".$count);
- $log->debug(' limitQuery sql = '.$sql .' st = '.$start .' co = '.$count);
- $this->checkConnection();
- $result =& $this->database->SelectLimit($sql,$count,$start);
- if(!$result) $this->checkError($msg.' Limit Query Failed:' . $sql . '::', $dieOnError);
- return $result;
- }
-
- /* ADODB converted
- function getOne($sql, $dieOnError=false, $msg=''){
- $this->log->info('Get One:' . $sql);
- $this->checkConnection();
- if($this->dbType == "mysql"){
- $queryresult =& $this->query($sql, $dieOnError, $msg);
- $result =& mysql_result($queryresult,0);
- }else{
- $result =& $this->database->getOne($sql);
- }
- $this->checkError($msg.' Get One Failed:' . $sql . '::', $dieOnError);
- return $result;
- }
- */
-
- function getOne($sql, $dieOnError=false, $msg='')
- {
- $this->println("ADODB getOne sql=".$sql);
- $this->checkConnection();
- $result =& $this->database->GetOne($sql);
- if(!$result) $this->checkError($msg.' Get one Query Failed:' . $sql . '::', $dieOnError);
- return $result;
- }
-
- /* ADODB converted
- function getFieldsArray(&$result)
- {
- $field_array = array();
-
- if(! isset($result) || empty($result))
- {
- return 0;
- }
-
- if($this->dbType == "mysql")
- {
- $i = 0;
- while ($i < mysql_num_fields($result))
- {
- $meta = mysql_fetch_field($result, $i);
-
- if (!$meta)
- {
- return 0;
- }
-
- array_push($field_array,$meta->name);
-
- $i++;
- }
- }
- else
- {
- $arr = tableInfo($result);
- foreach ($arr as $index=>$subarr)
- {
- array_push($field_array,$subarr['name']);
- }
-
- }
-
- return $field_array;
-
- }
- */
-
- function getFieldsArray(&$result)
- {
- //$this->println("ADODB getFieldsArray");
- $field_array = array();
- if(! isset($result) || empty($result))
- {
- return 0;
- }
-
- $i = 0;
- $n = $result->FieldCount();
- while ($i < $n)
- {
- $meta = $result->FetchField($i);
- if (!$meta)
- {
- return 0;
- }
- array_push($field_array,$meta->name);
- $i++;
- }
-
- //$this->println($field_array);
- return $field_array;
- }
-
- /* ADODB Converted
- function getRowCount(&$result){
- if(isset($result) && !empty($result))
- if($this->dbType == "mysql"){
- return mysql_numrows($result);
- }else{
- return $result->numRows();
- }
- return 0;
-
- }
- */
-
- function getRowCount(&$result){
- global $log;
- //$this->println("ADODB getRowCount");
- if(isset($result) && !empty($result))
- $rows= $result->RecordCount();
- //$this->println("ADODB getRowCount rows=".$rows);
- //$log->debug('getRowCount rows= '.$rows);
- return $rows;
- }
-
- /* ADODB newly added. replacement for mysql_num_rows */
-
- function num_rows(&$result)
- {
- return $this->getRowCount($result);
- }
-
- /* ADODB newly added. replacement form mysql_num_fields */
-
- function num_fields(&$result)
- {
- return $result->FieldCount();
- }
-
- /* ADODB newly added. replacement for mysql_fetch_array() */
-
- function fetch_array(&$result)
- {
- if($result->EOF)
- {
- //$this->println("ADODB fetch_array return null");
- return NULL;
- }
- return $this->change_key_case($result->FetchRow());
- }
-
- /* ADODB newly added. replacement for mysql_result() */
-
- function query_result(&$result, $row, $col=0)
- {
- //$this->println("ADODB query_result r=".$row." c=".$col);
- $result->Move($row);
- $rowdata = $this->change_key_case($result->FetchRow());
- //$this->println($rowdata);
- $coldata = strip_selected_tags($rowdata[$col],'script');
- //$this->println("ADODB query_result ". $coldata);
- return $coldata;
- }
-
-
- /* ADODB Converted
- function getAffectedRowCount(&$result){
- if($this->dbType == "mysql"){
- return mysql_affected_rows();
- }
- else {
- return $result->affectedRows();
- }
- return 0;
-
- }*/
-
- function getAffectedRowCount(&$result){
- global $log;
-// $this->println("ADODB getAffectedRowCount");
- $log->debug('getAffectedRowCount');
- $rows =$this->database->Affected_Rows();
- // $this->println("ADODB getAffectedRowCount rows=".rows);
- $log->debug('getAffectedRowCount rows = '.$rows);
- return $rows;
- }
-
-
-
- /* ADODB converted
- function requireSingleResult($sql, $dieOnError=false,$msg='', $encode=true){
- $result = $this->query($sql, $dieOnError, $msg);
-
- if($this->getRowCount($result ) == 1)
- return to_html($result, $encode);
- $this->log->error('Rows Returned:'. $this->getRowCount($result) .' More than 1 row returned for '. $sql);
- return '';
- }*/
-
- function requireSingleResult($sql, $dieOnError=false,$msg='', $encode=true){
- $result = $this->query($sql, $dieOnError, $msg);
-
- /*$row = $this->change_key_case($result->GetRowAssoc(false));
- $this->println("rsr ");
- $this->println($row);*/
- if($this->getRowCount($result ) == 1)
- //return to_html($result, $encode); // srini - just think $result compatability
- return $result;
- $this->log->error('Rows Returned:'. $this->getRowCount($result) .' More than 1 row returned for '. $sql);
- return '';
- }
-
-
- /* ADODB converted
- function fetchByAssoc(&$result, $rowNum = -1, $encode=true){
- if(isset($result) && $rowNum < 0){
- if($this->dbType == "mysql"){
- $row = mysql_fetch_assoc($result);
-
- if($encode&& is_array($row))return array_map('to_html', $row);
- return $row;
- }
- $row = $result->fetchRow(DB_FETCHMODE_ASSOC);
- }
- if($this->dbType == "mysql"){
- if($this->getRowCount($result) > $rowNum){
-
- mysql_data_seek($result, $rowNum);
- }
- $this->lastmysqlrow = $rowNum;
-
- $row = mysql_fetch_assoc($result);
-
- if($encode&& is_array($row))return array_map('to_html', $row);
- return $row;
-
- }
- $row = $result->fetchRow(DB_FETCHMODE_ASSOC, $rowNum);
- if($encode)return array_map('to_html', $row);
- return $row;
- }
- */
-
- function fetchByAssoc(&$result, $rowNum = -1, $encode=true){
- //$this->println("ADODB fetchByAssoc ".$rowNum." fetch mode=".$adb->database->$ADODB_FETCH_MODE);
- if($result->EOF)
- {
- $this->println("ADODB fetchByAssoc return null");
- return NULL;
- }
- if(isset($result) && $rowNum < 0)
- {
- $row = $this->change_key_case($result->GetRowAssoc(false));
- $result->MoveNext();
- //print_r($row);
- //$this->println("ADODB fetchByAssoc r< 0 isarray r=".is_array($row)." r1=".is_array($row[1]));
- //$this->println($row);
- if($encode&& is_array($row))
- return array_map('to_html', $row);
- //$this->println("ADODB fetchByAssoc r< 0 not array r1=".$row[1]);
- return $row;
- }
-
- //$this->println("ADODB fetchByAssoc after if ".$rowNum);
-
- if($this->getRowCount($result) > $rowNum)
- {
- $result->Move($rowNum);
- }
-
- $this->lastmysqlrow = $rowNum; //srini - think about this
- $row = $this->change_key_case($result->GetRowAssoc(false));
- $result->MoveNext();
- //print_r($row);
- $this->println($row);
-
- if($encode&& is_array($row))return array_map('to_html', $row);
- return $row;
- }
-
- /* ADODB converted
- function getNextRow(&$result, $encode=true){
- if(isset($result)){
- $row = $result->fetchRow();
- if($encode&& is_array($row))return array_map('to_html', $row);
- return $row;
-
- }
- return null;
- }
- */
-
- function getNextRow(&$result, $encode=true){
- global $log;
-
- //$this->println("ADODB getNextRow");
- $log->info('getNextRow');
- if(isset($result)){
- $row = $this->change_key_case($result->FetchRow());
- if($row && $encode&& is_array($row))return array_map('to_html', $row);
- return $row;
-
- }
- return null;
- }
-
- function fetch_row(&$result, $encode=true)
- {
- return $this->getNextRow($result);
- }
-
- function field_name(&$result, $col)
- {
- return $result->FetchField($col);
- }
-
- function getQueryTime(){
- return $this->query_time;
- }
- /*function execute($stmt, $data, $dieOnError=false, $msg=''){
- $this->log->info('Executing:'.$stmt);
- $this->checkConnection();
- $this->query_time = microtime();
- $prepared = $this->database->prepare($stmt);
- $result = execute($stmt, $data);
- $this->query_time = microtime() - $this->query_time;
- //$this->log->info('Query Execution Time:'.$this->query_time);
- $this->checkError('Execute Failed:' . $stmt. '::', $dieOnError);
- return $result;
- }*/
-
-
- /* adodb converted
- function connect($dieOnError = false){
- $this->println("connect");
- global $dbconfigoption;
- if($this->dbType == "mysql" && $dbconfigoption['persistent'] == true){
- $this->database =@mysql_pconnect($this->dbHostName,$this->userName,$this->userPassword);
- @mysql_select_db($this->dbName) or die( "Unable to select database");
- if(!$this->database){
- $this->connection = mysql_connect($this->dbHostName,$this->userName,$this->userPassword) or die("Could not connect to server ".$this->dbHostName." as ".$this->userName.".".mysql_error());
- if($this->connection == false && $dbconfigoption['persistent'] == true){
- $_SESSION['administrator_error'] = "Severe Performance Degradation: Persistent Database Connections not working. Please set \$dbconfigoption['persistent'] to false in your config.php file ";
- }
- }
- }
- else $this->database = DB::connect($this->getDataSourceName(), $this->dbOptions);
- if($this->checkError('Could Not Connect:', $dieOnError))
- $this->log->info("connected to db");
-
- }*/
-
- function connect($dieOnError = false)
- {
- //$this->println("ADODB connect");
- global $dbconfigoption,$dbconfig;
- //$this->println("ADODB type=".$this->dbType." host=".$this->dbHostName." dbname=".$this->dbName." user=".$this->userName." password=".$this->userPassword);
-
- /*$driver='mysql';
- $server='srinivasan';
- $user='root';
- $password='';
- $database='vtigercrm3_2';
-
- $this->database = ADONewConnection($driver);
-
- #$this->database->debug = true;
- $this->println("ADODB status=".$this->database->PConnect($server, $user, $password, $database));*/
-
- /*$this->dbHostName="srinivasan:1521";
- $this->userName="vt4";
- $this->userPassword="vt4";
- $this->dbName="srini";
- $this->dbType="oci8";*/
-
- if(!isset($this->dbType))
- {
- $this->println("ADODB Connect : DBType not specified");
- return;
- }
-
- $this->database = ADONewConnection($this->dbType);
- //$this->database->debug = true;
-
- $this->database->PConnect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName);
- $this->database->LogSQL($this->enableSQLlog);
- //$this->database->SetFetchMode(ADODB_FETCH_ASSOC);
- //$this->println("ADODB type=".$this->dbType." host=".$this->dbHostName." dbname=".$this->dbName." user=".$this->userName." password=".$this->userPassword);
-
- }
+ $this->database->PConnect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName);
+ $this->database->LogSQL($this->enableSQLlog);
+ //$this->database->SetFetchMode(ADODB_FETCH_ASSOC);
+ //$this->println("ADODB type=".$this->dbType." host=".$this->dbHostName." dbname=".$this->dbName." user=".$this->userName." password=".$this->userPassword);
+ }
+
/*
- function PearDatabase(){
- //$this->println("PearDatabase");
- global $currentModule;
- $this->log =& LoggerManager::getLogger('PearDatabase_'. $currentModule);
- $this->resetSettings();
-
-
- }
- function resetSettings(){
- global $dbconfig, $dbconfigoption;
- $this->disconnect();
- $this->setDatabaseType($dbconfig['db_type']);
- $this->setUserName($dbconfig['db_username']);
- $this->setUserPassword($dbconfig['db_password']);
- $this->setDatabaseHost( $dbconfig['db_hostname']);
- $this->setDatabaseName($dbconfig['db_name']);
- $this->dbOptions = $dbconfigoption;
- $this->enableSQLlog = ($dbconfig['log_sql'] == true);
- //$this->println("resetSettings log=".$this->enableSQLlog);
- //$this->println($dbconfig);
- /*if($this->dbType != "mysql"){
- require_once( 'DB.php' );
- }*/
-
-
-
- function PearDatabase($dbtype='',$host='',$dbname='',$username='',$passwd=''){
- //$this->println("PearDatabase");
- global $currentModule;
- $this->log =& LoggerManager::getLogger('PearDatabase_'. $currentModule);
- $this->resetSettings($dbtype,$host,$dbname,$username,$passwd);
-
-
- }
-
-
+ * function PearDatabase(){
+ * //$this->println("PearDatabase");
+ * global $currentModule;
+ * $this->log =& LoggerManager::getLogger('PearDatabase_'. $currentModule);
+ * $this->resetSettings();
+ * }
+ *
+ * function resetSettings(){
+ * global $dbconfig, $dbconfigoption;
+ * $this->disconnect();
+ * $this->setDatabaseType($dbconfig['db_type']);
+ * $this->setUserName($dbconfig['db_username']);
+ * $this->setUserPassword($dbconfig['db_password']);
+ * $this->setDatabaseHost( $dbconfig['db_hostname']);
+ * $this->setDatabaseName($dbconfig['db_name']);
+ * $this->dbOptions = $dbconfigoption;
+ * $this->enableSQLlog = ($dbconfig['log_sql'] == true);
+ * //$this->println("resetSettings log=".$this->enableSQLlog);
+ * //$this->println($dbconfig);
+ * //if($this->dbType != "mysql"){
+ * // require_once( 'DB.php' );
+ * //}
+ * }
+ */
+
+ function PearDatabase($dbtype='',$host='',$dbname='',$username='',$passwd='')
+ {
+ //$this->println("PearDatabase");
+ global $currentModule;
+ $this->log =& LoggerManager::getLogger('PearDatabase_'. $currentModule);
+ $this->resetSettings($dbtype,$host,$dbname,$username,$passwd);
+ }
+
function resetSettings($dbtype,$host,$dbname,$username,$passwd)
{
-
- global $dbconfig, $dbconfigoption;
-
- if($host == '')
- {
- $this->disconnect();
- $this->setDatabaseType($dbconfig['db_type']);
- $this->setUserName($dbconfig['db_username']);
- $this->setUserPassword($dbconfig['db_password']);
- $this->setDatabaseHost( $dbconfig['db_hostname']);
- $this->setDatabaseName($dbconfig['db_name']);
- $this->dbOptions = $dbconfigoption;
+ global $dbconfig, $dbconfigoption;
+
+ if($host == '')
+ {
+ $this->disconnect();
+ $this->setDatabaseType($dbconfig['db_type']);
+ $this->setUserName($dbconfig['db_username']);
+ $this->setUserPassword($dbconfig['db_password']);
+ $this->setDatabaseHost( $dbconfig['db_hostname']);
+ $this->setDatabaseName($dbconfig['db_name']);
+ $this->dbOptions = $dbconfigoption;
if($dbconfig['log_sql'])
- $this->enableSQLlog = ($dbconfig['log_sql'] == true);
- //$this->println("resetSettings log=".$this->enableSQLlog);
- //$this->println($dbconfig);
- /*if($this->dbType != "mysql"){
- require_once( 'DB.php' );
- }*/
- }
- else
- {
-
- $this->disconnect();
- $this->setDatabaseType($dbtype);
- $this->setDatabaseName($dbname);
- $this->setUserName($username);
- $this->setUserPassword($passwd);
- $this->setDatabaseHost( $host);
-
- }
-}
-
-function quote($string){
+ $this->enableSQLlog = ($dbconfig['log_sql'] == true);
+ //$this->println("resetSettings log=".$this->enableSQLlog);
+ //$this->println($dbconfig);
+ /*if($this->dbType != "mysql"){
+ require_once( 'DB.php' );
+ }*/
+ }
+ else
+ {
+ $this->disconnect();
+ $this->setDatabaseType($dbtype);
+ $this->setDatabaseName($dbname);
+ $this->setUserName($username);
+ $this->setUserPassword($passwd);
+ $this->setDatabaseHost( $host);
+ }
+ }
+
+ function quote($string){
return $this->database->qstr($string);
-}
+ }
/* ADODB converted
-function disconnect() {
- $this->println("disconnect");
- if(isset($this->database)){
- if($this->dbType == "mysql"){
- mysql_close($this->database);
- }else{
- $this->database->disconnect();
- }
- unset($this->database);
- }
-
-}
-*/
-
-function disconnect() {
- //$this->println("ADODB disconnect");
-
- // srini -- do something
-
-}
-
-function setDebug($value)
-{
+ * function disconnect() {
+ * $this->println("disconnect");
+ * if(isset($this->database)){
+ * if($this->dbType == "mysql"){
+ * mysql_close($this->database);
+ * } else {
+ * $this->database->disconnect();
+ * }
+ * unset($this->database);
+ * }
+ * }
+ */
+
+ function disconnect() {
+ $this->println("ADODB disconnect");
+ if(isset($this->database)){
+ if($this->dbType == "mysql"){
+ mysql_close($this->database);
+ } else {
+ $this->database->disconnect();
+ }
+ unset($this->database);
+ }
+ }
+
+ function setDebug($value)
+ {
$this->database->debug = $value;
-}
-
-
-// ADODB newly added methods
-
-
-function createTables($schemaFile, $dbHostName=false, $userName=false, $userPassword=false, $dbName=false, $dbType=false)
-{
+ }
+
+
+ // ADODB newly added methods
+ function createTables($schemaFile, $dbHostName=false, $userName=false, $userPassword=false, $dbName=false, $dbType=false)
+ {
$this->println("ADODB createTables ".$schemaFile);
if($dbHostName!=false) $this->dbHostName=$dbHostName;
if($userName!=false) $this->userName=$userPassword;
@@ -791,7 +800,6 @@
$this->checkConnection();
$db = $this->database;
//$db->debug = true;
-
//$this->println("ADODB createTables connect status=".$db->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName));
$schema = new adoSchema( $db );
@@ -811,10 +819,10 @@
// needs to return in a decent way
$this->println("ADODB createTables ".$schemaFile." status=".$result);
return $result;
-}
-
-function createTable($tablename, $flds)
-{
+ }
+
+ function createTable($tablename, $flds)
+ {
$this->println("ADODB createTable table=".$tablename." flds=".$flds);
$this->checkConnection();
//$dict = NewDataDictionary(ADONewConnection($this->dbType));
@@ -823,10 +831,10 @@
$result = $dict->ExecuteSQLArray($sqlarray);
$this->println("ADODB createTable table=".$tablename." flds=".$flds." status=".$result);
return $result;
-}
-
-function alterTable($tablename, $flds, $oper)
-{
+ }
+
+ function alterTable($tablename, $flds, $oper)
+ {
$this->println("ADODB alterTableTable table=".$tablename." flds=".$flds." oper=".$oper);
//$dict = NewDataDictionary(ADONewConnection($this->dbType));
$this->checkConnection();
@@ -835,11 +843,11 @@
if($oper == 'Add_Column')
{
- $sqlarray = $dict->AddColumnSQL($tablename, $flds);
+ $sqlarray = $dict->AddColumnSQL($tablename, $flds);
}
else if($oper == 'Delete_Column')
{
- $sqlarray = $dict->DropColumnSQL($tablename, $flds);
+ $sqlarray = $dict->DropColumnSQL($tablename, $flds);
}
$this->println("sqlarray");
@@ -850,10 +858,10 @@
$this->println("ADODB alterTableTable table=".$tablename." flds=".$flds." oper=".$oper." status=".$result);
return $result;
-}
-
-function getColumnNames($tablename)
-{
+ }
+
+ function getColumnNames($tablename)
+ {
$this->println("ADODB getColumnNames table=".$tablename);
$this->checkConnection();
$adoflds = $this->database->MetaColumns($tablename);
@@ -861,83 +869,79 @@
$i=0;
foreach($adoflds as $fld)
{
- $colNames[$i] = $fld->name;
- $i++;
+ $colNames[$i] = $fld->name;
+ $i++;
}
return $colNames;
-}
-
-function formatString($tablename,$fldname, $str)
-{
+ }
+
+ function formatString($tablename,$fldname, $str)
+ {
//$this->println("ADODB formatString table=".$tablename." fldname=".$fldname." str=".$str);
$this->checkConnection();
$adoflds = $this->database->MetaColumns($tablename);
foreach ( $adoflds as $fld )
{
- //$this->println("ADODB formatString adofld =".$fld->name);
- if(strcasecmp($fld->name,$fldname)==0)
+ //$this->println("ADODB formatString adofld =".$fld->name);
+ if(strcasecmp($fld->name,$fldname)==0)
+ {
+ //$this->println("ADODB formatString fldname=".$fldname." fldtype =".$fld->type);
+
+ $fldtype =strtoupper($fld->type);
+ if(strcmp($fldtype,'CHAR')==0 || strcmp($fldtype,'VARCHAR') == 0 || strcmp($fldtype,'VARCHAR2') == 0 || strcmp($fldtype,'LONGTEXT')==0 || strcmp($fldtype,'TEXT')==0)
{
- //$this->println("ADODB formatString fldname=".$fldname." fldtype =".$fld->type);
-
- $fldtype =strtoupper($fld->type);
- if(strcmp($fldtype,'CHAR')==0 || strcmp($fldtype,'VARCHAR') == 0 || strcmp($fldtype,'VARCHAR2') == 0 || strcmp($fldtype,'LONGTEXT')==0 || strcmp($fldtype,'TEXT')==0)
- {
- return $this->database->Quote($str);
- //$this->println("ADODB return else normal");
-
- }
- else if(strcmp($fldtype,'DATE') ==0 || strcmp($fldtype,'TIMESTAMP')==0)
- {
- return $this->formatDate($str);
- }
- else
- {
- return $str;
- }
+ //$this->println("ADODB return else normal");
+ return $this->database->Quote($str);
}
+ else if(strcmp($fldtype,'DATE') ==0 || strcmp($fldtype,'TIMESTAMP')==0)
+ {
+ return $this->formatDate($str);
+ }
+ else
+ {
+ return $str;
+ }
+ }
}
$this->println("format String Illegal field name ".$fldname);
return $str;
-}
-
-function formatDate($datetime)
-{
+ }
+
+ function formatDate($datetime)
+ {
$this->checkConnection();
//$db = ADONewConnection($this->dbType);
$db = &$this->database;
$date = $db->DBTimeStamp($datetime);
//if($db->dbType=='mysql') return $this->quote($date);
return $date;
-}
-
-function getDBDateString($datecolname)
-{
+ }
+
+ function getDBDateString($datecolname)
+ {
$this->checkConnection();
$db = &$this->database;
$datestr = $db->SQLDate("Y-m-d, H:i:s" ,$datecolname);
return $datestr;
-}
-
-function getUniqueID($seqname)
-{
+ }
+
+ function getUniqueID($seqname)
+ {
$this->checkConnection();
return $this->database->GenID($seqname."_seq",1);
-}
-function get_tables()
-{
- $this->checkConnection();
- $result = & $this->database->MetaTables('TABLES');
- $this->println($result);
- return $result;
-}
-
-
-}
+ }
+ function get_tables()
+ {
+ $this->checkConnection();
+ $result = & $this->database->MetaTables('TABLES');
+ $this->println($result);
+ return $result;
+ }
+} /* End of class */
$adb = new PearDatabase();
$adb->connect();
-
//$adb->database->setFetchMode(ADODB_FETCH_NUM);
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 14:44:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 18:44:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9149 -
/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060828184431.BFD25708216@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 12:44:24 2006
New Revision: 9149
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/include/utils/CommonUtils.php
Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Mon Aug 28 12:44:24 2006
@@ -960,14 +960,17 @@
if($disp_view == "detail_view")
{
if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users")
- {
- $sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in $blockid_list and vtiger_field.displaytype in (1,2,4) order by block,sequence";
- }
- else
- {
- $profileList = getCurrentUserProfileList();
- $sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
- }
+ {
+ $sql = "SELECT vtiger_field.* FROM vtiger_field WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN $blockid_list AND vtiger_field.displaytype IN (1,2,4) ORDER BY block,sequence";
+ }
+ else
+ {
+ $profileList = getCurrentUserProfileList();
+ $sql = "SELECT vtiger_field.* FROM vtiger_field INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid=vtiger_field.fieldid INNER JOIN vtiger_def_org_field ON vtiger_def_org_field.fieldid=vtiger_field.fieldid WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN ".$blockid_list." AND vtiger_field.displaytype IN (1,2,4) AND vtiger_profile2field.visible=0 AND vtiger_def_org_field.visible=0 AND vtiger_profile2field.profileid IN ".$profileList." GROUP BY vtiger_field.fieldid ORDER BY block,sequence";
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $sql = fixPostgresQuery( $sql, $log, 0);
+ }
$result = $adb->query($sql);
$getBlockInfo=getDetailBlockInformation($module,$result,$col_fields,$tabid,$block_label);
}
@@ -976,26 +979,32 @@
if ($info_type != '')
{
if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0 || $module == 'Users')
- {
- $sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list ." and ".$display_type_check." and info_type = '".$info_type."' order by block,sequence";
- }
- else
- {
- $profileList = getCurrentUserProfileList();
- $sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
- }
+ {
+ $sql = "SELECT vtiger_field.* FROM vtiger_field WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN ".$blockid_list ." AND ".$display_type_check." AND info_type = '".$info_type."' ORDER BY block,sequence";
+ }
+ else
+ {
+ $profileList = getCurrentUserProfileList();
+ $sql = "SELECT vtiger_field.* FROM vtiger_field INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid=vtiger_field.fieldid INNER JOIN vtiger_def_org_field ON vtiger_def_org_field.fieldid=vtiger_field.fieldid WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN ".$blockid_list." AND ".$display_type_check." AND info_type = '".$info_type."' AND vtiger_profile2field.visible=0 AND vtiger_def_org_field.visible=0 AND vtiger_profile2field.profileid IN ".$profileList.=" GROUP BY vtiger_field.fieldid ORDER BY block,sequence";
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $sql = fixPostgresQuery( $sql, $log, 0);
+ }
}
else
{
- if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == 'Users')
- {
- $sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." order by block,sequence";
- }
- else
- {
- $profileList = getCurrentUserProfileList();
- $sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
- }
+ if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == 'Users')
+ {
+ $sql = "SELECT vtiger_field.* FROM vtiger_field WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN ".$blockid_list." AND ".$display_type_check." ORDER BY block,sequence";
+ }
+ else
+ {
+ $profileList = getCurrentUserProfileList();
+ $sql = "SELECT vtiger_field.* FROM vtiger_field INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid=vtiger_field.fieldid INNER JOIN vtiger_def_org_field ON vtiger_def_org_field.fieldid=vtiger_field.fieldid WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN ".$blockid_list." AND ".$display_type_check." AND vtiger_profile2field.visible=0 AND vtiger_def_org_field.visible=0 AND vtiger_profile2field.profileid IN ".$profileList.=" GROUP BY vtiger_field.fieldid ORDER BY block,sequence";
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $sql = fixPostgresQuery( $sql, $log, 0);
+ }
}
$result = $adb->query($sql);
$getBlockInfo=getBlockInformation($module,$result,$col_fields,$tabid,$block_label,$mode);
@@ -1790,8 +1799,11 @@
}
else
{
- $profileList = getCurrentUserProfileList();
- $quickcreate_query = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and quickcreate=0 and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by quickcreatesequence";
+ $profileList = getCurrentUserProfileList();
+ $quickcreate_query = "SELECT vtiger_field.* FROM vtiger_field INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid=vtiger_field.fieldid INNER JOIN vtiger_def_org_field ON vtiger_def_org_field.fieldid=vtiger_field.fieldid WHERE vtiger_field.tabid=".$tabid." AND quickcreate=0 AND vtiger_profile2field.visible=0 AND vtiger_def_org_field.visible=0 AND vtiger_profile2field.profileid IN ".$profileList." ORDER BY quickcreatesequence";
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $quickcreate_query = fixPostgresQuery( $quickcreate_query, $log, 0);
}
$category = getParentTab();
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 14:52:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 18:52:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9150 -
/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060828185205.9E31D708226@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 12:51:58 2006
New Revision: 9150
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/include/utils/EditViewUtils.php
Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Aug 28 12:51:58 2006
@@ -562,32 +562,38 @@
$editview_label[]=$mod_strings[$fieldlabel];
}
elseif($uitype == 69)
- {
- $editview_label[]=$mod_strings[$fieldlabel];
- //This query is for Products only
- if($module_name == 'Products')
- {
- $query = 'select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
- }
- else
- {
- $query = "select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where contactid=".$col_fields['record_id'];
- }
- $result_image = $adb->query($query);
- for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)
- {
- $image_id_array[] = $adb->query_result($result_image,$image_iter,'attachmentsid');
- $image_array[] = $adb->query_result($result_image,$image_iter,'name');
- $image_path_array[] = $adb->query_result($result_image,$image_iter,'path');
- }
- if(is_array($image_array))
- for($img_itr=0;$img_itr$image_array[$img_itr],'path'=>$image_path_array[$img_itr].$image_id_array[$img_itr]."_");
- }
- else
- $fieldvalue[] = '';
- }
+ {
+ $editview_label[]=$mod_strings[$fieldlabel];
+
+ if( $col_fields['record_id'] != "")
+ {
+ //This query is for Products only
+ if($module_name == 'Products')
+ {
+ $query = 'select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
+ }
+ else
+ {
+ $query = "select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where contactid=".$col_fields['record_id'];
+ }
+ $result_image = $adb->query($query);
+ for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)
+ {
+ $image_id_array[] = $adb->query_result($result_image,$image_iter,'attachmentsid');
+ $image_array[] = $adb->query_result($result_image,$image_iter,'name');
+ $image_path_array[] = $adb->query_result($result_image,$image_iter,'path');
+ }
+ if(is_array($image_array))
+ for($img_itr=0;$img_itr$image_array[$img_itr],'path'=>$image_path_array[$img_itr].$image_id_array[$img_itr]."_");
+ }
+ else
+ $fieldvalue[] = '';
+ }
+ else
+ $fieldvalue[] = '';
+ }
elseif($uitype == 62)
{
if(isset($_REQUEST['parent_id']) && $_REQUEST['parent_id'] != '')
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 14:53:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 18:53:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9151 -
/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060828185306.1F72C70822F@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 12:52:59 2006
New Revision: 9151
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/include/utils/SearchUtils.php
Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Mon Aug 28 12:52:59 2006
@@ -12,6 +12,7 @@
require_once('include/database/PearDatabase.php');
+require_once('include/database/Postgres8.php');
require_once('include/ComboUtil.php'); //new
require_once('include/utils/CommonUtils.php'); //new
@@ -82,7 +83,9 @@
{
$profileList = getCurrentUserProfileList();
//changed to get vtiger_field.fieldname
- $query = "select vtiger_profile2field.*,vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." and vtiger_field.fieldname in ".$field_list." group by vtiger_field.fieldid";
+ $query = "SELECT vtiger_profile2field.*,vtiger_field.fieldname FROM vtiger_field INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid=vtiger_field.fieldid INNER JOIN vtiger_def_org_field ON vtiger_def_org_field.fieldid=vtiger_field.fieldid WHERE vtiger_field.tabid=".$tabid." AND vtiger_profile2field.visible=0 AND vtiger_def_org_field.visible=0 AND vtiger_profile2field.profileid IN ".$profileList." AND vtiger_field.fieldname IN ".$field_list." GROUP BY vtiger_field.fieldid";
+ if( $adb->dbType == "pgsql")
+ $query = fixPostgresQuery( $query, $log, 0);
$result = $adb->query($query);
$field=Array();
for($k=0;$k < $adb->num_rows($result);$k++)
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 14:54:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 18:54:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9152 -
/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060828185426.E4F2F70823A@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 12:54:19 2006
New Revision: 9152
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/include/utils/UserInfoUtil.php
Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Mon Aug 28 12:54:19 2006
@@ -12,6 +12,7 @@
require_once('include/database/PearDatabase.php');
+require_once('include/database/Postgres8.php');
require_once('include/utils/utils.php');
require_once('include/utils/GetUserGroups.php');
include('config.php');
@@ -4580,7 +4581,14 @@
//get tabid
$tabid = getTabid($fld_module);
- $query="select vtiger_profile2field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in".$profilelist." and vtiger_field.fieldname='".$fieldname."' group by vtiger_field.fieldid";
+
+ $query="SELECT vtiger_profile2field.* FROM vtiger_field INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid=vtiger_field.fieldid INNER JOIN vtiger_def_org_field ON vtiger_def_org_field.fieldid=vtiger_field.fieldid WHERE vtiger_field.tabid=".$tabid." AND vtiger_profile2field.visible=0 AND vtiger_def_org_field.visible=0 AND vtiger_profile2field.profileid in".$profilelist." AND vtiger_field.fieldname='".$fieldname."' GROUP BY vtiger_field.fieldid";
+
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $query = fixPostgresQuery( $query, $log, 0);
+
+
$result = $adb->query($query);
$log->debug("Exiting getFieldVisibilityPermission method ...");
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 14:55:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 18:55:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9153 -
/vtigercrm/trunk/include/RelatedListView.php
Message-ID: <20060828185547.9AD8D70823B@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 12:55:40 2006
New Revision: 9153
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/include/RelatedListView.php
Modified: vtigercrm/trunk/include/RelatedListView.php
==============================================================================
--- vtigercrm/trunk/include/RelatedListView.php (original)
+++ vtigercrm/trunk/include/RelatedListView.php Mon Aug 28 12:55:40 2006
@@ -148,7 +148,7 @@
}
//Retreiving the no of rows
- $count_query = "select count(*) count ".substr($query, stripos($query,'from'),strlen($query));
+ $count_query = "select count(*) as count ".substr($query, stripos($query,'from'),strlen($query));
$count_result = $adb->query(substr($count_query, stripos($count_query,'select'),stripos($count_query,'ORDER BY')));
$noofrows = $adb->query_result($count_result,0,"count");
@@ -174,7 +174,10 @@
else
$limit_start_rec = $start_rec -1;
- $list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+ if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+ else
+ $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
//Retreive the List View Table Header
if($noofrows == 0)
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:04:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:04:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9154 -
/vtigercrm/trunk/install/5createTables.inc.php
Message-ID: <20060828190454.DD4FD70823E@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:04:47 2006
New Revision: 9154
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/install/5createTables.inc.php
Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Mon Aug 28 13:04:47 2006
@@ -160,6 +160,78 @@
//$adb->setDebug(true);
$success = $adb->createTables("schema/DatabaseSchema.xml");
+//Postgres8 fix - create sequences.
+// This should be a part of "createTables" however ...
+ if( $adb->dbType == "pgsql" ) {
+ $sequences = array(
+ "vtiger_leadsource_seq",
+ "vtiger_accounttype_seq",
+ "vtiger_industry_seq",
+ "vtiger_leadstatus_seq",
+ "vtiger_rating_seq",
+ "vtiger_licencekeystatus_seq",
+ "vtiger_opportunity_type_seq",
+ "vtiger_salutationtype_seq",
+ "vtiger_sales_stage_seq",
+ "vtiger_ticketstatus_seq",
+ "vtiger_ticketpriorities_seq",
+ "vtiger_ticketseverities_seq",
+ "vtiger_ticketcategories_seq",
+ "vtiger_duration_minutes_seq",
+ "vtiger_eventstatus_seq",
+ "vtiger_taskstatus_seq",
+ "vtiger_taskpriority_seq",
+ "vtiger_manufacturer_seq",
+ "vtiger_productcategory_seq",
+ "vtiger_activitytype_seq",
+ "vtiger_currency_seq",
+ "vtiger_faqcategories_seq",
+ "vtiger_usageunit_seq",
+ "vtiger_glacct_seq",
+ "vtiger_quotestage_seq",
+ "vtiger_carrier_seq",
+ "vtiger_taxclass_seq",
+ "vtiger_recurringtype_seq",
+ "vtiger_faqstatus_seq",
+ "vtiger_invoicestatus_seq",
+ "vtiger_postatus_seq",
+ "vtiger_sostatus_seq",
+ "vtiger_visibility_seq",
+ "vtiger_campaigntype_seq",
+ "vtiger_campaignstatus_seq",
+ "vtiger_expectedresponse_seq",
+ "vtiger_status_seq",
+ "vtiger_activity_view_seq",
+ "vtiger_lead_view_seq",
+ "vtiger_date_format_seq",
+ "vtiger_users_seq",
+ "vtiger_role_seq",
+ "vtiger_profile_seq",
+ "vtiger_field_seq",
+ "vtiger_def_org_share_seq",
+ "vtiger_datashare_relatedmodules_seq",
+ "vtiger_relatedlists_seq",
+ "vtiger_notificationscheduler_seq",
+ "vtiger_inventorynotification_seq",
+ "vtiger_currency_info_seq",
+ "vtiger_emailtemplates_seq",
+ "vtiger_inventory_tandc_seq",
+ "vtiger_selectquery_seq",
+ "vtiger_customview_seq",
+ "vtiger_crmentity_seq",
+ "vtiger_seactivityrel_seq",
+ "vtiger_freetags_seq",
+ "vtiger_shippingtaxinfo_seq",
+ "vtiger_inventorytaxinfo_seq"
+ );
+
+ foreach ($sequences as $sequence ) {
+ $log->info( "Creating sequence ".$sequence);
+ $adb->query( "CREATE SEQUENCE ".$sequence." INCREMENT BY 1 NO MAXVALUE NO MINVALUE CACHE 1;");
+ }
+ }
+
+
// TODO HTML
if($success==0)
die("Error: Tables not created. Table creation failed.\n");
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:07:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:07:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9155 -
/vtigercrm/trunk/install/4createConfigFile.php
Message-ID: <20060828190713.3C182708242@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:07:06 2006
New Revision: 9155
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/install/4createConfigFile.php
Modified: vtigercrm/trunk/install/4createConfigFile.php
==============================================================================
--- vtigercrm/trunk/install/4createConfigFile.php (original)
+++ vtigercrm/trunk/install/4createConfigFile.php Mon Aug 28 13:07:06 2006
@@ -47,7 +47,7 @@
$vtiger_version = "5.0 Beta";
$release_date = "31 March 2006";
-
+if (isset($_REQUEST['db_type'])) $db_type = $_REQUEST['db_type'];
if (isset($_REQUEST['db_hostname']))
{
@@ -58,7 +58,11 @@
else
{
$db_hostname = $_REQUEST['db_hostname'];
- $db_port = '3306';
+ if($db_type == "pgsql")
+ $db_port = '5432';
+ else
+ $db_port = '3306';
+
}
}
if (isset($_REQUEST['db_username']))$db_username = $_REQUEST['db_username'];
@@ -67,7 +71,7 @@
if (isset($_REQUEST['db_name']))$db_name = $_REQUEST['db_name'];
-if (isset($_REQUEST['db_type'])) $db_type = $_REQUEST['db_type'];
+//if (isset($_REQUEST['db_type'])) $db_type = $_REQUEST['db_type'];
if (isset($_REQUEST['db_drop_tables'])) $db_drop_tables = $_REQUEST['db_drop_tables'];
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:09:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:09:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9157 -
/vtigercrm/trunk/modules/Vendors/ListView.php
Message-ID: <20060828190927.371D7708252@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:09:20 2006
New Revision: 9157
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Vendors/ListView.php
Modified: vtigercrm/trunk/modules/Vendors/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/ListView.php (original)
+++ vtigercrm/trunk/modules/Vendors/ListView.php Mon Aug 28 13:09:20 2006
@@ -9,11 +9,13 @@
*
********************************************************************************/
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('include/ListView/ListView.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/DatabaseUtil.php');
global $app_strings,$mod_strings,$list_max_entries_per_page,$currentModule,$theme;
@@ -117,11 +119,14 @@
$tablename = getTableNameForField('Vendors',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY '.$tablename.$order_by;
+
$list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$count_result = $adb->query( mkCountQuery( $list_query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -134,6 +139,10 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+//Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $list_query = fixPostgresQuery( $list_query, $log, 0);
+
// Setting the record count string
//modified by rdhital
$start_rec = $navigation_array['start'];
@@ -146,7 +155,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($list_query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+else
+ $list_result = $adb->query($list_query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:10:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:10:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9158 -
/vtigercrm/trunk/modules/Potentials/ListView.php
Message-ID: <20060828191048.7990570824F@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:10:41 2006
New Revision: 9158
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Potentials/ListView.php
Modified: vtigercrm/trunk/modules/Potentials/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/ListView.php (original)
+++ vtigercrm/trunk/modules/Potentials/ListView.php Mon Aug 28 13:10:41 2006
@@ -22,6 +22,9 @@
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
+
global $app_strings,$list_max_entries_per_page;
@@ -144,12 +147,17 @@
{
if($order_by == 'smownerid')
{
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY user_name';
$list_query .= ' ORDER BY user_name '.$sorder;
}
else
{
$tablename = getTableNameForField('Potentials',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
+
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY '.$tablename.$order_by;
$list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
@@ -170,7 +178,7 @@
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$count_result = $adb->query( mkCountQuery( $list_query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -183,6 +191,9 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+//Postgres 8 fixes
+if( $adb->dbType == "pgsql")
+ $list_query = fixPostgresQuery( $list_query, $log, 0);
// Setting the record count string
@@ -197,7 +208,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($list_query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+ else
+ $list_result = $adb->query($list_query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:11:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:11:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9159 -
/vtigercrm/trunk/modules/Notes/ListView.php
Message-ID: <20060828191134.1353370824F@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:11:27 2006
New Revision: 9159
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Notes/ListView.php
Modified: vtigercrm/trunk/modules/Notes/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/ListView.php (original)
+++ vtigercrm/trunk/modules/Notes/ListView.php Mon Aug 28 13:11:27 2006
@@ -29,6 +29,8 @@
require_once('include/utils/utils.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
global $app_strings,$mod_strings,$list_max_entries_per_page;
@@ -146,12 +148,15 @@
$tablename = getTableNameForField('Notes',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
+ if( $adb->dbType == "pgsql")
+ $query .= ' GROUP BY '.$tablename.$order_by;
+
$query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$count_result = $adb->query( mkCountQuery( $query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -164,6 +169,11 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+//Postgres 8 fixes
+if( $adb->dbType == "pgsql")
+ $query = fixPostgresQuery( $query, $log, 0);
+
+
// Setting the record count string
//modified by rdhital
@@ -177,7 +187,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+ if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+ else
+ $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:12:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:12:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9160 -
/vtigercrm/trunk/modules/Leads/ListView.php
Message-ID: <20060828191216.7B49770824F@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:12:09 2006
New Revision: 9160
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Leads/ListView.php
Modified: vtigercrm/trunk/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ListView.php (original)
+++ vtigercrm/trunk/modules/Leads/ListView.php Mon Aug 28 13:12:09 2006
@@ -27,6 +27,9 @@
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
+
global $app_strings;
global $list_max_entries_per_page;
@@ -167,12 +170,15 @@
{
$tablename = getTableNameForField('Leads',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
-
+ if( $adb->dbType == "pgsql")
+ $query .= ' GROUP BY '.$tablename.$order_by;
+
+
$query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$count_result = $adb->query( mkCountQuery( $query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -185,6 +191,11 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+
+//Postgres 8 fixes
+if( $adb->dbType == "pgsql")
+ $query = fixPostgresQuery( $query, $log, 0);
+
//limiting the query
if ($start_rec ==0)
@@ -192,7 +203,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+ if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+ else
+ $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
//mass merge for word templates -- *Raj*17/11
@@ -231,7 +245,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+ if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+ else
+ $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:13:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:13:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9161 -
/vtigercrm/trunk/modules/Invoice/ListView.php
Message-ID: <20060828191317.347C5708252@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:13:10 2006
New Revision: 9161
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Invoice/ListView.php
Modified: vtigercrm/trunk/modules/Invoice/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/ListView.php (original)
+++ vtigercrm/trunk/modules/Invoice/ListView.php Mon Aug 28 13:13:10 2006
@@ -23,7 +23,8 @@
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
-
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
global $app_strings,$list_max_entries_per_page,$currentModule,$theme;
@@ -129,12 +130,16 @@
{
if($order_by == 'smownerid')
{
+ if( $adb->dbType == "pgsql")
+ $query .= ' GROUP BY user_name';
$query .= ' ORDER BY user_name '.$sorder;
}
else
{
$tablename = getTableNameForField('Invoice',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
+ if( $adb->dbType == "pgsql")
+ $query .= ' GROUP BY '.$tablename.$order_by;
$query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
@@ -142,7 +147,7 @@
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$count_result = $adb->query( mkCountQuery( $query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -156,6 +161,10 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $query = fixPostgresQuery( $query, $log, 0);
+
// Setting the record count string
//modified by rdhital
@@ -169,7 +178,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+else
+ $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:13:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:13:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9162 -
/vtigercrm/trunk/modules/Campaigns/ListView.php
Message-ID: <20060828191350.A694C708264@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:13:43 2006
New Revision: 9162
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Campaigns/ListView.php
Modified: vtigercrm/trunk/modules/Campaigns/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/ListView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/ListView.php Mon Aug 28 13:13:43 2006
@@ -18,6 +18,8 @@
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
global $app_strings,$mod_strings,$current_language;
$current_module_strings = return_module_language($current_language, 'Campaigns');
@@ -129,25 +131,31 @@
{
if($order_by == 'smownerid')
{
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY vtiger_users.user_name';
$list_query .= ' ORDER BY vtiger_users.user_name '.$sorder;
}
else
{
$tablename = getTableNameForField('Campaigns',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
-
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY '.$tablename.$order_by;
+
$list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
}
else
{
- $list_query .= ' order by vtiger_campaign.campaignid DESC';
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY vtiger_campaign.campaignid';
+ $list_query .= ' ORDER BY vtiger_campaign.campaignid DESC';
}
//Constructing the list view
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$count_result = $adb->query( mkCountQuery( $list_query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -167,11 +175,22 @@
$end_rec = $navigation_array['end_val'];
//By Raju Ends
+
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $list_query = fixPostgresQuery( $list_query, $log, 0);
+
+
//limiting the query
if ($start_rec ==0)
$limit_start_rec = 0;
else
$limit_start_rec = $start_rec -1;
+
+ if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($list_query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+ else
+ $list_result = $adb->query($list_query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:14:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:14:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9163 -
/vtigercrm/trunk/modules/SalesOrder/ListView.php
Message-ID: <20060828191439.6C8A9708264@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:14:32 2006
New Revision: 9163
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/SalesOrder/ListView.php
Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/ListView.php Mon Aug 28 13:14:32 2006
@@ -14,7 +14,8 @@
require_once('include/ListView/ListView.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
-
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
global $app_strings,$mod_strings,$list_max_entries_per_page,$currentModule,$theme;
$theme_path="themes/".$theme."/";
@@ -114,20 +115,23 @@
{
if($order_by == 'smownerid')
{
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY user_name';
$list_query .= ' ORDER BY user_name '.$sorder;
}
else
{
$tablename = getTableNameForField('SalesOrder',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
-
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY '.$tablename.$order_by;
$list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
}
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$count_result = $adb->query( mkCountQuery( $list_query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -140,6 +144,11 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $list_query = fixPostgresQuery( $list_query, $log, 0);
+
+
// Setting the record count string
//modified by rdhital
@@ -152,8 +161,13 @@
$limit_start_rec = 0;
else
$limit_start_rec = $start_rec -1;
-
-$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+
+if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($list_query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+else
+ $list_result = $adb->query($list_query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
+
+
$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:16:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:16:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9164 -
/vtigercrm/trunk/modules/PurchaseOrder/ListView.php
Message-ID: <20060828191610.65AA8708264@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:16:03 2006
New Revision: 9164
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/PurchaseOrder/ListView.php
Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Mon Aug 28 13:16:03 2006
@@ -23,6 +23,9 @@
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
+
global $app_strings,$list_max_entries_per_page,$currentModule,$theme;
@@ -127,19 +130,23 @@
{
if($order_by == 'smownerid')
{
+ if( $adb->dbType == "pgsql")
+ $query .= ' GROUP BY user_name';
$query .= ' ORDER BY user_name '.$sorder;
}
else
{
$tablename = getTableNameForField('PurchaseOrder',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
+ if( $adb->dbType == "pgsql")
+ $query .= ' GROUP BY '.$tablename.$order_by;
$query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
}
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$count_result = $adb->query( mkCountQuery( $query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -152,6 +159,11 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $query = fixPostgresQuery( $query, $log, 0);
+
+
// Setting the record count string
//modified by rdhital
@@ -165,7 +177,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+else
+ $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:34:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:34:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9165 -
/vtigercrm/trunk/modules/HelpDesk/ListView.php
Message-ID: <20060828193409.0E38E708264@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:34:02 2006
New Revision: 9165
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/HelpDesk/ListView.php
Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListView.php Mon Aug 28 13:34:02 2006
@@ -23,6 +23,9 @@
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
+
global $app_strings;
global $mod_strings;
@@ -127,25 +130,31 @@
{
if($order_by == 'smownerid')
{
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY vtiger_users.user_name';
$list_query .= ' ORDER BY vtiger_users.user_name '.$sorder;
}
else
{
$tablename = getTableNameForField('HelpDesk',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
-
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY '.$tablename.$order_by;
+
$list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
}
else
{
- $list_query .= ' order by vtiger_troubletickets.ticketid DESC';
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY vtiger_troubletickets.ticketid';
+ $list_query .= ' ORDER BY vtiger_troubletickets.ticketid DESC';
}
//Constructing the list view
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$count_result = $adb->query( mkCountQuery( $list_query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -158,6 +167,11 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $list_query = fixPostgresQuery( $list_query, $log, 0);
+
+
// Setting the record count string
//modified by rdhital
@@ -171,7 +185,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($list_query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+else
+ $list_result = $adb->query($list_query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
//mass merge for word templates -- *Raj*17/11
while($row = $adb->fetch_array($list_result))
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:35:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:35:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9166 -
/vtigercrm/trunk/modules/PriceBooks/ListView.php
Message-ID: <20060828193508.8B777708264@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:35:01 2006
New Revision: 9166
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/PriceBooks/ListView.php
Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/ListView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/ListView.php Mon Aug 28 13:35:01 2006
@@ -14,6 +14,8 @@
require_once('include/ListView/ListView.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
global $app_strings,$mod_strings,$list_max_entries_per_page,$currentModule,$theme;
@@ -106,13 +108,14 @@
{
$tablename = getTableNameForField('PriceBooks',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
-
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY '.$tablename.$order_by;
$list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$count_result = $adb->query( mkCountQuery( $list_query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -125,6 +128,11 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $list_query = fixPostgresQuery( $list_query, $log, 0);
+
+
// Setting the record count string
//modified by rdhital
@@ -138,7 +146,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($list_query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+else
+ $list_result = $adb->query($list_query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:08:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:08:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9156 -
/vtigercrm/trunk/modules/Accounts/ListView.php
Message-ID: <20060828190837.11A3970824C@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:08:30 2006
New Revision: 9156
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Accounts/ListView.php
Modified: vtigercrm/trunk/modules/Accounts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/ListView.php (original)
+++ vtigercrm/trunk/modules/Accounts/ListView.php Mon Aug 28 13:08:30 2006
@@ -23,6 +23,8 @@
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
global $app_strings;
global $list_max_entries_per_page;
@@ -160,20 +162,24 @@
{
if($order_by == 'smownerid')
{
+ if( $adb->dbType == "pgsql")
+ $query .= ' GROUP BY user_name';
$query .= ' ORDER BY user_name '.$sorder;
}
else
{
$tablename = getTableNameForField('Accounts',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
-
+ if( $adb->dbType == "pgsql")
+ $query .= ' GROUP BY '.$tablename.$order_by;
+
$query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
}
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$count_result = $adb->query( mkCountQuery( $query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
@@ -187,7 +193,9 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
-
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $query = fixPostgresQuery( $query, $log, 0);
// Setting the record count string
//modified by rdhital
@@ -201,7 +209,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+ if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+ else
+ $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
//mass merge for word templates -- *Raj*17/11
while($row = $adb->fetch_array($list_result))
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:36:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:36:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9167 -
/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060828193646.3DF5A708252@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:36:39 2006
New Revision: 9167
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Users/User.php
Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Mon Aug 28 13:36:39 2006
@@ -656,7 +656,7 @@
*/
function saveentity($module)
{
- global $current_user, $adb;//$adb added by raju for mass mailing
+ global $current_user;//$adb added by raju for mass mailing
$insertion_mode = $this->mode;
$this->db->println("TRANS saveentity starts $module");
@@ -692,9 +692,9 @@
if($insertion_mode == 'edit')
{
$check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
- $check_result=$adb->query($check_query);
-
- $num_rows = $adb->num_rows($check_result);
+ $check_result=$this->db->query($check_query);
+
+ $num_rows = $this->db->num_rows($check_result);
if($num_rows <= 0)
{
@@ -713,7 +713,7 @@
$column = $this->tab_name_index[$table_name];
if($column == 'id' && $table_name == 'vtiger_users')
{
- $currentuser_id = $adb->getUniqueID("vtiger_users");
+ $currentuser_id = $this->db->getUniqueID("vtiger_users");
$this->id = $currentuser_id;
}
$value = $this->id;
@@ -721,13 +721,13 @@
$sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3,4)";
}
- $result = $adb->query($sql);
- $noofrows = $adb->num_rows($result);
+ $result = $this->db->query($sql);
+ $noofrows = $this->db->num_rows($result);
for($i=0; $i<$noofrows; $i++)
{
- $fieldname=$adb->query_result($result,$i,"fieldname");
- $columname=$adb->query_result($result,$i,"columnname");
- $uitype=$adb->query_result($result,$i,"uitype");
+ $fieldname=$this->db->query_result($result,$i,"fieldname");
+ $columname=$this->db->query_result($result,$i,"columnname");
+ $uitype=$this->db->query_result($result,$i,"uitype");
if(isset($this->column_fields[$fieldname]))
{
if($uitype == 56)
@@ -769,7 +769,7 @@
$fldvalue = $this->column_fields[$fieldname];
$fldvalue = stripslashes($fldvalue);
}
- $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
+ $fldvalue = from_html($this->db->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
@@ -809,14 +809,14 @@
{
$sql1 = "update ".$table_name." set ".$update." where ".$this->tab_name_index[$table_name]."=".$this->id;
- $adb->query($sql1);
+ $this->db->query($sql1);
}
}
else
{
$sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
- $adb->query($sql1);
+ $this->db->query($sql1);
}
}
@@ -829,7 +829,7 @@
*/
function insertIntoAttachment($id,$module)
{
- global $log, $adb;
+ global $log;
$log->debug("Entering into insertIntoAttachment($id,$module) method.");
foreach($_FILES as $fileindex => $files)
@@ -898,7 +898,7 @@
global $log;
$log->debug("Entering into uploadAndSaveFile($id,$module,$file_details) method.");
- global $adb, $current_user;
+ global $current_user;
global $upload_badext;
$date_var = date('YmdHis');
@@ -926,7 +926,7 @@
$filesize = $file_details['size'];
$filetmp_name = $file_details['tmp_name'];
- $current_id = $adb->getUniqueID("vtiger_crmentity");
+ $current_id = $this->db->getUniqueID("vtiger_crmentity");
//get the file path inwhich folder we want to upload the file
$upload_file_path = decideFilePath();
@@ -942,23 +942,23 @@
if($save_file == 'true')
{
- $sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
- $adb->query($sql1);
+ $sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$this->db->formatString("vtiger_crmentity","createdtime",$date_var).",".$this->db->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
+- $this->db->query($sql1);
$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
- $result=$adb->query($sql2);
+ $result=$this->db->query($sql2);
if($id != '')
{
$delquery = 'delete from vtiger_salesmanattachmentsrel where smid = '.$id;
- $adb->query($delquery);
+ $this->db->query($delquery);
}
$sql3='insert into vtiger_salesmanattachmentsrel values('.$id.','.$current_id.')';
- $adb->query($sql3);
+ $this->db->query($sql3);
//we should update the imagename in the users table
- $adb->query("update vtiger_users set imagename=\"$filename\" where id=$id");
+ $this->db->query("update vtiger_users set imagename=\"$filename\" where id=$id");
}
else
{
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:37:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:37:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9168 -
/vtigercrm/trunk/modules/Users/Authenticate.php
Message-ID: <20060828193722.DAAB5708272@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:37:15 2006
New Revision: 9168
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Users/Authenticate.php
Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Mon Aug 28 13:37:15 2006
@@ -46,9 +46,18 @@
$auditrecord = '';
else
$auditrecord = $record;
-
- $date_var = date('YmdHis');
- $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate','',$date_var)";
+
+ if( $adb->dbType = "pgsql")
+ {
+ $date_var = date('Y-m-d H:i:s');
+ $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate','','$date_var')";
+ }
+ else
+ {
+
+ $date_var = date('YmdHis');
+ $query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate','',$date_var)";
+ }
$adb->query($query);
}
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:38:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:38:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9169 -
/vtigercrm/trunk/modules/Faq/ListView.php
Message-ID: <20060828193807.4FEBB708272@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:38:00 2006
New Revision: 9169
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Faq/ListView.php
Modified: vtigercrm/trunk/modules/Faq/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/ListView.php (original)
+++ vtigercrm/trunk/modules/Faq/ListView.php Mon Aug 28 13:38:00 2006
@@ -23,6 +23,8 @@
require_once('themes/'.$theme.'/layout_utils.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
global $app_strings;
$current_module_strings = return_module_language($current_language, 'Faq');
@@ -135,7 +137,9 @@
{
$tablename = getTableNameForField('Faq',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
-
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY '.$tablename.$order_by;
+
$list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
//Constructing the list view
@@ -149,7 +153,7 @@
$smarty->assign("SINGLE_MOD",'Note');
//Retreiving the no of rows
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$count_result = $adb->query( mkCountQuery( $list_query));
$noofrows = $adb->query_result($count_result,0,"count");
if($viewnamedesc['viewname'] == 'All')
@@ -167,6 +171,11 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+ //Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $list_query = fixPostgresQuery( $list_query, $log, 0);
+
+
// Setting the record count string
//modified by rdhital
@@ -180,7 +189,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($list_query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+else
+ $list_result = $adb->query($list_query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:38:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:38:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9170 -
/vtigercrm/trunk/modules/Contacts/ListView.php
Message-ID: <20060828193847.8B5CA708278@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:38:40 2006
New Revision: 9170
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Contacts/ListView.php
Modified: vtigercrm/trunk/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/ListView.php (original)
+++ vtigercrm/trunk/modules/Contacts/ListView.php Mon Aug 28 13:38:40 2006
@@ -29,6 +29,8 @@
require_once('include/ComboUtil.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
+require_once('include/database/Postgres8.php');
+require_once('include/DatabaseUtil.php');
global $app_strings;
global $list_max_entries_per_page;
@@ -158,13 +160,17 @@
{
if($order_by == 'smownerid')
{
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY user_name';
$list_query .= ' ORDER BY user_name '.$sorder;
}
else
{
$tablename = getTableNameForField('Contacts',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
-
+ if( $adb->dbType == "pgsql")
+ $list_query .= ' GROUP BY '.$tablename.$order_by;
+
$list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
}
}
@@ -181,7 +187,7 @@
$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html);
$smarty->assign("VIEWID", $viewid);
//Retreiving the no of rows
-$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$count_result = $adb->query( mkCountQuery( $list_query));
$noofrows = $adb->query_result($count_result,0,"count");
//Storing Listview session object
if($_SESSION['lvs'][$currentModule])
@@ -193,6 +199,11 @@
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+//Postgres 8 fixes
+ if( $adb->dbType == "pgsql")
+ $list_query = fixPostgresQuery( $list_query, $log, 0);
+
+
// Setting the record count string
//modified by rdhital
@@ -206,7 +217,10 @@
else
$limit_start_rec = $start_rec -1;
-$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+if( $adb->dbType == "pgsql")
+ $list_result = $adb->query($list_query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page);
+else
+ $list_result = $adb->query($list_query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page);
//mass merge for word templates -- *Raj*17/11
while($row = $adb->fetch_array($list_result))
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 15:42:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 19:42:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9171 -
/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060828194229.812E7708280@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 13:42:22 2006
New Revision: 9171
Log:
Support for PostGres DB done
Modified:
vtigercrm/trunk/modules/Calendar/calendarLayout.php
Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Mon Aug 28 13:42:22 2006
@@ -1242,6 +1242,7 @@
*/
function getEventList(& $calendar,$start_date,$end_date,$info='')
{
+ global $log;
$Entries = Array();
$category = getParentTab();
global $adb,$current_user,$mod_strings,$cal_log;
@@ -1269,7 +1270,7 @@
{
$pending_query = $query." AND (vtiger_activity.eventstatus = 'Planned')
AND vtiger_crmentity.smownerid = ".$current_user->id."
- group by vtiger_activity.activityid
+ GROUP BY vtiger_activity.activityid
ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
$res = $adb->query($pending_query);
$pending_rows = $adb->num_rows($res);
@@ -1277,7 +1278,9 @@
if(!is_admin($current_user))
$query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.") ";
- $query .= "group by vtiger_activity.activityid ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
+ $query .= "GROUP BY vtiger_activity.activityid ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
+ if( $adb->dbType == "pgsql")
+ $query = fixPostgresQuery( $query, $log, 0);
$result = $adb->query($query);
$rows = $adb->num_rows($result);
if($info != '')
@@ -1354,6 +1357,7 @@
*/
function getTodoList(& $calendar,$start_date,$end_date,$info='')
{
+ global $log;
$Entries = Array();
$category = getParentTab();
global $adb,$current_user,$mod_strings,$cal_log;
@@ -1381,6 +1385,8 @@
$pending_query = $query." AND (vtiger_activity.status != 'Completed')
AND vtiger_crmentity.smownerid = ".$current_user->id."
ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
+ if( $adb->dbType == "pgsql")
+ $pending_query = fixPostgresQuery( $pending_query, $log, 0);
$res = $adb->query($pending_query);
$pending_rows = $adb->num_rows($res);
}
@@ -1388,6 +1394,8 @@
if(!is_admin($current_user))
$query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.")";
$query .= " ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
+ if( $adb->dbType == "pgsql")
+ $query = fixPostgresQuery( $query, $log, 0);
$result = $adb->query($query);
$rows = $adb->num_rows($result);
From vtigercrm-commits at vtiger.fosslabs.com Mon Aug 28 16:24:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 28 Aug 2006 20:24:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9172 -
/vtigercrm/trunk/modules/Calendar/Activity.php
Message-ID: <20060828202459.C0CB2708293@vtiger.fosslabs.com>
Author: richie
Date: Mon Aug 28 14:24:52 2006
New Revision: 9172
Log:
Security Implemented for Outlook --Jeri
Modified:
vtigercrm/trunk/modules/Calendar/Activity.php
Modified: vtigercrm/trunk/modules/Calendar/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Activity.php (original)
+++ vtigercrm/trunk/modules/Calendar/Activity.php Mon Aug 28 14:24:52 2006
@@ -398,7 +398,7 @@
global $current_user;
require_once("modules/Users/User.php");
$seed_user=new User();
- $user_id=$seed_user->retrieve_user_id($user_name);
+ $user_id=$seed_user->retrieve_user_id($username);
$current_user=$seed_user;
$current_user->retrieve_entity_info($user_id, 'Users');
require('user_privileges/user_privileges_'.$current_user->id.'.php');
@@ -406,11 +406,11 @@
if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
{
- $sql1 = "select tablename,columnname from vtiger_field where tabid=9";
+ $sql1 = "select tablename,columnname from vtiger_field where tabid=9 and tablename <> 'vtiger_recurringevents' and tablename <> 'vtiger_activity_reminder'";
}else
{
$profileList = getCurrentUserProfileList();
- $sql1 = "select tablename,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=9 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ $sql1 = "select tablename,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=9 and tablename <> 'vtiger_recurringevents' and tablename <> 'vtiger_activity_reminder' and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
}
$result1 = $adb->query($sql1);
for($i=0;$i < $adb->num_rows($result1);$i++)
@@ -434,6 +434,7 @@
inner join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid
left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid
+ left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid
where vtiger_users.user_name='".$username."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task'";
$log->debug("Exiting get_tasksforol method ...");
return $query;
@@ -457,11 +458,11 @@
if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
{
- $sql1 = "select tablename,columnname from vtiger_field where tabid=9";
+ $sql1 = "select tablename,columnname from vtiger_field where tabid=9 and tablename <> 'vtiger_recurringevents' and tablename <> 'vtiger_activity_reminder'";
}else
{
$profileList = getCurrentUserProfileList();
- $sql1 = "select tablename,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=9 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ $sql1 = "select tablename,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=9 and tablename <> 'vtiger_recurringevents' and tablename <> 'vtiger_activity_reminder' and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
}
$result1 = $adb->query($sql1);
for($i=0;$i < $adb->num_rows($result1);$i++)
@@ -486,6 +487,7 @@
inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid
left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid
left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid
+ left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid
inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
where vtiger_users.user_name='".$user_name."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Meeting'";
$log->debug("Exiting get_calendarsforol method ...");
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 29 05:04:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 29 Aug 2006 09:04:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9173 -
/vtigercrm/trunk/include/database/Postgres8.php
Message-ID: <20060829090432.1D7B37095E9@vtiger.fosslabs.com>
Author: richie
Date: Tue Aug 29 03:04:18 2006
New Revision: 9173
Log:
Support for PostGres DB done
Added:
vtigercrm/trunk/include/database/Postgres8.php
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 29 05:16:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 29 Aug 2006 09:16:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9174 -
/vtigercrm/trunk/include/DatabaseUtil.php
Message-ID: <20060829091606.BE77672A323@vtiger.fosslabs.com>
Author: richie
Date: Tue Aug 29 03:15:16 2006
New Revision: 9174
Log:
Support for PostGres DB done
Added:
vtigercrm/trunk/include/DatabaseUtil.php
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 29 06:42:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 29 Aug 2006 10:42:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9175 -
/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060829104259.67AA672A323@vtiger.fosslabs.com>
Author: richie
Date: Tue Aug 29 04:42:35 2006
New Revision: 9175
Log:
Issue in Outlook Plugin has been fixed--Jeri
Modified:
vtigercrm/trunk/soap/vtigerolservice.php
Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Tue Aug 29 04:42:35 2006
@@ -853,7 +853,7 @@
function AddTasks($username,$taskdtls)
{
- global $current_user;
+ global $current_user,$adb;
require_once('modules/Users/User.php');
require_once('modules/Calendar/Activity.php');
@@ -934,7 +934,7 @@
function UpdateTasks($username,$taskdtls)
{
- global $current_user;
+ global $current_user,$adb;
require_once('modules/Users/User.php');
require_once('modules/Calendar/Activity.php');
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 29 08:07:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 29 Aug 2006 12:07:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9176 -
/vtigercrm/trunk/modules/Calendar/TodoSave.php
Message-ID: <20060829120706.809B572A47E@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 29 06:07:02 2006
New Revision: 9176
Log:
changes made to fix the calendar related issue --Minnie
Modified:
vtigercrm/trunk/modules/Calendar/TodoSave.php
Modified: vtigercrm/trunk/modules/Calendar/TodoSave.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/TodoSave.php (original)
+++ vtigercrm/trunk/modules/Calendar/TodoSave.php Tue Aug 29 06:07:02 2006
@@ -33,12 +33,16 @@
}
$focus->column_fields["subject"] = $_REQUEST["task_subject"];
$focus->column_fields["time_start"] = $_REQUEST["task_time_start"];
- $focus->column_fields["assigned_user_id"] = $_REQUEST["assigned_user_id"];
+ $focus->column_fields["assigned_user_id"] = $_REQUEST["task_assigned_user_id"];
+ $_REQUEST["assigned_group_name"] = $_REQUEST['task_assigned_group_name'];
+ $_REQUEST['assigntype'] = $_REQUEST['task_assigntype'];
$focus->column_fields["taskstatus"] = $_REQUEST["taskstatus"];
$focus->column_fields["date_start"] = $_REQUEST["task_date_start"];
+ $focus->column_fields["due_date"] = $_REQUEST["task_due_date"];
$focus->column_fields["taskpriority"] = $_REQUEST["taskpriority"];
+ $focus->column_fields["description"] = $_REQUEST["task_description"];
+ $focus->column_fields["sendnotification"] = $_REQUEST["task_sendnotification"];
- //echo '';print_r($focus->column_fields);echo ' '; die;
$focus->save($tab_type);
header("Location: index.php?action=index&module=Calendar&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&viewOption=".$_REQUEST['viewOption']."&subtab=".$_REQUEST['subtab']."&parenttab=".$_REQUEST['parenttab']);
?>
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 29 08:40:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 29 Aug 2006 12:40:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9177 -
/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060829124008.3426C744DA6@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 29 06:40:03 2006
New Revision: 9177
Log:
changes made to fix the calendar related issue --Minnie
Modified:
vtigercrm/trunk/modules/Calendar/calendarLayout.php
Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Tue Aug 29 06:40:03 2006
@@ -1338,9 +1338,11 @@
else
$element['action'] =" ";
$element['status'] = $adb->query_result($result,$i,"eventstatus");
- $element['assignedto'] = $adb->query_result($result,$i,"user_name");
- if(empty($element['assignedto']))
- $element['groupname'] = $adb->query_result($result,$i,"groupname");
+ $assignedto = $adb->query_result($result,$i,"user_name");
+ if(!empty($assignedto))
+ $element['assignedto'] = $assignedto;
+ else
+ $element['assignedto'] = $adb->query_result($result,$i,"groupname");
$Entries[] = $element;
}
$cal_log->debug("Exiting getEventList() method...");
@@ -1423,9 +1425,11 @@
$element['action'] ="";
- $list_view .="".$mod_strings['LBL_NONE_SCHEDULED']." ";
+ $list_view .="
+ ";
+ $list_view .="";
+ $list_view .="
";
$cal_log->debug("Exiting constructEventListView() method...");
@@ -1546,8 +1582,10 @@
$hour_endat = convertTime2UserSelectedFmt($format,($cal['calendar']->day_start_hour+1),false);
$time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format);
$temp_ts = $cal['calendar']->date_time->ts;
+ //to get date in user selected date format
$temp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$temp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$temp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $temp_ts)):(''))));
$list_view = "";
+ //labels of listview header
$header = Array('0'=>'#',
'1'=>$mod_strings['LBL_TIME'],
'2'=>$mod_strings['LBL_TODO'],
@@ -1564,6 +1602,7 @@
);
$list_view .="
@@ -1603,9 +1642,31 @@
}
else
{
- $list_view .=" ";
- $list_view .="".$mod_strings['LBL_NONE_SCHEDULED']." ";
+ $list_view .="";
+ $list_view .="
+
+
+
+
+
+ ";
+ //checking permission for Create/Edit Operation
+ if(isPermitted("Calendar","EditView") == "yes")
+ {
+ $list_view .="".$app_strings['LBL_YOU_CAN_CREATE']." ".$app_strings['LBL_A']." ".$app_strings['Todo']." ".$app_strings['LBL_NOW'].". ".$app_strings['LBL_CLICK_THE_LINK']." :".$app_strings['LBL_CREATE']." ".$app_strings['LBL_A']." ".$app_strings['Todo']."
+ ";
+ }
+ else
+ {
+ $list_view .="".$app_strings['LBL_YOU_ARE_NOT_ALLOWED_TO_CREATE']." ".$app_strings['LBL_A']." ".$app_strings['Todo']." ";
+ }
+
+ $list_view .="
+
+
';print_r($userDetails);echo ' ';
$to_email = getUserEmailId('id',$current_user->id);
$date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
+ $assignedto = getAssignedTo();
$mysel= $_GET['view'];
$calendar_arr = Array();
$calendar_arr['IMAGE_PATH'] = $image_path;
@@ -78,25 +79,95 @@
$calendar_arr['calendar']->hour_format = 'am/pm';
else
$calendar_arr['calendar']->hour_format = $current_user->hour_format;
-
- function getPriorityCombo()
- {
- global $adb, $mod_strings;
- $combo = '';
- $combo .= '';
- $q = "select * from vtiger_taskpriority";
- $Res = $adb->query($q);
- $noofrows = $adb->num_rows($Res);
-
- for($i = 0; $i < $noofrows; $i++)
- {
- $value = $adb->query_result($Res,$i,'taskpriority');
- $combo .= ''.$mod_strings[$value].' ';
- }
-
- $combo .= ' ';
- return $combo;
- }
+/** Function to construct HTML code for Assigned To field
+ * @param $assignedto -- Assigned To values :: Type array
+ * @param $toggletype -- String to different event and task :: Type string
+ * return $htmlStr -- HTML code in string forat :: Type string
+ */
+function getAssignedToHTML($assignedto,$toggletype)
+{
+ global $app_strings;
+ $userlist = $assignedto[0];
+ if(isset($assignedto[1]) && $assignedto[1] != null)
+ $grouplist = $assignedto[1];
+ $htmlStr = '';
+ $check = 1;
+ foreach($userlist as $key_one=>$arr)
+ {
+ foreach($arr as $sel_value=>$value)
+ {
+ if($value != '')
+ $check=$check*0;
+ else
+ $check=$check*1;
+ }
+ }
+ if($check == 0)
+ {
+ $select_user='checked';
+ $style_user='display:block';
+ $style_group='display:none';
+ }
+ else
+ {
+ $select_group='checked';
+ $style_user='display:none';
+ $style_group='display:block';
+ }
+ if($toggletype == 'task')
+ $htmlStr .= '
+ ';
+ }
+ else
+ {
+ $htmlStr .= '
+ ';
+ }
+ foreach($userlist as $key_one=>$arr)
+ {
+ foreach($arr as $sel_value=>$value)
+ {
+ $htmlStr .= ''.$sel_value.' ';
+ }
+ }
+ $htmlStr .= '
+ ';
+ if($grouplist != '')
+ {
+ if($toggletype == 'task')
+ {
+ $htmlStr .= '
+ ';
+ }
+ else
+ {
+ $htmlStr .= '
+ ';
+ }
+ foreach($grouplist as $key_one=>$arr)
+ {
+ foreach($arr as $sel_value=>$value)
+ {
+ $htmlStr .= ''.$sel_value.' ';
+ }
+ }
+ $htmlStr .= '
+ ';
+ }
+ return $htmlStr;
+}
?>
@@ -139,12 +210,9 @@
-
-
- :
+
-
+
-
+
-
+
hour_format,'start');?>
@@ -205,7 +295,7 @@
-
+
hour_format,'end');?>
@@ -221,21 +311,15 @@
-
-
-
-
-
- :
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
@@ -499,15 +583,12 @@
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+ Cache Path
-
- Admin Username
+
+
+
+ Admin Configuration
+
+ Username
admin
- Admin Password
+ Password
- Master Currency
-
-
+ Email
+
+
+
+
+
+ Currency Configuration
+
+ Name
+
+
+
+ Symbol
+
+
+
+ Code
+
+
+
+
@@ -256,7 +281,9 @@
';
+ $q = "select * from ".$tablename;
+ $Res = $adb->query($q);
+ $noofrows = $adb->num_rows($Res);
+
+ for($i = 0; $i < $noofrows; $i++)
+ {
+ $value = $adb->query_result($Res,$i,$fieldname);
+ $combo .= ''.$mod_strings[$value].' ';
+ }
+
+ $combo .= ' ';
+ return $combo;
+}
+
+/*Fuction to get value for Assigned To field
+ *returns values of Assigned To field in array format
+*/
+function getAssignedTo()
+{
+ global $current_user,$noof_group_rows,$adb;
+ $assigned_user_id = $current_user->id;
+ if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid('Calendar')] == 3 or $defaultOrgSharingPermission[getTabid('Calendar')] == 0))
+ {
+ $result=get_current_user_access_groups('Calendar');
+ }
+ else
+ {
+ $result = get_group_options();
+ }
+ $nameArray = $adb->fetch_array($result);
+ global $current_user;
+ if($is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
+ {
+ $users_combo = get_select_options_array(get_user_array(FALSE, "Active", $assigned_user_id,'private'), $assigned_user_id);
+ }
+ else
+ {
+ $users_combo = get_select_options_array(get_user_array(FALSE, "Active", $assigned_user_id), $assigned_user_id);
+ }
+ if($noof_group_rows!=0)
+ {
+ do
+ {
+ $groupname=$nameArray["groupname"];
+ $group_option[] = array($groupname=>$selected);
+
+ }while($nameArray = $adb->fetch_array($result));
+ }
+ $fieldvalue[]=$users_combo;
+ $fieldvalue[] = $group_option;
+ return $fieldvalue;
+}
+
//Code Added by Minnie -Ends
?>
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 29 09:39:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 29 Aug 2006 13:39:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9184 -
/vtigercrm/trunk/modules/Calendar/DetailView.php
Message-ID: <20060829133928.2C0C374609F@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 29 07:39:24 2006
New Revision: 9184
Log:
changes made to fix the calendar related issue --Minnie
Modified:
vtigercrm/trunk/modules/Calendar/DetailView.php
Modified: vtigercrm/trunk/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/DetailView.php (original)
+++ vtigercrm/trunk/modules/Calendar/DetailView.php Tue Aug 29 07:39:24 2006
@@ -128,37 +128,30 @@
$data['endmin'] = $time_arr['endmin'];
$data['endfmt'] = $time_arr['endfmt'];
$data['record'] = $focus->id;
+if(isset($finaldata['sendnotification']) && $finaldata['sendnotification'] == 'yes')
+ $data['sendnotification'] = 'Yes';
+else
+ $data['sendnotification'] = 'No';
+$data['subject'] = $finaldata['subject'];
+$data['date_start'] = $stdate;
+$data['due_date'] = $enddate;
+$data['assigned_user_id'] = $finaldata['assigned_user_id'];
+$data['taskpriority'] = $finaldata['taskpriority'];
+$data['modifiedtime'] = $finaldata['modifiedtime'];
+$data['createdtime'] = $finaldata['createdtime'];
+$data['parent_name'] = $finaldata['parent_id'];
+$data['description'] = $finaldata['description'];
if($activity_mode == 'Task')
{
- $data['task_subject'] = $finaldata['subject'];
- $data['task_date_start'] = $stdate;
- $data['assigned_user_id'] = $finaldata['assigned_user_id'];
$data['taskstatus'] = $finaldata['taskstatus'];
- $data['priority'] = $finaldata['taskpriority'];
$data['activitytype'] = $activity_mode;
- $data['modifiedtime'] = $finaldata['modifiedtime'];
- $data['createdtime'] = $finaldata['createdtime'];
- $data['parent_name'] = $finaldata['parent_id'];
$data['contact_id'] = $finaldata['contact_id'];
- if(isset($finaldata['sendnotification']) && $finaldata['sendnotification'] == 'yes')
- $data['sendnotification'] = 'Yes';
- else
- $data['sendnotification'] = 'No';
}
elseif($activity_mode == 'Events')
{
- $data['subject'] = $finaldata['subject'];
- $data['date_start'] = $stdate;
- $data['due_date'] = $enddate;
$data['visibility'] = $finaldata['visibility'];
- $data['assigned_user_id'] = $finaldata['assigned_user_id'];
$data['eventstatus'] = $finaldata['eventstatus'];
- $data['priority'] = $finaldata['taskpriority'];
- $data['sendnotification'] = $finaldata['sendnotification'];
$data['activitytype'] = $finaldata['activitytype'];
- $data['modifiedtime'] = $finaldata['modifiedtime'];
- $data['createdtime'] = $finaldata['createdtime'];
- $data['parent_name'] = $finaldata['parent_id'];
//Calculating reminder time
$rem_days = 0;
$rem_hrs = 0;
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 29 09:50:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 29 Aug 2006 13:50:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9185 -
/vtigercrm/trunk/modules/Calendar/script.js
Message-ID: <20060829135026.8515B6B54F9@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 29 07:50:22 2006
New Revision: 9185
Log:
changes made to fix the calendar related issue --Minnie
Modified:
vtigercrm/trunk/modules/Calendar/script.js
Modified: vtigercrm/trunk/modules/Calendar/script.js
==============================================================================
--- vtigercrm/trunk/modules/Calendar/script.js (original)
+++ vtigercrm/trunk/modules/Calendar/script.js Tue Aug 29 07:50:22 2006
@@ -969,3 +969,21 @@
function doNothing()
{
}
+
+/** This is Javascript Function which is used to toogle between
+ * assigntype user and group/team select options while assigning owner to Task.
+ */
+function toggleTaskAssignType(currType)
+{
+ if (currType=="U")
+ {
+ getObj("task_assign_user").style.display="block"
+ getObj("task_assign_team").style.display="none"
+ }
+ else
+ {
+ getObj("task_assign_user").style.display="none"
+ getObj("task_assign_team").style.display="block"
+ }
+}
+
From vtigercrm-commits at vtiger.fosslabs.com Tue Aug 29 09:52:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 29 Aug 2006 13:52:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r9186 -
/vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl
Message-ID: <20060829135249.8E7B3746280@vtiger.fosslabs.com>
Author: saraj
Date: Tue Aug 29 07:52:45 2006
New Revision: 9186
Log:
changes made to fix the calendar related issue --Minnie
Modified:
vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl
Modified: vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl Tue Aug 29 07:52:45 2006
@@ -42,14 +42,6 @@
-
-
-
-
- 
![\"\"](\"/modules/System/images/")
getData("/phpsysinfo/Vitals/Distroicon") . "\"> " . $XPath->getData("/phpsysinfo/Vitals/Distro") . "
'
. '
'
. '
';
- } elseif (file_exists(getcwd() . "/modules/System/templates/" . TEMPLATE_SET . "/images/yellowbar_left.gif") && $barwidth > $yellow && $barwidth < $red) {
+ } elseif (file_exists("/modules/System/templates/" . TEMPLATE_SET . "/images/yellowbar_left.gif") && $barwidth > $yellow && $barwidth < $red) {
return '
'
. '
'
. '
';
@@ -60,7 +60,7 @@
return '
'
. '
'
. '
';
- } elseif (file_exists(getcwd() . "/modules/System/templates/" . TEMPLATE_SET . "/images/yellowbar_left.gif") && $barwidth > $yellow && $barwidth < $red) {
+ } elseif (file_exists("/modules/System/templates/" . TEMPLATE_SET . "/images/yellowbar_left.gif") && $barwidth > $yellow && $barwidth < $red) {
return '