[Vtigercrm-commits] [vtiger-commits] r5936 - in /vtigercrm/branches/5.0_postgresql_integration: ./ Smarty/libs/ Smarty/templates/ data/ include/js/ include/language/ include/utils/ modules/Accounts/ modules/Activities/ modules/Campaigns/ modules/Contacts/ modules/CustomView/ modules/Emails/ modules/Emails/language/ modules/HelpDesk/ modules/Invoice/ modules/Leads/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Settings/ modules/System/includes/ modules/System/includes/xml/ modules/Users/ modules/Vendors/ modules/Webmails/ schema/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Fri May 12 17:15:30 EDT 2006
Author: jeffk
Date: Fri May 12 15:15:00 2006
New Revision: 5936
Log:
refs #752. merge trunk changesets [5870] through [5935]. conflicts resolved in modules/Activities/Activity.php modules/Calendar/calendarLayout.php
Added:
vtigercrm/branches/5.0_postgresql_integration/modules/System/includes/class.error.inc.php
- copied unchanged from r5935, vtigercrm/trunk/modules/System/includes/class.error.inc.php
vtigercrm/branches/5.0_postgresql_integration/modules/System/includes/xml/hddtemp.php
- copied unchanged from r5935, vtigercrm/trunk/modules/System/includes/xml/hddtemp.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/Popup_picker_emails.html
- copied unchanged from r5935, vtigercrm/trunk/modules/Users/Popup_picker_emails.html
Modified:
vtigercrm/branches/5.0_postgresql_integration/Smarty/libs/Smarty.class.php
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RelatedLists.tpl
vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php
vtigercrm/branches/5.0_postgresql_integration/include/js/dtlviewajax.js
vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/include/utils/EditViewUtils.php
vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php
vtigercrm/branches/5.0_postgresql_integration/include/utils/UserInfoUtil.php
vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/Account.php
vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php
vtigercrm/branches/5.0_postgresql_integration/modules/Activities/Activity.php
vtigercrm/branches/5.0_postgresql_integration/modules/Activities/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/PopulateCustomView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Save.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/mailsend.php
vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Leads/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Leads/Lead.php
vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListViewTop.php
vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Products/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Settings/CreateCustomField.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateSharingRule.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateUserPrivilegeFile.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/Login.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingDetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/Popup.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php
vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Webmails/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml
vtigercrm/branches/5.0_postgresql_integration/vtigerservice.php
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/libs/Smarty.class.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/libs/Smarty.class.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/libs/Smarty.class.php Fri May 12 15:15:00 2006
@@ -157,7 +157,7 @@
* </ul>
* @var integer
*/
- var $caching = 1;
+ var $caching = 0;
/**
* The name of the directory for cache files.
@@ -175,7 +175,7 @@
*
* @var integer
*/
- var $cache_lifetime = 5;
+ var $cache_lifetime = 180;
/**
* Only used when $caching is enabled. If true, then If-Modified-Since headers
@@ -185,7 +185,7 @@
*
* @var boolean
*/
- var $cache_modified_check = true;
+ var $cache_modified_check = false;
/**
* This determines how Smarty handles "<?php ... ?>" tags in templates.
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl Fri May 12 15:15:00 2006
@@ -44,7 +44,7 @@
<td colspan="3">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td width="143"><img src="{$IMAGE_PATH}composeMail.jpg" width="143"></td>
+ <td width="143"><img src="{$IMAGE_PATH}composeMail.jpg"></td>
<td background="{$IMAGE_PATH}mailHdr.jpg" style="background-repeat:repeat-x;" width="100%"> </td>
<td width="86"><img src="{$IMAGE_PATH}mailTitle.jpg"></td>
</tr>
@@ -55,10 +55,10 @@
{foreach item=elements from=$row}
{if $elements.2.0 eq 'parent_id'}
<tr>
- <td class="lvtCol" style="padding: 5px;" align="right" width="15%"><b>To : </b></td>
+ <td class="lvtCol" style="padding: 5px;" align="right"><b>{$MOD.LBL_TO}</b></td>
<td class="dvtCellLabel" style="padding: 5px;">
- <input name="{$elements.2.0}" type="hidden" value="{$elements.3.1}">
- <textarea id="parent_name" cols="50">{$elements.3.0}</textarea>
+ <input name="{$elements.2.0}" type="hidden" value="{$IDLISTS}">
+ <textarea id="parent_name" cols="70">{$TO_MAIL}</textarea>
</td>
<td class="dvtCellLabel" style="padding: 5px;" align="left">
<select name="parent_type">
@@ -74,23 +74,23 @@
</td>
</tr>
<tr>
- <td class="lvtCol" style="padding: 5px;" align="right">Cc : </td>
+ <td class="lvtCol" style="padding: 5px;" align="right">{$MOD.LBL_CC}</td>
<td class="dvtCellLabel" style="padding: 5px;">
- <input name="ccmail" class="txtBox" type="text" style="width:99%">
+ <input name="ccmail" class="txtBox" type="text" value="{$CC_MAIL}" style="width:99%">
</td>
- <td class="dvtCellLabel" width="25%"> </td>
+ <td class="dvtCellLabel"> </td>
</tr>
<tr>
- <td class="lvtCol" style="padding: 5px;" align="right">Bcc : </td>
+ <td class="lvtCol" style="padding: 5px;" align="right">{$MOD.LBL_BCC}</td>
<td class="dvtCellLabel" style="padding: 5px;">
- <input name="bccmail" class="txtBox" type="text" style="width:99%">
+ <input name="bccmail" class="txtBox" type="text" value="{$BCC_MAIL}" style="width:99%">
</td>
- <td class="dvtCellLabel" width="25%"> </td>
+ <td class="dvtCellLabel"> </td>
</tr>
{elseif $elements.2.0 eq 'subject'}
<tr>
<td class="lvtCol" style="padding: 5px;" align="right" nowrap><font color="red">*</font>{$elements.1.0} :</td>
- <td colspan="2" class="dvtCellLabel" style="padding: 5px;"><input type="text" class="txtBox" name="{$elements.2.0}" value="{$elements.3.1}"></td>
+ <td colspan="2" class="dvtCellLabel" style="padding: 5px;"><input type="text" class="txtBox" name="{$elements.2.0}" value="{$elements.3.0}"></td>
</tr>
{elseif $elements.2.0 eq 'filename'}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl Fri May 12 15:15:00 2006
@@ -15,9 +15,6 @@
<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
-<span id="crmspanid" style="display:none;position:absolute;" onmouseover="show('crmspanid');">
- <a class="link" align="right" href="javascript:;">Edit</a>
-</span>
<div id="convertleaddiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
@@ -223,29 +220,29 @@
<td class="dvtCellLabel" align=right width=25%>{$label}</td>
{/if}
{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} <!--TextBox-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');">
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" >
{if $keyid eq '55'}<!--SalutationSymbol-->
{$keysalut}
{elseif $keyid eq '71' || $keyid eq '72'} <!--CurrencySymbol-->
{$keycursymb}
{/if}
- <span id="dtlview_{$label}">{$keyval}</span>
+ <div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');">{$keyval} </div>
+ <div id="editarea_{$label}" style="display:none;">
+ <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+ <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+ <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+ </div>
+ </td>
+ {elseif $keyid eq '13'} <!--Email-->
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="mailto:{$keyval}" target="_blank"> {$keyval}</a></div>
<div id="editarea_{$label}" style="display:none;">
<input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
<br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');hide('crmspanid');"/> or
<a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
</div>
</td>
- {elseif $keyid eq '13'} <!--Email-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
- <div id="editarea_{$label}" style="display:none;">
- <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
- <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');hide('crmspanid');"/> or
- <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
- </div>
- </td>
{elseif $keyid eq '15' || $keyid eq '16'} <!--ComboBox-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"> {$keyval}</div>
<div id="editarea_{$label}" style="display:none;">
<select id="txtbox_{$label}" name="{$keyfldname}">
{foreach item=arr from=$keyoptions}
@@ -259,7 +256,7 @@
</div>
</td>
{elseif $keyid eq '17'} <!--WebSite-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="http://{$keyval}" target="_blank"> {$keyval}</a></div>
<div id="editarea_{$label}" style="display:none;">
<input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
<br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');hide('crmspanid');"/> or
@@ -267,7 +264,7 @@
</div>
</td>
{elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"> {$keyval}</div>
<div id="editarea_{$label}" style="display:none;">
<textarea id="txtbox_{$label}" name="txtbox_{$label}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>
<br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');hide('crmspanid');"/> or
@@ -275,7 +272,7 @@
</div>
</td>
{elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"> {$keyval}</div>
<div id="editarea_{$label}" style="display:none;">
<textarea id="txtbox_{$label}" name="txtbox_{$label}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>
<br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');hide('crmspanid');"/> or
@@ -283,7 +280,7 @@
</div>
</td>
{elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}"> {$keyval}</a></div>
<div id="editarea_{$label}" style="display:none;">
<input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
<!--AccountPopup/WithClear-->{if $keyid eq '51'} <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}
@@ -292,7 +289,7 @@
</div>
</td>
{elseif $keyid eq '57'} <!--ContactPopup-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}"> {$keyval}</a></div>
<div id="editarea_{$label}" style="display:none;">
<input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
<br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');hide('crmspanid');"/> or
@@ -300,7 +297,7 @@
</div>
</td>
{elseif $keyid eq '59'} <!--ProductPopup-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}"> {$keyval}</a></div>
<div id="editarea_{$label}" style="display:none;">
<input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
<br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');hide('crmspanid');"/> or
@@ -308,7 +305,7 @@
</div>
</td>
{elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}"> {$keyval}</a></div>
<div id="editarea_{$label}" style="display:none;">
<input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
{if $uitype eq 75} <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}
@@ -317,7 +314,7 @@
</div>
</td>
{elseif $keyid eq 76} <!--PotentialPopup-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}"> {$keyval}</a></div>
<div id="editarea_{$label}" style="display:none;">
<input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
<br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');hide('crmspanid');"/> or
@@ -325,7 +322,7 @@
</div>
</td>
{elseif $keyid eq 78} <!--QuotePopup-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}"> {$keyval}</a></div>
<div id="editarea_{$label}" style="display:none;">
<input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
<br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');hide('crmspanid');"/> or
@@ -333,10 +330,10 @@
</div>
</td>
{elseif $keyid eq 82} <!--Email Body-->
- <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">{$keyval}</div>
+ <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'"> {$keyval}</div>
</td>
{elseif $keyid eq 80} <!--SalesOrderPopup-->
- <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="hide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+ <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}"> {$keyval}</a></div>
<div id="editarea_{$label}" style="display:none;">
<input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=DetailView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
<br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');hide('crmspanid');"/> or
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl Fri May 12 15:15:00 2006
@@ -9,17 +9,29 @@
*
********************************************************************************/
-->*}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" valign="top">
<tr>
<td class="forwardBg">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
+ {if $BLOCKS neq ''}
<td width="75%">
- <input type="button" name="reply" value=" {$MOD.LBL_REPLY_BUTTON} " class="classWebBtn" />
- <input type="button" name="forward" value=" {$MOD.LBL_FORWARD_BUTTON} " class="classWebBtn" />
- <input type="button" name="download" value=" {$MOD.LBL_DOWNLOAD_ATTCH_BUTTON} " class="classWebBtn" onclick="fnvshobj(this,'reportLay');" onmouseout="fninvsh('reportLay')" />
+ <input type="button" name="forward" value=" {$MOD.LBL_FORWARD_BUTTON} " class="classWebBtn" onClick=OpenCompose('{$ID}','forward')>
+ <input type="button" name="Send" value=" {$MOD.LBL_SEND} " class="classWebBtn" onClick=OpenCompose('{$ID}','edit')>
+ {foreach item=row from=$BLOCKS}
+ {foreach item=elements key=title from=$row}
+ {if $title eq 'Attachment'}
+ {if $elements.value ne ''}
+ <input type="button" name="download" value=" {$MOD.LBL_DOWNLOAD_ATTCH_BUTTON} " class="classWebBtn" onclick="fnvshobj(this,'reportLay')"/>
+ {/if}
+ {/if}
+ {/foreach}
+ {/foreach}
</td>
<td width="25%" align="right"><input type="button" name="Button" value=" {$APP.LBL_DELETE_BUTTON} " class="classWebBtn" onClick="DeleteEmail('{$ID}')"/></td>
+ {else}
+ <td colspan="2"> </td>
+ {/if}
</tr>
</table>
</td>
@@ -30,9 +42,10 @@
{foreach item=elements key=title from=$row}
{if $title eq 'Subject'}
<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr><td width="20%" align="right"><b>{$MOD.LBL_FROM}</b></td><td width="2%"> </td><td> </td></tr>
- <tr><td align="right">{$MOD.LBL_CC}</td><td> </td><td> </td></tr>
- <tr><td align="right"><b>{$MOD.LBL_SUBJECT}</b></td><td> </td><td>{$BLOCKS.3.Subject.value}</td></tr>
+ <tr><td width="20%" align="right"><b>{$MOD.LBL_TO}</b></td><td width="2%"> </td><td>{$TO_MAIL} </td></tr>
+ <tr><td align="right">{$MOD.LBL_CC}</td><td> </td><td> {$CC_MAIL}</td></tr>
+ <tr><td align="right">{$MOD.LBL_BCC}</td><td> </td><td> {$BCC_MAIL}</td></tr>
+ <tr><td align="right"><b>{$MOD.LBL_SUBJECT}</b></td><td> </td><td>{$elements.value}</td></tr>
<tr><td align="right" style="border-bottom:1px solid #666666;" colspan="3"> </td></tr>
</table>
{elseif $title eq 'Description'}
@@ -45,3 +58,20 @@
</td>
</tr>
</table>
+{foreach item=row from=$BLOCKS}
+ {foreach item=elements key=title from=$row}
+ {if $title eq 'Attachment'}
+ <div id="reportLay" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
+ <table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF">
+ <tr>
+ <td>
+ {$elements.value}
+ </td>
+ </tr>
+ <tr><td style="padding:5px;"> </td></tr>
+ </table>
+ </div>
+ {/if}
+ {/foreach}
+{/foreach}
+
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl Fri May 12 15:15:00 2006
@@ -54,7 +54,32 @@
document.getElementById("subjectsetter").innerHTML='';
document.getElementById("email_con").innerHTML=response.responseText;
}
+
{/literal}
+function ShowFolders(folderid)
+{ldelim}
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ switch(folderid)
+ {ldelim}
+ case 1:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_ALLMAILS}';
+ break;
+ case 2:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_TO_CONTACTS}';
+ break;
+ case 3:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_TO_ACCOUNTS}';
+ break;
+ case 4:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_TO_LEADS}';
+ break;
+ case 5:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_TO_USERS}';
+ break;
+ {rdelim}
+ var urlstring ="module=Emails&ajax=true&action=EmailsAjax&file=ListView&folderid="+folderid;
+ ajaxObj.process("index.php?",urlstring);
+{rdelim}
</script>
<script language="JavaScript" type="text/javascript" src="modules/Emails/Email.js"></script>
<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
@@ -89,7 +114,7 @@
</td>
<td width="10%">
<img src="{$IMAGE_PATH}compose.gif" align="absmiddle" />
- <a href="javascript:openPopUp('xComposeEmail',this,'index.php?module=Emails&action=EmailsAjax&file=EditView','createemailWin',655,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no');" class="webMnu">{$MOD.LBL_COMPOSE}</a>
+ <a href="javascript:;" onClick="OpenCompose('','create');" class="webMnu">{$MOD.LBL_COMPOSE}</a>
</td>
<td width="10%">
<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />
@@ -103,7 +128,7 @@
<tr>
<td width="28%" bgcolor="#949494"><span class="subHdr"><b>{$MOD.LBL_EMAIL_FOLDERS}</b></span> </td>
<td width="2%"> </td>
- <td width="60%" class="subHdr"><strong>{$MOD.LBL_MAILS}</strong></td>
+ <td width="60%" class="subHdr"><span id="mail_fldrname"><strong>{$MOD.LBL_ALLMAILS}</strong></span></td>
</tr>
<tr>
<td rowspan="6" valign="top" bgcolor="#FFFFFF" style="padding:10px; ">
@@ -119,18 +144,18 @@
<img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" /> <b class="txtGreen">{$MOD.LBL_SENT_MAILS}</b>
<ul style="list-style-type:none;">
<li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="javascript:;" onClick="ShowFolders('allmails')" class="webMnu">{$MOD.LBL_ALLMAILS}</a> <b></b>
- <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="javascript:;" onClick="ShowFolders('Contacts')" class="webMnu">{$MOD.LBL_TO_CONTACTS}</a> <b></b>
- </li>
- <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="javascript:;" onClick="ShowFolders('Accounts')" class="webMnu">{$MOD.LBL_TO_ACCOUNTS}</a> <b></b>
- </li>
- <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="javascript:;" onClick="ShowFolders('Leads')" class="webMnu">{$MOD.LBL_TO_LEADS}</a>
- </li>
- <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="javascript:;" onClick="ShowFolders('Users')" class="webMnu">{$MOD.LBL_TO_USERS}</a>
+ <a href="javascript:;" onClick="ShowFolders(1)" class="webMnu">{$MOD.LBL_ALLMAILS}</a> <b></b>
+ <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
+ <a href="javascript:;" onClick="ShowFolders(2)" class="webMnu">{$MOD.LBL_TO_CONTACTS}</a> <b></b>
+ </li>
+ <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
+ <a href="javascript:;" onClick="ShowFolders(3)" class="webMnu">{$MOD.LBL_TO_ACCOUNTS}</a> <b></b>
+ </li>
+ <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
+ <a href="javascript:;" onClick="ShowFolders(4)" class="webMnu">{$MOD.LBL_TO_LEADS}</a>
+ </li>
+ <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
+ <a href="javascript:;" onClick="ShowFolders(5)" class="webMnu">{$MOD.LBL_TO_USERS}</a>
</li>
</ul><br />
</td>
@@ -140,7 +165,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<input name="idlist" type="hidden">
<tr>
- <td width="25%"><input type="button" name="Button2" value=" {$MOD.LBL_QUALIFY_BUTTON}" class="classWebBtn" onClick="return massDelete();"/>
+ <td width="25%"><input type="button" name="Button2" value=" {$APP.LBL_DELETE_BUTTON}" class="classWebBtn" onClick="return massDelete();"/>
</td>
<td width="75%" align="right">
<font color="#000000">{$APP.LBL_SEARCH}</font> <input type="text" name="srch" class="importBox" />
@@ -192,4 +217,13 @@
</table>
<!-- END -->
<div id="status" style="display:none;position:absolute;background-color:#bbbbbb;left:887px;top:0px;height:17px;white-space:nowrap;"">Processing Request...</div>
-
+<script>
+function OpenCompose(id,mode)
+{ldelim}
+ if(id != '')
+ url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id;
+ else
+ url = 'index.php?module=Emails&action=EmailsAjax&file=EditView';
+ openPopUp('xComposeEmail',this,url,'createemailWin',775,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no');
+{rdelim}
+</script>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl Fri May 12 15:15:00 2006
@@ -107,7 +107,7 @@
{if $maintabs eq $CATEGORY}
{foreach key=number item=module from=$detail}
{if $module eq $MODULE_NAME}
- <td class="level2textSel">{$module}</td>
+ <td class="level2textSel"><a href="index.php?module={$module}&action=index&parenttab={$maintabs}">{$module}</a></td>
{else}
<td class="level2text"> <a href="index.php?module={$module}&action=index&parenttab={$maintabs}">{$module}</a> </td>
{/if}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl Fri May 12 15:15:00 2006
@@ -149,7 +149,7 @@
<img src="{$IMAGE_PATH}arrow.jpg" align="absmiddle">
<b>{$modulename}</b>
</td>
- <td align="right" colspan=2><input title="New" class="small" type="button" name="Create" value="{$CMOD.LBL_ADD_PRIVILEGES_BUTTON}" onClick="callEditDiv('{$modulename}','create','{$elements.0}')"></td>
+ <td align="right" colspan=2><input title="New" class="small" type="button" name="Create" value="{$CMOD.LBL_ADD_PRIVILEGES_BUTTON}" onClick="callEditDiv('{$modulename}','create','')"></td>
</tr>
<tr>
<th class="lvtCol" nowrap width="9%">Rule No.</th>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RelatedLists.tpl Fri May 12 15:15:00 2006
@@ -12,63 +12,8 @@
-->*}
<script language="JavaScript" type="text/javascript" src="modules/PriceBooks/PriceBook.js"></script>
-<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
-<tr><td style="height:2px"></td></tr>
-<tr>
- <td style="padding-left:10px;padding-right:30px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
- <td class="sep1" style="width:1px;padding-right:1px"></td>
- <td class=small >
- <table border=0 cellspacing=0 cellpadding=0>
- <tr>
- <td>
- <table border=0 cellspacing=0 cellpadding=5>
- <tr>
- <td style="padding-right:0px"><a href="#"><img src="themes/blue/images/btnL3Add.gif" alt="Create {$MODULE}..." title="Create {$MODULE}..." border=0></a></td>
- <td style="padding-right:0px"><a href="#"><img src="themes/blue/images/btnL3Search.gif" alt="Search in {$MODULE}..." title="Search in {$MODULE}..." border=0></a></a></td>
- </tr>
- </table>
- </td>
- <td nowrap width=50> </td>
- <td>
- <table border=0 cellspacing=0 cellpadding=5>
- <tr>
- <td style="padding-right:0px"><a href="#"><img src="themes/blue/images/btnL3Calendar.gif" alt="Open Calendar..." title="Open Calendar..." border=0></a></a></td>
- <td style="padding-right:0px"><a href="#"><img src="themes/blue/images/btnL3Clock.gif" alt="Show World Clock..." title="Show World Clock..." border=0 onClick="fnvshobj(this,'wclock')"></a></a></td>
- <td style="padding-right:0px"><a href="#"><img src="themes/blue/images/btnL3Calc.gif" alt="Open Calculator..." title="Open Calculator..." border=0 onClick="fnvshobj(this,'calc')"></a></a></td>
- <td nowrap="nowrap" width="25"> </td>
- <td style="padding-right: 0px;"><a href="#" onClick="fnvshobj(this,'allMenu')"><img src="themes/blue/images/btnL3AllMenu.gif" alt="Open All Menu..." title="Open All Menu..." border="0"></a></td>
- </tr>
- </table>
- </td>
-
- <td>
- <table border=0 cellspacing=0 cellpadding=5>
- <tr>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- {if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' || $MODULE eq 'Notes' || $MODULE eq 'Emails'}
- <td class="sep1" style="width:1px;padding-right:1px"></td>
- <td nowrap style="width:50%;padding:10px">
- {if $MODULE ne 'Notes' && $MODULE ne 'Emails'}
- <a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index">Import {$MODULE}</a> |
- {/if}
- <a href="index.php?module={$MODULE}&action=Export&all=1">Export {$MODULE}</a>
- {if $MODULE eq 'Contacts'}
- | <a href="index.php?module={$MODULE}&action=AddBusinessCard&return_module={$MODULE}&return_action=ListView">Add Business Card</a>
- {/if}
- </td>
- {else}
- <td nowrap style="width:50%;padding:10px"> </td>
- {/if}
-
-</tr>
-<tr><td style="height:2px"></td></tr>
-
-</TABLE>
+
+ {include file='Buttons_List1.tpl'}
<!-- Contents -->
<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
Modified: vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php Fri May 12 15:15:00 2006
@@ -102,8 +102,11 @@
{
$realid=explode("@",$myids[$i]);
$mycrmid=$realid[0];
-
- $mysql='insert into seactivityrel values('.$mycrmid.','.$actid.')';
+ //added to handle the relationship of emails with users
+ if($realid[1] == -1)
+ $mysql='insert into salesmanactivityrel values('.$mycrmid.','.$actid.')';
+ else
+ $mysql='insert into seactivityrel values('.$mycrmid.','.$actid.')';
$adb->query($mysql);
}
}
Modified: vtigercrm/branches/5.0_postgresql_integration/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/js/dtlviewajax.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/js/dtlviewajax.js Fri May 12 15:15:00 2006
@@ -10,7 +10,6 @@
var globaldtlviewspanid = "";
var globaleditareaspanid = "";
var globaltxtboxid = "";
-var itsonview=false;
function showHide(showId, hideId)
{
@@ -20,10 +19,7 @@
function hndCancel(valuespanid,textareapanid,fieldlabel)
{
-
showHide(valuespanid,textareapanid);
- itsonview=false;
- return false;
}
function hndMouseOver(uitype,fieldLabel)
@@ -31,28 +27,10 @@
var mouseArea="";
mouseArea="mouseArea_"+ fieldLabel;
- if(itsonview)
- {
- return;
- }
-
- show("crmspanid");
globaldtlviewspanid= "dtlview_"+ fieldLabel;//valuespanid;
globaleditareaspanid="editarea_"+ fieldLabel;//textareapanid;
globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
- divObj = getObj('crmspanid');
- crmy = findPosY(getObj(mouseArea));
- crmx = findPosX(getObj(mouseArea));
- if(document.all)
- {
- divObj.onclick=handleEdit;
- }
- else
- {
- divObj.setAttribute('onclick','handleEdit();');
- }
- divObj.style.left=(crmx+getObj(mouseArea).offsetWidth -divObj.offsetWidth)+"px";
- divObj.style.top=crmy+"px";
+ handleEdit();
}
function handleEdit()
@@ -60,8 +38,6 @@
show(globaleditareaspanid) ;
hide(globaldtlviewspanid);
getObj(globaltxtboxid).focus();
- hide('crmspanid');
- itsonview=true;
return false;
}
@@ -92,9 +68,8 @@
var editArea = "editarea_"+ fieldLabel;
var txtBox= "txtbox_"+ fieldLabel;
var popupTxt= "popuptxt_"+ fieldLabel;
-
+
var tagValue = trim(document.getElementById(txtBox).value);
-
var data = "module=" + module + "&action=" + module + "Ajax&recordid=" + crmId ;
data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
show("vtbusy_info");
@@ -151,7 +126,6 @@
getObj(dtlView).innerHTML = tagValue;
}
showHide(dtlView,editArea); //show,hide
- itsonview=false;
}
Modified: vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php Fri May 12 15:15:00 2006
@@ -604,6 +604,7 @@
'COMBO_HELPDESK'=>'HelpDesk',
+'COMBO_USERS'=>'Users',
'LBL_SELECT'=>'Select',
Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/EditViewUtils.php Fri May 12 15:15:00 2006
@@ -453,6 +453,15 @@
else
{
$assigned_user_id = $current_user->id;
+ }
+ if($col_fields['record_id'] != '')
+ {
+ $attachmentid=$adb->query_result($adb->query("select * from seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
+ if($col_fields[$fieldname] == '' && $attachmentid != '')
+ {
+ $attachquery = "select * from attachments where attachmentsid=".$attachmentid;
+ $value = $adb->query_result($adb->query($attachquery),0,'name');
+ }
}
if($value!='')
$filename=' [ '.$value. ' ]';
@@ -788,6 +797,15 @@
$parent_id .=$mycrmid.'@0|' ;//make it such that the email adress sent is remebered and only that one is retrived
$parent_name .= $account_name.'<'.$myemail.'>; ';
$account_selected = 'selected';
+ }elseif($parent_module == "Users")
+ {
+ $sql = "select user_name,email1 from users where id=".$mycrmid;
+ $result = $adb->query($sql);
+ $account_name = $adb->query_result($result,0,"user_name");
+ $myemail=$adb->query_result($result,0,"email1");
+ $parent_id .=$mycrmid.'@0|' ;//make it such that the email adress sent is remebered and only that one is retrived
+ $parent_name .= $account_name.'<'.$myemail.'>; ';
+ $user_selected = 'selected';
}
}
}
@@ -800,7 +818,8 @@
$editview_label[] = array(
$app_strings['COMBO_CONTACTS']=>$contact_selected,
$app_strings['COMBO_ACCOUNTS']=>$account_selected,
- $app_strings['COMBO_LEADS']=>$lead_selected
+ $app_strings['COMBO_LEADS']=>$lead_selected,
+ $app_strings['COMBO_USERS']=>$user_selected
);
$fieldvalue[] =$parent_name;
$fieldvalue[] = $parent_id;
Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php Fri May 12 15:15:00 2006
@@ -1253,25 +1253,27 @@
}
//added by rdhital/Raju for better emails
- elseif($popuptype == "set_return_emails")
+ elseif($popuptype == "set_return_emails")
+ {
+ if ($module=='Accounts')
{
- if ($module=='Accounts')
- {
+ $name = $adb->query_result($list_result,$list_result_count,'accountname');
$accid =$adb->query_result($list_result,$list_result_count,'accountid');
//$value = '<a href="javascript: submitform('.$accid.');">'.$temp_val.'</a>';
$emailaddress=$adb->query_result($list_result,$list_result_count,"email1");
- if($emailaddress == '')
- $emailaddress=$adb->query_result($list_result,$list_result_count,"email2");
-
- $querystr="select fieldid,fieldlabel,columnname from field where tabid=".getTabid($module)." and uitype=13;";
- $queryres = $adb->query($querystr);
- //Change this index 0 - to get the fieldid based on email1 or email2
- $fieldid = $adb->query_result($queryres,0,'fieldid');
-
-$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); window.close(); \'>'.$name.'</a>';
-
- }
- elseif ($module=='Contacts' || $module=='Leads')
+ if($emailaddress == '')
+ $emailaddress=$adb->query_result($list_result,$list_result_count,"email2");
+
+ $querystr="select fieldid,fieldlabel,columnname from field where tabid=".getTabid($module)." and uit
+ ype=13;";
+ $queryres = $adb->query($querystr);
+ //Change this index 0 - to get the fieldid based on email1 or email2
+ $fieldid = $adb->query_result($queryres,0,'fieldid');
+
+ $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_emails('.$entity_id.','.$fieldid.',"'
+ .$name.'","'.$emailaddress.'"); window.close(); \'>'.$name.'</a>';
+
+ }elseif ($module=='Contacts' || $module=='Leads')
{
$firstname=$adb->query_result($list_result,$list_result_count,"firstname");
$lastname=$adb->query_result($list_result,$list_result_count,"lastname");
@@ -1280,32 +1282,18 @@
if($emailaddress == '')
$emailaddress=$adb->query_result($list_result,$list_result_count,"yahooid");
- $querystr="select fieldid,fieldlabel,columnname from field where tabid=".getTabid($module)." and uitype=13;";
- $queryres = $adb->query($querystr);
- //Change this index 0 - to get the fieldid based on email or yahooid
- $fieldid = $adb->query_result($queryres,0,'fieldid');
-
- //$value = '<a href="javascript: submitform('.$entity_id.');">'.$name.'</a>';
- $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); window.close(); \'>'.$name.'</a>';
+ $querystr="select fieldid,fieldlabel,columnname from field where tabid=".getTabid($module)." and uit
+ ype=13;";
+ $queryres = $adb->query($querystr);
+ //Change this index 0 - to get the fieldid based on email or yahooid
+ $fieldid = $adb->query_result($queryres,0,'fieldid');
+
+ //$value = '<a href="javascript: submitform('.$entity_id.');">'.$name.'</a>';
+ $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); window.close(); \'>'.$name.'</a>';
}
- /* if ($module=='Accounts')
- {
- $accid =$adb->query_result($list_result,$list_result_count,'accountid');
- $value = '<a href="javascript: submitform('.$accid.');">'.$temp_val.'</a>';
- }
- elseif ($module=='Contacts' || $module=='Leads')
- {
- $firstname=$adb->query_result($list_result,$list_result_count,"firstname");
- $lastname=$adb->query_result($list_result,$list_result_count,"lastname");
- $name=$lastname.' '.$firstname;
-
- $value = '<a href="javascript: submitform('.$entity_id.');">'.$name.'</a>';
- }*/
-
- }
-//code added by raju ends
+ }
elseif($popuptype == "specific_vendor_address")
{
require_once('modules/Vendors/Vendor.php');
@@ -1423,7 +1411,7 @@
if($module == "Accounts")
{
//Query modified to sort by assigned to
- $query = "select crmentity.crmid, account.accountname,accountbillads.city,account.website,account.phone,crmentity.smownerid, accountscf.* from account inner join crmentity on crmentity.crmid=account.accountid inner join accountbillads on account.accountid=accountbillads.accountaddressid inner join accountshipads on account.accountid=accountshipads.accountaddressid inner join accountscf on account.accountid = accountscf.accountid left join accountgrouprelation on accountscf.accountid=accountgrouprelation.accountid left join groups on groups.groupname=accountgrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+ $query = "select crmentity.crmid, account.accountname,account.email1,account.email2,accountbillads.city,account.website,account.phone,crmentity.smownerid, accountscf.* from account inner join crmentity on crmentity.crmid=account.accountid inner join accountbillads on account.accountid=accountbillads.accountaddressid inner join accountshipads on account.accountid=accountshipads.accountaddressid inner join accountscf on account.accountid = accountscf.accountid left join accountgrouprelation on accountscf.accountid=accountgrouprelation.accountid left join groups on groups.groupname=accountgrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
{
@@ -1492,7 +1480,7 @@
}
if($module == "Emails")
{
- $query = "select distinct crmentity.crmid, crmentity.smownerid, activity.activityid, activity.subject, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid , activity.date_start from activity inner join crmentity on crmentity.crmid=activity.activityid left join users on users.id=crmentity.smownerid left join seactivityrel on seactivityrel.activityid = activity.activityid left join contactdetails on contactdetails.contactid=seactivityrel.crmid left join cntactivityrel on cntactivityrel.activityid= activity.activityid and cntactivityrel.contactid=cntactivityrel.contactid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname WHERE activity.activitytype='Emails' and crmentity.deleted=0 ";
+ $query = "select distinct crmentity.crmid, crmentity.smownerid, activity.activityid, activity.subject, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid , activity.date_start from activity inner join crmentity on crmentity.crmid=activity.activityid left join users on users.id=crmentity.smownerid left join seactivityrel on seactivityrel.activityid = activity.activityid left join contactdetails on contactdetails.contactid=seactivityrel.crmid left join cntactivityrel on cntactivityrel.activityid= activity.activityid and cntactivityrel.contactid=cntactivityrel.contactid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname left join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE activity.activitytype='Emails' and crmentity.deleted=0 ";
if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
{
$sec_parameter=getListViewSecurityParameter($module);
Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/UserInfoUtil.php Fri May 12 15:15:00 2006
@@ -4345,12 +4345,16 @@
}
elseif($module == 'Campaigns')
{
- $sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%')";
-
- if(sizeof($current_user_groups) > 0)
- {
- $sec_query .= " or (crmentity.smownerid in (0) and (groups.groupid in".getCurrentUserGroupList()."))) ";
- }
+
+ $sec_query .= " and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+
+ if(sizeof($current_user_groups) > 0)
+ {
+ $sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+ }
+ $sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+
+
}
else
{
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/Account.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/Account.php Fri May 12 15:15:00 2006
@@ -219,7 +219,7 @@
}
$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
- $query = "SELECT activity.*,seactivityrel.*, contactdetails.contactid,contactdetails.lastname, contactdetails.firstname, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name,recurringevents.recurringtype from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus !='' && activity.eventstatus = 'Planned')";
+ $query = "SELECT activity.*,seactivityrel.*, contactdetails.contactid,contactdetails.lastname, contactdetails.firstname, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name,recurringevents.recurringtype from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ((activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus !='' && activity.eventstatus = 'Planned'))";
$log->debug("Exiting get_activities method ...");
return GetRelatedList('Accounts','Activities',$focus,$query,$button,$returnset);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -12,6 +12,8 @@
require_once('Smarty_setup.php');
require_once('modules/Accounts/Account.php');
+require_once('include/utils/utils.php');
+
$focus = new Account();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
@@ -24,6 +26,13 @@
$log->debug("name is ".$focus->name);
}
+
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
$smarty = new vtigerCRM_Smarty;
@@ -40,5 +49,14 @@
$smarty->assign("id",$focus->id);
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD","Account");
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
+
$smarty->display("RelatedLists.tpl");
+
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/ListViewTop.php Fri May 12 15:15:00 2006
@@ -75,8 +75,8 @@
$entries[$account['accountid']]=$value;
}
$values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries);
- if ( ($display_empty_home_blocks && count($open_accounts_list) == 0 ) || (count($open_accounts_list)>0) )
$log->debug("Exiting getTopAccounts method ...");
+ if (($display_empty_home_blocks && count($entries) == 0 ) || (count($entries)>0))
return $values;
}
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Activities/Activity.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Activities/Activity.php Fri May 12 15:15:00 2006
@@ -205,8 +205,6 @@
$recur_result=$adb->query($recur_dates_qry);
$noofrows_recur = $adb->num_rows($recur_result);
- }
-
while($row = $adb->fetch_array($result))
{
@@ -216,16 +214,17 @@
if(is_admin($current_user))
{
- $entries[] = $row['last_name'].' '.$row['first_name'];
+ $entries[] = '<a href="index.php?module=Users&action=DetailView&parenttab=Settings&return_module=Activities&return_action=DetailView&activity_mode=Events&record='.$row["id"].'&return_id='.$_REQUEST['record'].'">'.$row['last_name'].' '.$row['first_name'].'</a>';
+ $entries[] = '<a href="index.php?module=Users&action=DetailView&parenttab=Settings&return_module=Activities&return_action=DetailView&activity_mode=Events&record='.$row["id"].'&return_id='.$_REQUEST['record'].'">'.$row['user_name'].'</a>';
}
else
{
$entries[] = $row['last_name'].' '.$row['first_name'];
+ $entries[] = $row['user_name'];
}
- $entries[] = $row['user_name'];
-
- $entries[] = $row['email1'];
+
+ $entries[] = '<a href="mailto:'.$row["email1"].'"]">'.$row['email1'].'</a>';
if($email == '') $email = $row['email2'];
if($email == '') $email = $row['yahoo_id'];
$entries[] = $row['phone_home'];
@@ -238,7 +237,17 @@
$list .= '<a href="index.php?module=Users&action=EditView&return_module=Activities&return_action=DetailView&activity_mode=Events&record='.$row["id"].'&return_id='.$_REQUEST['record'].'">'.$app_strings['LNK_EDIT'].'</a> | ';
}
-
+ // To display the dates for the Group calendar starts -Jaguar
+ $recur_dates_qry='select distinct(recurringdate) from recurringevents where activityid='.$activity_id;
+ $recur_result=$adb->query($recur_dates_qry);
+ $noofrows_recur = $adb->num_rows($recur_result);
+ if($noofrows_recur==0)
+ {
+ $recur_dates_qry='select activity.date_start,recurringevents.* from activity left outer join recurringevents on activity.activityid=recurringevents.activityid where recurringevents.activityid is NULL and activity.activityid='.$activity_id .' group by activity.activityid';
+ $recur_result=$adb->query($recur_dates_qry);
+ $noofrows_recur = $adb->num_rows($recur_result);
+
+ }
//Added for Group Calendar -Jaguar
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Activities/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Activities/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Activities/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -11,6 +11,7 @@
require_once('Smarty_setup.php');
+require_once('include/utils/utils.php');
require_once('modules/Activities/Activity.php');
global $mod_strings;
global $app_strings;
@@ -26,6 +27,11 @@
$log->debug("id is ".$focus->id);
$log->debug("name is ".$focus->name);
}
+
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
$smarty = new vtigerCRM_Smarty;
@@ -43,6 +49,13 @@
$smarty->assign("SINGLE_MOD", "Activity");
$smarty->assign("ACTIVITY_MODE",'Events');
$smarty->assign("MODULE", $MODULE);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
+
+
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -12,6 +12,8 @@
require_once('Smarty_setup.php');
require_once('modules/Campaigns/Campaign.php');
+require_once('include/utils/utils.php');
+
$focus = new Campaign();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
@@ -25,6 +27,13 @@
$log->debug("name is ".$focus->name);
}
+
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
$smarty = new vtigerCRM_Smarty;
@@ -42,5 +51,13 @@
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD",$currentmodule);
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
+
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -37,6 +37,13 @@
$campaignid = $adb->query_result($sql1,0,'campaignid');
if($campaignid == 0) $campaignid='';
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
$smarty->assign("accountid",$accountid);
$smarty->assign("campaignid",$campaignid);
@@ -58,5 +65,12 @@
$smarty->assign("SINGLE_MOD","Contact");
$smarty->assign("ID",$record );
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/PopulateCustomView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/PopulateCustomView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/PopulateCustomView.php Fri May 12 15:15:00 2006
@@ -267,9 +267,8 @@
'crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V'),
Array('activity:subject:subject:Emails_Subject:V',
- 'seactivityrel:crmid:parent_id:Emails_Related_To:I',
- 'activity:date_start:date_start:Emails_Date_Sent:D',
- 'crmentity:smownerid:assigned_user_id:Emails_Assigned_To:V'),
+ 'crmentity:smownerid:assigned_user_id:Emails_Sender:V'
+ 'activity:date_start:date_start:Emails_Date_Sent:D'),
Array('crmentity:crmid::Invoice_Invoice_Id:I',
'invoice:subject:subject:Invoice_Subject:V',
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -12,6 +12,8 @@
require_once('Smarty_setup.php');
require_once('modules/Emails/Email.php');
+require_once('include/utils/utils.php');
+
$focus = new Email();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
@@ -26,6 +28,13 @@
}
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
@@ -39,5 +48,13 @@
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD","Email");
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
+
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/DetailView.php Fri May 12 15:15:00 2006
@@ -34,11 +34,20 @@
$focus = new Email();
+$smarty = new vtigerCRM_Smarty;
if(isset($_REQUEST['record']))
{
+ global $adb;
$focus->retrieve_entity_info($_REQUEST['record'],"Emails");
- $log->info("Entity info successfully retrieved for DetailView.");
+ $log->info("Entity info successfully retrieved for DetailView.");
$focus->id = $_REQUEST['record'];
+ $query = 'select from_email,to_email,cc_email,bcc_email from emaildetails where emailid ='.$focus->id;
+ $result = $adb->query($query);
+ $smarty->assign('FROM_MAIL',$adb->query_result($result,0,'from_email'));
+ $to_email = ereg_replace('###',',',$adb->query_result($result,0,'to_email'));
+ $smarty->assign('TO_MAIL',$to_email);
+ $smarty->assign('CC_MAIL',ereg_replace('###',',',$adb->query_result($result,0,'cc_email')));
+ $smarty->assign('BCC_MAIL',ereg_replace('###',',',$adb->query_result($result,0,'bcc_email')));
if($focus->column_fields['name'] != '')
$focus->name = $focus->column_fields['name'];
else
@@ -104,9 +113,7 @@
$submenu = array('LBL_EMAILS_TITLE'=>'index.php?module=Emails&action=index','LBL_WEBMAILS_TITLE'=>'index.php?module=squirrelmail-1.4.4&action=redirect');
$sec_arr = array('index.php?module=Emails&action=index'=>'Emails','index.php?module=squirrelmail-1.4.4&action=redirect'=>'Emails');
-echo '<br>';
-$smarty = new vtigerCRM_Smarty;
$smarty->assign("MOD", $mod_strings);
$smarty->assign("APP", $app_strings);
@@ -120,7 +127,7 @@
$smarty->assign("CATEGORY",$category);
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-else $smarty->assign("NAME", "");
+ else $smarty->assign("NAME", "");
$entries = getBlocks("Emails","detail_view",'',$focus->column_fields);
if($_REQUEST['mode'] != 'ajax')
@@ -135,8 +142,6 @@
$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
-
-$smarty->assign("ID", $_REQUEST['record']);
if(isPermitted("Emails","EditView",$_REQUEST['record']) == 'yes')
$smarty->assign("EDIT_DUPLICATE","permitted");
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/EditView.php Fri May 12 15:15:00 2006
@@ -34,65 +34,6 @@
global $mod_strings;
global $current_user;
-$submenu = array('LBL_EMAILS_TITLE'=>'index.php?module=Emails&action=index','LBL_WEBMAILS_TITLE'=>'index.php?module=squirrelmail-1.4.4&action=redirect');
-$sec_arr = array('index.php?module=Emails&action=index'=>'Emails','index.php?module=squirrelmail-1.4.4&action=redirect'=>'Emails');
-?>
-<!--table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="tabStart"> </td-->
-<?
- if(isset($_REQUEST['smodule']) && $_REQUEST['smodule'] != '')
- {
- $classname = "tabOff";
- }
- else
- {
- $classname = "tabOn";
- }
- $listView = "ListView.php";
- foreach($submenu as $label=>$filename)
- {
- $cur_mod = $sec_arr[$filename];
- $cur_tabid = getTabid($cur_mod);
-
- if(isPermitted($cur_mod,'','') == 'yes')
- {
-
- list($lbl,$sname,$title)=split("_",$label);
- if(stristr($label,"EMAILS"))
- {
-
- //echo '<td class="tabOn" nowrap><a href="index.php?module=Emails&action=index&smodule='.$sname.'" class="tabLink">'.$mod_strings[$label].'</a></td>';
-
- $listView = $filename;
- $classname = "tabOff";
- }
- elseif(stristr($label,$_REQUEST['smodule']))
- {
- //echo '<td class="tabOn" nowrap><a href="index.php?module=squirrelmail-1.4.4&action=redirect&smodule='.$sname.'" class="tabLink">'.$mod_strings[$label].'</a></td>';
- $listView = $filename;
- $classname = "tabOff";
- }
- else
- {
- //echo '<td class="'.$classname.'" nowrap><a href="index.php?module=squirrelmail-1.4.4&action=redirect&smodule='.$sname.'" class="tabLink">'.$mod_strings[$label].'</a></td>';
- }
- $classname = "tabOff";
- }
-
- }
-?>
- <!--td width="100%" class="tabEnd"> </td>
- </tr>
- </table></td>
- </tr>
- </table>
- <br-->
-<?
-
-
$focus = new Email();
$smarty = new vtigerCRM_Smarty();
@@ -114,7 +55,16 @@
$focus->id = $_REQUEST['record'];
$focus->mode = 'edit';
$focus->retrieve_entity_info($_REQUEST['record'],"Emails");
- $log->info("Entity info successfully retrieved for EditView.");
+ $query = 'select idlists,from_email,to_email,cc_email,bcc_email from emaildetails where emailid ='.$focus->id;
+ $result = $adb->query($query);
+ $smarty->assign('FROM_MAIL',$adb->query_result($result,0,'from_email'));
+ $to_email = ereg_replace('###',',',$adb->query_result($result,0,'to_email'));
+ $smarty->assign('TO_MAIL',$to_email);
+ $smarty->assign('CC_MAIL',ereg_replace('###',',',$adb->query_result($result,0,'cc_email')));
+ $smarty->assign('BCC_MAIL',ereg_replace('###',',',$adb->query_result($result,0,'bcc_email')));
+ $smarty->assign('IDLISTS',ereg_replace('###',',',$adb->query_result($result,0,'idlists')));
+
+ $log->info("Entity info successfully retrieved for EditView.");
$focus->name=$focus->column_fields['name'];
}
if(isset($_REQUEST['parent_id']) && $_REQUEST['parent_id'] != '')
@@ -122,18 +72,8 @@
$focus->column_fields['parent_id'] = $_REQUEST['parent_id'];
$focus->mode = '';
}
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
-{
- $old_id = $_REQUEST['record'];
- if (! empty($focus->filename) )
- {
- $old_id = $focus->id;
- }
- $focus->id = "";
- $focus->mode = "";
-}
+
global $theme;
-
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
require_once($theme_path.'layout_utils.php');
@@ -142,8 +82,6 @@
$details = getBlocks("Emails",$disp_view,$mode,$focus->column_fields);
$smarty->assign("BLOCKS",$details['Email Information']);
-//echo '<pre>';print_r($details['Email Information']);echo '</pre>';
-
$smarty->assign("MODULE",$currentModule);
$smarty->assign("SINGLE_MOD","Email");
@@ -237,7 +175,6 @@
$focus->parent_type = $app_list_strings['record_type_default_key'];
}
-
$log->info("Email detail view");
$smarty->assign("MOD", $mod_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js Fri May 12 15:15:00 2006
@@ -68,13 +68,3 @@
return false;
}
}
-function ShowFolders(folder)
-{
- var ajaxObj = new Ajax(ajaxSaveResponse);
- var urlstring ="module=Emails&ajax=true&action=EmailsAjax&file=ListView&folder="+folder;
- ajaxObj.process("index.php?",urlstring);
-}
-
-
-
-
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php Fri May 12 15:15:00 2006
@@ -45,10 +45,6 @@
var $date_start;
var $time_start;
var $module_id="emailid";
-
- var $rel_users_table = "salesmanactivityrel";
- var $rel_contacts_table = "cntactivityrel";
- var $rel_serel_table = "seactivityrel";
var $table_name = "activity";
var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel');
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php Fri May 12 15:15:00 2006
@@ -162,21 +162,21 @@
{
$list_query .= " AND " .$where;
}
-if($_REQUEST['folder'] =='Contacts')
+if($_REQUEST['folderid'] =='2')
{
$list_query .= "AND seactivityrel.crmid in (select contactid from contactdetails)";
}
-if($_REQUEST['folder'] =='Accounts')
+if($_REQUEST['folderid'] =='3')
{
$list_query .= "AND seactivityrel.crmid in (select accountid from account)";
}
-if($_REQUEST['folder'] =='Leads')
+if($_REQUEST['folderid'] =='4')
{
$list_query .= "AND seactivityrel.crmid in (select leadid from leaddetails)";
}
-if($_REQUEST['folder'] =='Users')
-{
- $list_query .= "AND seactivityrel.crmid in (select id from users)";
+if($_REQUEST['folderid'] =='5')
+{
+ $list_query .= "AND salesmanactivityrel.smid in (select id from users)";
}
if(isset($order_by) && $order_by != '')
{
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Save.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Save.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Save.php Fri May 12 15:15:00 2006
@@ -48,15 +48,14 @@
$focus = new Email();
+global $current_user;
setObjectValuesFromRequest(&$focus);
-
//Check if the file is exist or not.
if($_FILES["filename"]["size"] == 0 && $_FILES["filename"]["name"] != '')
{
$file_upload_error = true;
$_FILES = '';
}
-
if((isset($_REQUEST['deletebox']) && $_REQUEST['deletebox'] != null) && $_REQUEST['addbox'] == null)
{
imap_delete($mbox,$_REQUEST['deletebox']);
@@ -149,12 +148,19 @@
$focus->filename = $_REQUEST['file_name'];
$focus->parent_id = $_REQUEST['parent_id'];
$focus->parent_type = $_REQUEST['parent_type'];
+$focus->column_fields["assigned_user_id"]=$current_user->id;
$focus->column_fields["activitytype"]="Emails";
+$focus->column_fields["date_start"]= date('Y-m-d');
$focus->save("Emails");
-
$return_id = $focus->id;
$email_id = $return_id;
-
+$query = 'select emailid from emaildetails where emailid ='.$email_id;
+$result = $adb->query($query);
+if($adb->num_rows($result) > 0)
+ $query = 'update emaildetails set idlists='.$_REQUEST["parent_id"].' where emailid = '.$email_id;
+else
+ $query = 'insert into emaildetails values ('.$email_id.',"","","","","","'.$_REQUEST["parent_id"].'","SAVED")';
+$adb->query($query);
$focus->retrieve_entity_info($return_id,"Emails");
//this is to receive the data from the Select Users button
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php Fri May 12 15:15:00 2006
@@ -64,7 +64,8 @@
'LBL_FORWARD_BUTTON'=>'Forward',
'LBL_DOWNLOAD_ATTCH_BUTTON'=>'Download Attachments',
'LBL_FROM'=>'From :',
-'LBL_CC'=>'CC :',
+'LBL_CC'=>'Cc :',
+'LBL_BCC'=>'Bcc :',
'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?',
'LBL_INVITEE'=>'Recipients',
@@ -135,6 +136,7 @@
'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!<br> Check in My Accounts->List Mail Server -> List Mail Account',
'LBL_ALLMAILS'=>'All Mails',
'LBL_TO_USERS'=>'To Users',
+'LBL_TO'=>'To:',
);
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/mailsend.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/mailsend.php Fri May 12 15:15:00 2006
@@ -72,6 +72,8 @@
else
{
$mail_status = send_mail('Emails',$to_email,$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],$cc,$bcc,'all',$focus->id);
+
+ $query = 'update emaildetails set cc_email="'.ereg_replace(',','###',$cc).'",bcc_email="'.ereg_replace(',','###',$bcc).'",assigned_user_email="'.$to_email.'",email_flag="SENT" where emailid='.$focus->id;
//set the errorheader1 to 1 if the mail has not been sent to the assigned to user
if($mail_status != 1)//when mail send fails
{
@@ -80,11 +82,13 @@
}
elseif($mail_status == 1 && $to_email == '')//Mail send success only for CC and BCC but the 'to' email is empty
{
+ $adb->query($query);
$errorheader1 = 1;
$mail_status_str = "cc_success=0&&&";
}
else
{
+ $adb->query($query);
$mail_status_str = $to_email."=".$mail_status."&&&";
}
}
@@ -93,50 +97,64 @@
//Added code from mysendmail.php which is contributed by Raju(rdhital)
$parentid= $_REQUEST['parent_id'];
$myids=explode("|",$parentid);
+$all_to_emailids = Array();
for ($i=0;$i<(count($myids)-1);$i++)
{
$realid=explode("@",$myids[$i]);
$nemail=count($realid);
$mycrmid=$realid[0];
- $pmodule=getSalesEntityType($mycrmid);
- for ($j=1;$j<$nemail;$j++)
+ if($realid[1] == -1)
{
- $temp=$realid[$j];
- //$myquery='Select columnname from field where fieldid='.$temp;
- $myquery='Select columnname from field where fieldid='.$adb->quote($temp);
- $fresult=$adb->query($myquery);
- if ($pmodule=='Contacts')
+ //handle the mail send to users
+ $emailadd = $adb->query_result($adb->query("select email1 from users where id=$mycrmid"),0,'email1');
+ $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$focus->column_fields['description'],'','','all',$focus->id);
+ $all_to_emailids []= $emailadd;
+ $mail_status_str .= $emailadd."=".$mail_status."&&&";
+ }
+ else
+ {
+ //Send mail to account or lead or contact based on their ids
+ $pmodule=getSalesEntityType($mycrmid);
+ for ($j=1;$j<$nemail;$j++)
{
- require_once('modules/Contacts/Contact.php');
- $myfocus = new Contact();
- $myfocus->retrieve_entity_info($mycrmid,"Contacts");
- }
- elseif ($pmodule=='Accounts')
- {
- require_once('modules/Accounts/Account.php');
- $myfocus = new Account();
- $myfocus->retrieve_entity_info($mycrmid,"Accounts");
- }
- elseif ($pmodule=='Leads')
- {
- require_once('modules/Leads/Lead.php');
- $myfocus = new Lead();
- $myfocus->retrieve_entity_info($mycrmid,"Leads");
- }
- $fldname=$adb->query_result($fresult,0,"columnname");
- $emailadd=br2nl($myfocus->column_fields[$fldname]);
+ $temp=$realid[$j];
+ $myquery='Select columnname from field where fieldid='.$adb->quote($temp);
+ $fresult=$adb->query($myquery);
+ if ($pmodule=='Contacts')
+ {
+ require_once('modules/Contacts/Contact.php');
+ $myfocus = new Contact();
+ $myfocus->retrieve_entity_info($mycrmid,"Contacts");
+ }
+ elseif ($pmodule=='Accounts')
+ {
+ require_once('modules/Accounts/Account.php');
+ $myfocus = new Account();
+ $myfocus->retrieve_entity_info($mycrmid,"Accounts");
+ }
+ elseif ($pmodule=='Leads')
+ {
+ require_once('modules/Leads/Lead.php');
+ $myfocus = new Lead();
+ $myfocus->retrieve_entity_info($mycrmid,"Leads");
+ }
+ $fldname=$adb->query_result($fresult,0,"columnname");
+ $emailadd=br2nl($myfocus->column_fields[$fldname]);
- if($emailadd != '')
- {
- $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$focus->column_fields['description'],'','','all',$focus->id);
- $mail_status_str .= $emailadd."=".$mail_status."&&&";
- //added to get remain the EditView page if an error occurs in mail sending
- if($mail_status != 1)
+ if($emailadd != '')
{
- $errorheader2 = 1;
+ $mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$focus->column_fields['description'],'','','all',$focus->id);
+
+ $all_to_emailids []= $emailadd;
+ $mail_status_str .= $emailadd."=".$mail_status."&&&";
+ //added to get remain the EditView page if an error occurs in mail sending
+ if($mail_status != 1)
+ {
+ $errorheader2 = 1;
+ }
}
- }
- }
+ }
+ }
}
//Added to redirect the page to Emails/EditView if there is an error in mail sending
@@ -155,7 +173,16 @@
$returnid = $_REQUEST['currentid'];
}
}
-
+else
+{
+ global $adb;
+ $date_var = date('Ymd');
+ $query = 'update activity set date_start ='.$date_var.' where activityid = '.$returnid;
+ $adb->query($query);
+ $toemails = implode('###',$all_to_emailids);
+ $query = 'update emaildetails set email_flag="SENT",to_email="'.$toemails.'" where emailid='.$focus->id;
+ $adb->query($query);
+}
//The following function call is used to parse and form a encoded error message and then pass to result page
$mail_error_str = getMailErrorString($mail_status_str);
$adb->println("Mail Sending Process has been finished.\n\n");
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -12,6 +12,8 @@
require_once('Smarty_setup.php');
require_once('modules/HelpDesk/HelpDesk.php');
+require_once('include/utils/utils.php');
+
$focus = new HelpDesk();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
@@ -25,6 +27,13 @@
$log->debug("name is ".$focus->name);
}
+
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
$smarty = new vtigerCRM_Smarty;
@@ -43,5 +52,13 @@
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD",$currentmodule);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
+
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -12,6 +12,8 @@
require_once('Smarty_setup.php');
require_once('modules/Invoice/Invoice.php');
+require_once('include/utils/utils.php');
+
$focus = new Invoice();
$currentmodule = $_REQUEST['module'];
$RECORD = $_REQUEST['record'];
@@ -22,6 +24,13 @@
$log->debug("id is ".$focus->id);
$log->debug("name is ".$focus->name);
}
+
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
$smarty = new vtigerCRM_Smarty;
@@ -36,5 +45,12 @@
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD",$currentmodule);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Leads/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -26,6 +26,13 @@
$log->debug("name is ".$focus->name);
}
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
@@ -51,6 +58,13 @@
$smarty->assign("MODULE", $currentmodule);
$smarty->assign("ID",$RECORD );
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Leads/Lead.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Leads/Lead.php Fri May 12 15:15:00 2006
@@ -264,7 +264,7 @@
*/
function get_emails($id)
{
-
+ global $log;
$log->debug("Entering get_emails(".$id.") method ...");
global $mod_strings;
require_once('include/RelatedListView.php');
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListViewTop.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListViewTop.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListViewTop.php Fri May 12 15:15:00 2006
@@ -71,7 +71,7 @@
$list_result = $adb->query($list_query);
$noofrows = $adb->num_rows($list_result);
$open_lead_list =array();
- if (count($list_result)>0)
+ if ($noofrows > 0)
for($i=0;$i<$noofrows,$i<5;$i++)
{
$open_lead_list[] = Array('leadname' => $adb->query_result($list_result,$i,'firstname').' '.$adb->query_result($list_result,$i,'lastname'),
@@ -122,6 +122,7 @@
}
$values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries);
$log->debug("Exiting getNewLeads method ...");
+ if (($display_empty_home_blocks && count($entries) == 0 ) || (count($entries)>0))
return $values;
}
function getLeadView($lead_view)
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -24,6 +24,13 @@
$log->debug("name is ".$focus->name);
}
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
@@ -39,6 +46,13 @@
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD","Potential");
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -32,6 +32,13 @@
$related_array=getRelatedLists("PriceBooks",$focus);
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
if(isset($focus->name))
@@ -45,6 +52,13 @@
$smarty->assign("RELATEDLISTS", $related_array);
$smarty->assign("SINGLE_MOD","PriceBook");
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Products/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Products/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Products/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -24,6 +24,13 @@
$log->debug("name is ".$focus->name);
}
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
@@ -42,6 +49,13 @@
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("SINGLE_MOD","Product");
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -23,6 +23,13 @@
$log->debug("name is ".$focus->name);
}
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
@@ -36,5 +43,12 @@
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD",$currentmodule);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -23,6 +23,13 @@
$log->debug("name is ".$focus->name);
}
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
@@ -36,5 +43,12 @@
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD","Quote");
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -22,6 +22,13 @@
$log->debug("name is ".$focus->name);
}
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
@@ -34,5 +41,12 @@
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD","SalesOrder");
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Settings/CreateCustomField.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Settings/CreateCustomField.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Settings/CreateCustomField.php Fri May 12 15:15:00 2006
@@ -144,12 +144,12 @@
<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_LENGTH'].'</b></td>
<td align="left"><input type="text" name="fldLength" value="'.$fieldlength.'""'.$readonly.'" class="txtBox"></td>
</tr>
- <tr id="decimaldetails">
+ <tr id="decimaldetails" style="visibility:hidden;">
<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_DECIMAL_PLACES'].'</b></td>
<td align="left"><input type="text" name="fldDecimal" value="'.$decimalvalue.'" "'.$readonly.'" class="txtBox"></td>
</tr>
- <tr id="picklist">
- <td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_PICK_LIST_VALUES'].'</b></td>
+ <tr id="picklist" style="visibility:hidden;">
+ <td class="dataLabel" nowrap="nowrap" align="right" valign="top"><b>'.$mod_strings['LBL_PICK_LIST_VALUES'].'</b></td>
<td align="left" valign="top"><textarea name="fldPickList" rows="10" class="txtBox" "'.$readonly.'">'.$fldVal.'</textarea></td>
<!--td style="padding-left:10px"><img src="themes/Aqua/images/picklist_hint.gif"/></td-->
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateSharingRule.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateSharingRule.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateSharingRule.php Fri May 12 15:15:00 2006
@@ -13,7 +13,6 @@
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
-
//Constructing the Role Array
$roleDetails=getAllRoleDetails();
$output='';
@@ -21,172 +20,310 @@
//Constructing the Group Array
$grpDetails=getAllGroupName();
$combovalues='';
-foreach($roleDetails as $roleid=>$rolename)
-{
- $combovalues .='<option value="roles::'.$roleid.'">Roles::'.$rolename[0].'</option>';
-}
-
-foreach($roleDetails as $roleid=>$rolename)
-{
- $combovalues .='<option value="rs::'.$roleid.'">Roles and Subordinates::'.$rolename[0].'</option>';
-}
-
-foreach($grpDetails as $groupid=>$groupname)
-{
- $combovalues .='<option value="groups::'.$groupid.'" selected>Group::'.$groupname.'</option>';
-}
- global $adb;
- $mode = $_REQUEST['mode'];
- if(isset($_REQUEST['shareid']) && $_REQUEST['shareid'] != '')
- {
- $shareid=$_REQUEST['shareid'];
- $shareInfo=getSharingRuleInfo($shareid);
- $tabid=$shareInfo[1];
- $sharing_module=getTabModuleName($tabid);
-
+
+global $adb;
+$mode = $_REQUEST['mode'];
+if(isset($_REQUEST['shareid']) && $_REQUEST['shareid'] != '')
+{
+ $shareid=$_REQUEST['shareid'];
+ $shareInfo=getSharingRuleInfo($shareid);
+ $tabid=$shareInfo[1];
+ $sharing_module=getTabModuleName($tabid);
+
+}
+else
+{
+ $sharing_module=$_REQUEST['sharing_module'];
+ $tabid=getTabid($sharing_module);
+}
+
+if($mode == 'create')
+{
+ foreach($roleDetails as $roleid=>$rolename)
+ {
+ $combovalues .='<option value="roles::'.$roleid.'">Roles::'.$rolename[0].'</option>';
+ }
+
+ foreach($roleDetails as $roleid=>$rolename)
+ {
+ $combovalues .='<option value="rs::'.$roleid.'">Roles and Subordinates::'.$rolename[0].'</option>';
+ }
+
+ foreach($grpDetails as $groupid=>$groupname)
+ {
+ $combovalues .='<option value="groups::'.$groupid.'">Group::'.$groupname.'</option>';
+ }
+
+ $fromComboValues=$combovalues;
+ $toComboValues=$combovalues;
+
+}
+elseif($mode == 'edit')
+{
+
+
+ //constructing the from combo values
+ $fromtype=$shareInfo[3];
+ $fromid=$shareInfo[5];
+
+
+ foreach($roleDetails as $roleid=>$rolename)
+ {
+ $selected='';
+
+ if($fromtype == 'roles')
+ {
+ if($roleid == $fromid)
+ {
+ $selected='selected';
+ }
}
- else
- {
- $sharing_module=$_REQUEST['sharing_module'];
- $tabid=getTabid($sharing_module);
+ $fromComboValues .='<option value="roles::'.$roleid.'" '.$selected.'>Roles::'.$rolename[0].'</option>';
+ }
+
+ foreach($roleDetails as $roleid=>$rolename)
+ {
+
+ $selected='';
+ if($fromtype == 'rs')
+ {
+ if($roleid == $fromid)
+ {
+ $selected='selected';
+ }
+ }
+
+ $fromComboValues .='<option value="rs::'.$roleid.'" '.$selected.'>Roles and Subordinates::'.$rolename[0].'</option>';
+ }
+
+ foreach($grpDetails as $groupid=>$groupname)
+ {
+ $selected='';
+ if($fromtype == 'groups')
+ {
+ if($groupid == $fromid)
+ {
+ $selected='selected';
+ }
+ }
+
+
+ $fromComboValues .='<option value="groups::'.$groupid.'" '.$selected.'>Group::'.$groupname.'</option>';
+ }
+
+ //constructing the to combo values
+ $totype=$shareInfo[4];
+ $toid=$shareInfo[6];
+
+
+ foreach($roleDetails as $roleid=>$rolename)
+ {
+ $selected='';
+
+ if($totype == 'roles')
+ {
+ if($roleid == $toid)
+ {
+ $selected='selected';
+ }
}
+ $toComboValues .='<option value="roles::'.$roleid.'" '.$selected.'>Roles::'.$rolename[0].'</option>';
+ }
+
+ foreach($roleDetails as $roleid=>$rolename)
+ {
+
+ $selected='';
+ if($totype == 'rs')
+ {
+ if($roleid == $toid)
+ {
+ $selected='selected';
+ }
+ }
+
+ $toComboValues .='<option value="rs::'.$roleid.'" '.$selected.'>Roles and Subordinates::'.$rolename[0].'</option>';
+ }
+
+ foreach($grpDetails as $groupid=>$groupname)
+ {
+ $selected='';
+ if($totype == 'groups')
+ {
+ if($groupid == $toid)
+ {
+ $selected='selected';
+ }
+ }
- $relatedmodule='';
- $relatedlistscombo='';
- $relatedModuleSharingArr=getRelatedSharingModules($tabid);
- $size=sizeof($relatedModuleSharingArr);
- if($size > 0)
- {
- if($mode=='edit')
- {
- $relatedModuleSharingPerrArr=getRelatedModuleSharingPermission($shareid);
+
+ $toComboValues .='<option value="groups::'.$groupid.'" '.$selected.'>Group::'.$groupname.'</option>';
+ }
+
+}
+
+
+
+$relatedmodule='';
+$relatedlistscombo='';
+$relatedModuleSharingArr=getRelatedSharingModules($tabid);
+$size=sizeof($relatedModuleSharingArr);
+if($size > 0)
+{
+ if($mode=='edit')
+ {
+ $relatedModuleSharingPerrArr=getRelatedModuleSharingPermission($shareid);
+ }
+ foreach($relatedModuleSharingArr as $reltabid=>$relmode_shareid)
+ {
+ $rel_module=getTabModuleName($reltabid);
+ $relatedmodule .=$rel_module.'###';
+ }
+ foreach($relatedModuleSharingArr as $reltabid=>$relmode_shareid)
+ {
+ $ro_selected='';
+ $rw_selected='';
+ $rel_module=getTabModuleName($reltabid);
+ if($mode=='create')
+ {
+ $ro_selected='selected';
+ }
+ elseif($mode=='edit')
+ {
+ $perr=$relatedModuleSharingPerrArr[$reltabid];
+ if($perr == 0)
+ {
+ $ro_selected='selected';
}
- foreach($relatedModuleSharingArr as $reltabid=>$relmode_shareid)
- {
- $rel_module=getTabModuleName($reltabid);
- $relatedmodule .=$rel_module.'###';
+ elseif($perr == 1)
+ {
+ $rw_selected='selected';
}
- foreach($relatedModuleSharingArr as $reltabid=>$relmode_shareid)
- {
- $ro_selected='';
- $rw_selected='';
- $rel_module=getTabModuleName($reltabid);
- if($mode=='create')
- {
- $ro_selected='selected';
- }
- elseif($mode=='edit')
- {
- $perr=$relatedModuleSharingPerrArr[$reltabid];
- if($perr == 0)
- {
- $ro_selected='selected';
- }
- elseif($perr == 1)
- {
- $rw_selected='selected';
- }
- }
-
+ }
+
$relatedlistscombo.='<tr><td align="right" nowrap style="padding-right:10px;"><b>'.$rel_module.' :</b></td>
- <td width="70%">';
+ <td width="70%">';
$relatedlistscombo.='<select id="'.$rel_module.'_accessopt" name="'.$rel_module.'_accessopt" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>
- <option value="0" '.$ro_selected.' >Read Only</option>
- <option value="1" '.$rw_selected.' >Read/Write</option>
- </select></td></tr>';
-
-
- }
- }
- $output.='<form name="newGroupForm" action="index.php" method="post">
- <input type="hidden" name="module" value="Users">
- <input type="hidden" name="parenttab" value="Settings">
- <input type="hidden" name="action" value="SaveSharingRule">
- <input type="hidden" name="sharing_module" value="'.$sharing_module.'">
- <input type="hidden" name="shareId" value="'.$shareid.'">
- <input type="hidden" name="mode" value="'.$mode.'">
-
- <div id="orgLay" style="display:block;">
- <table width="100%" border="0" cellpadding="3" cellspacing="0">
- <tr>
- <td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="60%">'.$sharing_module.' - Add Custom Privilege Rule</td>
- <td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:onClick=hide(\'orgLay\')";>Close</a></td>
-
- </tr>
- <tr><td colspan="2"> </td></tr>
- <tr>
- <td><b>Step 1 :'.$sharing_module.' of </b>(Select an entity below)</td>
- <td> </td>
-
- </tr>
- <tr>
- <td style="padding-left:20px;text-align:left;">';
- //combovalues
-
- $output.='<select id="'.$sharing_module.'_share" name="'.$sharing_module.'_share" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>'.$combovalues.'</select>';
- $output.='</td>
-
- <td> </td>
- </tr>
- <tr><td colspan="2"> </td></tr>
- <tr>
-
- <td style="text-align:left;"><b>Step 2 : Can be accessed by</b>(Select an entity below)</td>
- <td align="left"><b>Permissions</b></td>
- </tr>
- <tr>
- <td style="padding-left:20px;text-align:left;">
-
- <select id="'.$sharing_module.'_access" name="'.$sharing_module.'_access" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>';
-
- $output.=$combovalues.'</select>
-
- </td><td>
-
- <select id="share_memberType" name="share_memberType" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>
- <option value="0" selected>Read Only</option>
- <option value="1">Read/Write</option>
- </select>
-
- </td>
- </tr>
- <tr><td colspan="2"> </td></tr>
- <tr>
- <td style="text-align:left;"><b>Step 3 : Access rights for relative modules </b></td>
- <td> </td>
-
- </tr>
- <tr>
- <td style="padding-left:20px;text-align:left;">
- <table width="75%" border="0" cellspacing="0" cellpadding="0">';
-
-
+ <option value="0" '.$ro_selected.' >Read Only</option>
+ <option value="1" '.$rw_selected.' >Read/Write</option>
+ </select></td></tr>';
+
+
+ }
+}
+
+
+if($mode == 'create')
+{
+ $sharPerCombo = '<option value="0" selected>Read Only</option>';
+ $sharPerCombo .= '<option value="1">Read/Write</option>';
+}
+elseif($mode == 'edit')
+{
+ $selected1='';
+ $selected2='';
+ if($shareInfo[7] == 0)
+ {
+ $selected1='selected';
+ }
+ elseif($shareInfo[7] == 1)
+ {
+ $selected2='selected';
+ }
+
+ $sharPerCombo = '<option value="0" '.$selected1.'>Read Only</option>';
+ $sharPerCombo .= '<option value="1" '.$selected2.'>Read/Write</option>';
+}
+
- $output .=$relatedlistscombo.'</table>
- </td>
- <td> </td>
- </tr>
- <tr><td colspan="2" align="left"> </td></tr>
- <tr>
- <td colspan="2" class="detailedViewHeader"><b>Rule Construction Display</b></td>
-
- </tr>
- <tr>
- <td style="white-space:normal;" colspan="2" class="dvtCellLabel" id="rules">
- </td>
- </tr>
- <tr>
- <td style="white-space:normal;" colspan="2" class="dvtCellLabel" id="relrules">
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <input type="submit" class="small" name="add" value="Add Rule" onClick="return validate()">
- </td>
- </tr>
- </table>
- </div>';
-
- $output.='</form>';
- echo $output;
+$output.='<form name="newGroupForm" action="index.php" method="post">
+<input type="hidden" name="module" value="Users">
+<input type="hidden" name="parenttab" value="Settings">
+<input type="hidden" name="action" value="SaveSharingRule">
+<input type="hidden" name="sharing_module" value="'.$sharing_module.'">
+<input type="hidden" name="shareId" value="'.$shareid.'">
+<input type="hidden" name="mode" value="'.$mode.'">
+
+<div id="orgLay" style="display:block;">
+<table width="100%" border="0" cellpadding="3" cellspacing="0">
+<tr>
+<td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="60%">'.$sharing_module.' - Add Custom Privilege Rule</td>
+<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:onClick=hide(\'orgLay\')";>Close</a></td>
+
+</tr>
+<tr><td colspan="2"> </td></tr>
+<tr>
+<td><b>Step 1 :'.$sharing_module.' of </b>(Select an entity below)</td>
+<td> </td>
+
+</tr>
+<tr>
+<td style="padding-left:20px;text-align:left;">';
+//combovalues
+
+$output.='<select id="'.$sharing_module.'_share" name="'.$sharing_module.'_share" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>'.$fromComboValues.'</select>';
+$output.='</td>
+
+<td> </td>
+</tr>
+<tr><td colspan="2"> </td></tr>
+<tr>
+
+<td style="text-align:left;"><b>Step 2 : Can be accessed by</b>(Select an entity below)</td>
+<td align="left"><b>Permissions</b></td>
+</tr>
+<tr>
+<td style="padding-left:20px;text-align:left;">
+
+<select id="'.$sharing_module.'_access" name="'.$sharing_module.'_access" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>';
+
+$output.=$toComboValues.'</select>
+
+</td><td>
+
+<select id="share_memberType" name="share_memberType" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>';
+$output .= $sharPerCombo;
+$output .= '</select>
+
+</td>
+</tr>
+<tr><td colspan="2"> </td></tr>
+<tr>
+<td style="text-align:left;"><b>Step 3 : Access rights for relative modules </b></td>
+<td> </td>
+
+</tr>
+<tr>
+<td style="padding-left:20px;text-align:left;">
+<table width="75%" border="0" cellspacing="0" cellpadding="0">';
+
+
+
+$output .=$relatedlistscombo.'</table>
+</td>
+<td> </td>
+</tr>
+<tr><td colspan="2" align="left"> </td></tr>
+<tr>
+<td colspan="2" class="detailedViewHeader"><b>Rule Construction Display</b></td>
+
+</tr>
+<tr>
+<td style="white-space:normal;" colspan="2" class="dvtCellLabel" id="rules">
+</td>
+</tr>
+<tr>
+<td style="white-space:normal;" colspan="2" class="dvtCellLabel" id="relrules">
+</td>
+</tr>
+<tr>
+<td colspan="2" align="center">
+<input type="submit" class="small" name="add" value="Add Rule" onClick="return validate()">
+</td>
+</tr>
+</table>
+</div>';
+
+$output.='</form>';
+echo $output;
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateUserPrivilegeFile.php Fri May 12 15:15:00 2006
@@ -282,6 +282,13 @@
$email_share_write_per=$email_share_per_array['write'];
$newbuf .= "\$Emails_share_read_permission=array('ROLE'=>".constructTwoDimensionalCharIntSingleValueArray($email_share_read_per['ROLE']).",'GROUP'=>".constructTwoDimensionalValueArray($email_share_read_per['GROUP']).");\n\n";
$newbuf .= "\$Emails_share_write_permission=array('ROLE'=>".constructTwoDimensionalCharIntSingleValueArray($email_share_write_per['ROLE']).",'GROUP'=>".constructTwoDimensionalValueArray($email_share_write_per['GROUP']).");\n\n";
+
+ //Constructing Campaigns Sharing Rules
+ $campaign_share_per_array=getUserModuleSharingObjects("Campaigns",$userid,$def_org_share,$current_user_roles,$parent_roles,$current_user_groups);
+ $campaign_share_read_per=$campaign_share_per_array['read'];
+ $campaign_share_write_per=$campaign_share_per_array['write'];
+ $newbuf .= "\$Campaigns_share_read_permission=array('ROLE'=>".constructTwoDimensionalCharIntSingleValueArray($campaign_share_read_per['ROLE']).",'GROUP'=>".constructTwoDimensionalValueArray($campaign_share_read_per['GROUP']).");\n\n";
+ $newbuf .= "\$Campaigns_share_write_permission=array('ROLE'=>".constructTwoDimensionalCharIntSingleValueArray($campaign_share_write_per['ROLE']).",'GROUP'=>".constructTwoDimensionalValueArray($campaign_share_write_per['GROUP']).");\n\n";
//Constructing Quotes Sharing Rules
@@ -1402,7 +1409,7 @@
}
//Populating Values into the tmp sharing tables
- $sharingArray=Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Emails','Quotes','PurchaseOrder','SalesOrder','Invoice');
+ $sharingArray=Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Emails','Campaigns','Quotes','PurchaseOrder','SalesOrder','Invoice');
foreach($sharingArray as $module)
{
populateSharingPrivileges('USER',$userid,$module,'read');
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/Login.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/Login.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/Login.php Fri May 12 15:15:00 2006
@@ -1,261 +1,251 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is: SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Login.php,v 1.6 2005/01/08 13:15:03 jack Exp $
- * Description: TODO: To be written.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
- ********************************************************************************/
-$theme_path="themes/".$theme."/";
-$image_path="include/images/";
-require_once($theme_path.'layout_utils.php');
-
-global $app_language;
-//we don't want the parent module's string file, but rather the string file specifc to this subpanel
-global $current_language;
-$current_module_strings = return_module_language($current_language, 'Users');
-
- define("IN_LOGIN", true);
-
-// Retrieve username and password from the session if possible.
-if(isset($_SESSION["login_user_name"]))
-{
- if (isset($_REQUEST['default_user_name']))
- $login_user_name = $_REQUEST['default_user_name'];
- else
- $login_user_name = $_SESSION['login_user_name'];
-}
-else
-{
- if (isset($_REQUEST['default_user_name']))
- {
- $login_user_name = $_REQUEST['default_user_name'];
- }
- elseif (isset($_REQUEST['ck_login_id_vtiger'])) {
- $login_user_name = get_assigned_user_name($_REQUEST['ck_login_id_vtiger']);
- }
- else
- {
- $login_user_name = $default_user_name;
- }
- $_session['login_user_name'] = $login_user_name;
-}
-
-$current_module_strings['VLD_ERROR'] = base64_decode('UGxlYXNlIHJlcGxhY2UgdGhlIFN1Z2FyQ1JNIGxvZ29zLg==');
-
-// Retrieve username and password from the session if possible.
-if(isset($_SESSION["login_password"]))
-{
- $login_password = $_SESSION['login_password'];
-}
-else
-{
- $login_password = $default_password;
- $_session['login_password'] = $login_password;
-}
-
-if(isset($_SESSION["login_error"]))
-{
- $login_error = $_SESSION['login_error'];
-}
-
-?>
-<script type="text/javascript" language="JavaScript">
-<!-- Begin
-function set_focus() {
- if (document.DetailView.user_name.value != '') {
- document.DetailView.user_password.focus();
- document.DetailView.user_password.select();
- }
- else document.DetailView.user_name.focus();
-}
-// End -->
-</script>
-
-
-<table border=0 cellspacing=0 cellpadding=0 width=100%>
-<tr>
- <td align=center>
- <br><br>
- <br><br>
-
- <table border="0" cellspacing="0" cellpadding="0" width="720" class="loginTopBg">
- <tr>
- <td align=left><img src="include/images/loginVtigerCRM.gif" alt="vtiger CRM" title="vtiger CRM"></td>
- <td align=right><img src="include/images/loginAlpha.gif" alt="Beta" title="Beta"></td>
- </tr>
- </table>
-
- <table border=0 cellspacing=0 cellpadding=0 width=720 class="loginTopShade">
- <tr>
- <td><img src="include/images/loginTopShade.gif"></td>
- </tr>
- </table>
-
- <table border=0 cellspacing=0 cellpadding=0 width=720 class="loginBg" >
- <tr>
- <td valign=top width=60% height="250" class="loginBillBoard">
- <div align=left style="padding:20px">
- <span style="font-size:20px;color:white">Welcome to vtiger CRM 5 - Beta</span><br><br>
-
- vtigerCRM 5 is more user-friendly than ever before and sets the standard for all commercial-grade business applications, open-source or otherwise.<br><br>
-
- <b>New in Beta</b> <br>
-
- <li>New-look Mail Client</li>
- <li>Improved API docs</li>
- <li>Performance Optimizations</li>
- <li>Sexier Dashboards and Reports</li>
- <li>Migration Support</li>
- <br>
-
- Your 'vtiger-xperience' is ...
- <br>
- <li><a href='http://blogs.vtiger.com'>vtiger blogs </a></li>
- <li><a href='http://www.bloglines.com'>bloglines </a></li>
- <li><a href='http://technorati.com/'>technorati</a></li>
- <li><a href='http://digg.com/'>digg</a></li>
- <li><a href='http://www.blogger.com'>blogger</a></li>
- </div>
-
-
- </td>
- <td valign=top>
- <br>
- <!-- sign in -->
- <table border=0 cellspacing=0 cellpadding=0 width=90% bgcolor=white>
- <tr>
- <td>
- <table border=0 cellspacing=0 cellpadding=0 width=100%><tr><td align=left><img src="include/images/loginSITopLeft.gif"></td><td align=right><img src="include/images/loginSITopRight.gif"></td></tr></table>
-
-
- <table border=0 cellspacing=0 cellpadding=5 align=center width=90%>
-<form action="index.php" method="post" name="DetailView" id="form">
-
- <input type="hidden" name="module" value="Users">
- <input type="hidden" name="action" value="Authenticate">
- <input type="hidden" name="return_module" value="Users">
- <input type="hidden" name="return_action" value="Login">
-<?php
-if( isset($_SESSION['validation'])){
-?>
- <tr>
- <td><font color="Red"> <?php echo $current_module_strings['VLD_ERROR']; ?> </font></td>
- </tr>
-<?php
-}
-else if(isset($login_error) && $login_error != "")
-{
-?>
- <tr>
- <td><b><font color="Brown">
- </tr>
- <?php echo $login_error ?>
- </font></b></td>
- </tr>
-<?php
-}
-
-if (isset($_REQUEST['ck_login_language_vtiger'])) {
- $display_language = $_REQUEST['ck_login_language_vtiger'];
-}
-else {
- $display_language = $default_language;
-}
-
-if (isset($_REQUEST['ck_login_theme_vtiger'])) {
- $display_theme = $_REQUEST['ck_login_theme_vtiger'];
-}
-else {
- $display_theme = $default_theme;
-}
-
-?>
- <tr>
- <td colspan="2" class="loginSignin" style="border-bottom: 1px solid rgb(153, 153, 153); padding: 10px;" align="left">
- Sign in
- </td>
- </tr>
- <tr>
- <td class=small align=right>
- <?php echo $current_module_strings['LBL_USER_NAME'] ?>
- </td>
- <td class=small>
- <input class=textbox type="text" name="user_name" class=textbox value="<?php echo $login_user_name ?>">
- </td>
- </tr>
- <tr>
- <td class=small align=right>
- <?php echo $current_module_strings['LBL_PASSWORD'] ?>
- </b></td><td class=small>
- <input class=textbox type="password" size='20' name="user_password" class=textbox value="<?php echo $login_password ?>">
- </td>
- </tr>
- <tr>
- <td class=small align=right style="background-color:#f5f5f5">
- <?php echo $current_module_strings['LBL_THEME'] ?>
- </b></td><td class=small style="background-color:#f5f5f5">
- <select class='small' name='login_theme' style="width:120px;">
- <?php echo get_select_options_with_id(get_themes(), $display_theme) ?>
- </select>
- </td>
- </tr>
- <tr>
- <td class=small align=right style="background-color:#f5f5f5">
- <?php echo $current_module_strings['LBL_LANGUAGE'] ?>
- </b>
- </td>
- <td class=small style="background-color:#f5f5f5">
-
- <select class='small' name='login_language' style="width:120px;">
- <?php echo get_select_options_with_id(get_languages(), $display_language) ?>
- </select>
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <input class=small title="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>" accesskey="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>" class="button" type="image" src="include/images/loginBtnSignin.gif" name="Login" value=" <?php echo $current_module_strings['LBL_LOGIN_BUTTON_LABEL'] ?> " style="width:100; height:25;">
- </b> </td>
- </tr>
- </table>
-
- <table border=0 cellspacing=0 cellpadding=0 width=100%><tr><td align=left><img src="include/images/loginSIBottomLeft.gif"></td><td align=right><img src="include/images/loginSIBottomRight.gif"></td><tr></table>
- </td>
- </form>
-</tr>
-</table>
-
- </td>
- </tr>
- </table>
-<table border=0 cellspacing=0 cellpadding=0 width=720 class="loginBottomBg">
- <tr>
- <td align=left><img src="include/images/loginBottomBg.gif"></td>
- </tr>
- </table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=720 >
- <tr>
- <td align=left><img src="include/images/loginBottomURL.gif" alt="vtiger CRM" title="vtiger CRM"></td>
- </tr>
- </table>
-
- </td>
-</table></td>
-</tr>
-</table>
-
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is: SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Login.php,v 1.6 2005/01/08 13:15:03 jack Exp $
+ * Description: TODO: To be written.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________..
+ ********************************************************************************/
+$theme_path="themes/".$theme."/";
+$image_path="include/images/";
+require_once($theme_path.'layout_utils.php');
+
+global $app_language;
+//we don't want the parent module's string file, but rather the string file specifc to this subpanel
+global $current_language;
+$current_module_strings = return_module_language($current_language, 'Users');
+
+ define("IN_LOGIN", true);
+
+// Retrieve username and password from the session if possible.
+if(isset($_SESSION["login_user_name"]))
+{
+ if (isset($_REQUEST['default_user_name']))
+ $login_user_name = $_REQUEST['default_user_name'];
+ else
+ $login_user_name = $_SESSION['login_user_name'];
+}
+else
+{
+ if (isset($_REQUEST['default_user_name']))
+ {
+ $login_user_name = $_REQUEST['default_user_name'];
+ }
+ elseif (isset($_REQUEST['ck_login_id_vtiger'])) {
+ $login_user_name = get_assigned_user_name($_REQUEST['ck_login_id_vtiger']);
+ }
+ else
+ {
+ $login_user_name = $default_user_name;
+ }
+ $_session['login_user_name'] = $login_user_name;
+}
+
+$current_module_strings['VLD_ERROR'] = base64_decode('UGxlYXNlIHJlcGxhY2UgdGhlIFN1Z2FyQ1JNIGxvZ29zLg==');
+
+// Retrieve username and password from the session if possible.
+if(isset($_SESSION["login_password"]))
+{
+ $login_password = $_SESSION['login_password'];
+}
+else
+{
+ $login_password = $default_password;
+ $_session['login_password'] = $login_password;
+}
+
+if(isset($_SESSION["login_error"]))
+{
+ $login_error = $_SESSION['login_error'];
+}
+
+?>
+<script type="text/javascript" language="JavaScript">
+<!-- Begin
+function set_focus() {
+ if (document.DetailView.user_name.value != '') {
+ document.DetailView.user_password.focus();
+ document.DetailView.user_password.select();
+ }
+ else document.DetailView.user_name.focus();
+}
+// End -->
+</script>
+
+<table border="0" cellspacing="0" cellpadding="0" width="100%">
+ <tr>
+ <td align="center"><br><br><br><br>
+ <table border="0" cellspacing="0" cellpadding="0" width="720" class="loginTopBg">
+ <tr>
+ <td align=left><img src="include/images/loginVtigerCRM.gif" alt="vtiger CRM" title="vtiger CRM"></td>
+ <td align=right><img src="include/images/loginAlpha.gif" alt="Beta" title="Beta"></td>
+ </tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="0" width="720" class="loginTopShade">
+ <tr>
+ <td><img src="include/images/loginTopShade.gif"></td>
+ </tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="0" width="720 "class="loginBg small" >
+ <tr>
+ <td valign="top" width="60%" height="250" class="loginBillBoard small">
+ <div align=left style="padding:20px">
+ <span style="font-size:20px;color:white">Welcome to vtiger CRM 5 - Beta</span><br><br>
+ vtigerCRM 5 is more user-friendly than ever before and sets the standard for all commercial-grade business applications, open-source or otherwise.<br><br>
+ <b>New in Beta</b> <br>
+ <li>New-look Mail Client</li>
+ <li>Improved API docs</li>
+ <li>Performance Optimizations</li>
+ <li>Sexier Dashboards and Reports</li>
+ <li>Migration Support</li><br>
+ Your 'vtiger-xperience' is ... <br>
+ <li><a href='http://blogs.vtiger.com' tabindex="6">vtiger blogs </a></li>
+ <li><a href='http://www.bloglines.com' tabindex="7">bloglines </a></li>
+ <li><a href='http://technorati.com/' tabindex="8">technorati</a></li>
+ <li><a href='http://digg.com/' tabindex="9">digg</a></li>
+ <li><a href='http://www.blogger.com' tabindex="10">blogger</a></li>
+ </div>
+ </td>
+ <td valign="top"><br>
+ <!-- sign in -->
+ <table border="0" cellspacing="0" cellpadding="0" width="90%" bgcolor="white" class="small">
+ <tr>
+ <td>
+ <table border="0" cellspacing="0" cellpadding="0" width="100%" class="small">
+ <tr>
+ <td align=left><img src="include/images/loginSITopLeft.gif"></td>
+ <td align=right><img src="include/images/loginSITopRight.gif"></td>
+ </tr>
+ </table>
+ <form action="index.php" method="post" name="DetailView" id="form">
+ <input type="hidden" name="module" value="Users">
+ <input type="hidden" name="action" value="Authenticate">
+ <input type="hidden" name="return_module" value="Users">
+ <input type="hidden" name="return_action" value="Login">
+ <table border="0" cellspacing="0" cellpadding="5" align="center" width="90%" class="small">
+ <?php
+ if( isset($_SESSION['validation'])){
+ ?>
+ <tr>
+ <td colspan="2"><font color="Red"> <?php echo $current_module_strings['VLD_ERROR']; ?> </font></td>
+ </tr>
+ <?php
+ }
+ else if(isset($login_error) && $login_error != "")
+ {
+ ?>
+ <tr>
+ <td colspan="2"><b class="small"><font color="Brown">
+ <?php echo $login_error ?>
+ </font>
+ </b>
+ </td>
+ </tr>
+ <?php
+ }
+
+ if (isset($_REQUEST['ck_login_language_vtiger'])) {
+ $display_language = $_REQUEST['ck_login_language_vtiger'];
+ }
+ else {
+ $display_language = $default_language;
+ }
+
+ if (isset($_REQUEST['ck_login_theme_vtiger'])) {
+ $display_theme = $_REQUEST['ck_login_theme_vtiger'];
+ }
+ else {
+ $display_theme = $default_theme;
+ }
+
+ ?>
+ <tr>
+ <td colspan="2" class="loginSignin" style="border-bottom: 1px solid rgb(153, 153, 153); padding: 10px;" align="left">
+ Sign in
+ </td>
+ </tr>
+ <tr>
+ <td class="small" align="right">
+ <?php echo $current_module_strings['LBL_USER_NAME'] ?>
+ </td>
+ <td class="small">
+ <input class="textbox" type="text" name="user_name" value="<?php echo $login_user_name ?>" tabindex="1">
+ </td>
+ </tr>
+ <tr>
+ <td class="small" align="right">
+ <?php echo $current_module_strings['LBL_PASSWORD'] ?>
+ </td>
+ <td class="small">
+ <input class="textbox" type="password" size='20' name="user_password" value="<?php echo $login_password ?>" tabindex="2">
+ </td>
+ </tr>
+ <tr>
+ <td class="small" align="right" style="background-color:#f5f5f5">
+ <?php echo $current_module_strings['LBL_THEME'] ?>
+ </td>
+ <td class="small" style="background-color:#f5f5f5">
+ <select class='small' name='login_theme' style="width:120px;" tabindex="3">
+ <?php echo get_select_options_with_id(get_themes(), $display_theme) ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="small" align="right" style="background-color:#f5f5f5">
+ <?php echo $current_module_strings['LBL_LANGUAGE'] ?>
+ </td>
+ <td class="small" style="background-color:#f5f5f5">
+ <select class='small' name='login_language' style="width:120px;" tabindex="4">
+ <?php echo get_select_options_with_id(get_languages(), $display_language) ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <input class=small title="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>" accesskey="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>" type="image" src="include/images/loginBtnSignin.gif" name="Login" value=" <?php echo $current_module_strings['LBL_LOGIN_BUTTON_LABEL'] ?> " tabindex="5">
+
+ </td>
+ </tr>
+ </table>
+ </form>
+ <table border="0" cellspacing="0" cellpadding="0" width="100%">
+ <tr>
+ <td align=left><img src="include/images/loginSIBottomLeft.gif"></td>
+ <td align=right><img src="include/images/loginSIBottomRight.gif"></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="0" width="720" class="loginBottomBg">
+ <tr>
+ <td align="left"><img src="include/images/loginBottomBg.gif"></td>
+ </tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="0" width="720" >
+ <tr>
+ <td align="left"><img src="include/images/loginBottomURL.gif" alt="vtiger CRM" title="vtiger CRM"></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+
+
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingDetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingDetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingDetailView.php Fri May 12 15:15:00 2006
@@ -63,6 +63,9 @@
//Email Sharing
$custom_access['Emails'] = getSharingRuleList('Emails');
+//Campaign Sharing
+$custom_access['Campaigns'] = getSharingRuleList('Campaigns');
+
//Quotes Sharing
$custom_access['Quotes'] = getSharingRuleList('Quotes');
@@ -74,6 +77,8 @@
//Invoice Sharing
$custom_access['Invoice'] = getSharingRuleList('Invoice');
+
+
$smarty->assign("MODSHARING", $custom_access);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/Popup.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/Popup.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/Popup.php Fri May 12 15:15:00 2006
@@ -63,12 +63,18 @@
// Start the output
////////////////////////////////////////////////////////
if (!isset($_REQUEST['html'])) {
- $form =new XTemplate ('modules/Users/Popup_picker.html');
+ if($_REQUEST['popuptype'] != 'set_return_emails')
+ $form =new XTemplate ('modules/Users/Popup_picker.html');
+ else
+ $form =new XTemplate ('modules/Users/Popup_picker_emails.html');
$form->assign("POPUPTYPE",$_REQUEST['popuptype']);
$log->debug("using file modules/Users/Popup_picker.html");
}
else {
- $form =new XTemplate ('modules/Users/'.$_REQUEST['html'].'.html');
+ if($_REQUEST['popuptype'] != 'set_return_emails')
+ $form =new XTemplate ('modules/Users/'.$_REQUEST['html'].'.html');
+ else
+ $form =new XTemplate ('modules/Users/Popup_picker_emails.html');
$log->debug("using file modules/Users/".$_REQUEST['html'].'.html');
$log->debug("_REQUEST['html'] is ".$_REQUEST['html']);
}
@@ -106,6 +112,10 @@
$the_javascript .= " window.opener.document.EditView.reports_to_id.value = user_id;\n";
$the_javascript .= "}\n";
$the_javascript .= "</script>\n";
+}
+elseif($_REQUEST['popuptype'] == 'set_return_emails')
+{
+ $the_javascript = "<script type='text/javascript' src='include/js/Mail.js'></script>";
}
else // ($_REQUEST['form'] == 'EditView')
{
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php Fri May 12 15:15:00 2006
@@ -493,7 +493,7 @@
$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,1,23,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -32,6 +32,13 @@
$related_array=getRelatedLists("Vendors",$focus);
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
$category = getParentTab();
@@ -45,6 +52,13 @@
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD","Vendor");
$smarty->assign("RELATEDLISTS", $related_array);
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Webmails/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Webmails/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Webmails/CallRelatedList.php Fri May 12 15:15:00 2006
@@ -65,6 +65,13 @@
$block["Accounts"]["entries"]= array("0"=>array($adb->query_result($rs,0,'accountname'),"1"=>$adb->query_result($rs,0,'email'),2=>$adb->query_result($rs,0,'website'),3=>$adb->query_result($rs,0,'industry'),4=>$adb->query_result($rs,0,'smownerid')));
}
+global $mod_strings;
+global $app_strings;
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
$smarty = new vtigerCRM_Smarty;
$smarty->assign("CATEGORY","My Home Page");
$smarty->assign("id",$_REQUEST["record"]);
@@ -74,5 +81,12 @@
$smarty->assign("REDIR_MOD","Webmails");
$smarty->assign("MODULE", "Webmails");
$smarty->assign("ID",$_REQUEST["record"] );
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
$smarty->display("RelatedLists.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml (original)
+++ vtigercrm/branches/5.0_postgresql_integration/schema/DatabaseSchema.xml Fri May 12 15:15:00 2006
@@ -1785,7 +1785,7 @@
<field name="currency_name" type="C" size="100" />
<field name="currency_code" type="C" size="100" />
<field name="currency_symbol" type="C" size="30" />
- <field name="conversion_rate" type="N" size="5.3" />
+ <field name="conversion_rate" type="N" size="10.3" />
<field name="currency_status" type="C" size="25" />
<field name="defaultid" type="C" size="10">
<notnull />
@@ -5036,5 +5036,37 @@
</index>
<opt platform="mysql">Type=InnoDB</opt>
</table>
+ <table name="emaildetails">
+ <field name="emailid" type="I" size="19">
+ <notnull />
+ <key />
+ </field>
+ <field name="from_email" type="C" size="50">
+ <notnull />
+ <default value="" />
+ </field>
+ <field name="to_email" type="X">
+ <notnull />
+ </field>
+ <field name="cc_email" type="X">
+ <notnull />
+ </field>
+ <field name="bcc_email" type="X">
+ <notnull />
+ </field>
+ <field name="assigned_user_email" type="C" size="50">
+ <notnull />
+ <default value="" />
+ </field>
+ <field name="idlists" type="C" size="50">
+ <notnull />
+ <default value="" />
+ </field>
+ <field name="email_flag" type="C" size="50">
+ <notnull />
+ <default value="" />
+ </field>
+ </table>
+
</schema>
Modified: vtigercrm/branches/5.0_postgresql_integration/vtigerservice.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/vtigerservice.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/vtigerservice.php Fri May 12 15:15:00 2006
@@ -23,6 +23,14 @@
{
include("soap/webforms.php");
}
+ elseif($_REQUEST['service'] == "firefox")
+ {
+ include("soap/contactserialize.php");
+ }
+ elseif($_REQUEST['service'] == "thunderbird")
+ {
+ include("soap/contactserialize.php");
+ }
else
{
echo "No Service Configured for $_REQUEST[service]";
More information about the vtigercrm-commits
mailing list