Skip to content
Snippets Groups Projects
Commit b2e6c20e authored by Satish's avatar Satish
Browse files

Unable to send email from Mail Manager

parent f404a83f
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 5317 additions and 5276 deletions
layouts/v7/modules/Emails/resources/MassEdit.js
+ 374
− 374
View file @ b2e6c20e
This diff is collapsed.
layouts/v7/modules/Settings/Vtiger/OutgoingServerEdit.tpl
+ 1
− 1
View file @ b2e6c20e
......@@ -42,7 +42,7 @@
<div class=" col-lg-6 col-md-6 col-sm-12">
<select class="select2 inputElement col-lg-12 col-md-12 col-lg-12" name="serverType">
<option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option>
<option value="{"ssl://smtp.gmail.com:465"}" {if {$MODEL->get('server')} eq "ssl://smtp.gmail.com:465;"} selected {/if}>{vtranslate('LBL_GMAIL', $QUALIFIED_MODULE)} </option>
<option value="{"ssl://smtp.gmail.com:465"}" {if {$MODEL->get('server')} eq "ssl://smtp.gmail.com:465"} selected {/if}>{vtranslate('LBL_GMAIL', $QUALIFIED_MODULE)} </option>
<option value="{"smtp.live.com"}" {if {$MODEL->get('server')} eq "smtp.live.com"} selected {/if}>{vtranslate('LBL_HOTMAIL', $QUALIFIED_MODULE)}</option>
<option value="{"smtp-mail.outlook.com"}" {if {$MODEL->get('server')} eq "smtp.live.com"} selected {/if}>{vtranslate('LBL_OFFICE365', $QUALIFIED_MODULE)}</option>
<option value="{"smtp.mail.yahoo.com"}" {if {$MODEL->get('server')} eq "smtp.mail.yahoo.com"} selected {/if}>{vtranslate('LBL_YAHOO', $QUALIFIED_MODULE)}</option>
......
layouts/v7/modules/Users/Login.tpl
+ 13
− 13
View file @ b2e6c20e
......@@ -80,22 +80,20 @@
display: block;
color: red;
}
.app-footer p {
margin-top: 0px;
}
#page {
padding-top: 55px;
}
</style>
</head>
<body>
<div class="header">
<div class="row">
<div class="login-logo">
<img src='layouts/v7/resources/Images/vtiger.jpg'/>
</div>
</div>
<div class="row">
<h1>One account. All of Vtiger.</h1>
</div>
<div class="row">
<h4>Sign in to continue to Vtiger</h4>
</div>
<div class="login-logo"><img src='layouts/v7/resources/Images/vtiger.jpg'/></div>
<div><h1>One account. All of Vtiger.</h1></div>
<div><h4>Sign in to continue to Vtiger</h4></div>
</div>
<div class="body">
<div class="container login-form" id="login-form-div">
......@@ -139,8 +137,10 @@
</form>
</div>
</div>
<div class="footer"></div>
</body>
<div class="footer">
{include file="Footer.tpl"|vtemplate_path:$MODULE}
</div>
</body>
<script>
jQuery(document).ready(function () {
jQuery('#login-form-div #username').focus();
......
layouts/v7/modules/Vtiger/Footer.tpl
+ 2
− 1
View file @ b2e6c20e
......@@ -8,7 +8,8 @@
************************************************************************************}
<footer class="app-footer">
<p>Powered by vtiger CRM - 7.0 &nbsp;© 2004 - 2015&nbsp;&nbsp;
<p>
Powered by vtiger CRM - 7.0&nbsp;&nbsp;© 2004 - 2017&nbsp;&nbsp;
<a href="//www.vtiger.com" target="_blank">Vtiger</a>&nbsp;|&nbsp;
<a href="https://www.vtiger.com/privacy-policy" target="_blank">Privacy Policy</a>
</p>
......
layouts/v7/modules/Vtiger/resources/Detail.js
+ 2179
− 2177
View file @ b2e6c20e
This diff is collapsed.
layouts/v7/modules/Vtiger/resources/Vtiger.js
+ 1257
− 1257
View file @ b2e6c20e
This diff is collapsed.
modules/Emails/models/Record.php
+ 8
− 8
View file @ b2e6c20e
......@@ -47,7 +47,7 @@ class Emails_Record_Model extends Vtiger_Record_Model {
*/
public function send($addToQueue = false) {
$currentUserModel = Users_Record_Model::getCurrentUserModel();
$rootDirectory = vglobal('root_directory');
$rootDirectory = vglobal('root_directory');
$mailer = Emails_Mailer_Model::getInstance();
$mailer->IsHTML(true);
......@@ -119,7 +119,7 @@ class Emails_Record_Model extends Vtiger_Record_Model {
}
if(!empty($generatedMessageId)){
$mailer->MessageID = $generatedMessageId;
$mailer->MessageID = $generatedMessageId;
}
if (strpos($description, '$logo$')) {
......@@ -186,7 +186,7 @@ class Emails_Record_Model extends Vtiger_Record_Model {
}
if(!$status) {
$status = $mailer->getError();
//If mailer error, then update emailflag as saved
//If mailer error, then update emailflag as saved
if($status){
$this->updateEmailFlag();
}
......@@ -340,7 +340,7 @@ class Emails_Record_Model extends Vtiger_Record_Model {
*/
public function deleteDocumentLink($idList = array()){
$db = PearDatabase::getInstance();
$query = 'DELETE FROM vtiger_senotesrel where crmid=?';
$query = 'DELETE FROM vtiger_senotesrel where crmid=?';
$params = array($this->getId());
if(count($idList) > 0) {
$query .= 'AND notesid IN ('.generateQuestionMarks($idList).')';
......@@ -491,8 +491,8 @@ class Emails_Record_Model extends Vtiger_Record_Model {
}
$db = PearDatabase::getInstance();
$sql = 'SELECT mailid, access_count,click_count FROM vtiger_email_track WHERE crmid = ? AND mailid IN('. generateQuestionMarks($emailIds).')';
$result = $db->pquery($sql, array($parentId, $emailIds));
$sql = 'SELECT mailid, access_count,click_count FROM vtiger_email_track WHERE crmid = ? AND mailid IN('.generateQuestionMarks($emailIds).')';
$result = $db->pquery($sql, array($parentId, $emailIds));
$numRows = $db->num_rows($result);
if($numRows > 0) {
for($i=0;$i<$numRows;$i++){
......@@ -538,7 +538,7 @@ class Emails_Record_Model extends Vtiger_Record_Model {
}
/**
* Function stores emailid,parentmodule and generates shorturl
* Function stores emailid,parentmodule and generates shorturl
* @param type $parentModule
* @return type
*/
......@@ -640,8 +640,8 @@ class Emails_Record_Model extends Vtiger_Record_Model {
$trackingUrl = $this->getTrackUrlForClicks($crmid, $sourceUrl);
$content = $this->replaceLinkWithShortUrl($content, $trackingUrl, $sourceUrl, $type);
}
return $content;
}
return $content;
}
public function replaceLinkWithShortUrl($content, $toReplace, $search, $type) {
......
modules/Emails/views/MassSaveAjax.php
+ 0
− 2
View file @ b2e6c20e
......@@ -59,7 +59,6 @@ class Emails_MassSaveAjax_View extends Vtiger_Footer_View {
$recordModel->set('mode', '');
}
$parentEmailId = $request->get('parent_id',null);
$attachmentsWithParentEmail = array();
if(!empty($parentEmailId) && !empty ($recordId)) {
......@@ -117,7 +116,6 @@ class Emails_MassSaveAjax_View extends Vtiger_Footer_View {
}
// This will be used for sending mails to each individual
$toMailInfo = $request->get('toemailinfo');
......
modules/Migration/schema/660_to_700.php
+ 33
− 11
View file @ b2e6c20e
......@@ -213,7 +213,7 @@ if(defined('VTIGER_UPGRADE')) {
$result = $db->pquery($query, array());
$num_rows = $db->num_rows($result);
$relationShipMapping = array();
for ($i = 0; $i < $num_rows; $i++) {
for ($i=0; $i<$num_rows; $i++) {
$tabId = $db->query_result($result, $i, 'tabid');
$relatedTabid = $db->query_result($result, $i, 'related_tabid');
$relationId = $db->query_result($result, $i, 'relation_id');
......@@ -345,7 +345,7 @@ if(defined('VTIGER_UPGRADE')) {
WHERE vtiger_crmentity.setype NOT IN ('.generateQuestionMarks($internalCommentModules).')
OR vtiger_crmentity.setype IS NULL', $internalCommentModules, array());
$commentCount = $db->num_rows($commentsResult);
for ($i = 0; $i < $commentCount; $i++) {
for ($i=0; $i<$commentCount; $i++) {
$commentIds[] = $db->query_result($commentsResult, $i, 'modcommentsid');
}
if (count($commentIds) > 0) {
......@@ -388,7 +388,7 @@ if(defined('VTIGER_UPGRADE')) {
$result = $db->pquery($query, array($tabid, $modcommentTabid));
$count = $db->num_rows($result);
for ($i = 0; $i < $count; $i++) {
for ($i=0; $i<$count; $i++) {
$relationId = $db->query_result($result, $i, 'relation_id');
$sequence = $db->query_result($result, $i, 'sequence');
$sequence += 1;
......@@ -888,7 +888,7 @@ if(defined('VTIGER_UPGRADE')) {
//Adding Create Event and Create Todo workflow tasks for Project module.
$taskResult = $db->pquery('SELECT id, modules FROM com_vtiger_workflow_tasktypes WHERE tasktypename IN (?, ?)', array('VTCreateTodoTask', 'VTCreateEventTask'));
$taskResultCount = $db->num_rows($taskResult);
for ($i = 0; $i < $taskResultCount; $i++) {
for ($i=0; $i<$taskResultCount; $i++) {
$taskId = $db->query_result($taskResult, $i, 'id');
$modules = Zend_Json::decode(decode_html($db->query_result($taskResult, $i, 'modules')));
$modules['include'][] = 'Project';
......@@ -1146,7 +1146,7 @@ if(defined('VTIGER_UPGRADE')) {
$tagOwners = array();
$tagNamesList = array();
$visibility = Vtiger_Tag_Model::PRIVATE_TYPE;
for ($i = 0; $i < $num_rows; $i++) {
for ($i=0; $i<$num_rows; $i++) {
$row = $db->query_result_rowdata($result, $i);
$tagId = $row['tag_id'];
$tagOwners[$tagId][] = $row['tagger_id'];
......@@ -1176,7 +1176,7 @@ if(defined('VTIGER_UPGRADE')) {
$fieldRows = $db->num_rows($fieldResult);
$ignorePickListFields = array('hdnTaxType', 'email_flag');
for ($i = 0; $i < $fieldRows; $i++) {
for ($i=0; $i<$fieldRows; $i++) {
$fieldName = $db->query_result($fieldResult, $i, 'fieldname');
if (in_array($fieldName, $ignorePickListFields) || !Vtiger_Utils::CheckTable("vtiger_$fieldName"))
continue;
......@@ -1192,7 +1192,7 @@ if(defined('VTIGER_UPGRADE')) {
$fieldResult = $db->pquery('SELECT fieldname FROM vtiger_field WHERE uitype IN (?,?,?,?) AND tabid IN (?)', array('15', '16', '33', '114', getTabid('Users')));
$fieldRows = $db->num_rows($fieldResult);
for ($i = 0; $i < $fieldRows; $i++) {
for ($i=0; $i<$fieldRows; $i++) {
$fieldName = $db->query_result($fieldResult, $i, 'fieldname');
if (!Vtiger_Utils::CheckTable("vtiger_$fieldName"))
continue;
......@@ -1241,7 +1241,8 @@ if(defined('VTIGER_UPGRADE')) {
//End
$result = $db->pquery('SELECT * FROM vtiger_module_dashboard_widgets', array());
for ($i = 0; $i < $db->num_rows($result); $i++) {
$num_rows = $db->num_rows($result);
for ($i=0; $i<$num_rows; $i++) {
$rowdata = $db->query_result_rowdata($result, $i);
if ($rowdata['dashboardtabid'] == null) {
$result1 = $db->pquery('SELECT id FROM vtiger_dashboard_tabs WHERE userid=? AND tabname=?', array($rowdata['userid'], 'My Dashboard'));
......@@ -1269,7 +1270,7 @@ if(defined('VTIGER_UPGRADE')) {
$fieldResult = $db->pquery('SELECT fieldname FROM vtiger_field WHERE fieldname=? AND tabid NOT IN (?)', array('salutationtype', getTabid('Users')));
$fieldRows = $db->num_rows($fieldResult);
for ($i = 0; $i < $fieldRows; $i++) {
for ($i=0; $i<$fieldRows; $i++) {
$fieldName = $db->query_result($fieldResult, $i, 'fieldname');
if (!Vtiger_Utils::CheckTable("vtiger_$fieldName")) {
continue;
......@@ -1298,8 +1299,8 @@ if(defined('VTIGER_UPGRADE')) {
INNER JOIN vtiger_role2picklist ON vtiger_role2picklist.picklistid = vtiger_picklist.picklistid)', array());
$rows = $db->num_rows($deletedPicklistResult);
$deletablePicklists = array();
for ($z = 0; $z < $rows; $z++) {
$deletablePicklists[] = $db->query_result($deletedPicklistResult, $z, 'picklistid');
for ($i=0; $i<$rows; $i++) {
$deletablePicklists[] = $db->query_result($deletedPicklistResult, $i, 'picklistid');
}
if (count($deletablePicklists)) {
$db->pquery('DELETE FROM vtiger_role2picklist WHERE picklistid IN ('.generateQuestionMarks($deletablePicklists).')', array($deletablePicklists));
......@@ -1703,6 +1704,27 @@ if(defined('VTIGER_UPGRADE')) {
$db->pquery('UPDATE vtiger_emailtemplates SET module=? WHERE templatename IN (?,?,?) AND module IS NULL', array('Events', 'ToDo Reminder', 'Activity Reminder', 'Invite Users'));
$db->pquery('UPDATE vtiger_emailtemplates SET module=? WHERE module IS NULL', array('Contacts'));
$columns = $db->getColumnNames('vtiger_mailmanager_mailrecord');
if (!in_array('mfolder', $columns)) {
$db->pquery('ALTER TABLE vtiger_mailmanager_mailrecord ADD COLUMN mfolder VARCHAR(250)', array());
$duplicateResult = $db->pquery('SELECT muid FROM vtiger_mailmanager_mailrecord GROUP BY muid HAVING COUNT(muid) > ?', array('1'));
$noOfDuplicate = $db->num_rows($duplicateResult);
if ($noOfDuplicate) {
$duplicateMuid = array();
for ($i=0; $i<$noOfDuplicate; $i++) {
$duplicateMuid[] = $db->query_result($duplicateResult, $i, 'muid');
}
$db->pquery('DELETE FROM vtiger_mailmanager_mailrecord WHERE muid IN ('.generateQuestionMarks($duplicateMuid).')', $duplicateMuid);
$db->pquery('DELETE FROM vtiger_mailmanager_mailattachments WHERE muid IN ('.generateQuestionMarks($duplicateMuid).')', $duplicateMuid);
}
}
if (Vtiger_Utils::CheckTable('vtiger_mailscanner_ids')) {
$db->pquery('RENAME TABLE vtiger_mailscanner_ids TO vtiger_message_ids', array());
$db->pquery('ALTER TABLE vtiger_message_ids ADD COLUMN refids MEDIUMTEXT', array());
$db->pquery('ALTER TABLE vtiger_message_ids ADD INDEX messageids_crmid_idx(crmid)',array());
}
//Update existing package modules
Install_Utils_Model::installModules();
......
modules/Vtiger/actions/RelatedRecordsAjax.php
+ 1
− 0
View file @ b2e6c20e
......@@ -38,6 +38,7 @@ class Vtiger_RelatedRecordsAjax_Action extends Vtiger_Action_Controller {
$relationModels = $parentModuleModel->getRelations();
$relatedRecordsCount = array();
foreach ($relationModels as $relation) {
$relationId = $relation->getId();
$relatedModuleName = $relation->get('relatedModuleName');
$relationListView = Vtiger_RelationListView_Model::getInstance($parentRecordModel, $relatedModuleName, $relation->get('label'));
$count = $relationListView->getRelatedEntriesCount();
......
packages/vtiger/mandatory/MailManager.zip
+ 0
− 0
View file @ b2e6c20e
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright 2023 Vtiger. All rights reserved.