From 5ed66702baaec1aa7742eea479b8ae4f15ca3589 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 14 Sep 2010 22:18:56 +0000 Subject: [PATCH 1/5] Improve detection & removal of empty conditions --- .../class.importexport_wizard_basic_import_csv.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php index 8e07478c6d..990da3a489 100644 --- a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php +++ b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php @@ -199,7 +199,7 @@ class importexport_wizard_basic_import_csv foreach($content['field_conversion'] as $field => $convert) { if(!trim($convert)) unset($content['field_conversion'][$field]); } - + switch (array_search('pressed', $content['button'])) { case 'next': @@ -267,11 +267,11 @@ class importexport_wizard_basic_import_csv { array_shift($content['conditions']); - foreach($content['conditions'] as $key => &$condition) { - // Clear empties - if($condition['string'] == '') { + // Clear conditions that don't do anything + foreach($content['conditions'] as $key => $condition) { + if($condition['true']['action'] == 'none' && !$condition['true']['stop'] + && $condition['false']['action'] == 'none' && !$condition['false']['stop']) { unset($content['conditions'][$key]); - continue; } } From a4d3aca9e9992a06cb624bbe0167e649623baf78 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Wed, 15 Sep 2010 08:28:16 +0000 Subject: [PATCH 2/5] fix for Safari Padding-Bug --- phpgwapi/templates/idots/css/traditional.css | 1 + 1 file changed, 1 insertion(+) diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css index 3f9049f4c8..0d25ff109a 100755 --- a/phpgwapi/templates/idots/css/traditional.css +++ b/phpgwapi/templates/idots/css/traditional.css @@ -203,6 +203,7 @@ a.appTitles,.appTitles a.textSidebox { + padding: 0; border-top: 0; } From 02c6955326b23e9a3fce9606dcd8b9d1c4e32114 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Wed, 15 Sep 2010 08:39:07 +0000 Subject: [PATCH 3/5] convertHTML2Text: handling of chars that break further processing of converted Data (e.g.: Mail to Infolog) --- phpgwapi/inc/class.translation.inc.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php index c91af7255d..01c7cabdcb 100644 --- a/phpgwapi/inc/class.translation.inc.php +++ b/phpgwapi/inc/class.translation.inc.php @@ -1139,7 +1139,9 @@ class translation '@&(pound|#163);@i', // Pound '@&(copy|#169);@i', // Copyright '@&(reg|#174);@i', // Registered + '@&(trade|#8482);@i', // trade '@'@i', // singleQuote + '@(\xc2\xa0)@', // nbsp or tab (encoded windows-style) ); $Replace = array ('', '"', @@ -1150,9 +1152,11 @@ class translation chr(161), chr(162), chr(163), - chr(169), - chr(174), + '(C)',//chr(169),// copyrighgt + '(R)',//chr(174),// registered + '(TM)',// trade "'", + ' ', ); $_html = preg_replace($Rules, $Replace, $_html); From 6a25f137f75727d4f719268a0d0e29966b424d83 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Wed, 15 Sep 2010 08:52:26 +0000 Subject: [PATCH 4/5] *Infolog: Feature; import_mail; Prepend the Message HeaderData in Front of the infolog Text. That way Headerinformation is preserved, when the Infolog is altered in Type, Link, Adresses or Startdate; funded by Knauber --- infolog/inc/class.infolog_ui.inc.php | 39 +++++++++++++++++++++------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index 04ca301d1f..2e663aec5f 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -1327,6 +1327,8 @@ class infolog_ui $GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog').' - '. ($content['status_only'] ? lang('Edit Status') : lang('Edit')); $GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => ($info_id ? 'ManualInfologEdit' : 'ManualInfologAdd')); + //error_log(substr($content['info_des'],1793,10)); + //$content['info_des'] = substr($content['info_des'],0,1793); //echo "

infolog_ui.edit(info_id='$info_id',action='$action',action_id='$action_id') readonlys="; print_r($readonlys); echo ", content = "; _debug_array($content); $this->tmpl->exec('infolog.infolog_ui.edit',$content,array( 'info_type' => $types, @@ -1581,6 +1583,8 @@ class infolog_ui $subject = $bofelamimail->decode_header($headers['SUBJECT']); $message = self::getdisplayableBody($bofelamimail, $bodyParts); + $headdata = self::createHeaderInfoSection($headers); + $message = $headdata.$message; //echo __METHOD__.'
'; //_debug_array($attachments); if (is_array($attachments)) @@ -1596,16 +1600,7 @@ class infolog_ui $headdata =''; if ($mailcontent['headers']) { - if ($mailcontent['headers']['SUBJECT']) $headdata = lang('subject').': '.$mailcontent['headers']['SUBJECT']."\n"; - if ($mailcontent['headers']['FROM']) $headdata .= lang('from').': '.$mailcontent['headers']['FROM']."\n"; - if ($mailcontent['headers']['SENDER']) $headdata .= lang('sender').': '.$mailcontent['headers']['SENDER']."\n"; - if ($mailcontent['headers']['TO']) $headdata .= lang('to').': '.$mailcontent['headers']['TO']."\n"; - if ($mailcontent['headers']['CC']) $headdata .= lang('cc').': '.$mailcontent['headers']['CC']."\n"; - if ($mailcontent['headers']['DATE']) $headdata .= lang('date').': '.$mailcontent['headers']['DATE']."\n"; - if ($mailcontent['headers']['PRIORITY'] && $mailcontent['headers']['PRIORITY'] != 'normal') $headdata .= lang('priority').': '.$mailcontent['headers']['PRIORITY']."\n"; - if ($mailcontent['headers']['IMPORTANCE'] && $mailcontent['headers']['IMPORTANCE'] !='normal') $headdata .= lang('importance').': '.$mailcontent['headers']['IMPORTANCE']."\n"; - //if ($mailcontent['headers']['ORGANIZATION']) $headdata .= lang('organization').': '.$mailcontent['headers']['ORGANIZATION']."\n"; - if (!empty($headdata)) $headdata .= "--------------------------------------------------------\n"; + $headdata = self::createHeaderInfoSection($mailcontent['headers']); } if ($mailcontent['message']) { @@ -1650,6 +1645,30 @@ class infolog_ui ); } + static function createHeaderInfoSection($header) + { + $headdata = null; + if ($header['SUBJECT']) $headdata = lang('subject').': '.$header['SUBJECT']."\n"; + if ($header['FROM']) $headdata .= lang('from').': '.$header['FROM']."\n"; + if ($header['SENDER']) $headdata .= lang('sender').': '.$header['SENDER']."\n"; + if ($header['TO']) $headdata .= lang('to').': '.$header['TO']."\n"; + if ($header['CC']) $headdata .= lang('cc').': '.$header['CC']."\n"; + if ($header['DATE']) $headdata .= lang('date').': '.$header['DATE']."\n"; + if ($header['PRIORITY'] && $header['PRIORITY'] != 'normal') $headdata .= lang('priority').': '.$header['PRIORITY']."\n"; + if ($header['IMPORTANCE'] && $header['IMPORTANCE'] !='normal') $headdata .= lang('importance').': '.$header['IMPORTANCE']."\n"; + //if ($mailcontent['headers']['ORGANIZATION']) $headdata .= lang('organization').': '.$mailcontent['headers']['ORGANIZATION']."\ + if (!empty($headdata)) + { + $headdata = "--------------------------------------------------------\n".$headdata; + $headdata .= "--------------------------------------------------------\n"; + } + else + { + $headdata = "--------------------------------------------------------\n"; + } + return $headdata; + } + static function &getdisplayableBody(&$bofelamimail, $bodyParts) { for($i=0; $i Date: Wed, 15 Sep 2010 09:10:12 +0000 Subject: [PATCH 5/5] * added mail log, which can be enabled by setting $GLOBALS[egw_info][server][log_mail] to a path or true for standard error_log - added egw_mailer class to archive that and correctly intialise EGroupware pathes for translations - updated translations and moved them to phpgwapi/lang/ (getting rid of message not translated errors) - using egw_mailer in fmail including catching of phpmailerException to not glutter GUI with echoed errors --- phpgwapi/inc/class.egw_mailer.inc.php | 85 +++++ phpgwapi/inc/class.send.inc.php | 408 ++++++++++-------------- phpgwapi/lang/phpmailer.lang-ar.php | 27 ++ phpgwapi/lang/phpmailer.lang-br.php | 26 ++ phpgwapi/lang/phpmailer.lang-ca.php | 26 ++ phpgwapi/lang/phpmailer.lang-ch.php | 26 ++ phpgwapi/lang/phpmailer.lang-cz.php | 25 ++ phpgwapi/lang/phpmailer.lang-de.php | 25 ++ phpgwapi/lang/phpmailer.lang-dk.php | 26 ++ phpgwapi/lang/phpmailer.lang-es.php | 26 ++ phpgwapi/lang/phpmailer.lang-et.php | 26 ++ phpgwapi/lang/phpmailer.lang-fi.php | 27 ++ phpgwapi/lang/phpmailer.lang-fo.php | 27 ++ phpgwapi/lang/phpmailer.lang-fr.php | 25 ++ phpgwapi/lang/phpmailer.lang-hu.php | 25 ++ phpgwapi/lang/phpmailer.lang-it.php | 27 ++ phpgwapi/lang/phpmailer.lang-ja.php | 26 ++ phpgwapi/lang/phpmailer.lang-nl.php | 25 ++ phpgwapi/lang/phpmailer.lang-no.php | 25 ++ phpgwapi/lang/phpmailer.lang-pl.php | 25 ++ phpgwapi/lang/phpmailer.lang-ro.php | 27 ++ phpgwapi/lang/phpmailer.lang-ru.php | 25 ++ phpgwapi/lang/phpmailer.lang-se.php | 26 ++ phpgwapi/lang/phpmailer.lang-tr.php | 27 ++ phpgwapi/lang/phpmailer.lang-zh.php | 26 ++ phpgwapi/lang/phpmailer.lang-zh_cn.php | 26 ++ phpgwapi/setup/phpmailer.lang-br.php | 21 -- phpgwapi/setup/phpmailer.lang-de.php | 23 -- phpgwapi/setup/phpmailer.lang-en.php | 23 -- phpgwapi/setup/phpmailer.lang-es-es.php | 23 -- phpgwapi/setup/phpmailer.lang-it.php | 28 -- phpgwapi/setup/phpmailer.lang-sl.php | 21 -- 32 files changed, 880 insertions(+), 374 deletions(-) create mode 100644 phpgwapi/inc/class.egw_mailer.inc.php create mode 100644 phpgwapi/lang/phpmailer.lang-ar.php create mode 100644 phpgwapi/lang/phpmailer.lang-br.php create mode 100644 phpgwapi/lang/phpmailer.lang-ca.php create mode 100644 phpgwapi/lang/phpmailer.lang-ch.php create mode 100644 phpgwapi/lang/phpmailer.lang-cz.php create mode 100644 phpgwapi/lang/phpmailer.lang-de.php create mode 100644 phpgwapi/lang/phpmailer.lang-dk.php create mode 100644 phpgwapi/lang/phpmailer.lang-es.php create mode 100644 phpgwapi/lang/phpmailer.lang-et.php create mode 100644 phpgwapi/lang/phpmailer.lang-fi.php create mode 100644 phpgwapi/lang/phpmailer.lang-fo.php create mode 100644 phpgwapi/lang/phpmailer.lang-fr.php create mode 100644 phpgwapi/lang/phpmailer.lang-hu.php create mode 100644 phpgwapi/lang/phpmailer.lang-it.php create mode 100644 phpgwapi/lang/phpmailer.lang-ja.php create mode 100644 phpgwapi/lang/phpmailer.lang-nl.php create mode 100644 phpgwapi/lang/phpmailer.lang-no.php create mode 100644 phpgwapi/lang/phpmailer.lang-pl.php create mode 100644 phpgwapi/lang/phpmailer.lang-ro.php create mode 100644 phpgwapi/lang/phpmailer.lang-ru.php create mode 100644 phpgwapi/lang/phpmailer.lang-se.php create mode 100644 phpgwapi/lang/phpmailer.lang-tr.php create mode 100644 phpgwapi/lang/phpmailer.lang-zh.php create mode 100644 phpgwapi/lang/phpmailer.lang-zh_cn.php delete mode 100644 phpgwapi/setup/phpmailer.lang-br.php delete mode 100644 phpgwapi/setup/phpmailer.lang-de.php delete mode 100644 phpgwapi/setup/phpmailer.lang-en.php delete mode 100644 phpgwapi/setup/phpmailer.lang-es-es.php delete mode 100644 phpgwapi/setup/phpmailer.lang-it.php delete mode 100644 phpgwapi/setup/phpmailer.lang-sl.php diff --git a/phpgwapi/inc/class.egw_mailer.inc.php b/phpgwapi/inc/class.egw_mailer.inc.php new file mode 100644 index 0000000000..919edc2504 --- /dev/null +++ b/phpgwapi/inc/class.egw_mailer.inc.php @@ -0,0 +1,85 @@ + + * @version $Id$ + */ + +require_once(EGW_API_INC.'/class.phpmailer.inc.php'); + +/** + * Log mails to log file specified in $GLOBALS['egw_info']['server']['log_mail'] + * or regular error_log for true (can be set either in DB or header.inc.php). + * + * This class does NOT use anything EGroupware specific, it acts like PHPMail, but logs. + */ +class egw_mailer extends PHPMailer +{ + /** + * Constructor: always throw exceptions instead of echoing errors and EGw pathes + */ + function __construct() + { + parent::__construct(true); // throw exceptions instead of echoing errors + + // setting EGroupware specific path for PHPMailer lang files + list($lang,$nation) = explode('-',$GLOBALS['egw_info']['user']['preferences']['common']['lang']); + $lang_path = EGW_SERVER_ROOT.'/phpgwapi/lang/'; + if ($nation && file_exists($lang_path."phpmailer.lang-$nation.php")) // atm. only for pt-br => br + { + $lang = $nation; + } + if (!$this->SetLanguage($lang,$lang_path)) + { + $this->SetLanguage('en',$lang_path); // use English default + } + } + + /** + * Log mails to log file specified in $GLOBALS['egw_info']['server']['log_mail'] + * or regular error_log for true (can be set either in DB or header.inc.php). + * + * We can NOT supply this method as callback to phpMailer, as phpMailer only accepts + * functions (not methods) and from a function we can NOT access $this->ErrorInfo. + * + * @param boolean $isSent + * @param string $to + * @param string $cc + * @param string $bcc + * @param string $subject + * @param string $body + */ + protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) + { + if ($GLOBALS['egw_info']['server']['log_mail']) + { + $msg = $GLOBALS['egw_info']['server']['log_mail'] !== true ? date('Y-m-d H:i:s')."\n" : ''; + $msg .= ($isSent ? 'Mail send' : 'Mail NOT send'). + ' to '.$to.' with subject: "'.trim($subject).'"'; + + if ($GLOBALS['egw_info']['user']['account_id'] && class_exists('common',false)) + { + $msg .= ' from user #'.$GLOBALS['egw_info']['user']['account_id'].' ('. + common::grab_owner_name($GLOBALS['egw_info']['user']['account_id']).')'; + } + if (!$isSent) + { + $this->SetError(''); // queries error from (private) smtp and stores it in $this->ErrorInfo + $msg .= $GLOBALS['egw_info']['server']['log_mail'] !== true ? "\n" : ': '; + $msg .= 'ERROR '.str_replace(array('Language string failed to load: smtp_error',"\n","\r"),'', + strip_tags($this->ErrorInfo)); + } + if ($GLOBALS['egw_info']['server']['log_mail'] !== true) $msg .= "\n\n"; + + error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3, + $GLOBALS['egw_info']['server']['log_mail']); + } + // calling the orginal callback of phpMailer + parent::doCallback($isSent,$to,$cc,$bcc,$subject,$body); + } +} diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php index 8f4d38544e..2cc963cda7 100644 --- a/phpgwapi/inc/class.send.inc.php +++ b/phpgwapi/inc/class.send.inc.php @@ -1,267 +1,205 @@ + * @version $Id$ + */ - /* $Id$ */ - - require_once(EGW_API_INC.'/class.phpmailer.inc.php'); +/** + * New eGW send-class. It implements the old interface (msg-method) on top of PHPMailer. + * + * The configuration is read from Admin >> Site configuration and it does NOT depend on one of the email-apps anymore. + */ +class send extends egw_mailer +{ + var $err = array(); + var $to_res = array(); + // switching on debug with a numeric value other than 0, switches debug in PHPMailer/SMTP Class on + var $debug = false; /** - * New eGW send-class. It implements the old interface (msg-method) on top of PHPMailer. - * - * The configuration is read from Admin >> Site configuration and it does NOT depend on one of the email-apps anymore. - * - * @author RalfBecker@outdoor-training.de - */ - class send extends PHPMailer + * eGW specific initialisation of the PHPMailer: charset, language, smtp-host, ... + * + * To be able to call PHPMailer's Send function, we check if a subject, body or address is set and call it in that case, + * else we do our constructors work. + */ + function send() { - /** - * Log mails to log file specified in $GLOBALS['egw_info']['server']['log_mail'] - * or regular error_log for true (can be set either in DB or header.inc.php). - * - * We can NOT supply this method as callback to phpMailer, as phpMailer only accepts - * functions (not methods) and from a function we can NOT access $this->ErrorInfo. - * - * @param boolean $isSent - * @param string $to - * @param string $cc - * @param string $bcc - * @param string $subject - * @param string $body - */ - protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) + if ($this->debug && is_numeric($this->debug)) $this->SMTPDebug = $this->debug; + if ($this->Subject || $this->Body || count($this->to)) { - if ($GLOBALS['egw_info']['server']['log_mail']) - { - $msg = $GLOBALS['egw_info']['server']['log_mail'] !== true ? date('Y-m-d H:i:s')."\n" : ''; - $msg .= ($isSent ? 'Mail send' : 'Mail NOT send'). - ' to '.$to.' with subject: "'.trim($subject).'"'; - - if ($GLOBALS['egw_info']['user']['account_id']) - { - $msg .= ' from user #'.$GLOBALS['egw_info']['user']['account_id'].' ('. - common::grab_owner_name($GLOBALS['egw_info']['user']['account_id']).')'; - } - if (!$isSent) - { - $this->SetError(''); // queries error from (private) smtp and stores it in $this->ErrorInfo - $msg .= $GLOBALS['egw_info']['server']['log_mail'] !== true ? "\n" : ': '; - $msg .= 'ERROR '.str_replace(array('Language string failed to load: smtp_error',"\n","\r"),'', - strip_tags($this->ErrorInfo)); - } - if ($GLOBALS['egw_info']['server']['log_mail'] !== true) $msg .= "\n\n"; - - error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3, - $GLOBALS['egw_info']['server']['log_mail']); - } - // calling the orginal callback of phpMailer - parent::doCallback($isSent,$to,$cc,$bcc,$subject,$body); + if ($this->debug) error_log(__METHOD__." ".print_r($this->Subject,true)." to be send"); + return PHPMailer::Send(); } + parent::__construct(); // calling parent constructor - var $err = array(); - var $to_res = array(); - // switching on debug with a numeric value other than 0, switches debug in PHPMailer/SMTP Class on - var $debug = false; - - /** - * eGW specific initialisation of the PHPMailer: charset, language, smtp-host, ... - * - * To be able to call PHPMailer's Send function, we check if a subject, body or address is set and call it in that case, - * else we do our constructors work. - */ - function send() - { - parent::__construct(true); // throw exceptions instead of echoing errors - - if ($this->debug && is_numeric($this->debug)) $this->SMTPDebug = $this->debug; - if ($this->Subject || $this->Body || count($this->to)) - { - if ($this->debug) error_log(__METHOD__." ".print_r($this->Subject,true)." to be send"); - return PHPMailer::Send(); - } - $this->CharSet = $GLOBALS['egw']->translation->charset(); - list($lang,$nation) = explode('-',$GLOBALS['egw_info']['user']['preferences']['common']['lang']); - $lang_path = EGW_SERVER_ROOT.'/phpgwapi/setup/'; - if ($nation && file_exists($lang_path."phpmailer.lang-$nation.php")) // atm. only for pt-br => br - { - $lang = $nation; - } - $this->SetLanguage($lang,$lang_path); - $this->IsSmtp(); - $restoreSession = $getUserDefinedProfiles = true; - // if dontUseUserDefinedProfiles is set to yes/true/1 dont restore the session AND dont retrieve UserdefinedAccount settings - $notification_config = config::read('notifications'); - if ($notification_config['dontUseUserDefinedProfiles']) $restoreSession = $getUserDefinedProfiles = false; - $bopreferences =& CreateObject('felamimail.bopreferences',$restoreSession); - if ($bopreferences) { - if ($this->debug) error_log(__METHOD__." using felamimail preferences for mailing."); - // if dontUseUserDefinedProfiles is set to yes/true/1 dont retrieve UserdefinedAccount settings - $preferences = $bopreferences->getPreferences($getUserDefinedProfiles); - if ($preferences) { - $ogServer = $preferences->getOutgoingServer(0); - if ($ogServer) { - $this->Host = $ogServer->host; - $this->Port = $ogServer->port; - if($ogServer->smtpAuth) { - $this->SMTPAuth = true; - list($username,$senderadress) = explode(';', $ogServer->username,2); - if (!isset($this->Sender) || empty($this->Sender)) // if there is no Sender info, try to determine one - { - if (isset($senderadress) && !empty($senderadress)) // thats the senderinfo, that may be part of the - { // SMTP Auth. this one has precedence over other settings - $this->Sender = $senderadress; + $this->CharSet = translation::charset(); + $this->IsSmtp(); + $restoreSession = $getUserDefinedProfiles = true; + // if dontUseUserDefinedProfiles is set to yes/true/1 dont restore the session AND dont retrieve UserdefinedAccount settings + $notification_config = config::read('notifications'); + if ($notification_config['dontUseUserDefinedProfiles']) $restoreSession = $getUserDefinedProfiles = false; + $bopreferences =& CreateObject('felamimail.bopreferences',$restoreSession); + if ($bopreferences) { + if ($this->debug) error_log(__METHOD__." using felamimail preferences for mailing."); + // if dontUseUserDefinedProfiles is set to yes/true/1 dont retrieve UserdefinedAccount settings + $preferences = $bopreferences->getPreferences($getUserDefinedProfiles); + if ($preferences) { + $ogServer = $preferences->getOutgoingServer(0); + if ($ogServer) { + $this->Host = $ogServer->host; + $this->Port = $ogServer->port; + if($ogServer->smtpAuth) { + $this->SMTPAuth = true; + list($username,$senderadress) = explode(';', $ogServer->username,2); + if (!isset($this->Sender) || empty($this->Sender)) // if there is no Sender info, try to determine one + { + if (isset($senderadress) && !empty($senderadress)) // thats the senderinfo, that may be part of the + { // SMTP Auth. this one has precedence over other settings + $this->Sender = $senderadress; + } + else // there is no senderinfo with smtp auth, fetch the identities mailaddress, as it should be connected to + { // the active profiles smtp settings + $activeMailProfile = $preferences->getIdentity(0); // fetch active identity + if (isset($activeMailProfile->emailAddress) && !empty($activeMailProfile->emailAddress)) + { + $this->Sender = $activeMailProfile->emailAddress; } - else // there is no senderinfo with smtp auth, fetch the identities mailaddress, as it should be connected to - { // the active profiles smtp settings - $activeMailProfile = $preferences->getIdentity(0); // fetch active identity - if (isset($activeMailProfile->emailAddress) && !empty($activeMailProfile->emailAddress)) - { - $this->Sender = $activeMailProfile->emailAddress; - } - } - } - $this->Username = $username; - $this->Password = $ogServer->password; - } - if ($this->debug) error_log(__METHOD__." using Host ".print_r($this->Host,true)." to be send"); - if ($this->debug) error_log(__METHOD__." using User ".print_r($this->Username,true)." to be send"); - if ($this->debug) error_log(__METHOD__." using Sender ".print_r($this->Sender,true)." to be send"); + } + } + $this->Username = $username; + $this->Password = $ogServer->password; } + if ($this->debug) error_log(__METHOD__." using Host ".print_r($this->Host,true)." to be send"); + if ($this->debug) error_log(__METHOD__." using User ".print_r($this->Username,true)." to be send"); + if ($this->debug) error_log(__METHOD__." using Sender ".print_r($this->Sender,true)." to be send"); } - } else { - if ($this->debug) error_log(__METHOD__." using global config to send"); - $this->Host = $GLOBALS['egw_info']['server']['smtp_server']?$GLOBALS['egw_info']['server']['smtp_server']:'localhost'; - $this->Port = $GLOBALS['egw_info']['server']['smtp_port']?$GLOBALS['egw_info']['server']['smtp_port']:25; - $this->SMTPAuth = !empty($GLOBALS['egw_info']['server']['smtp_auth_user']); - list($username,$senderadress) = explode(';', $GLOBALS['egw_info']['server']['smtp_auth_user'],2); - if (isset($senderadress) && !empty($senderadress)) $this->Sender = $senderadress; - $this->Username = $username; - $this->Password = $GLOBALS['egw_info']['server']['smtp_auth_passwd']; - if ($this->debug) error_log(__METHOD__." using Host ".print_r($this->Host,true)." to be send"); - if ($this->debug) error_log(__METHOD__." using User ".print_r($this->Username,true)." to be send"); - if ($this->debug) error_log(__METHOD__." using Sender ".print_r($this->Sender,true)." to be send"); } - $this->Hostname = $GLOBALS['egw_info']['server']['hostname']; + } else { + if ($this->debug) error_log(__METHOD__." using global config to send"); + $this->Host = $GLOBALS['egw_info']['server']['smtp_server']?$GLOBALS['egw_info']['server']['smtp_server']:'localhost'; + $this->Port = $GLOBALS['egw_info']['server']['smtp_port']?$GLOBALS['egw_info']['server']['smtp_port']:25; + $this->SMTPAuth = !empty($GLOBALS['egw_info']['server']['smtp_auth_user']); + list($username,$senderadress) = explode(';', $GLOBALS['egw_info']['server']['smtp_auth_user'],2); + if (isset($senderadress) && !empty($senderadress)) $this->Sender = $senderadress; + $this->Username = $username; + $this->Password = $GLOBALS['egw_info']['server']['smtp_auth_passwd']; + if ($this->debug) error_log(__METHOD__." using Host ".print_r($this->Host,true)." to be send"); + if ($this->debug) error_log(__METHOD__." using User ".print_r($this->Username,true)." to be send"); + if ($this->debug) error_log(__METHOD__." using Sender ".print_r($this->Sender,true)." to be send"); } + $this->Hostname = $GLOBALS['egw_info']['server']['hostname']; + } - /** - * Reset all Settings to send multiple Messages - */ - function ClearAll() + /** + * Reset all Settings to send multiple Messages + */ + function ClearAll() + { + $this->err = array(); + + $this->Subject = $this->Body = $this->AltBody = ''; + $this->IsHTML(False); + $this->ClearAllRecipients(); + $this->ClearAttachments(); + $this->ClearCustomHeaders(); + + $this->FromName = $GLOBALS['egw_info']['user']['fullname']; + $this->From = $GLOBALS['egw_info']['user']['email']; + $this->Sender = ''; + + $this->AddCustomHeader('X-Mailer:eGroupWare (http://www.eGroupWare.org)'); + } + + /** + * Emulating the old send::msg interface for compatibility with existing code + * + * You can either use that code or the PHPMailer variables and methods direct. + */ + function msg($service, $to, $subject, $body, $msgtype='', $cc='', $bcc='', $from='', $sender='', $content_type='', $boundary='Message-Boundary') + { + if ($this->debug) error_log(__METHOD__." to='$to',subject='$subject',,'$msgtype',cc='$cc',bcc='$bcc',from='$from',sender='$sender'"); + //echo "

send::msg(,to='$to',subject='$subject',,'$msgtype',cc='$cc',bcc='$bcc',from='$from',sender='$sender','$content_type','$boundary')

$body
\n"; + $this->ClearAll(); // reset everything to its default, we might be called more then once !!! + + if ($service != 'email') { - $this->err = array(); - - $this->Subject = $this->Body = $this->AltBody = ''; - $this->IsHTML(False); - $this->ClearAllRecipients(); - $this->ClearAttachments(); - $this->ClearCustomHeaders(); - - $this->FromName = $GLOBALS['egw_info']['user']['fullname']; - $this->From = $GLOBALS['egw_info']['user']['email']; - $this->Sender = ''; - - $this->AddCustomHeader('X-Mailer:eGroupWare (http://www.eGroupWare.org)'); + return False; } - - /** - * Emulating the old send::msg interface for compatibility with existing code - * - * You can either use that code or the PHPMailer variables and methods direct. - */ - function msg($service, $to, $subject, $body, $msgtype='', $cc='', $bcc='', $from='', $sender='', $content_type='', $boundary='Message-Boundary') + if ($from) { - if ($this->debug) error_log(__METHOD__." to='$to',subject='$subject',,'$msgtype',cc='$cc',bcc='$bcc',from='$from',sender='$sender'"); - //echo "

send::msg(,to='$to',subject='$subject',,'$msgtype',cc='$cc',bcc='$bcc',from='$from',sender='$sender','$content_type','$boundary')

$body
\n"; - $this->ClearAll(); // reset everything to its default, we might be called more then once !!! - - if ($service != 'email') + if (preg_match('/"?(.+)"?<(.+)>/',$from,$matches)) { - return False; + list(,$this->FromName,$this->From) = $matches; } - if ($from) + else { - if (preg_match('/"?(.+)"?<(.+)>/',$from,$matches)) + $this->From = $from; + $this->FromName = ''; + } + } + if ($sender) + { + $this->Sender = $sender; + } + foreach(array('to','cc','bcc') as $adr) + { + if ($$adr) + { + if (is_string($$adr) && preg_match_all('/"?(.+)"?<(.+)>,?/',$$adr,$matches)) { - list(,$this->FromName,$this->From) = $matches; + $names = $matches[1]; + $addresses = $matches[2]; } else { - $this->From = $from; - $this->FromName = ''; + $addresses = (is_string($$adr) ? explode(',',trim($$adr)) : explode(',',trim($$adr[0]))); + $names = array(); } - } - if ($sender) - { - $this->Sender = $sender; - } - foreach(array('to','cc','bcc') as $adr) - { - if ($$adr) + $method = 'Add'.($adr == 'to' ? 'Address' : $adr); + + foreach($addresses as $n => $address) { - if (is_string($$adr) && preg_match_all('/"?(.+)"?<(.+)>,?/',$$adr,$matches)) - { - $names = $matches[1]; - $addresses = $matches[2]; - } - else - { - $addresses = (is_string($$adr) ? explode(',',trim($$adr)) : explode(',',trim($$adr[0]))); - $names = array(); - } - $method = 'Add'.($adr == 'to' ? 'Address' : $adr); - - foreach($addresses as $n => $address) - { - $this->$method($address,$names[$n]); - } + $this->$method($address,$names[$n]); } } - if (!empty($msgtype)) - { - $this->AddCustomHeader('X-eGW-Type: '.$msgtype); - } - if ($content_type) - { - $this->ContentType = $content_type; - } - $this->Subject = $subject; - $this->Body = $body; - - //echo "PHPMailer = 
".print_r($this,True)."
\n"; - if (!$this->Send()) - { - $this->err = array( - 'code' => 1, // we dont get a numerical code from PHPMailer - 'msg' => $this->ErrorInfo, - 'desc' => $this->ErrorInfo, - ); - return False; - } - return True; } - - /** - * encode 8-bit chars in subject-line - * - * This is not needed any more, as it is done be PHPMailer, but older code depend on it. - */ - function encode_subject($subject) + if (!empty($msgtype)) { - return $subject; + $this->AddCustomHeader('X-eGW-Type: '.$msgtype); } + if ($content_type) + { + $this->ContentType = $content_type; + } + $this->Subject = $subject; + $this->Body = $body; + + //echo "PHPMailer = 
".print_r($this,True)."
\n"; + if (!$this->Send()) + { + $this->err = array( + 'code' => 1, // we dont get a numerical code from PHPMailer + 'msg' => $this->ErrorInfo, + 'desc' => $this->ErrorInfo, + ); + return False; + } + return True; } + + /** + * encode 8-bit chars in subject-line + * + * @deprecated This is not needed any more, as it is done be PHPMailer, but older code depend on it. + */ + function encode_subject($subject) + { + return $subject; + } +} diff --git a/phpgwapi/lang/phpmailer.lang-ar.php b/phpgwapi/lang/phpmailer.lang-ar.php new file mode 100644 index 0000000000..b7c5057d0c --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-ar.php @@ -0,0 +1,27 @@ + +*/ + +$PHPMAILER_LANG['authenticate'] = 'SMTP Error: لم نستطع تأكيد الهوية.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Error: لم نستطع الاتصال بمخدم SMTP.'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: لم يتم قبول المعلومات .'; +//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['encoding'] = 'ترميز غير معروف: '; +$PHPMAILER_LANG['execute'] = 'لم أستطع تنفيذ : '; +$PHPMAILER_LANG['file_access'] = 'لم نستطع الوصول للملف: '; +$PHPMAILER_LANG['file_open'] = 'File Error: لم نستطع فتح الملف: '; +$PHPMAILER_LANG['from_failed'] = 'البريد التالي لم نستطع ارسال البريد له : '; +$PHPMAILER_LANG['instantiate'] = 'لم نستطع توفير خدمة البريد.'; +//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer غير مدعوم.'; +//$PHPMAILER_LANG['provide_address'] = 'You must provide at least one recipient email address.'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: الأخطاء التالية ' . + 'فشل في الارسال لكل من : '; +$PHPMAILER_LANG['signing'] = 'خطأ في التوقيع: '; +//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; +//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; +?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-br.php b/phpgwapi/lang/phpmailer.lang-br.php new file mode 100644 index 0000000000..6afe60b18c --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-br.php @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-ca.php b/phpgwapi/lang/phpmailer.lang-ca.php new file mode 100644 index 0000000000..4a160a21eb --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-ca.php @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-ch.php b/phpgwapi/lang/phpmailer.lang-ch.php new file mode 100644 index 0000000000..31ebd861cb --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-ch.php @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-cz.php b/phpgwapi/lang/phpmailer.lang-cz.php new file mode 100644 index 0000000000..1c8b206392 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-cz.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-de.php b/phpgwapi/lang/phpmailer.lang-de.php new file mode 100644 index 0000000000..b2a76ce1b5 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-de.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-dk.php b/phpgwapi/lang/phpmailer.lang-dk.php new file mode 100644 index 0000000000..b26257316b --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-dk.php @@ -0,0 +1,26 @@ + +*/ + +$PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Kunne ikke logge på.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP fejl: Kunne ikke tilslutte SMTP serveren.'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fejl: Data kunne ikke accepteres.'; +//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['encoding'] = 'Ukendt encode-format: '; +$PHPMAILER_LANG['execute'] = 'Kunne ikke køre: '; +$PHPMAILER_LANG['file_access'] = 'Ingen adgang til fil: '; +$PHPMAILER_LANG['file_open'] = 'Fil fejl: Kunne ikke åbne filen: '; +$PHPMAILER_LANG['from_failed'] = 'Følgende afsenderadresse er forkert: '; +$PHPMAILER_LANG['instantiate'] = 'Kunne ikke initialisere email funktionen.'; +//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.'; +$PHPMAILER_LANG['provide_address'] = 'Du skal indtaste mindst en modtagers emailadresse.'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP fejl: Følgende modtagere er forkerte: '; +//$PHPMAILER_LANG['signing'] = 'Signing Error: '; +//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; +//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; +?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-es.php b/phpgwapi/lang/phpmailer.lang-es.php new file mode 100644 index 0000000000..69b6817482 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-es.php @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-et.php b/phpgwapi/lang/phpmailer.lang-et.php new file mode 100644 index 0000000000..cf61779b08 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-et.php @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-fi.php b/phpgwapi/lang/phpmailer.lang-fi.php new file mode 100644 index 0000000000..12a845aad6 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-fi.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-fo.php b/phpgwapi/lang/phpmailer.lang-fo.php new file mode 100644 index 0000000000..6bd9b0a213 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-fo.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-fr.php b/phpgwapi/lang/phpmailer.lang-fr.php new file mode 100644 index 0000000000..c99ac3caf9 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-fr.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-hu.php b/phpgwapi/lang/phpmailer.lang-hu.php new file mode 100644 index 0000000000..caca0b50f1 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-hu.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-it.php b/phpgwapi/lang/phpmailer.lang-it.php new file mode 100644 index 0000000000..fc1fcb8d2e --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-it.php @@ -0,0 +1,27 @@ + +*/ + +$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Impossibile autenticarsi.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Impossibile connettersi all\'host SMTP.'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Data non accettati dal server.'; +//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['encoding'] = 'Encoding set dei caratteri sconosciuto: '; +$PHPMAILER_LANG['execute'] = 'Impossibile eseguire l\'operazione: '; +$PHPMAILER_LANG['file_access'] = 'Impossibile accedere al file: '; +$PHPMAILER_LANG['file_open'] = 'File Error: Impossibile aprire il file: '; +$PHPMAILER_LANG['from_failed'] = 'I seguenti indirizzi mittenti hanno generato errore: '; +$PHPMAILER_LANG['instantiate'] = 'Impossibile istanziare la funzione mail'; +//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; +$PHPMAILER_LANG['provide_address'] = 'Deve essere fornito almeno un indirizzo ricevente'; +$PHPMAILER_LANG['mailer_not_supported'] = 'Mailer non supportato'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: I seguenti indirizzi destinatari hanno generato errore: '; +//$PHPMAILER_LANG['signing'] = 'Signing Error: '; +//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; +//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; +?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-ja.php b/phpgwapi/lang/phpmailer.lang-ja.php new file mode 100644 index 0000000000..63cfb23b6a --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-ja.php @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-nl.php b/phpgwapi/lang/phpmailer.lang-nl.php new file mode 100644 index 0000000000..d2c380b09d --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-nl.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-no.php b/phpgwapi/lang/phpmailer.lang-no.php new file mode 100644 index 0000000000..65cb884399 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-no.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-pl.php b/phpgwapi/lang/phpmailer.lang-pl.php new file mode 100644 index 0000000000..f4fd801d61 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-pl.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-ro.php b/phpgwapi/lang/phpmailer.lang-ro.php new file mode 100644 index 0000000000..f6aa922556 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-ro.php @@ -0,0 +1,27 @@ + +*/ + +$PHPMAILER_LANG['authenticate'] = 'Eroare SMTP: Nu a functionat autentificarea.'; +$PHPMAILER_LANG['connect_host'] = 'Eroare SMTP: Nu m-am putut conecta la adresa SMTP.'; +$PHPMAILER_LANG['data_not_accepted'] = 'Eroare SMTP: Continutul mailului nu a fost acceptat.'; +//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['encoding'] = 'Encodare necunoscuta: '; +$PHPMAILER_LANG['execute'] = 'Nu pot executa: '; +$PHPMAILER_LANG['file_access'] = 'Nu pot accesa fisierul: '; +$PHPMAILER_LANG['file_open'] = 'Eroare de fisier: Nu pot deschide fisierul: '; +$PHPMAILER_LANG['from_failed'] = 'Urmatoarele adrese From au dat eroare: '; +$PHPMAILER_LANG['instantiate'] = 'Nu am putut instantia functia mail.'; +//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.'; +$PHPMAILER_LANG['provide_address'] = 'Trebuie sa adaugati cel putin un recipient (adresa de mail).'; +$PHPMAILER_LANG['recipients_failed'] = 'Eroare SMTP: Urmatoarele adrese de mail au dat eroare: '; +//$PHPMAILER_LANG['signing'] = 'Signing Error: '; +//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; +//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; +?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-ru.php b/phpgwapi/lang/phpmailer.lang-ru.php new file mode 100644 index 0000000000..d6990525de --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-ru.php @@ -0,0 +1,25 @@ + +*/ + +$PHPMAILER_LANG['authenticate'] = 'Ошибка SMTP: ошибка авторизации.'; +$PHPMAILER_LANG['connect_host'] = 'Ошибка SMTP: не удается подключиться к серверу SMTP.'; +$PHPMAILER_LANG['data_not_accepted'] = 'Ошибка SMTP: данные не приняты.'; +//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['encoding'] = 'Неизвестный вид кодировки: '; +$PHPMAILER_LANG['execute'] = 'Невозможно выполнить команду: '; +$PHPMAILER_LANG['file_access'] = 'Нет доступа к файлу: '; +$PHPMAILER_LANG['file_open'] = 'Файловая ошибка: не удается открыть файл: '; +$PHPMAILER_LANG['from_failed'] = 'Неверный адрес отправителя: '; +$PHPMAILER_LANG['instantiate'] = 'Невозможно запустить функцию mail.'; +//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; +$PHPMAILER_LANG['provide_address'] = 'Пожалуйста, введите хотя бы один адрес e-mail получателя.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' - почтовый сервер не поддерживается.'; +$PHPMAILER_LANG['recipients_failed'] = 'Ошибка SMTP: отправка по следующим адресам получателей не удалась: '; +//$PHPMAILER_LANG['signing'] = 'Signing Error: '; +//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; +//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; +?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-se.php b/phpgwapi/lang/phpmailer.lang-se.php new file mode 100644 index 0000000000..67e05f59c6 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-se.php @@ -0,0 +1,26 @@ + +*/ + +$PHPMAILER_LANG['authenticate'] = 'SMTP fel: Kunde inte autentisera.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP fel: Kunde inte ansluta till SMTP-server.'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fel: Data accepterades inte.'; +//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['encoding'] = 'Okänt encode-format: '; +$PHPMAILER_LANG['execute'] = 'Kunde inte köra: '; +$PHPMAILER_LANG['file_access'] = 'Ingen åtkomst till fil: '; +$PHPMAILER_LANG['file_open'] = 'Fil fel: Kunde inte öppna fil: '; +$PHPMAILER_LANG['from_failed'] = 'Följande avsändaradress är felaktig: '; +$PHPMAILER_LANG['instantiate'] = 'Kunde inte initiera e-postfunktion.'; +//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; +$PHPMAILER_LANG['provide_address'] = 'Du måste ange minst en mottagares e-postadress.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer stöds inte.'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP fel: Följande mottagare är felaktig: '; +//$PHPMAILER_LANG['signing'] = 'Signing Error: '; +//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; +//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; +?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-tr.php b/phpgwapi/lang/phpmailer.lang-tr.php new file mode 100644 index 0000000000..d24627a49a --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-tr.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-zh.php b/phpgwapi/lang/phpmailer.lang-zh.php new file mode 100644 index 0000000000..fef66f8cb1 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-zh.php @@ -0,0 +1,26 @@ + +*/ + +$PHPMAILER_LANG['authenticate'] = 'SMTP 錯誤：登錄失敗。'; +$PHPMAILER_LANG['connect_host'] = 'SMTP 錯誤：無法連接到 SMTP 主機。'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 錯誤：數據不被接受。'; +//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['encoding'] = '未知編碼: '; +$PHPMAILER_LANG['file_access'] = '無法訪問文件：'; +$PHPMAILER_LANG['file_open'] = '文件錯誤：無法打開文件：'; +$PHPMAILER_LANG['from_failed'] = '發送地址錯誤：'; +$PHPMAILER_LANG['execute'] = '無法執行：'; +$PHPMAILER_LANG['instantiate'] = '未知函數調用。'; +//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; +$PHPMAILER_LANG['provide_address'] = '必須提供至少一個收件人地址。'; +$PHPMAILER_LANG['mailer_not_supported'] = '發信客戶端不被支持。'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP 錯誤：收件人地址錯誤：'; +//$PHPMAILER_LANG['signing'] = 'Signing Error: '; +//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; +//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; +?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-zh_cn.php b/phpgwapi/lang/phpmailer.lang-zh_cn.php new file mode 100644 index 0000000000..b188404359 --- /dev/null +++ b/phpgwapi/lang/phpmailer.lang-zh_cn.php @@ -0,0 +1,26 @@ + +*/ + +$PHPMAILER_LANG['authenticate'] = 'SMTP 错误：登录失败。'; +$PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机。'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误：数据不被接受。'; +//$P$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['encoding'] = '未知编码: '; +$PHPMAILER_LANG['execute'] = '无法执行：'; +$PHPMAILER_LANG['file_access'] = '无法访问文件：'; +$PHPMAILER_LANG['file_open'] = '文件错误：无法打开文件：'; +$PHPMAILER_LANG['from_failed'] = '发送地址错误：'; +$PHPMAILER_LANG['instantiate'] = '未知函数调用。'; +//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; +$PHPMAILER_LANG['mailer_not_supported'] = '发信客户端不被支持。'; +$PHPMAILER_LANG['provide_address'] = '必须提供至少一个收件人地址。'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误：收件人地址错误：'; +//$PHPMAILER_LANG['signing'] = 'Signing Error: '; +//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; +//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; +?> \ No newline at end of file diff --git a/phpgwapi/setup/phpmailer.lang-br.php b/phpgwapi/setup/phpmailer.lang-br.php deleted file mode 100644 index b948c264f3..0000000000 --- a/phpgwapi/setup/phpmailer.lang-br.php +++ /dev/null @@ -1,21 +0,0 @@ - diff --git a/phpgwapi/setup/phpmailer.lang-de.php b/phpgwapi/setup/phpmailer.lang-de.php deleted file mode 100644 index 89d249f970..0000000000 --- a/phpgwapi/setup/phpmailer.lang-de.php +++ /dev/null @@ -1,23 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/setup/phpmailer.lang-en.php b/phpgwapi/setup/phpmailer.lang-en.php deleted file mode 100644 index 2f45383fec..0000000000 --- a/phpgwapi/setup/phpmailer.lang-en.php +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/phpgwapi/setup/phpmailer.lang-es-es.php b/phpgwapi/setup/phpmailer.lang-es-es.php deleted file mode 100644 index 0c898f9d4a..0000000000 --- a/phpgwapi/setup/phpmailer.lang-es-es.php +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/phpgwapi/setup/phpmailer.lang-it.php b/phpgwapi/setup/phpmailer.lang-it.php deleted file mode 100644 index 26ef64dd1c..0000000000 --- a/phpgwapi/setup/phpmailer.lang-it.php +++ /dev/null @@ -1,28 +0,0 @@ - -*/ - -$PHPMAILER_LANG = array(); - -$PHPMAILER_LANG["provide_address"] = 'Deve essere fornito almeno un'. - ' indirizzo ricevente'; -$PHPMAILER_LANG["mailer_not_supported"] = 'Mailer non supportato'; -$PHPMAILER_LANG["execute"] = "Impossibile eseguire l'operazione: "; -$PHPMAILER_LANG["instantiate"] = 'Impossibile istanziare la funzione mail'; -$PHPMAILER_LANG["authenticate"] = 'SMTP Error: Impossibile autenticarsi.'; -$PHPMAILER_LANG["from_failed"] = 'I seguenti indirizzi mittenti hanno'. - ' generato errore: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: I seguenti indirizzi'. - 'destinatari hanno generato errore: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data non accettati dal'. - 'server.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Error: Impossibile connettersi'. - ' all\'host SMTP.'; -$PHPMAILER_LANG["file_access"] = 'Impossibile accedere al file: '; -$PHPMAILER_LANG["file_open"] = 'File Error: Impossibile aprire il file: '; -$PHPMAILER_LANG["encoding"] = 'Encoding set dei caratteri sconosciuto: '; -?> diff --git a/phpgwapi/setup/phpmailer.lang-sl.php b/phpgwapi/setup/phpmailer.lang-sl.php deleted file mode 100644 index b5e86627ba..0000000000 --- a/phpgwapi/setup/phpmailer.lang-sl.php +++ /dev/null @@ -1,21 +0,0 @@ -