--- typo3conf/ext/th_mailformplus/ext_tables.php.orig 2007-03-15 12:05:10.663325256 +0100 +++ typo3conf/ext/th_mailformplus/ext_tables.php 2007-03-15 12:24:21.999295584 +0100 @@ -3,6 +3,9 @@ t3lib_extMgm::allowTableOnStandardPages("tx_thmailformplus_main"); +$TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_pi1']= 'pi_flexform'; +t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_pi1', 'FILE:EXT:'.$_EXTKEY.'/flexform_ds.xml'); + t3lib_extMgm::addToInsertRecords("tx_thmailformplus_main"); @@ -36,4 +39,4 @@ # if (TYPO3_MODE=="BE") # $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_thmailformplus_pi1_wizicon"] = t3lib_extMgm::extPath($_EXTKEY)."pi1/class.tx_thmailformplus_pi1_wizicon.php"; -?> \ Kein Zeilenumbruch am Dateiende. +?> --- /dev/null 2005-04-05 16:46:42.000000000 +0200 +++ typo3conf/ext/th_mailformplus/flexform_ds.xml 2007-03-15 14:47:24.212980088 +0100 @@ -0,0 +1,136 @@ + + + 1 + + + + + + + LLL:EXT:th_mailformplus/locallang_tca.php:th_mailformplus.pi_flexform.sheet_general + + array + + + + + + group + file + tmpl,html,htm + 100 + uploads/tx_thmailformplus/ + 1 + 1 + Width:180px + + + + + + + + + + + LLL:EXT:th_mailformplus/locallang_tca.php:th_mailformplus.pi_flexform.sheet_emailSettings + + array + + + + + + input + text + 50 + + + + + + + + + input + text + 50 + + + + + + + + + input + text + 50 + + + + + + + + + group + db + pages + 1 + 1 + 0 + 1 + + + + + + + + + input + text + 500 + + + + + + + + + input + text + 50 + + + + + + + + + input + text + 50 + + + + + + + + + input + text + 50 + + + + + + + + + --- /dev/null 2005-04-05 16:46:42.000000000 +0200 +++ typo3conf/ext/th_mailformplus/locallang_tca.xml 2007-03-15 13:53:20.126626552 +0100 @@ -0,0 +1,113 @@ + + + + language labels for th_mailformplus BE forms + database + + EXT:th_mailformplus/locallang_tca.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- typo3conf/ext/th_mailformplus/example_form/mailformplus_demo.html.orig 2007-03-15 14:58:27.466150280 +0100 +++ typo3conf/ext/th_mailformplus/example_form/mailformplus_demo.html 2007-03-15 14:58:30.961618888 +0100 @@ -133,7 +133,7 @@
- + ###ERROR### --- typo3conf/ext/th_mailformplus/pi1/class.tx_thmailformplus_pi1.php.orig 2007-03-15 12:05:26.595903136 +0100 +++ typo3conf/ext/th_mailformplus/pi1/class.tx_thmailformplus_pi1.php 2007-03-15 15:06:45.043735720 +0100 @@ -48,6 +48,9 @@ $this->get_post = array_merge(t3lib_div::_GET(), t3lib_div::_POST()); $this->debug = $this->conf['saveDB.']['debug']; + $this->pi_setPiVarDefaults(); + $this->pi_initPIflexForm(); + $this->loadDefaultValues(); switch((string)$conf["CMD"]) { @@ -63,7 +66,7 @@ $mailformplus_id = $this->cObj->data['pages']; # default: display the form from the page where the plugin is inserted if (!$mailformplus_id) $mailformplus_id = $this->cObj->data['pid']; - + // Initializing the query parameters: $query = "SELECT tx_thmailformplus_main.* FROM tx_thmailformplus_main WHERE pid IN (".$mailformplus_id.") LIMIT 0,1"; $res = $GLOBALS['TYPO3_DB']->sql(TYPO3_db, $query); @@ -77,14 +80,31 @@ t3lib_div::loadTCA('tx_thmailformplus_main'); $config = $GLOBALS['TCA']['tx_thmailformplus_main']; # old version: copy of template file in upload folder - if ($config[columns][email_htmltemplate][config][uploadfolder]) $template_folder = $config[columns][email_htmltemplate][config][uploadfolder].'/'; - else $template_folder = ''; - - $this->templateCode_orig = t3lib_div::getURL($template_folder.$this->getFieldContent("email_htmltemplate")); + if ($config[columns][email_htmltemplate][config][uploadfolder]) + { + $template_folder = $config[columns][email_htmltemplate][config][uploadfolder].'/'; + } + else + { + $template_folder = ''; + } + + /* get the template */ + $templateFile = $this->getFieldContent("email_htmltemplate"); + /* content_field */ + $templateFile = ($this->getFieldContent("email_htmltemplate")) ? $this->getFieldContent("email_htmltemplate") : $templateFile; + + /* TS entry */ +# $templateFile = ($this->conf["email_htmltemplate"] != '') ? $this->conf["email_htmltemplate"] : $templateFile; + /* FlexForm entry */ + $templateFile = ( $this->pi_getFFvalue($this->cObj->data['pi_flexform'], 'template_file', 'sDEFAULT') ) ? $this->pi_getFFvalue($this->cObj->data['pi_flexform'], 'template_file', 'sDEFAULT') : $templateFile; + + + $this->templateCode_orig = t3lib_div::getURL($template_folder.$templateFile); # compatibility reasons: look for copy of template in uploads directory if (!$this->templateCode_orig) { - $template_folder = "uploads/tx_thmailformplus/"; - $this->templateCode_orig = t3lib_div::getURL($template_folder.$this->getFieldContent("email_htmltemplate")); + $template_folder = "uploads/tx_thmailformplus/"; + $this->templateCode_orig = t3lib_div::getURL($template_folder.$templateFile); } ############################## @@ -585,7 +605,6 @@ $email_to = $this->getFieldContent("email_to"); $email_replyto = $this->getFieldContent("email_replyto"); - # since 18.10.2005: prevent mail injection (reported by Joerg Schoppet - thx!) if (eregi("\r",$email_sender) || eregi("\n",$email_sender)) { $email_sender = ''; @@ -1003,6 +1022,8 @@ $globalMarkerArray["###EMAIL_TO###"] = $this->getFieldContent("email_to"); $globalMarkerArray["###EMAIL_REQUIREDFIELDS###"] = $this->getFieldContent("email_requiredfields"); // $globalMarkerArray['###PID###'] = $this->get_post['id']; + $globalMarkerArray['###value_language_id###'] = $GLOBALS['TSFE']->sys_language_uid; + $globalMarkerArray['###PID###'] = $GLOBALS["TSFE"]->id; $globalMarkerArray['###ERROR###'] = $this->error; @@ -1781,6 +1802,7 @@ $globalMarkerArray["###EMAIL_REQUIREDFIELDS###"] = $this->getFieldContent("email_requiredfields"); // // bugfixed - thx to Sebastian F.:: $globalMarkerArray['###PID###'] = $this->get_post['id']; $globalMarkerArray['###PID###'] = $GLOBALS["TSFE"]->id; + $globalMarkerArray['###value_language_id###'] = $GLOBALS['TSFE']->sys_language_uid; $globalMarkerArray['###ERROR###'] = $this->error; $this->templateCode = $this->cObj->substituteMarkerArray($this->templateCode, $globalMarkerArray); @@ -1813,6 +1835,10 @@ if ($this->conf['default.'][$fN.'.']) { return $this->cObj->TEXT($this->conf['default.'][$fN.'.']); } else { + if ($this->pi_getFFvalue($this->cObj->data['pi_flexform'], $fN, 's_form') ) + { + return $this->pi_getFFvalue($this->cObj->data['pi_flexform'], $fN, 's_form'); + } return $this->conf['default.'][$fN]; } @@ -1828,4 +1854,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]["XCLASS"]["ext/th_mailformplus/pi1/class.tx_thmailformplus_pi1.php"]); } -?> \ Kein Zeilenumbruch am Dateiende. +?>