$query"); - $log->debug("Exiting set_emails_contact_invitee_relationship method ..."); - } - - /** - * Used to releate email and salesentity -- Outlook Plugin - */ - function set_emails_se_invitee_relationship($email_id, $contact_id) - { - global $log; - $log->debug("Entering set_emails_se_invitee_relationship(".$email_id.",". $contact_id.") method ..."); - $query = "insert into $this->rel_serel_table (crmid,activityid) values(?,?)"; - $this->db->pquery($query, array($contact_id, $email_id), true,"Error setting email to contact relationship: "."
$query"); - $log->debug("Exiting set_emails_se_invitee_relationship method ..."); - } - - /** - * Used to releate email and Users -- Outlook Plugin - */ - function set_emails_user_invitee_relationship($email_id, $user_id) - { - global $log; - $log->debug("Entering set_emails_user_invitee_relationship(".$email_id.",". $user_id.") method ..."); - $query = "insert into $this->rel_users_table (smid,activityid) values (?,?)"; - $this->db->pquery($query, array($user_id, $email_id), true,"Error setting email to user relationship: "."
$query"); - $log->debug("Exiting set_emails_user_invitee_relationship method ..."); - } - - // Function to unlink an entity with given Id from another entity - function unlinkRelationship($id, $return_module, $return_id) { - global $log; - - $sql='DELETE FROM vtiger_seactivityrel WHERE activityid=?'; - $this->db->pquery($sql, array($id)); - - $sql = 'DELETE FROM vtiger_crmentityrel WHERE (crmid=? AND relmodule=? AND relcrmid=?) OR (relcrmid=? AND module=? AND crmid=?)'; - $params = array($id, $return_module, $return_id, $id, $return_module, $return_id); - $this->db->pquery($sql, $params); - } - - public function getNonAdminAccessControlQuery($module, $user,$scope='') { - return " and vtiger_crmentity$scope.smownerid=$user->id "; - } -} -/** Function to get the emailids for the given ids form the request parameters - * It returns an array which contains the mailids and the parentidlists -*/ - -function get_to_emailids($module) -{ - global $adb; - if(isset($_REQUEST["field_lists"]) && $_REQUEST["field_lists"] != "") - { - $field_lists = $_REQUEST["field_lists"]; - if (is_string($field_lists)) $field_lists = explode(":", $field_lists); - $query = 'select columnname,fieldid from vtiger_field where fieldid in ('. generateQuestionMarks($field_lists) .') and vtiger_field.presence in (0,2)'; - $result = $adb->pquery($query, array($field_lists)); - $columns = Array(); - $idlists = ''; - $mailids = ''; - while($row = $adb->fetch_array($result)) - { - $columns[]=$row['columnname']; - $fieldid[]=$row['fieldid']; - } - $columnlists = implode(',',$columns); - $idstring = $_REQUEST["idlist"]; - $single_record = false; - if(!strpos($idstring,':')) - { - $single_record = true; - } - $crmids = preg_replace('/:/',',',$idstring); - $crmids = explode(",", $crmids); - switch($module) - { - case 'Leads': - $query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid where vtiger_crmentity.deleted=0 and ((ltrim(vtiger_leaddetails.email) != \'\') or (ltrim(vtiger_leaddetails.yahooid) != \'\')) and vtiger_crmentity.crmid in ('. generateQuestionMarks($crmids) .')'; - break; - case 'Contacts': - //email opt out funtionality works only when we do mass mailing. - if(!$single_record) - $concat_qry = '(((ltrim(vtiger_contactdetails.email) != \'\') or (ltrim(vtiger_contactdetails.yahooid) != \'\')) and (vtiger_contactdetails.emailoptout != 1)) and '; - else - $concat_qry = '((ltrim(vtiger_contactdetails.email) != \'\') or (ltrim(vtiger_contactdetails.yahooid) != \'\')) and '; - $query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid left join vtiger_contactscf on vtiger_contactscf.contactid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and '.$concat_qry.' vtiger_crmentity.crmid in ('. generateQuestionMarks($crmids) .')'; - break; - case 'Accounts': - //added to work out email opt out functionality. - if(!$single_record) - $concat_qry = '(((ltrim(vtiger_account.email1) != \'\') or (ltrim(vtiger_account.email2) != \'\')) and (vtiger_account.emailoptout != 1)) and '; - else - $concat_qry = '((ltrim(vtiger_account.email1) != \'\') or (ltrim(vtiger_account.email2) != \'\')) and '; - - $query = 'select crmid,accountname as entityname,'.$columnlists.' from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid left join vtiger_accountscf on vtiger_accountscf.accountid = vtiger_account.accountid where vtiger_crmentity.deleted=0 and '.$concat_qry.' vtiger_crmentity.crmid in ('. generateQuestionMarks($crmids) .')'; - break; - } - $result = $adb->pquery($query, array($crmids)); - while($row = $adb->fetch_array($result)) - { - $name = $row['entityname']; - for($i=0;$i
- ";
- if(queryResult.length > 0){
- each(queryResult, function(i, row){
- var entityName = getEntityName(moduleName,row);
- str+="
- "+ - entityName+" "; - }); - }else{ - str +="
- No Record Match \""+accountName+"\" "; - } - str += "
![]("+ doc.vtigerURL + "themes/images/close.gif "Close Window")
";
- closeMe.onclick = function(){
- window.removeMe();
- }
- bookMarkletDiv.appendChild(closeMe);
-
- var popUp = doc.createElement("iframe");
- popUp.id="__vtigerBookmarkletFrame__";
- popUp.name="__vtigerBookmarkletFrame__";
- popUp.style.border="0px";
- popUp.frameBorder="0px";
- popUp.marginHeight="0px";
- popUp.marginWidth="0px";
- popUp.style.width="100%";
- popUp.style.height="100%";
- popUp.src = getTargetURL();
- bookMarkletDiv.appendChild(popUp);
- doc.body.appendChild(bookMarkletDiv);
- }else{
- bookMarkletDiv.style.display="block";
- }
-}else{
- var vtigerGmailBookmarkletWindow = window.open(getTargetURL(),elementId,
- "scrollbars=1,top=40,left=40,resizable=1,height=450,width=562");
-}
-
-function getTargetURL(){
- var threadid = top.location.hash.split("/");
- var mailId = threadid[threadid.length-1];
- var description = encodeURIComponent(getGmailURL()+"?fs=1&tf=1&source=atom&view=cv&search=all&shva=1&th="+mailId);
- return doc.vtigerURL+"index.php?module=Emails&action=SaveBookmarklet&subject="+
- encodeURIComponent(getGmailSubject())+"&description="+description+
- "&location="+encodeURIComponent(getGmailURL());
-}
-
-function trim(str) {
- var s = str.replace(/\s+$/, "");
- s = s.replace(/^\s+/, "");
- return s;
-}
-
-function getGmailSubject() {
- var subject = top.document.title;
- var firstIndexOf = subject.indexOf("-");
- var lastIndexOf = subject.lastIndexOf("-");
- subject = subject.substring(firstIndexOf+1, lastIndexOf-1);
- return trim(subject);
-}
-
-function getGmailURL() {
- var locationhref = location.href;
- if(locationhref.indexOf("?")!==-1) {
- var lsplits = locationhref.split("?");
- locationhref = lsplits[0];
- } else if(locationhref.indexOf("#")!==-1) {
- var lsplits = locationhref.split("#");
- locationhref = lsplits[0];
- }
- return locationhref;
-}
-window.top.removeMe = function(){
- if(navigator.userAgent.toLowerCase().indexOf("msie") == -1){
- doc.body.removeChild(bookMarkletDiv);
- }else{
- vtigerGmailBookmarkletWindow.close();
- }
-}
-})();
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Emails/ListView.php b/oss/vtiger/trunk/modules/Emails/ListView.php
deleted file mode 100644
index f72af282..00000000
--- a/oss/vtiger/trunk/modules/Emails/ListView.php
+++ /dev/null
@@ -1,202 +0,0 @@
-initSortbyField('Emails');
-// END
-$smarty = new vtigerCRM_Smarty;
-$other_text = Array();
-
-//<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
- $order_by = $adb->sql_escape_string($_REQUEST['order_by']);
-else
- $order_by = (($_SESSION['EMAILS_ORDER_BY'] != '')?($_SESSION['EMAILS_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
- $sorder = $adb->sql_escape_string($_REQUEST['sorder']);
-else
- $sorder = (($_SESSION['EMAILS_SORT_ORDER'] != '')?($_SESSION['EMAILS_SORT_ORDER']):($focus->default_sort_order));
-
-$_SESSION['EMAILS_ORDER_BY'] = $order_by;
-$_SESSION['EMAILS_SORT_ORDER'] = $sorder;
-//<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-
-
-// focus_list is the means of passing data to a ListView.
-global $focus_list;
-
-//<<<"; - } - else if($errorCode == 2) - { - $errormessage = "".$mod_strings['LBL_EXCEED_MAX'].$upload_maxsize.$mod_strings['LBL_BYTES']."
"; - } - else if($errorCode == 6) - { - $errormessage = "".$mod_strings['LBL_KINDLY_UPLOAD']."
" ; - } - else if($errorCode == 3 ) - { - if($_FILES['filename']['size'] == 0) - $errormessage = "".$mod_strings['LBL_PLEASE_ATTACH']."
"; - } - else{} - if($errormessage != ""){ - $ret_error = 1; - $ret_parentid = $_REQUEST['parent_id']; - $ret_toadd = $_REQUEST['parent_name']; - $ret_subject = $_REQUEST['subject']; - $ret_ccaddress = $_REQUEST['ccmail']; - $ret_bccaddress = $_REQUEST['bccmail']; - $ret_description = $_REQUEST['description']; - echo $errormessage; - include("EditView.php"); - exit(); - } -} - - -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']); - imap_expunge($mbox); - header("Location: index.php?module=Emails&action=index"); - exit(); -} - -function checkIfContactExists($mailid) -{ - global $log; - $log->debug("Entering checkIfContactExists(".$mailid.") method ..."); - global $adb; - $sql = "select contactid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and email= ?"; - $result = $adb->pquery($sql, array($mailid)); - $numRows = $adb->num_rows($result); - if($numRows > 0) - { - $log->debug("Exiting checkIfContactExists method ..."); - return $adb->query_result($result,0,"contactid"); - } - else - { - $log->debug("Exiting checkIfContactExists method ..."); - return -1; - } -} -//assign the focus values -$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(getNewDisplayDate());//This will be converted to db date format in save -$focus->save("Emails"); -$return_id = $focus->id; - -require_once("modules/Emails/mail.php"); -if(isset($_REQUEST['send_mail']) && $_REQUEST['send_mail'] && $_REQUEST['parent_id'] != '') -{ - $user_mail_status = send_mail('Emails',$current_user->column_fields['email1'],$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],$_REQUEST['ccmail'],$_REQUEST['bccmail'],'all',$focus->id); - - //if block added to fix the issue #3759 - if($user_mail_status != 1){ - $query = "select crmid,attachmentsid from vtiger_seattachmentsrel where crmid=?"; - $result = $adb->pquery($query, array($email_id)); - $numOfRows = $adb->num_rows($result); - for($i=0; $i<$numOfRows; $i++) - { - $attachmentsid = $adb->query_result($result,0,"attachmentsid"); - if($attachmentsid > 0) - { - $query1="delete from vtiger_crmentity where crmid=?"; - $adb->pquery($query1, array($attachmentsid)); - } - - $crmid=$adb->query_result($result,0,"crmid"); - $query2="delete from vtiger_crmentity where crmid=?"; - $adb->pquery($query2, array($crmid)); - } - - $query = "delete from vtiger_emaildetails where emailid=?"; - $adb->pquery($query, array($focus->id)); - - $error_msg = "".$mod_strings['LBL_CHECK_USER_MAILID'].""; - $ret_error = 1; - $ret_parentid = $_REQUEST['parent_id']; - $ret_toadd = $_REQUEST['parent_name']; - $ret_subject = $_REQUEST['subject']; - $ret_ccaddress = $_REQUEST['ccmail']; - $ret_bccaddress = $_REQUEST['bccmail']; - $ret_description = $_REQUEST['description']; - echo $error_msg; - include("EditView.php"); - exit(); - } - -} - -$focus->retrieve_entity_info($return_id,"Emails"); - -//this is to receive the data from the Select Users button -if($_REQUEST['source_module'] == null) -{ - $module = 'users'; -} -//this will be the case if the Select Contact button is chosen -else -{ - $module = $_REQUEST['source_module']; -} - -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") - $return_module = vtlib_purify($_REQUEST['return_module']); -else - $return_module = "Emails"; - -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") - $return_action = vtlib_purify($_REQUEST['return_action']); -else - $return_action = "DetailView"; - -if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") - $return_id = vtlib_purify($_REQUEST['return_id']); - -if(isset($_REQUEST['filename']) && $_REQUEST['filename'] != "") - $filename = vtlib_purify($_REQUEST['filename']); - -$local_log->debug("Saved record with id of ".$return_id); - -if(isset($_REQUEST['send_mail']) && $_REQUEST['send_mail'] && $_REQUEST['parent_id'] == ''){ - if($_REQUEST["parent_name"] != '' && isset($_REQUEST["parent_name"])) { - include("modules/Emails/webmailsend.php"); - } - -} elseif( isset($_REQUEST['send_mail']) && $_REQUEST['send_mail']) - include("modules/Emails/mailsend.php"); - - - -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] == 'mailbox') - header("Location: index.php?module=$return_module&action=index"); -else { - if($_REQUEST['return_viewname'] == '') $return_viewname='0'; - if($_REQUEST['return_viewname'] != '')$return_viewname=vtlib_purify($_REQUEST['return_viewname']); - //Added for 4600 - $inputs=""; - echo $inputs; -} -?> \ No newline at end of file diff --git a/oss/vtiger/trunk/modules/Emails/SaveBookmarklet.php b/oss/vtiger/trunk/modules/Emails/SaveBookmarklet.php deleted file mode 100644 index be407e03..00000000 --- a/oss/vtiger/trunk/modules/Emails/SaveBookmarklet.php +++ /dev/null @@ -1,81 +0,0 @@ -assign("subject",$_REQUEST['subject']); -$smarty->assign("description",$_REQUEST['description']); - -Zend_Json::$useBuiltinEncoderDecoder = true; -$json = new Zend_Json(); - -$elementType = $_REQUEST['module']; - -global $log,$adb; -$webserviceObject = VtigerWebserviceObject::fromName($adb,$elementType); -$handlerPath = $webserviceObject->getHandlerPath(); -$handlerClass = $webserviceObject->getHandlerClass(); - -require_once $handlerPath; - -$handler = new $handlerClass($webserviceObject,$current_user,$adb,$log); -$meta = $handler->getMeta(); -$meta->retrieveMeta(); - -$types = vtws_listtypes($current_user); -if(!in_array($elementType,$types['types'])){ - throw new WebServiceException(WebServiceErrorCode::$ACCESSDENIED,"Permission to perform the operation is denied"); -} - -$wsFieldDetails = $handler->getField('parent_id'); - -$moduleEntityNameDetails = array(); -$moduleEmailFieldDetails = array(); -foreach ($wsFieldDetails['type']['refersTo'] as $type) { - $referenceModuleHandler = vtws_getModuleHandlerFromName($type, $current_user); - $referenceModuleMeta = $referenceModuleHandler->getMeta(); - $nameFields = explode(',',$referenceModuleMeta->getNameFields()); - $moduleFields = $referenceModuleMeta->getModuleFields(); - $accessibleFields = array_keys($moduleFields); - $accessibleNameFields = array_intersect($nameFields, $accessibleFields); - $moduleEntityNameDetails[$type] = $accessibleNameFields; - $moduleEmailFieldDetails[$type] = $referenceModuleMeta->getEmailFields(); -} - -$smarty->assign("types",$wsFieldDetails['type']['refersTo']); -$smarty->assign("entityNameFields",$json->encode($moduleEntityNameDetails)); -$smarty->assign("emailFields",$json->encode($moduleEmailFieldDetails)); -$smarty->assign("userEmail",$current_user->column_fields['email1']); - -$smarty->display("modules/Bookmarklet/Bookmarklet.tpl"); -?> \ No newline at end of file diff --git a/oss/vtiger/trunk/modules/Emails/TrackAccess.php b/oss/vtiger/trunk/modules/Emails/TrackAccess.php deleted file mode 100644 index 95de9f48..00000000 --- a/oss/vtiger/trunk/modules/Emails/TrackAccess.php +++ /dev/null @@ -1,40 +0,0 @@ -pquery("INSERT INTO vtiger_email_access(crmid, mailid, accessdate, accesstime) VALUES(?,?,?,?)", array($crmid, $mailid, date('Y-m-d'), date('H:i:s'))); - -$result = $adb->pquery("select count(*) as count from vtiger_email_access where crmid=? and mailid=?",array($crmid, $mailid)); -$count = $adb->query_result($result,0,'count'); - -$result = $adb->pquery("select * from vtiger_email_track where crmid=? and mailid=?", array($crmid, $mailid)); -if($adb->num_rows($result)>0){ - $adb->pquery("update vtiger_email_track set access_count=? where crmid=? and mailid=?", array($count, $crmid, $mailid)); -} else { - $adb->pquery("insert into vtiger_email_track(crmid,mailid,access_count) values(?,?,?)", array($crmid, $mailid, 1)); -} - -?> \ No newline at end of file diff --git a/oss/vtiger/trunk/modules/Emails/UnifiedSearch.php b/oss/vtiger/trunk/modules/Emails/UnifiedSearch.php deleted file mode 100644 index 9a37320c..00000000 --- a/oss/vtiger/trunk/modules/Emails/UnifiedSearch.php +++ /dev/null @@ -1,11 +0,0 @@ - \ No newline at end of file diff --git a/oss/vtiger/trunk/modules/Emails/class.phpmailer.php b/oss/vtiger/trunk/modules/Emails/class.phpmailer.php deleted file mode 100644 index 4381935f..00000000 --- a/oss/vtiger/trunk/modules/Emails/class.phpmailer.php +++ /dev/null @@ -1,1510 +0,0 @@ -ContentType = "text/html"; - else - $this->ContentType = "text/plain"; - } - - /** - * Sets Mailer to send message using SMTP. - * @return void - */ - function IsSMTP() { - $this->Mailer = "smtp"; - } - - /** - * Sets Mailer to send message using PHP mail() function. - * @return void - */ - function IsMail() { - $this->Mailer = "mail"; - } - - /** - * Sets Mailer to send message using the $Sendmail program. - * @return void - */ - function IsSendmail() { - $this->Mailer = "sendmail"; - } - - /** - * Sets Mailer to send message using the qmail MTA. - * @return void - */ - function IsQmail() { - $this->Sendmail = "/var/qmail/bin/sendmail"; - $this->Mailer = "sendmail"; - } - - - ///////////////////////////////////////////////// - // RECIPIENT METHODS - ///////////////////////////////////////////////// - - /** - * Adds a "To" address. - * @param string $address - * @param string $name - * @return void - */ - function AddAddress($address, $name = "") { - $cur = count($this->to); - $this->to[$cur][0] = trim($address); - $this->to[$cur][1] = $name; - } - - /** - * Adds a "Cc" address. Note: this function works - * with the SMTP mailer on win32, not with the "mail" - * mailer. - * @param string $address - * @param string $name - * @return void - */ - function AddCC($address, $name = "") { - $cur = count($this->cc); - $this->cc[$cur][0] = trim($address); - $this->cc[$cur][1] = $name; - } - - /** - * Adds a "Bcc" address. Note: this function works - * with the SMTP mailer on win32, not with the "mail" - * mailer. - * @param string $address - * @param string $name - * @return void - */ - function AddBCC($address, $name = "") { - $cur = count($this->bcc); - $this->bcc[$cur][0] = trim($address); - $this->bcc[$cur][1] = $name; - } - - /** - * Adds a "Reply-to" address. - * @param string $address - * @param string $name - * @return void - */ - function AddReplyTo($address, $name = "") { - $cur = count($this->ReplyTo); - $this->ReplyTo[$cur][0] = trim($address); - $this->ReplyTo[$cur][1] = $name; - } - - - ///////////////////////////////////////////////// - // MAIL SENDING METHODS - ///////////////////////////////////////////////// - - /** - * Creates message and assigns Mailer. If the message is - * not sent successfully then it returns false. Use the ErrorInfo - * variable to view description of the error. - * @return bool - */ - function Send() { - $header = ""; - $body = ""; - $result = true; - - if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) - { - $this->SetError($this->Lang("provide_address")); - return false; - } - - // Set whether the message is multipart/alternative - if(!empty($this->AltBody)) - $this->ContentType = "multipart/alternative"; - - $this->error_count = 0; // reset errors - $this->SetMessageType(); - $header .= $this->CreateHeader(); - $body = $this->CreateBody(); - - if($body == "") { return false; } - - // Choose the mailer - switch($this->Mailer) - { - case "sendmail": - $result = $this->SendmailSend($header, html_entity_decode($body,ENT_COMPAT,$this->CharSet)); - break; - case "mail": - $result = $this->MailSend($header, html_entity_decode($body,ENT_COMPAT,$this->CharSet)); - break; - case "smtp": - $result = $this->SmtpSend($header, html_entity_decode($body,ENT_COMPAT,$this->CharSet)); - break; - default: - $this->SetError($this->Mailer . $this->Lang("mailer_not_supported")); - $result = false; - break; - } - - return $result; - } - - /** - * Sends mail using the $Sendmail program. - * @access private - * @return bool - */ - function SendmailSend($header, $body) { - if ($this->Sender != "") - $sendmail = sprintf("%s -oi -f %s -t", $this->Sendmail, $this->Sender); - else - $sendmail = sprintf("%s -oi -t", $this->Sendmail); - - if(!@$mail = popen($sendmail, "w")) - { - $this->SetError($this->Lang("execute") . $this->Sendmail); - return false; - } - - fputs($mail, $header); - fputs($mail, $body); - - $result = pclose($mail) >> 8 & 0xFF; - if($result != 0) - { - $this->SetError($this->Lang("execute") . $this->Sendmail); - return false; - } - - return true; - } - - /** - * Sends mail using the PHP mail() function. - * @access private - * @return bool - */ - function MailSend($header, $body) { - $to = ""; - for($i = 0; $i < count($this->to); $i++) - { - if($i != 0) { $to .= ", "; } - $to .= $this->to[$i][0]; - } - - if ($this->Sender != "" && strlen(ini_get("safe_mode"))< 1) - { - $old_from = ini_get("sendmail_from"); - ini_set("sendmail_from", $this->Sender); - $params = sprintf("-oi -f %s", $this->Sender); - $rt = @mail($to, $this->EncodeHeader($this->Subject), $body, - $header, $params); - } - else - $rt = @mail($to, $this->EncodeHeader($this->Subject), $body, $header); - - if (isset($old_from)) - ini_set("sendmail_from", $old_from); - - if(!$rt) - { - $this->SetError($this->Lang("instantiate")); - return false; - } - - return true; - } - - /** - * Sends mail via SMTP using PhpSMTP (Author: - * Chris Ryan). Returns bool. Returns false if there is a - * bad MAIL FROM, RCPT, or DATA input. - * @access private - * @return bool - */ - function SmtpSend($header, $body) { - include_once($this->PluginDir . "class.smtp.php"); - $error = ""; - $bad_rcpt = array(); - - if(!$this->SmtpConnect()) - return false; - - $smtp_from = ($this->Sender == "") ? $this->From : $this->Sender; - if(!$this->smtp->Mail($smtp_from)) - { - $error = $this->Lang("from_failed") . $smtp_from; - $this->SetError($error); - $this->smtp->Reset(); - return false; - } - - // Attempt to send attach all recipients - for($i = 0; $i < count($this->to); $i++) - { - if(!$this->smtp->Recipient($this->to[$i][0])) - $bad_rcpt[] = $this->to[$i][0]; - } - for($i = 0; $i < count($this->cc); $i++) - { - if(!$this->smtp->Recipient($this->cc[$i][0])) - $bad_rcpt[] = $this->cc[$i][0]; - } - for($i = 0; $i < count($this->bcc); $i++) - { - if(!$this->smtp->Recipient($this->bcc[$i][0])) - $bad_rcpt[] = $this->bcc[$i][0]; - } - - if(count($bad_rcpt) > 0) // Create error message - { - for($i = 0; $i < count($bad_rcpt); $i++) - { - if($i != 0) { $error .= ", "; } - $error .= $bad_rcpt[$i]; - } - $error = $this->Lang("recipients_failed") . $error; - $this->SetError($error); - $this->smtp->Reset(); - return false; - } - - if(!$this->smtp->Data($header . $body)) - { - $this->SetError($this->Lang("data_not_accepted")); - $this->smtp->Reset(); - return false; - } - if($this->SMTPKeepAlive == true) - $this->smtp->Reset(); - else - $this->SmtpClose(); - - return true; - } - - /** - * Initiates a connection to an SMTP server. Returns false if the - * operation failed. - * @access private - * @return bool - */ - function SmtpConnect() { - if($this->smtp == NULL) { $this->smtp = new SMTP(); } - - $this->smtp->do_debug = $this->SMTPDebug; - $hosts = explode(";", $this->Host); - $index = 0; - $connection = ($this->smtp->Connected()); - - // Retry while there is no connection - while($index < count($hosts) && $connection == false) - { - if(strstr($hosts[$index], ":")) - { - #list($host, $port) = explode(":", $hosts[$index]); - $hostA = explode(':', $hosts[$index]); - if (is_numeric(end($hostA))) - $port = array_pop($hostA); - else - $port = $this->Port; - $host = implode(':', $hostA); - } - else - { - $host = $hosts[$index]; - $port = $this->Port; - } - - if($this->smtp->Connect($host, $port, $this->Timeout)) - { - if ($this->Helo != '') - $this->smtp->Hello($this->Helo); - else - $this->smtp->Hello($this->ServerHostname()); - - if($this->SMTPAuth) - { - if(!$this->smtp->Authenticate($this->Username, - $this->Password)) - { - $this->SetError($this->Lang("authenticate")); - $this->smtp->Reset(); - $connection = false; - } - } - $connection = true; - } - $index++; - } - if(!$connection) - $this->SetError($this->Lang("connect_host")); - - return $connection; - } - - /** - * Closes the active SMTP session if one exists. - * @return void - */ - function SmtpClose() { - if($this->smtp != NULL) - { - if($this->smtp->Connected()) - { - $this->smtp->Quit(); - $this->smtp->Close(); - } - } - } - - /** - * Sets the language for all class error messages. Returns false - * if it cannot load the language file. The default language type - * is English. - * @param string $lang_type Type of language (e.g. Portuguese: "br") - * @param string $lang_path Path to the language file directory - * @access public - * @return bool - */ - function SetLanguage($lang_type, $lang_path = "language/") { - global $root_directory; - if(file_exists($root_directory.'/modules/Emails/'.$lang_path.'phpmailer.lang-'.$lang_type.'.php')) - include($root_directory.'/modules/Emails/'.$lang_path.'phpmailer.lang-'.$lang_type.'.php'); - else if(file_exists($root_directory.'/modules/Emails/'.$lang_path.'phpmailer.lang-en.php')) - include($root_directory.'/modules/Emails/'.$lang_path.'phpmailer.lang-en.php'); - else - { - $this->SetError("Could not load language file"); - return false; - } - $this->language = $PHPMAILER_LANG; - - return true; - } - - ///////////////////////////////////////////////// - // MESSAGE CREATION METHODS - ///////////////////////////////////////////////// - - /** - * Creates recipient vtiger_headers. - * @access private - * @return string - */ - function AddrAppend($type, $addr) { - $addr_str = $type . ": "; - $addr_str .= $this->AddrFormat($addr[0]); - if(count($addr) > 1) - { - for($i = 1; $i < count($addr); $i++) - $addr_str .= ", " . $this->AddrFormat($addr[$i]); - } - $addr_str .= $this->LE; - - return $addr_str; - } - - /** - * Formats an address correctly. - * @access private - * @return string - */ - function AddrFormat($addr) { - if(empty($addr[1])) - $formatted = $addr[0]; - else - { - $formatted = $this->EncodeHeader($addr[1], 'phrase') . " <" . - $addr[0] . ">"; - } - - return $formatted; - } - - /** - * Wraps message for use with mailers that do not - * automatically perform wrapping and for quoted-printable. - * Original written by philippe. - * @access private - * @return string - */ - function WrapText($message, $length, $qp_mode = false) { - $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE; - - $message = $this->FixEOL($message); - if (substr($message, -1) == $this->LE) - $message = substr($message, 0, -1); - - $line = explode($this->LE, $message); - $message = ""; - for ($i=0 ;$i < count($line); $i++) - { - $line_part = explode(" ", $line[$i]); - $buf = ""; - for ($e = 0; $e
'; - return false; - } - - # verify we connected properly - if(empty($this->smtp_conn)) { - $this->error = array("error" => "Failed to connect to server", - "errno" => $errno, - "errstr" => $errstr); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . - ": $errstr ($errno)" . $this->CRLF; - } - return false; - } - - # sometimes the SMTP server takes a little longer to respond - # so we will give it a longer timeout for the first read - // Windows still does not have support for this timeout function - if(substr(PHP_OS, 0, 3) != "WIN") - socket_set_timeout($this->smtp_conn, $tval, 0); - - # get any vtiger_announcement stuff - $announce = $this->get_lines(); - - # set the timeout of any socket functions at 1/10 of a second - //if(function_exists("socket_set_timeout")) - // socket_set_timeout($this->smtp_conn, 0, 100000); - - if($this->do_debug >= 2) { - echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce; - } - - return true; - } - - /** - * Performs SMTP authentication. Must be run after running the - * Hello() method. Returns true if successfully authenticated. - * @access public - * @return bool - */ - function Authenticate($username, $password) { - // Start authentication - fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 334) { - $this->error = - array("error" => "AUTH not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . - ": " . $rply . $this->CRLF; - } - return false; - } - - // Send encoded username - fputs($this->smtp_conn, base64_encode($username) . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 334) { - $this->error = - array("error" => "Username not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . - ": " . $rply . $this->CRLF; - } - return false; - } - - // Send encoded password - fputs($this->smtp_conn, base64_encode($password) . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 235) { - $this->error = - array("error" => "Password not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . - ": " . $rply . $this->CRLF; - } - return false; - } - - return true; - } - - /** - * Returns true if connected to a server otherwise false - * @access private - * @return bool - */ - function Connected() { - if(!empty($this->smtp_conn)) { - $sock_status = socket_get_status($this->smtp_conn); - if($sock_status["eof"]) { - # hmm this is an odd situation... the socket is - # valid but we aren't connected anymore - if($this->do_debug >= 1) { - echo "SMTP -> NOTICE:" . $this->CRLF . - "EOF caught while checking if connected"; - } - $this->Close(); - return false; - } - return true; # everything looks good - } - return false; - } - - /** - * Closes the socket and cleans up the state of the class. - * It is not considered good to use this function without - * first trying to use QUIT. - * @access public - * @return void - */ - function Close() { - $this->error = null; # so there is no confusion - $this->helo_rply = null; - if(!empty($this->smtp_conn)) { - # close the connection and cleanup - fclose($this->smtp_conn); - $this->smtp_conn = 0; - } - } - - - /*************************************************************** - * SMTP COMMANDS * - *************************************************************/ - - /** - * Issues a data command and sends the msg_data to the server - * finializing the mail transaction. $msg_data is the message - * that is to be send with the vtiger_headers. Each header needs to be - * on a single line followed by a
'; -} - -include ('modules/Emails/ListView.php'); - -?> diff --git a/oss/vtiger/trunk/modules/Emails/language/en_us.lang.php b/oss/vtiger/trunk/modules/Emails/language/en_us.lang.php deleted file mode 100644 index 4b84eafb..00000000 --- a/oss/vtiger/trunk/modules/Emails/language/en_us.lang.php +++ /dev/null @@ -1,183 +0,0 @@ -'General Information', - -'LBL_MODULE_NAME'=>'Email', -'LBL_MODULE_TITLE'=>'Email: Home', -'LBL_SEARCH_FORM_TITLE'=>'Email Search', -'LBL_LIST_FORM_TITLE'=>'Email List', -'LBL_NEW_FORM_TITLE'=>'Track Email', - -'LBL_LIST_SUBJECT'=>'Subject', -'LBL_LIST_CONTACT'=>'Contact', -'LBL_LIST_RELATED_TO'=>'Related to', -'LBL_LIST_DATE'=>'Date Sent', -'LBL_LIST_TIME'=>'Time Sent', - -'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.", -'LBL_DATE_SENT'=>'Date Sent:', -'LBL_DATE_AND_TIME'=>'Date & Time Sent:', -'LBL_DATE'=>'Date Sent:', -'LBL_TIME'=>'Time Sent:', -'LBL_SUBJECT'=>'Subject:', -'LBL_BODY'=>'Body:', -'LBL_CONTACT_NAME'=>' Contact Name: ', -'LBL_EMAIL'=>'Email:', -'LBL_DETAILVIEW_EMAIL'=>'E-Mail', -'LBL_COLON'=>':', -'LBL_CHK_MAIL'=>'Check Mail', -'LBL_COMPOSE'=>'Compose', -//Single change for 5.0.3 -'LBL_SETTINGS'=>'Incoming Mail Server Settings', -'LBL_EMAIL_FOLDERS'=>'Email Folders', -'LBL_INBOX'=>'Inbox', -'LBL_SENT_MAILS'=>'Sent Mails', -'LBL_TRASH'=>'Trash', -'LBL_JUNK_MAILS'=>'Junk Mails', -'LBL_TO_LEADS'=>'To Leads', -'LBL_TO_CONTACTS'=>'To Contacts', -'LBL_TO_ACCOUNTS'=>'To Accounts', -'LBL_MY_MAILS'=>'My Mails', -'LBL_QUAL_CONTACT'=>'Qualified Mails (As Contacts)', -'LBL_MAILS'=>'Mails', -'LBL_QUALIFY_BUTTON'=>'Qualify', -'LBL_REPLY_BUTTON'=>'Reply', -'LBL_FORWARD_BUTTON'=>'Forward', -'LBL_DOWNLOAD_ATTCH_BUTTON'=>'Download Attachments', -'LBL_FROM'=>'From :', -'LBL_CC'=>'Cc :', -'LBL_BCC'=>'Bcc :', - -'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', -'LBL_INVITEE'=>'Recipients', - -// Added Fields -// Contacts-SubPanelViewContactsAndUsers.php -'LBL_BULK_MAILS'=>'Bulk Mails', -'LBL_ATTACHMENT'=>'Attachment', -'LBL_UPLOAD'=>'Upload', -'LBL_FILE_NAME'=>'File Name', -'LBL_SEND'=>'Send', - -'LBL_EMAIL_TEMPLATES'=>'Email Templates', -'LBL_TEMPLATE_NAME'=>'Template Name', -'LBL_DESCRIPTION'=>'Description', -'LBL_EMAIL_TEMPLATES_LIST'=>'Email Templates List', -'LBL_EMAIL_INFORMATION'=>'Email Information', - - - - -//for v4 release added -'LBL_NEW_LEAD'=>'New Lead', -'LBL_LEAD_TITLE'=>'Leads', - -'LBL_NEW_PRODUCT'=>'New Product', -'LBL_PRODUCT_TITLE'=>'Products', -'LBL_NEW_CONTACT'=>'New Contact', -'LBL_CONTACT_TITLE'=>'Contacts', -'LBL_NEW_ACCOUNT'=>'New Account', -'LBL_ACCOUNT_TITLE'=>'Accounts', - -// Added vtiger_fields after vtiger4 - Beta -'LBL_USER_TITLE'=>'Users', -'LBL_NEW_USER'=>'New User', - -// Added for 4 GA -'LBL_TOOL_FORM_TITLE'=>'Email Tools', -//Added for 4GA -'Date & Time Sent'=>'Date & Time Sent', -'Sales Enity Module'=>'Sales Enity Module', -'Related To'=>'Related To', -'Assigned To'=>'Assigned To', -'Subject'=>'Subject', -'Attachment'=>'Attachment', -'Description'=>'Description', -'Time Start'=>'Time Start', -'Created Time'=>'Created Time', -'Modified Time'=>'Modified Time', - -'MESSAGE_CHECK_MAIL_SERVER_NAME'=>'Please Check the Mail Server Name...', -'MESSAGE_CHECK_MAIL_ID'=>'Please Check the Email Id of "Assigned To" User...', -'MESSAGE_MAIL_HAS_SENT_TO_USERS'=>'Mail has been sent to the following User(s) :', -'MESSAGE_MAIL_HAS_SENT_TO_CONTACTS'=>'Mail has been sent to the following Contact(s) :', -'MESSAGE_MAIL_ID_IS_INCORRECT'=>'Mail Id is incorrect. Please Check this Mail Id...', -'MESSAGE_ADD_USER_OR_CONTACT'=>'Please Add any User(s) or Contact(s)...', -'MESSAGE_MAIL_SENT_SUCCESSFULLY'=>' Mail(s) sent successfully!', - -// Added for web mail post 4.0.1 release -'LBL_FETCH_WEBMAIL'=>'Fetch Web Mail', -//Added for 4.2 Release -- CustomView -'LBL_ALL'=>'All', -'MESSAGE_CONTACT_NOT_WANT_MAIL'=>'This Contact does not want to receive mails.', -'LBL_WEBMAILS_TITLE'=>'WebMails', -'LBL_EMAILS_TITLE'=>'Email', -'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
Check in My Accounts->List Mail Server -> List Mail Account', -'LBL_ALLMAILS'=>'All Mails', -'LBL_TO_USERS'=>'To Users', -'LBL_TO'=>'To:', -'LBL_IN_SUBJECT'=>'in Subject', -'LBL_IN_SENDER'=>'in Sender', -'LBL_IN_SUBJECT_OR_SENDER'=>'in Subject or Sender', -'SELECT_EMAIL'=>'Select Email IDs', -'Sender'=>'Sender', -'LBL_CONFIGURE_MAIL_SETTINGS'=>'Your Incoming Mail Server is not configured', -'LBL_MAILSELECT_INFO1'=>'The following Email ID types are associated to the selected', -'LBL_MAILSELECT_INFO2'=>'Select the Email ID types to which,the email should be sent', -'LBL_MULTIPLE'=>'Multiple', -'LBL_COMPOSE_EMAIL'=>'Compose E-Mail', -'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Webmail Client', - -//Added for 5.0.3 -'TITLE_VTIGERCRM_MAIL'=>'vtigerCRM Mail', -'TITLE_COMPOSE_MAIL'=>'Compose Mail', - -'MESSAGE_MAIL_COULD_NOT_BE_SEND'=>'Mail could not be sent to the assigned to user.', -'MESSAGE_PLEASE_CHECK_ASSIGNED_USER_EMAILID'=>'Please check the assigned to user email id...', -'MESSAGE_PLEASE_CHECK_THE_FROM_MAILID'=>'Please check the from email id', -'MESSAGE_MAIL_COULD_NOT_BE_SEND_TO_THIS_EMAILID'=>'Mail could not be sent to this email id', -'PLEASE_CHECK_THIS_EMAILID'=>'Please check this mail id...', -'LBL_CC_EMAIL_ERROR'=>'Your cc mailid is not proper', -'LBL_BCC_EMAIL_ERROR'=>'Your bcc mailid is not proper', -'LBL_NO_RCPTS_EMAIL_ERROR'=>'No recepients specified', -'LBL_CONF_MAILSERVER_ERROR'=>'Please configure your outgoing mailserver under Settings ---> Outgoing Server link', -'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Webmail Client', -'LBL_MAILSELECT_INFO3'=>'You don\'t have permission to view email id(s) of the selected Record(s).', -//Added for script alerts -'FEATURE_AVAILABLE_INFO' => 'This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait f -or an update!', -'DOWNLOAD_CONFIRAMATION' => 'Do you want to download the file ?', -'LBL_PLEASE_ATTACH' => 'Please give a valid file to attach and try again!', -'LBL_KINDLY_UPLOAD' => 'Please configure upload_tmp_dir variable in php.ini file.', -'LBL_EXCEED_MAX' => 'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than ', -'LBL_BYTES' => ' bytes', -'LBL_CHECK_USER_MAILID' => 'Please check the current user mailid.It should be a valid mailid to send Emails', - -// Added/Updated for vtiger CRM 5.0.4 -'Activity Type'=>'Activity Type', -'LBL_MAILSELECT_INFO'=>'has the following Email IDs associated.Please Select the Email IDs to which,the mail should be sent', -'LBL_NO_RECORDS' => 'No Records Found', -'LBL_PRINT_EMAIL'=> 'Print', - -); - -?> diff --git a/oss/vtiger/trunk/modules/Emails/language/phpmailer.lang-en_us.php b/oss/vtiger/trunk/modules/Emails/language/phpmailer.lang-en_us.php deleted file mode 100644 index 7b09c424..00000000 --- a/oss/vtiger/trunk/modules/Emails/language/phpmailer.lang-en_us.php +++ /dev/null @@ -1,31 +0,0 @@ -.'; -$PHPMAILER_LANG["file_access"] = 'Could not access file: '; -$PHPMAILER_LANG["file_open"] = 'File Error: Could not open file: '; -$PHPMAILER_LANG["encoding"] = 'Unknown encoding: '; -?> diff --git a/oss/vtiger/trunk/modules/Emails/language/phpmailer.lang-zh_cn.php b/oss/vtiger/trunk/modules/Emails/language/phpmailer.lang-zh_cn.php deleted file mode 100644 index 7b09c424..00000000 --- a/oss/vtiger/trunk/modules/Emails/language/phpmailer.lang-zh_cn.php +++ /dev/null @@ -1,31 +0,0 @@ -.'; -$PHPMAILER_LANG["file_access"] = 'Could not access file: '; -$PHPMAILER_LANG["file_open"] = 'File Error: Could not open file: '; -$PHPMAILER_LANG["encoding"] = 'Unknown encoding: '; -?> diff --git a/oss/vtiger/trunk/modules/Emails/language/zh_cn.lang.php b/oss/vtiger/trunk/modules/Emails/language/zh_cn.lang.php deleted file mode 100644 index 6fa50c4b..00000000 --- a/oss/vtiger/trunk/modules/Emails/language/zh_cn.lang.php +++ /dev/null @@ -1,184 +0,0 @@ - '一般信息', - - 'LBL_MODULE_NAME' => '邮件', - 'LBL_MODULE_TITLE' => '邮件： 首页', - 'LBL_SEARCH_FORM_TITLE' => '搜寻邮件', - 'LBL_LIST_FORM_TITLE' => '邮件列表', - 'LBL_NEW_FORM_TITLE' => '追踪邮件', - - 'LBL_LIST_SUBJECT' => '标题', - 'LBL_LIST_CONTACT' => '联系人', - 'LBL_LIST_RELATED_TO' => '相关人事', - 'LBL_LIST_DATE' => '寄出日期', - 'LBL_LIST_TIME' => '寄出时间', - - 'ERR_DELETE_RECORD' => '必须有记录编号才能删除该笔账号.', - 'LBL_DATE_SENT' => '寄出日期：', - 'LBL_DATE_AND_TIME' => '寄出日期 & 时间：', - 'LBL_DATE' => '寄出日期：', - 'LBL_TIME' => '寄出时间：', - 'LBL_SUBJECT' => '标题：', - 'LBL_BODY' => '邮件内容：', - 'LBL_CONTACT_NAME' => '联系人名称： ', -'LBL_EMAIL' => '邮件：', -'LBL_DETAILVIEW_EMAIL'=>'邮件', -'LBL_COLON'=>':', -'LBL_CHK_MAIL'=>'检查邮件', -'LBL_COMPOSE'=>'新邮件', -//Single change for 5.0.3 -'LBL_SETTINGS'=>'邮件服务器设置', -'LBL_EMAIL_FOLDERS'=>'邮件数据夹', -'LBL_INBOX' => '收件夹', -'LBL_SENT_MAILS'=>'邮件备份', -'LBL_TRASH' => '垃圾桶', - 'LBL_JUNK_MAILS' => '广告邮件', - 'LBL_TO_LEADS' => '转为准客户', - 'LBL_TO_CONTACTS' => '转为联系人', - 'LBL_TO_ACCOUNTS' => '转为客户', - 'LBL_MY_MAILS' => '我的邮件', - 'LBL_QUAL_CONTACT' => '已转换邮件（转为联系人）', - 'LBL_MAILS' => '邮件', - 'LBL_QUALIFY_BUTTON' => '转换', - 'LBL_REPLY_BUTTON' => '回应', - 'LBL_FORWARD_BUTTON' => '转寄', - 'LBL_DOWNLOAD_ATTCH_BUTTON' => '下载附加档案', - 'LBL_FROM' => '寄件人：', - 'LBL_CC' => '副本：', - 'LBL_BCC' => '密件副本：', - - 'NTC_REMOVE_INVITEE' => '您确定要移除这封来信？', -'LBL_INVITEE'=>'接收者', - -// Added Fields -// Contacts-SubPanelViewContactsAndUsers.php - 'LBL_BULK_MAILS' => '大量寄信', - 'LBL_ATTACHMENT' => '附件', -'LBL_UPLOAD' => '上传', - 'LBL_FILE_NAME' => '文件名称', - 'LBL_SEND' => '寄出', - -'LBL_EMAIL_TEMPLATES' => '邮件样版', - 'LBL_TEMPLATE_NAME' => '样版名称', - 'LBL_DESCRIPTION' => '描述', - 'LBL_EMAIL_TEMPLATES_LIST' => '邮件样版列表', - 'LBL_EMAIL_INFORMATION' => '邮件信息', - - - - -//for v4 release added - 'LBL_NEW_LEAD' => '新增潜在客户', - 'LBL_LEAD_TITLE' => '潜在客户', - - 'LBL_NEW_PRODUCT' => '新增商品', - 'LBL_PRODUCT_TITLE' => '商品', - 'LBL_NEW_CONTACT' => '新增联系人', - 'LBL_CONTACT_TITLE' => '联系人', - 'LBL_NEW_ACCOUNT' => '新增公司', - 'LBL_ACCOUNT_TITLE' => '公司', - -// Added vtiger_fields after vtiger4 - Beta -'LBL_USER_TITLE' => '使用者', - 'LBL_NEW_USER' => '新增使用者', - -// Added for 4 GA - 'LBL_TOOL_FORM_TITLE' => '邮件编辑器', -//Added for 4GA -'Date & Time Sent' => '寄出日期 & 时间', - 'Sales Enity Module' => '客服模块', - - 'Related To' => '相关人事', - 'Assigned To' => '负责人', - 'Subject' => '标题', - 'Attachment' => '附件', - 'Description' => '描述', - 'Time Start' => '开始时间', - 'Created Time' => '建立时间', - 'Modified Time' => '修改时间', - - 'MESSAGE_CHECK_MAIL_SERVER_NAME' => '请检查电子邮件服务器名称...', - 'MESSAGE_CHECK_MAIL_ID' => '请检查负责人的信箱编号...', - 'MESSAGE_MAIL_HAS_SENT_TO_USERS' => '邮件将会寄出给指定的使用者：', - 'MESSAGE_MAIL_HAS_SENT_TO_CONTACTS' => '邮件将会寄出给指定的联系人：', - 'MESSAGE_MAIL_ID_IS_INCORRECT' => '邮件格式不正确. 请检查这封邮件的Id...', - 'MESSAGE_ADD_USER_OR_CONTACT' => '请新增其它位使用者或联系人...', - 'MESSAGE_MAIL_SENT_SUCCESSFULLY' => ' 邮件已顺利寄出!', - -// Added for web mail post 4.0.1 release - 'LBL_FETCH_WEBMAIL' => '取得网页邮件', -//Added for 4.2 Release -- CustomView - 'LBL_ALL' => '全部', - 'MESSAGE_CONTACT_NOT_WANT_MAIL' => '这个联系人不想要收到电子邮件', - 'LBL_WEBMAILS_TITLE' => '网页邮件', - 'LBL_EMAILS_TITLE' => '电子邮件', - 'LBL_MAIL_CONNECT_ERROR_INFO' => '联机到邮件服务器时发生错误，检查我的账号=>邮件服务器列表=>邮件账号', - 'LBL_ALLMAILS' => '所有邮件', - 'LBL_TO_USERS' => '给使用者', - 'LBL_TO' => '收件人：', -'LBL_IN_SUBJECT' => '主旨', - 'LBL_IN_SENDER' => '寄件人', - 'LBL_IN_SUBJECT_OR_SENDER' => '主旨或寄件人', - 'SELECT_EMAIL' => '选择邮件编号', - 'Sender' => '寄件人', - 'LBL_CONFIGURE_MAIL_SETTINGS' => '您的收件邮件服务器还没设定', - 'LBL_MAILSELECT_INFO' => '有下面相关邮件编号，请选择要寄送的邮件编号', - 'LBL_MAILSELECT_INFO1' => '下面的邮件编号与选择的项目有关', - 'LBL_MAILSELECT_INFO2' => '选择要寄送的邮件编号类型', - 'LBL_MULTIPLE' => '多选', - 'LBL_COMPOSE_EMAIL' => '发送邮件', - 'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Webmail 客户', - -//Added for 5.0.3 -'TITLE_VTIGERCRM_MAIL'=>'vtigerCRM 邮件', -'TITLE_COMPOSE_MAIL'=>'组成邮件', - -'MESSAGE_MAIL_COULD_NOT_BE_SEND'=>'邮件不能寄发到被分配的用户.', -'MESSAGE_PLEASE_CHECK_ASSIGNED_USER_EMAILID'=>'请检查被分配的用户电子邮件id...', -'MESSAGE_PLEASE_CHECK_THE_FROM_MAILID'=>'请检查电子邮件id', -'MESSAGE_MAIL_COULD_NOT_BE_SEND_TO_THIS_EMAILID'=>'邮件不能寄发到这电子邮件id', -'PLEASE_CHECK_THIS_EMAILID'=>'请检查这邮件id...', -'LBL_CC_EMAIL_ERROR'=>'您的CC邮件ID不是适当的', -'LBL_BCC_EMAIL_ERROR'=>'您的BCC邮件ID不是适当的', -'LBL_NO_RCPTS_EMAIL_ERROR'=>'没有指定移植对象', -'LBL_CONF_MAILSERVER_ERROR'=>'请设置您外部的邮件服务器 ---> 外出的服务器链接', -'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Webmail 客户', -'LBL_MAILSELECT_INFO3'=>'您不能查看选择记录的邮件ID.', -'LBL_NO_RECORDS' => '这个文件夹没有记录', -//Added for script alerts -'FEATURE_AVAILABLE_INFO' => '这个特点只支持Microsoft Internet Explorer 5.5+或更高!', -'DOWNLOAD_CONFIRAMATION' => '您想要下载文件 ?', -'LBL_PLEASE_ATTACH' => '请再尝试附上一个合法的文件', -'LBL_KINDLY_UPLOAD' => '请配置 upload_tmp_dir variable in php.ini file.', -'LBL_EXCEED_MAX' => '抱歉, 上传的文件超出最大值极限。请尝试一个小文件 ', -'LBL_BYTES' => ' 字节', -'LBL_CHECK_USER_MAILID' => '请检查当前用户的电邮ID是否正确', - -// Added/Updated for vtiger CRM 5.0.4 -'Activity Type'=>'任务类型', -'LBL_MAILSELECT_INFO'=>'has the following Email IDs associated.Please Select the Email IDs to which,the mail should be sent', -'LBL_NO_RECORDS' => 'No Records Found', -'LBL_PRINT_EMAIL'=> 'Print', -); - -?> diff --git a/oss/vtiger/trunk/modules/Emails/mail.php b/oss/vtiger/trunk/modules/Emails/mail.php deleted file mode 100644 index 9e028af4..00000000 --- a/oss/vtiger/trunk/modules/Emails/mail.php +++ /dev/null @@ -1,535 +0,0 @@ -println("To id => '".$to_email."'\nSubject ==>'".$subject."'\nContents ==> '".$contents."'"); - - //Get the email id of assigned_to user -- pass the value and name, name must be "user_name" or "id"(field names of vtiger_users vtiger_table) - //$to_email = getUserEmailId('id',$assigned_user_id); - - //if module is HelpDesk then from_email will come based on support email id - if($from_email == '') { - //if from email is not defined, then use the useremailid as the from address - $from_email = getUserEmailId('user_name',$from_name); - } - - //if the newly defined from email field is set, then use this email address as the from address - //and use the username as the reply-to address - $query = "select * from vtiger_systems where server_type=?"; - $params = array('email'); - $result = $adb->pquery($query,$params); - $from_email_field = $adb->query_result($result,0,'from_email_field'); - $replyToEmail = $from_email; - if(isset($from_email_field) && $from_email_field!=''){ - //setting from _email to the defined email address in the outgoing server configuration - $from_email = $from_email_field; - } - - if($module != "Calendar") - $contents = addSignature($contents,$from_name); - - $mail = new PHPMailer(); - - setMailerProperties($mail,$subject,$contents,$from_email,$from_name,trim($to_email,","),$attachment,$emailid,$module,$logo); - setCCAddress($mail,'cc',$cc); - setCCAddress($mail,'bcc',$bcc); - $mail->AddReplyTo($replyToEmail); - - // vtmailscanner customization: If Support Reply to is defined use it. - global $HELPDESK_SUPPORT_EMAIL_REPLY_ID; - if($HELPDESK_SUPPORT_EMAIL_REPLY_ID && $HELPDESK_SUPPORT_EMAIL_ID != $HELPDESK_SUPPORT_EMAIL_REPLY_ID) { - $mail->AddReplyTo($HELPDESK_SUPPORT_EMAIL_REPLY_ID); - } - // END - - // Fix: Return immediately if Outgoing server not configured - if(empty($mail->Host)) { - return 0; - } - // END - - $mail_status = MailSend($mail); - - if($mail_status != 1) - { - $mail_error = getMailError($mail,$mail_status,$mailto); - } - else - { - $mail_error = $mail_status; - } - - return $mail_error; -} - -/** Function to get the user Email id based on column name and column value - * $name -- column name of the vtiger_users vtiger_table - * $val -- column value - */ -function getUserEmailId($name,$val) -{ - global $adb; - $adb->println("Inside the function getUserEmailId. --- ".$name." = '".$val."'"); - if($val != '') - { - //$sql = "select email1, email2, yahoo_id from vtiger_users where ".$name." = '".$val."'"; - //done to resolve the PHP5 specific behaviour - $sql = "SELECT email1, email2, yahoo_id from vtiger_users WHERE status='Active' AND ". $adb->sql_escape_string($name)." = ?"; - $res = $adb->pquery($sql, array($val)); - $email = $adb->query_result($res,0,'email1'); - if($email == '') - { - $email = $adb->query_result($res,0,'email2'); - if($email == '') - { - $email = $adb->query_result($res,0,'yahoo_id'); - } - } - $adb->println("Email id is selected => '".$email."'"); - return $email; - } - else - { - $adb->println("User id is empty. so return value is ''"); - return ''; - } -} - -/** Funtion to add the user's signature with the content passed - * $contents -- where we want to add the signature - * $fromname -- which user's signature will be added to the contents - */ -function addSignature($contents, $fromname) -{ - global $adb; - $adb->println("Inside the function addSignature"); - - $sign = nl2br($adb->query_result($adb->pquery("select signature from vtiger_users where user_name=?", array($fromname)),0,"signature")); - if($sign != '') - { - $contents .= '
'.$sign; - $adb->println("Signature is added with the body => '.".$sign."'"); - } - else - { - $adb->println("Signature is empty for the user => '".$fromname."'"); - } - return $contents; -} - -/** Function to set all the Mailer properties - * $mail -- reference of the mail object - * $subject -- subject of the email you want to send - * $contents -- body of the email you want to send - * $from_email -- from email id which will be displayed in the mail - * $from_name -- from name which will be displayed in the mail - * $to_email -- to email address -- This can be an email in a single string, a comma separated - * list of emails or an array of email addresses - * $attachment -- whether we want to attach the currently selected file or all vtiger_files. - [values = current,all] - optional - * $emailid -- id of the email object which will be used to get the vtiger_attachments - optional - */ -function setMailerProperties($mail,$subject,$contents,$from_email,$from_name,$to_email,$attachment='',$emailid='',$module='',$logo='') -{ - global $adb; - $adb->println("Inside the function setMailerProperties"); - if($module == "Support" || $logo ==1) - $mail->AddEmbeddedImage('themes/images/logo_mail.jpg', 'logo', 'logo.jpg',"base64","image/jpg"); - - $mail->Subject = $subject; - $mail->Body = $contents; - //$mail->Body = html_entity_decode(nl2br($contents)); //if we get html tags in mail then we will use this line - $mail->AltBody = strip_tags(preg_replace(array("/
/i","/
/i","/
/i"),array("\n","\n","\n"),$contents));
-
- $mail->IsSMTP(); //set mailer to use SMTP
- //$mail->Host = "smtp1.example.com;smtp2.example.com"; // specify main and backup server
-
- setMailServerProperties($mail);
-
- //Handle the from name and email for HelpDesk
- $mail->From = $from_email;
- $rs = $adb->pquery("select first_name,last_name from vtiger_users where user_name=?", array($from_name));
- if($adb->num_rows($rs) > 0)
- $from_name = $adb->query_result($rs,0,"first_name")." ".$adb->query_result($rs,0,"last_name");
-
- $mail->FromName = decode_html($from_name);
-
- if($to_email != '')
- {
- if(is_array($to_email)) {
- for($j=0,$num=count($to_email);$j<$num;$j++) {
- $mail->addAddress($to_email[$j]);
- }
- } else {
- $_tmp = explode(",",$to_email);
- for($j=0,$num=count($_tmp);$j<$num;$j++) {
- $mail->addAddress($_tmp[$j]);
- }
- }
- }
-
- $mail->AddReplyTo($from_email);
- $mail->WordWrap = 50;
-
- //If we want to add the currently selected file only then we will use the following function
- if($attachment == 'current' && $emailid != '')
- {
- if (isset($_REQUEST['filename_hidden'])) {
- $file_name = $_REQUEST['filename_hidden'];
- } else {
- $file_name = $_FILES['filename']['name'];
- }
- addAttachment($mail,$file_name,$emailid);
- }
-
- //This will add all the vtiger_files which are related to this record or email
- if($attachment == 'all' && $emailid != '')
- {
- addAllAttachments($mail,$emailid);
- }
-
- $mail->IsHTML(true); // set email format to HTML
-
- return;
-}
-
-/** Function to set the Mail Server Properties in the object passed
- * $mail -- reference of the mailobject
- */
-function setMailServerProperties($mail)
-{
- global $adb;
- $adb->println("Inside the function setMailServerProperties");
-
- $res = $adb->pquery("select * from vtiger_systems where server_type=?", array('email'));
- if(isset($_REQUEST['server']))
- $server = $_REQUEST['server'];
- else
- $server = $adb->query_result($res,0,'server');
- if(isset($_REQUEST['server_username']))
- $username = $_REQUEST['server_username'];
- else
- $username = $adb->query_result($res,0,'server_username');
- if(isset($_REQUEST['server_password']))
- $password = $_REQUEST['server_password'];
- else
- $password = $adb->query_result($res,0,'server_password');
- // Prasad: First time read smtp_auth from the request
- if(isset($_REQUEST['smtp_auth']))
- {
- $smtp_auth = $_REQUEST['smtp_auth'];
- if($smtp_auth == 'on')
- $smtp_auth = 'true';
- }
- else if (isset($_REQUEST['module']) && $_REQUEST['module'] == 'Settings' && (!isset($_REQUEST['smtp_auth'])))
- {
- //added to avoid issue while editing the values in the outgoing mail server.
- $smtp_auth = 'false';
- }
- else
- $smtp_auth = $adb->query_result($res,0,'smtp_auth');
-
- $adb->println("Mail server name,username & password => '".$server."','".$username."','".$password."'");
- if($smtp_auth == "true"){
- $mail->SMTPAuth = true; // turn on SMTP authentication
- }
- $mail->Host = $server; // specify main and backup server
- $mail->Username = $username ; // SMTP username
- $mail->Password = $password ; // SMTP password
-
- return;
-}
-
-/** Function to add the file as attachment with the mail object
- * $mail -- reference of the mail object
- * $filename -- filename which is going to added with the mail
- * $record -- id of the record - optional
- */
-function addAttachment($mail,$filename,$record)
-{
- global $adb, $root_directory;
- $adb->println("Inside the function addAttachment");
- $adb->println("The file name is => '".$filename."'");
-
- //This is the file which has been selected in Email EditView
- if(is_file($filename) && $filename != '')
- {
- $mail->AddAttachment($root_directory."test/upload/".$filename);
- }
-}
-
-/** Function to add all the vtiger_files as attachment with the mail object
- * $mail -- reference of the mail object
- * $record -- email id ie., record id which is used to get the all vtiger_attachments from database
- */
-function addAllAttachments($mail,$record)
-{
- global $adb,$log, $root_directory;
- $adb->println("Inside the function addAllAttachments");
-
- //Retrieve the vtiger_files from database where avoid the file which has been currently selected
- $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_attachments.attachmentsid = vtiger_seattachmentsrel.attachmentsid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_attachments.attachmentsid where vtiger_crmentity.deleted=0 and vtiger_seattachmentsrel.crmid=?";
- $res = $adb->pquery($sql, array($record));
- $count = $adb->num_rows($res);
-
- for($i=0;$i<$count;$i++)
- {
- $fileid = $adb->query_result($res,$i,'attachmentsid');
- $filename = decode_html($adb->query_result($res,$i,'name'));
- $filepath = $adb->query_result($res,$i,'path');
- $filewithpath = $root_directory.$filepath.$fileid."_".$filename;
-
- //if the file is exist in test/upload directory then we will add directly
- //else get the contents of the file and write it as a file and then attach (this will occur when we unlink the file)
- if(is_file($filewithpath))
- {
- $mail->AddAttachment($filewithpath,$filename);
- }
- }
-}
-
-/** Function to set the CC or BCC addresses in the mail
- * $mail -- reference of the mail object
- * $cc_mod -- mode to set the address ie., cc or bcc
- * $cc_val -- addresss with comma seperated to set as CC or BCC in the mail
- */
-function setCCAddress($mail,$cc_mod,$cc_val)
-{
- global $adb;
- $adb->println("Inside the functin setCCAddress");
-
- if($cc_mod == 'cc')
- $method = 'AddCC';
- if($cc_mod == 'bcc')
- $method = 'AddBCC';
- if($cc_val != '')
- {
- $ccmail = explode(",",trim($cc_val,","));
- for($i=0;$i
'.$mod_strings['MESSAGE_CHECK_MAIL_SERVER_NAME'].'';
- break;
- }
- elseif($status_str[1] == '0')
- {
- $adb->println("first elseif part - status will be 0 which is the case of assigned to vtiger_users's email is empty.");
- $errorstr .= '
'.$mod_strings['MESSAGE_MAIL_COULD_NOT_BE_SEND'].' '.$mod_strings['MESSAGE_PLEASE_CHECK_FROM_THE_MAILID'].'';
- //Added to display the message about the CC && BCC mail sending status
- if($status_str[0] == 'cc_success')
- {
- $cc_msg = 'But the mail has been sent to CC & BCC addresses.';
- $errorstr .= '
'.$cc_msg.'';
- }
- }
- elseif(strstr($status_str[1],'from_failed'))
- {
- $adb->println("second elseif part - from email id is failed.");
- $from = explode('from_failed',$status_str[1]);
- $errorstr .= "
".$mod_strings['MESSAGE_PLEASE_CHECK_THE_FROM_MAILID']." '".$from[1]."'";
- }
- else
- {
- $adb->println("else part - mail send process failed due to the following reason.");
- $errorstr .= "
".$mod_strings['MESSAGE_MAIL_COULD_NOT_BE_SEND_TO_THIS_EMAILID']." '".$status_str[0]."'. ".$mod_strings['PLEASE_CHECK_THIS_EMAILID']."";
- }
- }
- }
- $adb->println("Return Error string => ".$errorstr);
- return $errorstr;
-}
-?>
diff --git a/oss/vtiger/trunk/modules/Emails/mailSelect.php b/oss/vtiger/trunk/modules/Emails/mailSelect.php
deleted file mode 100644
index 5bb49f3a..00000000
--- a/oss/vtiger/trunk/modules/Emails/mailSelect.php
+++ /dev/null
@@ -1,109 +0,0 @@
-id;
-
-$querystr = "select fieldid, fieldname, fieldlabel, columnname from vtiger_field where tabid=? and uitype=13 and vtiger_field.presence in (0,2)";
-$res=$adb->pquery($querystr, array(getTabid($pmodule)));
-$numrows = $adb->num_rows($res);
-$returnvalue = Array();
-for($i = 0; $i < $numrows; $i++)
-{
- $value = Array();
- $fieldname = $adb->query_result($res,$i,"fieldname");
- $permit = getFieldVisibilityPermission($pmodule, $userid, $fieldname);
- if($permit == '0')
- {
- $temp=$adb->query_result($res,$i,'columnname');
- $columnlists [] = $temp;
- $fieldid=$adb->query_result($res,$i,'fieldid');
- $fieldlabel =$adb->query_result($res,$i,'fieldlabel');
- $value[] = getTranslatedString($fieldlabel);
- $returnvalue [$fieldid]= $value;
- }
-}
-
-if($single_record && count($columnlists) > 0)
-{
- $count = 0;
- $val_cnt = 0;
- switch($pmodule)
- {
- case 'Accounts':
- $query = 'select accountname,'.implode(",",$columnlists).' from vtiger_account left join vtiger_accountscf on vtiger_accountscf.accountid = vtiger_account.accountid where vtiger_account.accountid = ?';
- $result=$adb->pquery($query, array($idlist));
- foreach($columnlists as $columnname)
- {
- $acc_eval = $adb->query_result($result,0,$columnname);
- $field_value[$count++] = $acc_eval;
- if($acc_eval != "") $val_cnt++;
-
- }
- $entity_name = $adb->query_result($result,0,'accountname');
- break;
- case 'Leads':
- $query = 'select concat(firstname," ",lastname) as leadname,'.implode(",",$columnlists).' from vtiger_leaddetails left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid where vtiger_leaddetails.leadid = ?';
- $result=$adb->pquery($query, array($idlist));
- foreach($columnlists as $columnname)
- {
- $lead_eval = $adb->query_result($result,0,$columnname);
- $field_value[$count++] = $lead_eval;
- if($lead_eval != "") $val_cnt++;
- }
- $entity_name = $adb->query_result($result,0,'leadname');
- break;
- case 'Contacts':
- $query = 'select concat(firstname," ",lastname) as contactname,'.implode(",",$columnlists).' from vtiger_contactdetails left join vtiger_contactscf on vtiger_contactscf.contactid = vtiger_contactdetails.contactid where vtiger_contactdetails.contactid = ?';
- $result=$adb->pquery($query, array($idlist));
- foreach($columnlists as $columnname)
- {
- $con_eval = $adb->query_result($result,0,$columnname);
- $field_value[$count++] = $con_eval;
- if($con_eval != "") $val_cnt++;
- }
- $entity_name = $adb->query_result($result,0,'contactname');
- break;
- }
-}
-$smarty->assign('PERMIT',$permit);
-$smarty->assign('ENTITY_NAME',$entity_name);
-$smarty->assign('ONE_RECORD',$single_record);
-$smarty->assign('MAILDATA',$field_value);
-$smarty->assign('MAILINFO',$returnvalue);
-$smarty->assign("MOD", $mod_strings);
-$smarty->assign("IDLIST", $idlist);
-$smarty->assign("APP", $app_strings);
-$smarty->assign("FROM_MODULE", $pmodule);
-$smarty->assign("THEME", $theme);
-$smarty->assign("IMAGE_PATH",$image_path);
-if($single_record && count($columnlists) > 0 && $val_cnt > 0)
- $smarty->display("SelectEmail.tpl");
-else if(!$single_record && count($columnlists) > 0)
- $smarty->display("SelectEmail.tpl");
-else if($single_record && $val_cnt == 0)
- echo "No Mail Ids";
-else
- echo "Mail Ids not permitted";
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Emails/mailsend.php b/oss/vtiger/trunk/modules/Emails/mailsend.php
deleted file mode 100644
index bcc14e7f..00000000
--- a/oss/vtiger/trunk/modules/Emails/mailsend.php
+++ /dev/null
@@ -1,239 +0,0 @@
-id;//$_REQUEST['record'];
-}
-
-
-$adb->println("\n\nMail Sending Process has been started.");
-//This function call is used to send mail to the assigned to user. In this mail CC and BCC addresses will be added.
-if($_REQUEST['assigntype' == 'T'] && $_REQUEST['assigned_group_id']!='')
-{
- $grp_obj = new GetGroupUsers();
- $grp_obj->getAllUsersInGroup($_REQUEST['assigned_group_id']);
- $users_list = constructList($grp_obj->group_users,'INTEGER');
- if (count($users_list) > 0) {
- $sql = "select first_name, last_name, email1, email2, yahoo_id from vtiger_users where id in (". generateQuestionMarks($users_list) .")";
- $params = array($users_list);
- } else {
- $sql = "select first_name, last_name, email1, email2, yahoo_id from vtiger_users";
- $params = array();
- }
- $res = $adb->pquery($sql, $params);
- $user_email = '';
- while ($user_info = $adb->fetch_array($res))
- {
- $email = $user_info['email1'];
- if($email == '' || $email == 'NULL')
- {
- $email = $user_info['email2'];
- if($email == '' || $email == 'NULL')
- {
- $email = $user_info['yahoo_id'];
- }
- }
- if($user_email=='')
- $user_email .= $user_info['first_name']." ".$user_info['last_name']."<".$email.">";
- else
- $user_email .= ",".$user_info['first_name']." ".$user_info['last_name']."<".$email.">";
- $email='';
- }
- $to_email = $user_email;
-}
-else
-{
- $to_email = getUserEmailId('id',$focus->column_fields["assigned_user_id"]);
-}
-$cc = $_REQUEST['ccmail'];
-$bcc = $_REQUEST['bccmail'];
-if($to_email == '' && $cc == '' && $bcc == '')
-{
- $adb->println("Mail Error : send_mail function not called because To email id of assigned to user, CC and BCC are empty");
- $mail_status_str = "'".$to_email."'=0&&&";
- $errorheader1 = 1;
-}
-else
-{
- $query1 = "select email1 from vtiger_users where id =?";
- $res1 = $adb->pquery($query1, array($current_user->id));
- $val = $adb->query_result($res1,0,"email1");
-// $mail_status = send_mail('Emails',$to_email,$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],$cc,$bcc,'all',$focus->id);
-
- $query = 'update vtiger_emaildetails set email_flag ="SENT",from_email =? where emailid=?';
- $adb->pquery($query, array($val, $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
- {
- $errorheader1 = 1;
- $mail_status_str = $to_email."=".$mail_status."&&&";
- }
- elseif($mail_status == 1 && $to_email == '')//Mail send success only for CC and BCC but the 'to' email is empty
- {
- $adb->pquery($query, array($val, $focus->id));
- $errorheader1 = 1;
- $mail_status_str = "cc_success=0&&&";
- }
- else
- {
- $mail_status_str = $to_email."=".$mail_status."&&&";
- }
-}
-
-
-//Added code from mysendmail.php which is contributed by Raju(rdhital)
-$parentid= $_REQUEST['parent_id'];
-$myids=explode("|",$parentid);
-$all_to_emailids = Array();
-$from_name = $current_user->user_name;
-$from_address = $current_user->column_fields['email1'];
-
-for ($i=0;$i<(count($myids)-1);$i++)
-{
- $realid=explode("@",$myids[$i]);
- $nemail=count($realid);
- $mycrmid=$realid[0];
- if($realid[1] == -1)
- {
- //handle the mail send to vtiger_users
- $emailadd = $adb->query_result($adb->pquery("select email1 from vtiger_users where id=?", array($mycrmid)),0,'email1');
- $pmodule = 'Users';
- $description = getMergedDescription($_REQUEST['description'],$mycrmid,$pmodule);
- $mail_status = send_mail('Emails',$emailadd,$from_name,$from_address,$_REQUEST['subject'],$description,'','','all',$focus->id);
- $all_to_emailids []= $emailadd;
- $mail_status_str .= $emailadd."=".$mail_status."&&&";
- }
- else
- {
- //Send mail to vtiger_account or lead or contact based on their ids
- $pmodule=getSalesEntityType($mycrmid);
- for ($j=1;$j<$nemail;$j++)
- {
- $temp=$realid[$j];
- $myquery='Select columnname from vtiger_field where fieldid = ? and vtiger_field.presence in (0,2)';
- $fresult=$adb->pquery($myquery, array($temp));
- if ($pmodule=='Contacts')
- {
- require_once('modules/Contacts/Contacts.php');
- $myfocus = new Contacts();
- $myfocus->retrieve_entity_info($mycrmid,"Contacts");
- }
- elseif ($pmodule=='Accounts')
- {
- require_once('modules/Accounts/Accounts.php');
- $myfocus = new Accounts();
- $myfocus->retrieve_entity_info($mycrmid,"Accounts");
- }
- elseif ($pmodule=='Leads')
- {
- require_once('modules/Leads/Leads.php');
- $myfocus = new Leads();
- $myfocus->retrieve_entity_info($mycrmid,"Leads");
- }
- elseif ($pmodule=='Vendors')
- {
- require_once('modules/Vendors/Vendors.php');
- $myfocus = new Vendors();
- $myfocus->retrieve_entity_info($mycrmid,"Vendors");
- }
- else {
- // vtlib customization: Enabling mail send from other modules
- $myfocus = CRMEntity::getInstance($pmodule);
- $myfocus->retrieve_entity_info($mycrmid, $pmodule);
- // END
- }
- $fldname=$adb->query_result($fresult,0,"columnname");
- $emailadd=br2nl($myfocus->column_fields[$fldname]);
-
-//This is to convert the html encoded string to original html entities so that in mail description contents will be displayed correctly
- //$focus->column_fields['description'] = from_html($focus->column_fields['description']);
-
- if($emailadd != '')
- {
- $description = getMergedDescription($_REQUEST['description'],$mycrmid,$pmodule);
- //Email Open Tracking
- global $site_URL, $application_unique_key;
- $emailid = $focus->id;
- $track_URL = "$site_URL/modules/Emails/TrackAccess.php?record=$mycrmid&mailid=$emailid&app_key=$application_unique_key";
- $description = "$description";
- // END
-
- $pos = strpos($description, '$logo$');
- if ($pos !== false)
- {
-
- $description =str_replace('$logo$','
',$description);
- $logo=1;
- }
- if(isPermitted($pmodule,'DetailView',$mycrmid) == 'yes')
- {
- $mail_status = send_mail('Emails',$emailadd,$from_name,$from_address,$_REQUEST['subject'],$description,'','','all',$focus->id,$logo);
- }
-
- $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
-if($errorheader1 == 1 || $errorheader2 == 1)
-{
- $returnset = 'return_module='.$returnmodule.'&return_action='.$returnaction.'&return_id='.vtlib_purify($_REQUEST['return_id']);
- $returnmodule = 'Emails';
- $returnaction = 'EditView';
- //This condition is added to set the record(email) id when we click on send mail button after returning mail error
- if($_REQUEST['mode'] == 'edit')
- {
- $returnid = $_REQUEST['record'];
- }
- else
- {
- $returnid = $_REQUEST['currentid'];
- }
-}
-else
-{
- global $adb;
- $date_var = date('Ymd');
- $query = 'update vtiger_activity set date_start =? where activityid = ?';
- $adb->pquery($query, array($date_var, $returnid));
-}
-//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");
-if(isset($_REQUEST['popupaction']) && $_REQUEST['popupaction'] != '')
-{
- /*this will fix #1211*/
- $inputs="";
- //$inputs="";
- echo $inputs;
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Emails/templates/testemailtemplateusage.php b/oss/vtiger/trunk/modules/Emails/templates/testemailtemplateusage.php
deleted file mode 100644
index e69de29b..00000000
diff --git a/oss/vtiger/trunk/modules/Emails/templates/todel.txt b/oss/vtiger/trunk/modules/Emails/templates/todel.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/oss/vtiger/trunk/modules/Emails/updateRelations.php b/oss/vtiger/trunk/modules/Emails/updateRelations.php
deleted file mode 100644
index 14be6cbe..00000000
--- a/oss/vtiger/trunk/modules/Emails/updateRelations.php
+++ /dev/null
@@ -1,40 +0,0 @@
-pquery($sql, array($id, $record));
- }
-}
-if(isset($_REQUEST['user_id']) && $_REQUEST['user_id'] != '')
-{
- $record = $_REQUEST['record'];
- $sql = "insert into vtiger_salesmanactivityrel values (?,?)";
- $adb->pquery($sql, array($_REQUEST["user_id"], $record));
-}
-
-header("Location: index.php?action=CallRelatedList&module=Emails&record=".vtlib_purify($record));
-
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Emails/webmailsend.php b/oss/vtiger/trunk/modules/Emails/webmailsend.php
deleted file mode 100644
index 1c54392d..00000000
--- a/oss/vtiger/trunk/modules/Emails/webmailsend.php
+++ /dev/null
@@ -1,61 +0,0 @@
-user_name;
- $from_add = $current_user->column_fields['email1'];
- }
- else{
- $from_arr = explode('@',$_REQUEST['from_add']);
- $from_name = $from_arr[0];
- $from_add = $_REQUEST['from_add'];
- }
-$mail_status = send_mail('Emails',$_REQUEST["parent_name"],$from_name,$from_add,$_REQUEST['subject'],$_REQUEST['description'],$_REQUEST["ccmail"],$_REQUEST["bccmail"],'all',$focus->id);
-
-$query = "update vtiger_emaildetails set email_flag ='SENT' where emailid=?";
-$adb->pquery($query, array($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
- $errorheader1 = 1;
- $mail_status_str = $to_email."=".$mail_status."&&&";
-
-} elseif($mail_status == 1 && $to_email == '') { //Mail send success only for CC and BCC but the 'to' email is empty
- $adb->pquery($query, array($focus->id));
- $errorheader1 = 1;
- $mail_status_str = "cc_success=0&&&";
-} else
- $mail_status_str = $to_email."=".$mail_status."&&&";
-
-
-
-//Added to redirect the page to Emails/EditView if there is an error in mail sending
-if($errorheader1 == 1 || $errorheader2 == 1)
-{
- $returnset = 'return_module='.$returnmodule.'&return_action='.$returnaction.'&return_id='.vtlib_purify($_REQUEST['return_id']);
- $returnmodule = 'Emails';
- $returnaction = 'EditView';
- if($_REQUEST['mode'] == 'edit')
- $returnid = $_REQUEST['record'];
- else
- $returnid = $_REQUEST['currentid'];
-}
-
-//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");
-
-if(isset($_REQUEST['popupaction']) && $_REQUEST['popupaction'] != '')
-{
- $inputs="";
- echo $inputs;
-}
-?>