contactform fixes
This commit is contained in:
parent
7fc9b59f48
commit
20f084a5f0
|
@ -1,31 +1,40 @@
|
|||
1.17:
|
||||
-----
|
||||
* Sets required version to S9y 1.3
|
||||
* Set Sent Box to text, to not allow hidden <p> tags by WYSIWYG-Editors
|
||||
for the text.
|
||||
* Fixed Smarty template includement
|
||||
* Removed unused and confusing code
|
||||
* Fix german lang constant for "PLUGIN_CONTACTFORM_SENT_HTML"
|
||||
|
||||
1.16:
|
||||
-----
|
||||
|
||||
fix XSS security vulnerability (Thanks to Stefan Schurtz!)
|
||||
* fix XSS security vulnerability (Thanks to Stefan Schurtz!)
|
||||
|
||||
1.15:
|
||||
-----
|
||||
|
||||
latest: Smarty3 forward compatibility
|
||||
* latest: Smarty3 forward compatibility
|
||||
|
||||
1.14:
|
||||
-----
|
||||
|
||||
Added check to circument adduser plugin's "registered only" option.
|
||||
* Added check to circument adduser plugin's "registered only" option.
|
||||
|
||||
1.13:
|
||||
-----
|
||||
|
||||
Force spamblock plugin to properly realize "time to live" of captchas.
|
||||
* Force spamblock plugin to properly realize "time to live" of captchas.
|
||||
Previously, even though captchas where displayed, it did not matter what
|
||||
the user entered.
|
||||
|
||||
1.11:
|
||||
-----
|
||||
|
||||
Fix XHTML validity of checked="checked"
|
||||
* Fix XHTML validity of checked="checked"
|
||||
|
||||
1.10:
|
||||
-----
|
||||
|
||||
Introdcuce new "issue counter".
|
||||
* Introdcuce new "issue counter".
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -57,4 +57,4 @@
|
|||
<li>The last four together:- "require;Phone number;text:Default text;textarea;This is default text. It is boring. But it is default.:Radio Button;radio;Yes,yes|No,no,checked:Check Box;checkbox;checked" </li>
|
||||
</ul>
|
||||
</p>');
|
||||
?>
|
||||
|
||||
|
|
|
@ -72,3 +72,4 @@
|
|||
@define('PLUGIN_CONTACTFORM_ISSUECOUNTER', 'Používat počítadlo kontaktních formulářů?');
|
||||
@define('PLUGIN_CONTACTFORM_ISSUECOUNTER_DESC', 'Pokud je použito, každý odeslaný kontaktní formulář dostane jedinečné ID identifikační číslo.');
|
||||
@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER', 'Číslo lístku: %s');
|
||||
|
||||
|
|
|
@ -72,3 +72,4 @@
|
|||
@define('PLUGIN_CONTACTFORM_ISSUECOUNTER', 'Používat počítadlo kontaktních formulářů?');
|
||||
@define('PLUGIN_CONTACTFORM_ISSUECOUNTER_DESC', 'Pokud je použito, každý odeslaný kontaktní formulář dostane jedinečné ID identifikační číslo.');
|
||||
@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER', 'Číslo lístku: %s');
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
@define('PLUGIN_CONTACTFORM_INTRO', 'Einführungstext (optional)');
|
||||
@define('PLUGIN_CONTACTFORM_MESSAGE', 'Nachricht');
|
||||
@define('PLUGIN_CONTACTFORM_SENT', 'Dargestellter Text nach Übermittlung der Nachricht.');
|
||||
@define('PLUGIN_CONTACTFORM_SENT_HTML', 'Ihre Nachricht wurde erfolgreich verschickt!!');
|
||||
@define('PLUGIN_CONTACTFORM_SENT_HTML', 'Ihre Nachricht wurde erfolgreich verschickt');
|
||||
@define('PLUGIN_CONTACTFORM_ERROR_HTML', 'Ein Fehler trat bei der Übermittlung der E-Mail auf. Eventuell ist ihre E-Mail Adresse ungültig oder der Server ist spazieren gegangen.');
|
||||
@define('PLUGIN_CONTACTFORM_ERROR_DATA', 'Name, E-Mail und ihre Nachricht dürfen nicht leer gelassen werden.');
|
||||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Als Artikel formatieren?');
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -21,4 +21,3 @@
|
|||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Formater comme un article ?');
|
||||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'si oui, le texte est formaté comme un article (couleurs, bordures, etc.)');
|
||||
|
||||
?>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -21,4 +21,3 @@
|
|||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', '記事として清書しますか?');
|
||||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'もし記事のように清書された書式(色・境界線など)で出力するなら「はい」を選びます (デフォルト: はい)');
|
||||
|
||||
?>
|
||||
|
|
|
@ -47,3 +47,4 @@
|
|||
<li>Alle 4 velden samen:- "require;Telefoonnummer;text:Standaard tekst;textarea;Dit is een standaard tekst. Saai? Wat wil je, hij is standaard! :Opsommingsteken;radio;Ja,ja|Nee,nee,checked:Afvinkveld;checkbox;checked" </li>
|
||||
</ul>
|
||||
</p>');
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -21,4 +21,3 @@
|
|||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Formatować jak artykuł?');
|
||||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'Jeśli tak, strona z formularzem będzie formatowana i wyświetlana jak strona z wpisem i będą stosowane wszystkie formatowania (kolory, obramowania itp.) (Standardowo: Tak)');
|
||||
|
||||
?>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -21,4 +21,3 @@
|
|||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Makale olarak biçimlensin mi?');
|
||||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'Eğer evet seçeneği işaretlenirse çıktı makale olarak biçimlenecek (renkler, kenarlıklar, vb.) (öntanımlı: evet)');
|
||||
|
||||
?>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -57,4 +57,4 @@
|
|||
<li>The last four together:- "require;Phone number;text:Default text;textarea;This is default text. It is boring. But it is default.:Radio Button;radio;Yes,yes|No,no,checked:Check Box;checkbox;checked" </li>
|
||||
</ul>
|
||||
</p>');
|
||||
?>
|
||||
|
||||
|
|
|
@ -72,3 +72,4 @@
|
|||
@define('PLUGIN_CONTACTFORM_ISSUECOUNTER', 'Používat poèítadlo kontaktních formuláøù?');
|
||||
@define('PLUGIN_CONTACTFORM_ISSUECOUNTER_DESC', 'Pokud je použito, každý odeslaný kontaktní formuláø dostane jedineèné ID identifikaèní èíslo.');
|
||||
@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER', 'Èíslo lístku: %s');
|
||||
|
||||
|
|
|
@ -72,3 +72,4 @@
|
|||
@define('PLUGIN_CONTACTFORM_ISSUECOUNTER', 'Pou¾ívat poèítadlo kontaktních formuláøù?');
|
||||
@define('PLUGIN_CONTACTFORM_ISSUECOUNTER_DESC', 'Pokud je pou¾ito, ka¾dý odeslaný kontaktní formuláø dostane jedineèné ID identifikaèní èíslo.');
|
||||
@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER', 'Èíslo lístku: %s');
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
@define('PLUGIN_CONTACTFORM_INTRO', 'Einführungstext (optional)');
|
||||
@define('PLUGIN_CONTACTFORM_MESSAGE', 'Nachricht');
|
||||
@define('PLUGIN_CONTACTFORM_SENT', 'Dargestellter Text nach Übermittlung der Nachricht.');
|
||||
@define('PLUGIN_CONTACTFORM_SENT_HTML', 'Ihre Nachricht wurde erfolgreich verschickt!!');
|
||||
@define('PLUGIN_CONTACTFORM_SENT_HTML', 'Ihre Nachricht wurde erfolgreich verschickt!');
|
||||
@define('PLUGIN_CONTACTFORM_ERROR_HTML', 'Ein Fehler trat bei der Übermittlung der E-Mail auf. Eventuell ist ihre E-Mail Adresse ungültig oder der Server ist spazieren gegangen.');
|
||||
@define('PLUGIN_CONTACTFORM_ERROR_DATA', 'Name, E-Mail und ihre Nachricht dürfen nicht leer gelassen werden.');
|
||||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Als Artikel formatieren?');
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -21,4 +21,3 @@
|
|||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Formater comme un article ?');
|
||||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'si oui, le texte est formaté comme un article (couleurs, bordures, etc.)');
|
||||
|
||||
?>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -21,4 +21,3 @@
|
|||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', '記事として清書しますか?');
|
||||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'もし記事のように清書された書式(色・境界線など)で出力するなら「はい」を選びます (デフォルト: はい)');
|
||||
|
||||
?>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -52,4 +52,4 @@
|
|||
<li>Alle 4 velden samen:- "require;Telefoonnummer;text:Standaard tekst;textarea;Dit is een standaard tekst. Saai? Wat wil je, hij is standaard! :Opsommingsteken;radio;Ja,ja|Nee,nee,checked:Afvinkveld;checkbox;checked" </li>
|
||||
</ul>
|
||||
</p>');
|
||||
?>
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -21,4 +21,3 @@
|
|||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Formatować jak artykuł?');
|
||||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'Jeśli tak, strona z formularzem będzie formatowana i wyświetlana jak strona z wpisem i będą stosowane wszystkie formatowania (kolory, obramowania itp.) (Standardowo: Tak)');
|
||||
|
||||
?>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?php #
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @version
|
||||
|
@ -21,4 +21,3 @@
|
|||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Makale olarak biçimlensin mi?');
|
||||
@define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'Eğer evet seçeneği işaretlenirse çıktı makale olarak biçimlenecek (renkler, kenarlıklar, vb.) (öntanımlı: evet)');
|
||||
|
||||
?>
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
<?php
|
||||
|
||||
|
||||
if (IN_serendipity !== true) {
|
||||
die ("Don't hack!");
|
||||
}
|
||||
|
@ -30,9 +29,9 @@ class serendipity_event_contactform extends serendipity_event {
|
|||
$propbag->add('event_hooks', array('entries_header' => true, 'entry_display' => true, 'genpage' => true));
|
||||
$propbag->add('configuration', array('permalink', 'pagetitle', 'backend_title', 'email', 'subject', 'counter', 'intro', 'sent', 'articleformat', 'dynamic_tpl', 'dynamic_fields', 'dynamic_fields_tpl', 'dynamic_fields_desc'));
|
||||
$propbag->add('author', 'Garvin Hicking');
|
||||
$propbag->add('version', '1.16.1');
|
||||
$propbag->add('version', '1.17');
|
||||
$propbag->add('requirements', array(
|
||||
'serendipity' => '0.7',
|
||||
'serendipity' => '1.3',
|
||||
'smarty' => '2.6.7',
|
||||
'php' => '4.1.0'
|
||||
));
|
||||
|
@ -90,7 +89,7 @@ class serendipity_event_contactform extends serendipity_event {
|
|||
break;
|
||||
|
||||
case 'sent':
|
||||
$propbag->add('type', 'html');
|
||||
$propbag->add('type', 'text');
|
||||
$propbag->add('name', PLUGIN_CONTACTFORM_SENT);
|
||||
$propbag->add('description', '');
|
||||
$propbag->add('default', PLUGIN_CONTACTFORM_SENT_HTML);
|
||||
|
@ -427,9 +426,10 @@ class serendipity_event_contactform extends serendipity_event {
|
|||
'commentform_dynamicfields' => $form_fields
|
||||
)
|
||||
);
|
||||
|
||||
if ($dynamic_tpl == 'standard') {
|
||||
$tfile = serendipity_getTemplateFile('plugin_contactform.tpl', 'serendipityPath');
|
||||
if (!$tfile) {
|
||||
if (!$tfile || $tfile == 'plugin_contactform.tpl') {
|
||||
$tfile = dirname(__FILE__) . '/plugin_contactform.tpl';
|
||||
}
|
||||
} else {
|
||||
|
@ -439,22 +439,11 @@ class serendipity_event_contactform extends serendipity_event {
|
|||
}
|
||||
$tfile = serendipity_getTemplateFile($filename, 'serendipityPath');
|
||||
|
||||
if (!$tfile) {
|
||||
if (!$tfile || $tfile == $filename) {
|
||||
$tfile = dirname(__FILE__) . '/' . $filename;
|
||||
}
|
||||
}
|
||||
$inclusion = $serendipity['smarty']->security_settings[INCLUDE_ANY];
|
||||
$serendipity['smarty']->security_settings[INCLUDE_ANY] = true;
|
||||
$content = $serendipity['smarty']->fetch('file:'. $tfile);
|
||||
$serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion;
|
||||
|
||||
if ($this->get_config('markup') == TRUE) {
|
||||
$entry = array('body' => $content);
|
||||
serendipity_plugin_api::hook_event('frontend_display', $entry);
|
||||
echo $entry['body'];
|
||||
} else {
|
||||
echo $content;
|
||||
}
|
||||
echo $this->parseTemplate($tfile);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -512,11 +501,6 @@ class serendipity_event_contactform extends serendipity_event {
|
|||
$eventData = array('clean_page' => true);
|
||||
}
|
||||
}
|
||||
|
||||
if (version_compare($serendipity['version'], '0.7.1', '<=')) {
|
||||
$this->show();
|
||||
}
|
||||
|
||||
return true;
|
||||
break;
|
||||
|
||||
|
|
Loading…
Reference in a new issue