Project

General

Profile

Download (4.52 KB)

Bug #20481 » 11154_v4_ws.patch

Administrator Admin, 2009-06-26 14:32

View differences:

typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc (Arbeitskopie)
function main_wapversion($content,$conf) {
$GLOBALS['TSFE']->set_no_cache();
$className=t3lib_div::makeInstanceClassName('t3lib_xml');
$xmlObj = new $className('wml');
$xmlObj = t3lib_div::makeInstance('t3lib_xml', 'wml');
$xmlObj->XMLdebug=$conf['debug'];
// Creating top level object
typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc (Arbeitskopie)
}
/**
* Actually sends the requested mails (through $this->cObj->sendNotifyEmail)
* Actually sends the requested mails (through $this->cObj->sendNotifyEmail or through $this->sendHTMLMail).
* As of TYPO3 v4.3 with autoloader, a check for $GLOBALS['TSFE']->config['config']['incT3Lib_htmlmail'] has been included for backwards compatibility.
*
* @param string Recipient email address (or list)
* @param string Possible "admin" email address. Will enable sending of admin emails if also $adminContent is provided
......
function sendMail($recipient, $admin, $content='', $adminContent='') {
// Admin mail:
if ($admin && $adminContent) {
if (!$this->isHTMLContent($adminContent)) {
$admMail = $this->cObj->sendNotifyEmail($adminContent,
if (!$this->isHTMLContent($adminContent) || !$GLOBALS['TSFE']->config['config']['incT3Lib_htmlmail']) {
$admMail = $this->cObj->sendNotifyEmail(
strip_tags($adminContent),
$admin,
'',
$this->conf['email.']['from'],
......
}
}
// user mail:
if (!$this->isHTMLContent($content)) {
$this->cObj->sendNotifyEmail($content,
if (!$this->isHTMLContent($content) || !$GLOBALS['TSFE']->config['config']['incT3Lib_htmlmail']) {
$this->cObj->sendNotifyEmail(
strip_tags($content),
$recipient,
'', // ($admMail ? '' : $admin), // If the special administration mail was not found and send, the regular is...
$this->conf['email.']['from'],
......
/**
* Sending HTML email, using same parameters as tslib_cObj::sendNotifyEmail()
* NOTICE: "t3lib_htmlmail" library must be included for this to work, otherwise an error message is outputted.
*
* @param string The message content. If blank, no email is sent.
* @param string Comma list of recipient email addresses
......
*/
function sendHTMLMail($content,$recipient,$dummy,$fromEmail,$fromName,$replyTo='') {
if (trim($recipient) && trim($content)) {
$cls=t3lib_div::makeInstanceClassName('t3lib_htmlmail');
// Avoid autoloading of t3lib_htmlmail, since it's only a strategy check here:
if (class_exists($cls, false)) { // If htmlmail lib is included, then generate a nice HTML-email
$parts = spliti('<title>|</title>',$content,3);
$subject = trim($parts[1]) ? trim($parts[1]) : 'TYPO3 FE Admin message';
......
$Typo3_htmlmail->setContent();
$Typo3_htmlmail->setRecipient($recipient);
// debug($Typo3_htmlmail->theParts);
$Typo3_htmlmail->sendtheMail();
} else {
debug('SYSTEM ERROR: No HTML-mail library loaded. Set "page.config.incT3Lib_htmlmail = 1" is your TypoScript template.');
}
}
}
typo3/sysext/cms/tslib/media/scripts/xmlversionLib.inc (Arbeitskopie)
* @return string XML content
*/
function main_xmlversion($content,$conf) {
$className=t3lib_div::makeInstanceClassName('t3lib_xml');
$xmlObj = new $className('typo3_page');
$xmlObj = t3lib_div::makeInstance('t3lib_xml', 'typo3_page');
$xmlObj->XMLdebug=0;
$xmlObj->setRecFields('pages','doktype,title,alias,hidden,starttime,endtime,fe_group,url,target,no_cache,shortcut,keywords,description,abstract,author,author_email,newUntil,lastUpdated,cache_timeout');
$xmlObj->setRecFields('tt_content','CType,header,header_link,bodytext,image,imagewidth,imageorient,media,records,colPos,starttime,endtime,fe_group');
(5-5/5)