qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use serendipity_specialchars

Browse source 
See https://github.com/s9y/Serendipity/issues/236
This commit is contained in:
onli 2014-11-25 01:15:57 +01:00
parent c18e793b70
commit d2d298ab41
110 changed files with 633 additions and 635 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
serendipity_event_adminnotes/serendipity_event_adminnotes.php
View file

@ -27,7 +27,7 @@ class serendipity_event_adminnotes extends serendipity_event {
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '0.11'); $propbag->add('version', '0.11.1');
$propbag->add('author', 'Garvin Hicking, Matthias Mees'); $propbag->add('author', 'Garvin Hicking, Matthias Mees');
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('configuration', array('feedback', 'limit', 'html', 'markup', 'cutoff')); $propbag->add('configuration', array('feedback', 'limit', 'html', 'markup', 'cutoff'));
@ -242,17 +242,17 @@ class serendipity_event_adminnotes extends serendipity_event {
echo serendipity_setFormToken(); echo serendipity_setFormToken();
echo '<input type="hidden" name="serendipity[adminModule]" value="event_display" />'; echo '<input type="hidden" name="serendipity[adminModule]" value="event_display" />';
echo '<input type="hidden" name="serendipity[adminAction]" value="adminnotes" />'; echo '<input type="hidden" name="serendipity[adminAction]" value="adminnotes" />';
echo '<input type="hidden" name="action" value="' . htmlspecialchars($_REQUEST['action']) . '" />'; echo '<input type="hidden" name="action" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($_REQUEST['action']) : htmlspecialchars($_REQUEST['action'], ENT_COMPAT, LANG_CHARSET)) . '" />';
echo '<input type="hidden" name="note" value="' . $entry['noteid'] . '" />'; echo '<input type="hidden" name="note" value="' . $entry['noteid'] . '" />';
echo '<input type="hidden" name="note_notetype" value="note" />'; echo '<input type="hidden" name="note_notetype" value="note" />';
if ($serendipity['version'][0] == '1') { if ($serendipity['version'][0] == '1') {
echo TITLE . '<br />'; echo TITLE . '<br />';
echo '<input class="input_textbox" type="text" name="note_subject" value="' . htmlspecialchars($entry['subject']) . '" /><br /><br />'; echo '<input class="input_textbox" type="text" name="note_subject" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['subject']) : htmlspecialchars($entry['subject'], ENT_COMPAT, LANG_CHARSET)) . '" /><br /><br />';
} else { } else {
echo '<div class="form_field">'; echo '<div class="form_field">';
echo '<label for="note_subject" class="block_level">' . TITLE . '</label>'; echo '<label for="note_subject" class="block_level">' . TITLE . '</label>';
echo '<input id="note_subject" type="text" name="note_subject" value="' . htmlspecialchars($entry['subject']) . '">'; echo '<input id="note_subject" type="text" name="note_subject" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['subject']) : htmlspecialchars($entry['subject'], ENT_COMPAT, LANG_CHARSET)) . '">';
echo '</div>'; echo '</div>';
} }
@ -281,7 +281,7 @@ class serendipity_event_adminnotes extends serendipity_event {
} else { } else {
$is_selected = ''; $is_selected = '';
} }
echo '<option ' . $is_selected . ' value="' . $group['confkey'] . '">' . htmlspecialchars($group['confvalue']) . '</option>' . "\n"; echo '<option ' . $is_selected . ' value="' . $group['confkey'] . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($group['confvalue']) : htmlspecialchars($group['confvalue'], ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
if ($serendipity['version'][0] == '1') { if ($serendipity['version'][0] == '1') {
echo '</select><br /><br />'; echo '</select><br /><br />';
@ -295,7 +295,7 @@ class serendipity_event_adminnotes extends serendipity_event {
echo '<div class="form_area">'; echo '<div class="form_area">';
echo '<label for="note_body" class="block_level">' . ENTRY_BODY . '</label>'; echo '<label for="note_body" class="block_level">' . ENTRY_BODY . '</label>';
} }
echo '<textarea id="note_body" rows=10 cols=80 name="note_body">' . htmlspecialchars($entry['body']) . '</textarea>'; echo '<textarea id="note_body" rows=10 cols=80 name="note_body">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['body']) : htmlspecialchars($entry['body'], ENT_COMPAT, LANG_CHARSET)) . '</textarea>';
if ($serendipity['version'][0] == '1') { if ($serendipity['version'][0] == '1') {
echo '<br /><br />'; echo '<br /><br />';
echo '<input type="submit" name="submit" value="' . SAVE . '" class="serendipityPrettyButton input_button" />'; echo '<input type="submit" name="submit" value="' . SAVE . '" class="serendipityPrettyButton input_button" />';
@ -316,7 +316,7 @@ class serendipity_event_adminnotes extends serendipity_event {
if ($serendipity['version'][0] == '2') { if ($serendipity['version'][0] == '2') {
echo '<span class="msg_hint"><span class="icon-help-circled"></span> '; echo '<span class="msg_hint"><span class="icon-help-circled"></span> ';
} }
printf(DELETE_SURE, $entry['noteid'] . ' - ' . htmlspecialchars($entry['subject'])); printf(DELETE_SURE, $entry['noteid'] . ' - ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['subject']) : htmlspecialchars($entry['subject'], ENT_COMPAT, LANG_CHARSET)));
if ($serendipity['version'][0] == '2') { if ($serendipity['version'][0] == '2') {
echo '</span>'; echo '</span>';
} }
@ -326,7 +326,7 @@ class serendipity_event_adminnotes extends serendipity_event {
<br /> <br />
<br /> <br />
<div> <div>
<a href="<?php echo htmlspecialchars($_SERVER["HTTP_REFERER"]); ?>" class="serendipityPrettyButton"><?php echo NOT_REALLY; ?></a> <a href="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($_SERVER["HTTP_REFERER"]) : htmlspecialchars($_SERVER["HTTP_REFERER"], ENT_COMPAT, LANG_CHARSET)); ?>" class="serendipityPrettyButton"><?php echo NOT_REALLY; ?></a>
<?php echo str_repeat('&nbsp;', 10); ?> <?php echo str_repeat('&nbsp;', 10); ?>
<a href="<?php echo $newLoc; ?>" class="serendipityPrettyButton"><?php echo DUMP_IT; ?></a> <a href="<?php echo $newLoc; ?>" class="serendipityPrettyButton"><?php echo DUMP_IT; ?></a>
</div> </div>
@ -335,7 +335,7 @@ class serendipity_event_adminnotes extends serendipity_event {
?> ?>
<div class="form_buttons"> <div class="form_buttons">
<a class="button_link state_submit" href="<?php echo $newLoc; ?>"><?php echo DUMP_IT; ?></a> <a class="button_link state_submit" href="<?php echo $newLoc; ?>"><?php echo DUMP_IT; ?></a>
<a class="button_link state_cancel" href="<?php echo htmlspecialchars($_SERVER["HTTP_REFERER"]); ?>"><?php echo NOT_REALLY; ?></a> <a class="button_link state_cancel" href="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($_SERVER["HTTP_REFERER"]) : htmlspecialchars($_SERVER["HTTP_REFERER"], ENT_COMPAT, LANG_CHARSET)); ?>"><?php echo NOT_REALLY; ?></a>
</div> </div>
<?php <?php
} }
@ -355,7 +355,7 @@ class serendipity_event_adminnotes extends serendipity_event {
if ($serendipity['version'][0] == '2') { if ($serendipity['version'][0] == '2') {
echo '<span class="msg_success"><span class="icon-ok-circled"></span> '; echo '<span class="msg_success"><span class="icon-ok-circled"></span> ';
} }
printf(RIP_ENTRY, $entry['noteid'] . ' - ' . htmlspecialchars($entry['subject'])); printf(RIP_ENTRY, $entry['noteid'] . ' - ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['subject']) : htmlspecialchars($entry['subject'], ENT_COMPAT, LANG_CHARSET)));
if ($serendipity['version'][0] == '2') { if ($serendipity['version'][0] == '2') {
echo '</span>'; echo '</span>';
} }
@ -410,7 +410,7 @@ class serendipity_event_adminnotes extends serendipity_event {
if ($allow_html) { if ($allow_html) {
$body = $string; $body = $string;
} else { } else {
$body = htmlspecialchars($string); $body = (function_exists('serendipity_specialchars') ? serendipity_specialchars($string) : htmlspecialchars($string, ENT_COMPAT, LANG_CHARSET));
} }
if ($do_markup) { if ($do_markup) {
@ -477,7 +477,7 @@ function fulltext_toggle(id) {
if (is_array($notes)) { if (is_array($notes)) {
foreach($notes AS $id => $note) { foreach($notes AS $id => $note) {
echo '<div class="serendipity_note note_' . $this->output($note['notetype']) . ' note_owner_' . $note['authorid'] . ($serendipity['COOKIE']['lastnote'] < $note['noteid'] ? ' note_new' : '') . '">' . "\n"; echo '<div class="serendipity_note note_' . $this->output($note['notetype']) . ' note_owner_' . $note['authorid'] . ($serendipity['COOKIE']['lastnote'] < $note['noteid'] ? ' note_new' : '') . '">' . "\n";
echo '<div class="note_subject"><strong>' . $this->output($note['subject']) . '</strong> ' . POSTED_BY . ' ' . htmlspecialchars($note['realname']) . ' ' . ON . ' ' . serendipity_strftime(DATE_FORMAT_SHORT, $note['notetime']) . '</div>' . "\n"; echo '<div class="note_subject"><strong>' . $this->output($note['subject']) . '</strong> ' . POSTED_BY . ' ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($note['realname']) : htmlspecialchars($note['realname'], ENT_COMPAT, LANG_CHARSET)) . ' ' . ON . ' ' . serendipity_strftime(DATE_FORMAT_SHORT, $note['notetime']) . '</div>' . "\n";
if (strlen($note['body']) > $cutoff) { if (strlen($note['body']) > $cutoff) {
$output = $this->output($note['body']); $output = $this->output($note['body']);

24
serendipity_event_aggregator/serendipity_event_aggregator.php
View file

@ -72,7 +72,7 @@ class serendipity_event_aggregator extends serendipity_event {
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '0.31'); $propbag->add('version', '0.31.1');
$propbag->add('author', 'Evan Nemerson, Garvin Hicking, Kristian Koehntopp, Thomas Schulz, Claus Schmidt'); $propbag->add('author', 'Evan Nemerson, Garvin Hicking, Kristian Koehntopp, Thomas Schulz, Claus Schmidt');
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
@ -135,7 +135,7 @@ class serendipity_event_aggregator extends serendipity_event {
if (!is_array($plugin_data['p']->markup_elements)) { if (!is_array($plugin_data['p']->markup_elements)) {
continue; continue;
} }
$markups[$plugin_data['p']->instance] = htmlspecialchars($plugin_data['p']->title); $markups[$plugin_data['p']->instance] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($plugin_data['p']->title) : htmlspecialchars($plugin_data['p']->title, ENT_COMPAT, LANG_CHARSET));
} }
} }
@ -714,15 +714,15 @@ class serendipity_event_aggregator extends serendipity_event {
<tr style="padding: 10px;" class="serendipity_admin_list_item serendipity_admin_list_item_' . $even . '"> <tr style="padding: 10px;" class="serendipity_admin_list_item serendipity_admin_list_item_' . $even . '">
<td valign="top"><em>' . $idx . '</em></td> <td valign="top"><em>' . $idx . '</em></td>
<td valign="top"> <td valign="top">
<input class="input_textbox" type="text" name="serendipity[feed][' . $feed['feedid'] . '][feedname]" value="' . htmlspecialchars($feed['feedname']) . '" /> ' . htmlspecialchars($feed['charset']) . ' <input class="input_textbox" type="text" name="serendipity[feed][' . $feed['feedid'] . '][feedname]" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['feedname']) : htmlspecialchars($feed['feedname'], ENT_COMPAT, LANG_CHARSET)) . '" /> ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['charset']) : htmlspecialchars($feed['charset'], ENT_COMPAT, LANG_CHARSET)) . '
</td> </td>
<td width="100%" valign="top"> <td width="100%" valign="top">
<input class="input_textbox" style="width: 100%" type="text" name="serendipity[feed][' . $feed['feedid'] . '][feedurl]" value="' . htmlspecialchars($feed['feedurl']) . '" /> <input class="input_textbox" style="width: 100%" type="text" name="serendipity[feed][' . $feed['feedid'] . '][feedurl]" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['feedurl']) : htmlspecialchars($feed['feedurl'], ENT_COMPAT, LANG_CHARSET)) . '" />
<input class="input_textbox" style="width: 65%; margin-top: 2px;" type="text" name="serendipity[feed][' . $feed['feedid'] . '][htmlurl]" value="' . htmlspecialchars($feed['htmlurl']) . '" /> <input class="input_textbox" style="width: 65%; margin-top: 2px;" type="text" name="serendipity[feed][' . $feed['feedid'] . '][htmlurl]" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['htmlurl']) : htmlspecialchars($feed['htmlurl'], ENT_COMPAT, LANG_CHARSET)) . '" />
</td> </td>
<td valign="top" rowspan="2">' . $cat . '</td> <td valign="top" rowspan="2">' . $cat . '</td>
<td valign="top" rowspan="2"><textarea rows=6 cols=25 name="serendipity[feed][' . $feed['feedid'] . '][match_expression]">' . htmlspecialchars($feed['match_expression']) . '</textarea><br /> <td valign="top" rowspan="2"><textarea rows=6 cols=25 name="serendipity[feed][' . $feed['feedid'] . '][match_expression]">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['match_expression']) : htmlspecialchars($feed['match_expression'], ENT_COMPAT, LANG_CHARSET)) . '</textarea><br />
<input class="input_textbox" style="width: 65%; margin-top: 2px;" type="text" name="serendipity[feed][' . $feed['feedid'] . '][feedicon]" value="' . htmlspecialchars($feed['feedicon']) . '" /> <input class="input_textbox" style="width: 65%; margin-top: 2px;" type="text" name="serendipity[feed][' . $feed['feedid'] . '][feedicon]" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['feedicon']) : htmlspecialchars($feed['feedicon'], ENT_COMPAT, LANG_CHARSET)) . '" />
</tr> </tr>
<tr style="padding: 10px;" class="serendipity_admin_list_item serendipity_admin_list_item_' . $even . '"> <tr style="padding: 10px;" class="serendipity_admin_list_item serendipity_admin_list_item_' . $even . '">
@ -1394,7 +1394,7 @@ class serendipity_event_aggregator extends serendipity_event {
// error handling // error handling
if ($simplefeed->error()) { if ($simplefeed->error()) {
if (!$opt['store_seperate']) printf('<p><b>ERROR:</b> ' . htmlspecialchars($simplefeed->error()) . "</p>\r\n") ; if (!$opt['store_seperate']) printf('<p><b>ERROR:</b> ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($simplefeed->error()) : htmlspecialchars($simplefeed->error(), ENT_COMPAT, LANG_CHARSET)) . "</p>\r\n") ;
} }
if ($success) { if ($success) {
@ -1610,10 +1610,10 @@ class serendipity_event_aggregator extends serendipity_event {
} }
printf(' <outline title="%s" xmlUrl="%s" htmlUrl="%s" description="%s" />' . "\n", printf(' <outline title="%s" xmlUrl="%s" htmlUrl="%s" description="%s" />' . "\n",
serendipity_utf8_encode(htmlspecialchars($feed['feedname'])), serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['feedname']) : htmlspecialchars($feed['feedname'], ENT_COMPAT, LANG_CHARSET))),
serendipity_utf8_encode(htmlspecialchars($feed['feedurl'])), serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['feedurl']) : htmlspecialchars($feed['feedurl'], ENT_COMPAT, LANG_CHARSET))),
serendipity_utf8_encode(htmlspecialchars($feed['htmlurl'])), serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['htmlurl']) : htmlspecialchars($feed['htmlurl'], ENT_COMPAT, LANG_CHARSET))),
serendipity_utf8_encode(htmlspecialchars($feed['feedname'])) serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['feedname']) : htmlspecialchars($feed['feedname'], ENT_COMPAT, LANG_CHARSET)))
); );
} }
} }

76
serendipity_event_amazonchooser/Amazon_s9y_lib.php
View file

@ -388,70 +388,70 @@ function Amazon_AttributesText ($SearchIndex,$items,$country_url) {
$item['strings']['largeurl'] = rawurldecode($item['LARGEIMAGE']['LARGEIMAGE_URL']); $item['strings']['largeurl'] = rawurldecode($item['LARGEIMAGE']['LARGEIMAGE_URL']);
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_LISTPRICE_FORMATTEDPRICE'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_LISTPRICE_FORMATTEDPRICE'])) {
$item['strings']['price'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_LISTPRICE_FORMATTEDPRICE']); $item['strings']['price'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_LISTPRICE_FORMATTEDPRICE']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_LISTPRICE_FORMATTEDPRICE'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PRODUCTGROUP'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PRODUCTGROUP'])) {
if ($SearchIndex == "" || !isset($SearchIndex)) { if ($SearchIndex == "" || !isset($SearchIndex)) {
$SearchIndex = $item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PRODUCTGROUP']; $SearchIndex = $item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PRODUCTGROUP'];
} }
$item['strings']['productgroup'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PRODUCTGROUP']); $item['strings']['productgroup'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PRODUCTGROUP']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PRODUCTGROUP'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_LANGUAGES_LANGUAGE_NAME'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_LANGUAGES_LANGUAGE_NAME'])) {
$item['strings']['productlanguage'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_LANGUAGES_LANGUAGE_NAME']); $item['strings']['productlanguage'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_LANGUAGES_LANGUAGE_NAME']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_LANGUAGES_LANGUAGE_NAME'], ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RELEASEDATE'])) { if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RELEASEDATE'])) {
$item['strings']['releasedate'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RELEASEDATE']); $item['strings']['releasedate'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RELEASEDATE']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RELEASEDATE'], ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RUNNINGTIME'])) { if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RUNNINGTIME'])) {
$item['strings']['running'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RUNNINGTIME']).' '.htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RUNNINGTIME_UNITS']); $item['strings']['running'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RUNNINGTIME']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RUNNINGTIME'], ENT_COMPAT, LANG_CHARSET)).' '.(function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RUNNINGTIME_UNITS']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RUNNINGTIME_UNITS'], ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_NUMBEROFDISCS'])) { if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_NUMBEROFDISCS'])) {
$item['strings']['numberofdiscs'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_NUMBEROFDISCS']); $item['strings']['numberofdiscs'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_NUMBEROFDISCS']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_NUMBEROFDISCS'], ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_FORMAT'])) { if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_FORMAT'])) {
$item['strings']['format'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_FORMAT']); $item['strings']['format'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_FORMAT']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_FORMAT'], ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ISBN'])) { if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ISBN'])) {
$item['strings']['ISBN'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ISBN']); $item['strings']['ISBN'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ISBN']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ISBN'], ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_EAN']) && $euro) { if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_EAN']) && $euro) {
$item['strings']['EAN'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_EAN']); $item['strings']['EAN'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_EAN']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_EAN'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_TITLE'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_TITLE'])) {
$item['strings']['title'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_TITLE']); $item['strings']['title'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_TITLE']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_TITLE'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_HARDWAREPLATFORM'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_HARDWAREPLATFORM'])) {
$item['strings']['platform'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_HARDWAREPLATFORM']); $item['strings']['platform'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_HARDWAREPLATFORM']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_HARDWAREPLATFORM'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_GENRE'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_GENRE'])) {
$item['strings']['genre'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_GENRE']); $item['strings']['genre'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_GENRE']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_GENRE'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ESRBAGERATING'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ESRBAGERATING'])) {
$item['strings']['esrbarating'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ESRBAGERATING']); $item['strings']['esrbarating'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ESRBAGERATING']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ESRBAGERATING'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUDIENCERATING'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUDIENCERATING'])) {
$item['strings']['audiencerating'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUDIENCERATING']); $item['strings']['audiencerating'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUDIENCERATING']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUDIENCERATING'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MODEL'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MODEL'])) {
$item['strings']['model'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MODEL']); $item['strings']['model'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MODEL']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MODEL'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMAPERTURE'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMAPERTURE'])) {
$item['strings']['maxaperture'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMAPERTURE_UNITS'])."/".htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMAPERTURE']); $item['strings']['maxaperture'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMAPERTURE_UNITS']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMAPERTURE_UNITS'], ENT_COMPAT, LANG_CHARSET))."/".(function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMAPERTURE']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMAPERTURE'], ENT_COMPAT, LANG_CHARSET));
} }
if ((isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MINIMUMFOCALLENGTH'])) && (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMFOCALLENGTH']))) { if ((isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MINIMUMFOCALLENGTH'])) && (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMFOCALLENGTH']))) {
$item['strings']['focallength'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MINIMUMFOCALLENGTH']).'-'.htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMFOCALLENGTH']).' '.htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MINIMUMFOCALLENGTH_UNITS']); } $item['strings']['focallength'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MINIMUMFOCALLENGTH']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MINIMUMFOCALLENGTH'], ENT_COMPAT, LANG_CHARSET)).'-'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMFOCALLENGTH']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MAXIMUMFOCALLENGTH'], ENT_COMPAT, LANG_CHARSET)).' '.(function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MINIMUMFOCALLENGTH_UNITS']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MINIMUMFOCALLENGTH_UNITS'], ENT_COMPAT, LANG_CHARSET)); }
if ((isset($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALNEW']) && ($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALNEW'] != 0)) && (isset($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTNEWPRICE_FORMATTEDPRICE']))) { if ((isset($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALNEW']) && ($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALNEW'] != 0)) && (isset($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTNEWPRICE_FORMATTEDPRICE']))) {
$item['strings']['newoffers'] = htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALNEW']) . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_NEW') . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_FROM') . " " . htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTNEWPRICE_FORMATTEDPRICE']); $item['strings']['newoffers'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALNEW']) : htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALNEW'], ENT_COMPAT, LANG_CHARSET)) . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_NEW') . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_FROM') . " " . (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTNEWPRICE_FORMATTEDPRICE']) : htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTNEWPRICE_FORMATTEDPRICE'], ENT_COMPAT, LANG_CHARSET));
} }
if ((isset($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALUSED']) && ($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALUSED'] != 0)) && (isset($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTUSEDPRICE_FORMATTEDPRICE']))) { if ((isset($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALUSED']) && ($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALUSED'] != 0)) && (isset($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTUSEDPRICE_FORMATTEDPRICE']))) {
$item['strings']['usedoffers'] = htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALUSED']) . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_USED') . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_FROM') . " " . htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTUSEDPRICE_FORMATTEDPRICE']); $item['strings']['usedoffers'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALUSED']) : htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALUSED'], ENT_COMPAT, LANG_CHARSET)) . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_USED') . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_FROM') . " " . (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTUSEDPRICE_FORMATTEDPRICE']) : htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTUSEDPRICE_FORMATTEDPRICE'], ENT_COMPAT, LANG_CHARSET));
} }
if ((isset($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALCOLLECTABLE']) && ($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALCOLLECTABLE'] != 0)) && (isset($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTCOLLECTABLEPRICE_FORMATTEDPRICE']))) { if ((isset($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALCOLLECTABLE']) && ($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALCOLLECTABLE'] != 0)) && (isset($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTCOLLECTABLEPRICE_FORMATTEDPRICE']))) {
$item['strings']['collectableoffers'] = htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALCOLLECTABLE']) . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_COLLECTABLE') . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_FROM') . " " . htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTCOLLECTABLEPRICE_FORMATTEDPRICE']); $item['strings']['collectableoffers'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALCOLLECTABLE']) : htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALCOLLECTABLE'], ENT_COMPAT, LANG_CHARSET)) . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_COLLECTABLE') . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_FROM') . " " . (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTCOLLECTABLEPRICE_FORMATTEDPRICE']) : htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTCOLLECTABLEPRICE_FORMATTEDPRICE'], ENT_COMPAT, LANG_CHARSET));
} }
if ((isset($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALREFURBISHED']) && ($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALREFURBISHED'] != 0)) && (isset($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTREFURBISHEDPRICE_FORMATTEDPRICE']))) { if ((isset($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALREFURBISHED']) && ($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALREFURBISHED'] != 0)) && (isset($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTREFURBISHEDPRICE_FORMATTEDPRICE']))) {
$item['strings']['refurboffers'] = htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALREFURBISHED']) . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_REFURBISHED') . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_FROM') . " " . htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTREFURBISHEDPRICE_FORMATTEDPRICE']); $item['strings']['refurboffers'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALREFURBISHED']) : htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_TOTALREFURBISHED'], ENT_COMPAT, LANG_CHARSET)) . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_REFURBISHED') . " " . constant('PLUGIN_EVENT_AMAZONCHOOSER_FROM') . " " . (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTREFURBISHEDPRICE_FORMATTEDPRICE']) : htmlspecialchars($item['OFFERSUMMARY']['OFFERSUMMARY_LOWESTREFURBISHEDPRICE_FORMATTEDPRICE'], ENT_COMPAT, LANG_CHARSET));
} }
switch ($SearchIndex) { switch ($SearchIndex) {
case 'Books': case 'Books':
@ -460,20 +460,20 @@ function Amazon_AttributesText ($SearchIndex,$items,$country_url) {
case 'KindleStore': case 'KindleStore':
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUTHOR'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUTHOR'])) {
if (is_array($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUTHOR'])) { if (is_array($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUTHOR'])) {
$item['strings']['author'] = htmlspecialchars(implode(', ',$item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUTHOR'])); $item['strings']['author'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars(implode(', ',$item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUTHOR']) : htmlspecialchars(implode(', ',$item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUTHOR'], ENT_COMPAT, LANG_CHARSET)));
} else { } else {
$item['strings']['author'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUTHOR']); $item['strings']['author'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUTHOR']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_AUTHOR'], ENT_COMPAT, LANG_CHARSET));
} }
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'])) {
$item['strings']['publisher'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER']); $item['strings']['publisher'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'], ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PUBLICATIONDATE'])) { if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PUBLICATIONDATE'])) {
$item['strings']['publicationdate'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PUBLICATIONDATE']); $item['strings']['publicationdate'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PUBLICATIONDATE']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_PUBLICATIONDATE'], ENT_COMPAT, LANG_CHARSET));
unset($item['strings']['releasedate']); unset($item['strings']['releasedate']);
} }
if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_NUMBEROFPAGES'])) { if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_NUMBEROFPAGES'])) {
$item['strings']['numberofpages'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_NUMBEROFPAGES']); $item['strings']['numberofpages'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_NUMBEROFPAGES']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_NUMBEROFPAGES'], ENT_COMPAT, LANG_CHARSET));
} }
break; break;
case 'VHS': case 'VHS':
@ -481,19 +481,19 @@ function Amazon_AttributesText ($SearchIndex,$items,$country_url) {
case 'DVD': case 'DVD':
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ACTOR'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ACTOR'])) {
if (is_array($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ACTOR'])) { if (is_array($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ACTOR'])) {
$item['strings']['actor'] = htmlspecialchars(implode(', ',$item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ACTOR'])); $item['strings']['actor'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars(implode(', ',$item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ACTOR']) : htmlspecialchars(implode(', ',$item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ACTOR'], ENT_COMPAT, LANG_CHARSET)));
} else { } else {
$item['strings']['actor'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ACTOR']); $item['strings']['actor'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ACTOR']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ACTOR'], ENT_COMPAT, LANG_CHARSET));
} }
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'])) {
$item['strings']['distributor'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER']); $item['strings']['distributor'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_DIRECTOR'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_DIRECTOR'])) {
$item['strings']['director'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_DIRECTOR']); $item['strings']['director'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_DIRECTOR']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_DIRECTOR'], ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RELEASEDATE'])) { if (!empty($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RELEASEDATE'])) {
$item['strings']['releasedate'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RELEASEDATE']); $item['strings']['releasedate'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RELEASEDATE']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_RELEASEDATE'], ENT_COMPAT, LANG_CHARSET));
} }
break; break;
case 'Music': case 'Music':
@ -504,33 +504,33 @@ function Amazon_AttributesText ($SearchIndex,$items,$country_url) {
case 'MusicTracks': case 'MusicTracks':
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ARTIST'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ARTIST'])) {
if (is_array($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ARTIST'])) { if (is_array($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ARTIST'])) {
$item['strings']['artist'] = htmlspecialchars(implode(', ',$item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ARTIST'])); $item['strings']['artist'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars(implode(', ',$item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ARTIST']) : htmlspecialchars(implode(', ',$item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ARTIST'], ENT_COMPAT, LANG_CHARSET)));
} else { } else {
$item['strings']['artist']= htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ARTIST']); $item['strings']['artist']= (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ARTIST']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_ARTIST'], ENT_COMPAT, LANG_CHARSET));
} }
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'])) {
$item['strings']['distributor']= htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER']); $item['strings']['distributor']= (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'], ENT_COMPAT, LANG_CHARSET));
} }
break; break;
case 'Software': case 'Software':
case 'VideoGames': case 'VideoGames':
case 'SoftwareVideoGames': case 'SoftwareVideoGames':
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'])) {
$item['strings']['distributor'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER']); $item['strings']['distributor'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'], ENT_COMPAT, LANG_CHARSET));
} }
break; break;
case 'Apparel': case 'Apparel':
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_BRAND'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_BRAND'])) {
$item['strings']['brand'] = htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_BRAND']); $item['strings']['brand'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_BRAND']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_BRAND'], ENT_COMPAT, LANG_CHARSET));
} }
break; break;
default: default:
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'])) {
$item['strings']['distributor']= htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER']); $item['strings']['distributor']= (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_MANUFACTURER'], ENT_COMPAT, LANG_CHARSET));
} }
if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_FEATURE'])) { if (isset($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_FEATURE'])) {
$item['strings']['feature']= htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_FEATURE']); $item['strings']['feature']= (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_FEATURE']) : htmlspecialchars($item['ITEMATTRIBUTES']['ITEMATTRIBUTES_FEATURE'], ENT_COMPAT, LANG_CHARSET));
} }
break; break;
} }

20
serendipity_event_amazonchooser/serendipity_event_amazonchooser.php
View file

@ -29,7 +29,7 @@ class serendipity_event_amazonchooser extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_AMAZONCHOOSER_DESC); $propbag->add('description', PLUGIN_EVENT_AMAZONCHOOSER_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Matthew Groeninger, Ian'); $propbag->add('author', 'Matthew Groeninger, Ian');
$propbag->add('version', '0.74'); $propbag->add('version', '0.74.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.3', 'serendipity' => '1.3',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -278,13 +278,13 @@ class serendipity_event_amazonchooser extends serendipity_event
} else { } else {
$simple = ""; $simple = "";
} }
$request_mode = trim(htmlspecialchars(rawurlencode($_REQUEST['mode']))); $request_mode = trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['mode'])) : htmlspecialchars(rawurlencode($_REQUEST['mode']), ENT_COMPAT, LANG_CHARSET)));
if (in_array($_REQUEST['mode'],$mode)) { if (in_array($_REQUEST['mode'],$mode)) {
$results = $this->Amazon_Call("search",$request_mode,trim(htmlspecialchars(rawurlencode($_REQUEST['keyword']))),$country_url,$page); $results = $this->Amazon_Call("search",$request_mode,trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['keyword'])) : htmlspecialchars(rawurlencode($_REQUEST['keyword']), ENT_COMPAT, LANG_CHARSET))),$country_url,$page);
} else { } else {
$results['return_count'] = 0; $results['return_count'] = 0;
$results['count'] = 0; $results['count'] = 0;
$results['error_message'] = PLUGIN_EVENT_AMAZONCHOOSER_INVALIDINDEX . ": " .trim(htmlspecialchars(rawurlencode($_REQUEST['mode']))); $results['error_message'] = PLUGIN_EVENT_AMAZONCHOOSER_INVALIDINDEX . ": " .trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['mode'])) : htmlspecialchars(rawurlencode($_REQUEST['mode']), ENT_COMPAT, LANG_CHARSET)));
} }
if ($page > 1) { if ($page > 1) {
$previous_page = $page - 1; $previous_page = $page - 1;
@ -306,16 +306,16 @@ class serendipity_event_amazonchooser extends serendipity_event
'plugin_amazonchooser_error_result' => $results['error_result'], 'plugin_amazonchooser_error_result' => $results['error_result'],
'plugin_amazonchooser_cache_time' => $results['return_date'], 'plugin_amazonchooser_cache_time' => $results['return_date'],
'plugin_amazonchooser_items' => $results['items'], 'plugin_amazonchooser_items' => $results['items'],
'plugin_amazonchooser_search_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&amp;') . 'txtarea=' . htmlspecialchars($_REQUEST['txtarea']).$simple.'&amp;keyword='.trim(htmlspecialchars(rawurlencode($_REQUEST['keyword']))).'&amp;mode='.$request_mode, 'plugin_amazonchooser_search_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&amp;') . 'txtarea=' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($_REQUEST['txtarea']) : htmlspecialchars($_REQUEST['txtarea'], ENT_COMPAT, LANG_CHARSET)).$simple.'&amp;keyword='.trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['keyword'])) : htmlspecialchars(rawurlencode($_REQUEST['keyword']), ENT_COMPAT, LANG_CHARSET))).'&amp;mode='.$request_mode,
'plugin_amazonchooser_this_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&amp;') . '&amp;mode='.trim(htmlspecialchars(rawurlencode($_REQUEST['mode']))).'&amp;txtarea=' . htmlspecialchars($_REQUEST['txtarea']) .$simple. '&amp;step=1&amp;keyword='.trim(htmlspecialchars(rawurlencode($_REQUEST['keyword']))).'&amp;page=', 'plugin_amazonchooser_this_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&amp;') . '&amp;mode='.trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['mode'])) : htmlspecialchars(rawurlencode($_REQUEST['mode']), ENT_COMPAT, LANG_CHARSET))).'&amp;txtarea=' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($_REQUEST['txtarea']) : htmlspecialchars($_REQUEST['txtarea'], ENT_COMPAT, LANG_CHARSET)) .$simple. '&amp;step=1&amp;keyword='.trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['keyword'])) : htmlspecialchars(rawurlencode($_REQUEST['keyword']), ENT_COMPAT, LANG_CHARSET))).'&amp;page=',
'plugin_amazonchooser_select_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&amp;') . '&amp;mode='.trim(htmlspecialchars(rawurlencode($_REQUEST['mode']))).$simple.'&amp;txtarea=' . htmlspecialchars($_REQUEST['txtarea']) . '&amp;step=2&amp;asin=' 'plugin_amazonchooser_select_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&amp;') . '&amp;mode='.trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['mode'])) : htmlspecialchars(rawurlencode($_REQUEST['mode']), ENT_COMPAT, LANG_CHARSET))).$simple.'&amp;txtarea=' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($_REQUEST['txtarea']) : htmlspecialchars($_REQUEST['txtarea'], ENT_COMPAT, LANG_CHARSET)) . '&amp;step=2&amp;asin='
) )
); );
break; break;
case '2': case '2':
if (isset($_REQUEST['asin'])) { if (isset($_REQUEST['asin'])) {
$result = $this->Amazon_Call("lookup",trim(htmlspecialchars(rawurlencode($_REQUEST['mode']))),trim(htmlspecialchars(rawurlencode($_REQUEST['asin']))),$country_url,$page); $result = $this->Amazon_Call("lookup",trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['mode'])) : htmlspecialchars(rawurlencode($_REQUEST['mode']), ENT_COMPAT, LANG_CHARSET))),trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['asin'])) : htmlspecialchars(rawurlencode($_REQUEST['asin']), ENT_COMPAT, LANG_CHARSET))),$country_url,$page);
} else { } else {
$result['count'] = 0; $result['count'] = 0;
$result['error_message'] = PLUGIN_EVENT_AMAZONCHOOSER_NOASIN; $result['error_message'] = PLUGIN_EVENT_AMAZONCHOOSER_NOASIN;
@ -332,7 +332,7 @@ class serendipity_event_amazonchooser extends serendipity_event
'plugin_amazonchooser_txtarea' => $_REQUEST['txtarea'], 'plugin_amazonchooser_txtarea' => $_REQUEST['txtarea'],
'plugin_amazonchooser_item_count' => $result['count'], 'plugin_amazonchooser_item_count' => $result['count'],
'plugin_amazonchooser_return_count' => $result['return_count'], 'plugin_amazonchooser_return_count' => $result['return_count'],
'plugin_amazonchooser_searchmode' => trim(htmlspecialchars(rawurlencode($_REQUEST['mode']))), 'plugin_amazonchooser_searchmode' => trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['mode'])) : htmlspecialchars(rawurlencode($_REQUEST['mode']), ENT_COMPAT, LANG_CHARSET))),
'plugin_amazonchooser_simple' => $simple, 'plugin_amazonchooser_simple' => $simple,
'plugin_amazonchooser_error_message' => $result['error_message'], 'plugin_amazonchooser_error_message' => $result['error_message'],
'plugin_amazonchooser_cache_time' => $result['return_date'], 'plugin_amazonchooser_cache_time' => $result['return_date'],
@ -359,7 +359,7 @@ class serendipity_event_amazonchooser extends serendipity_event
'plugin_amazonchooser_page' => "default", 'plugin_amazonchooser_page' => "default",
'plugin_amazonchooser_keyword' => rawurldecode($_REQUEST['keyword']), 'plugin_amazonchooser_keyword' => rawurldecode($_REQUEST['keyword']),
'plugin_amazonchooser_link' => $link, 'plugin_amazonchooser_link' => $link,
'plugin_amazonchooser_txtarea' => trim(htmlspecialchars(rawurlencode($_REQUEST['txtarea']))), 'plugin_amazonchooser_txtarea' => trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['txtarea'])) : htmlspecialchars(rawurlencode($_REQUEST['txtarea']), ENT_COMPAT, LANG_CHARSET))),
'plugin_amazonchooser_simple' => $simple, 'plugin_amazonchooser_simple' => $simple,
'plugin_amazonchooser_mode' => $mode_out, 'plugin_amazonchooser_mode' => $mode_out,
'plugin_amazonchooser_defaultmode' => $defaultmode 'plugin_amazonchooser_defaultmode' => $defaultmode

10
serendipity_event_assigncategories/serendipity_event_assigncategories.php
View file

@ -23,7 +23,7 @@ class serendipity_event_assigncategories extends serendipity_event
$propbag->add('description', PLUGIN_ASSIGNCATEGORIES_DESC); $propbag->add('description', PLUGIN_ASSIGNCATEGORIES_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Matthias Mees'); $propbag->add('author', 'Garvin Hicking, Matthias Mees');
$propbag->add('version', '1.4'); $propbag->add('version', '1.4.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'php' => '4.1.0' 'php' => '4.1.0'
@ -151,11 +151,11 @@ class serendipity_event_assigncategories extends serendipity_event
echo '<table>'; echo '<table>';
foreach ($cats as $cat_data) { foreach ($cats as $cat_data) {
echo '<tr>' . "\n"; echo '<tr>' . "\n";
echo '<td valign="top"><strong>' . htmlspecialchars($cat_data['category_name']) . '</strong></td>' . "\n"; echo '<td valign="top"><strong>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($cat_data['category_name']) : htmlspecialchars($cat_data['category_name'], ENT_COMPAT, LANG_CHARSET)) . '</strong></td>' . "\n";
echo '<td><select size="5" name="serendipity[assigncat][' . $cat_data['categoryid'] . '][]" multiple="true">' . "\n"; echo '<td><select size="5" name="serendipity[assigncat][' . $cat_data['categoryid'] . '][]" multiple="true">' . "\n";
if (is_array($entries) && !empty($entries)) { if (is_array($entries) && !empty($entries)) {
foreach($entries AS $entryid => $entry) { foreach($entries AS $entryid => $entry) {
echo '<option value="' . $entryid . '" ' . (in_array($cat_data['categoryid'], (array)$entry['categories']) ? 'selected="selected"' : '') . '>' . htmlspecialchars($entry['title']) . '</option>' . "\n"; echo '<option value="' . $entryid . '" ' . (in_array($cat_data['categoryid'], (array)$entry['categories']) ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
} }
echo '</select></td>' . "\n"; echo '</select></td>' . "\n";
@ -168,11 +168,11 @@ class serendipity_event_assigncategories extends serendipity_event
} else { } else {
foreach ($cats as $cat_data) { foreach ($cats as $cat_data) {
echo '<div class="form_multiselect">'; echo '<div class="form_multiselect">';
echo '<label for="serendipity_assigncat_' . $cat_data['categoryid'] . '" class="block_level">' . htmlspecialchars($cat_data['category_name']) . '</label>'; echo '<label for="serendipity_assigncat_' . $cat_data['categoryid'] . '" class="block_level">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($cat_data['category_name']) : htmlspecialchars($cat_data['category_name'], ENT_COMPAT, LANG_CHARSET)) . '</label>';
echo '<select id="serendipity_assigncat_' . $cat_data['categoryid'] . '" size="5" name="serendipity[assigncat][' . $cat_data['categoryid'] . '][]" multiple="true">'; echo '<select id="serendipity_assigncat_' . $cat_data['categoryid'] . '" size="5" name="serendipity[assigncat][' . $cat_data['categoryid'] . '][]" multiple="true">';
if (is_array($entries) && !empty($entries)) { if (is_array($entries) && !empty($entries)) {
foreach($entries AS $entryid => $entry) { foreach($entries AS $entryid => $entry) {
echo '<option value="' . $entryid . '" ' . (in_array($cat_data['categoryid'], (array)$entry['categories']) ? 'selected="selected"' : '') . '>' . htmlspecialchars($entry['title']) . '</option>'; echo '<option value="' . $entryid . '" ' . (in_array($cat_data['categoryid'], (array)$entry['categories']) ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '</option>';
} }
} }
echo '</select></div>'; echo '</select></div>';

6
serendipity_event_autoupdate/serendipity_event_autoupdate.php
View file

@ -22,7 +22,7 @@ class serendipity_event_autoupdate extends serendipity_event {
$propbag->add('description', PLUGIN_EVENT_AUTOUPDATE_DESC); $propbag->add('description', PLUGIN_EVENT_AUTOUPDATE_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'onli, Ian'); $propbag->add('author', 'onli, Ian');
$propbag->add('version', '1.1'); $propbag->add('version', '1.1.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'php' => '5.1' 'php' => '5.1'
@ -129,11 +129,11 @@ class serendipity_event_autoupdate extends serendipity_event {
of 16M but image processing scripts may raise it to 20M. of 16M but image processing scripts may raise it to 20M.
Edit /etc/php5/conf.d/suhosin.ini and add e.g. suhosin.memory_limit = 512M ... Edit /etc/php5/conf.d/suhosin.ini and add e.g. suhosin.memory_limit = 512M ...
*/ */
$self_info = sprintf(USER_SELF_INFO, htmlspecialchars($serendipity['serendipityUser']), $serendipity['permissionLevels'][$serendipity['serendipityUserlevel']]); $self_info = sprintf(USER_SELF_INFO, (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['serendipityUser']) : htmlspecialchars($serendipity['serendipityUser'], ENT_COMPAT, LANG_CHARSET)), $serendipity['permissionLevels'][$serendipity['serendipityUserlevel']]);
$lang_char = LANG_CHARSET; $lang_char = LANG_CHARSET;
$ad_suite = SERENDIPITY_ADMIN_SUITE; $ad_suite = SERENDIPITY_ADMIN_SUITE;
$css_upd = file_get_contents(dirname(__FILE__) . '/upgrade.min.css'); $css_upd = file_get_contents(dirname(__FILE__) . '/upgrade.min.css');
$nv = htmlspecialchars($_REQUEST['serendipity']['newVersion']); // reduce to POST only? $nv = (function_exists('serendipity_specialchars') ? serendipity_specialchars($_REQUEST['serendipity']['newVersion']) : htmlspecialchars($_REQUEST['serendipity']['newVersion'], ENT_COMPAT, LANG_CHARSET)); // reduce to POST only?
$logmsg = ''; $logmsg = '';
echo <<<EOS echo <<<EOS
<!DOCTYPE html> <!DOCTYPE html>

8
serendipity_event_backend/serendipity_event_backend.php
View file

@ -34,7 +34,7 @@ class serendipity_event_backend extends serendipity_event {
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '0.6'); $propbag->add('version', '0.6.1');
$propbag->add('author', 'Alexander \'dma147\' Mieland, http://blog.linux-stats.org, dma147@linux-stats.org'); $propbag->add('author', 'Alexander \'dma147\' Mieland, http://blog.linux-stats.org, dma147@linux-stats.org');
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
@ -169,9 +169,9 @@ class serendipity_event_backend extends serendipity_event {
if ($details <= 0) { if ($details <= 0) {
if ($date != "") { if ($date != "") {
$date = "[".addslashes(htmlspecialchars($date))."] "; $date = "[".addslashes((function_exists('serendipity_specialchars') ? serendipity_specialchars($date) : htmlspecialchars($date, ENT_COMPAT, LANG_CHARSET)))."] ";
} }
echo " document.write('<span class=\"blog_point\">".(trim($point) !="" ? addslashes(htmlspecialchars(trim($point)))." " : "") . "</span><span class=\"blog_date\">" . $date . "</span><a class=\"blog_link\" href=\"" . $entryurl . "\">" . addslashes($entries[$a]['title']) . "</a><br />');\n"; echo " document.write('<span class=\"blog_point\">".(trim($point) !="" ? addslashes((function_exists('serendipity_specialchars') ? serendipity_specialchars(trim($point) : htmlspecialchars(trim($point, ENT_COMPAT, LANG_CHARSET))))." " : "") . "</span><span class=\"blog_date\">" . $date . "</span><a class=\"blog_link\" href=\"" . $entryurl . "\">" . addslashes($entries[$a]['title']) . "</a><br />');\n";
} else { } else {
echo " document.write('<span class=\"blog_title\">".addslashes($entries[$a]['title'])."</span>');\n"; echo " document.write('<span class=\"blog_title\">".addslashes($entries[$a]['title'])."</span>');\n";
echo " document.write('<hr class=\"blog_hr\" />');\n"; echo " document.write('<hr class=\"blog_hr\" />');\n";
@ -187,7 +187,7 @@ class serendipity_event_backend extends serendipity_event {
} }
if ($date != "") { if ($date != "") {
$date = ", " . addslashes(htmlspecialchars($date)); $date = ", " . addslashes((function_exists('serendipity_specialchars') ? serendipity_specialchars($date) : htmlspecialchars($date, ENT_COMPAT, LANG_CHARSET)));
} }
$body = str_replace("'", "\'", $body); $body = str_replace("'", "\'", $body);

6
serendipity_event_blogpdf/serendipity_event_blogpdf.php
View file

@ -46,7 +46,7 @@ class serendipity_event_blogpdf extends serendipity_event
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Olivier PLATHEY, Steven Wittens'); $propbag->add('author', 'Garvin Hicking, Olivier PLATHEY, Steven Wittens');
$propbag->add('license', 'GPL (Uses LGPL FPDF, HTML2PDF, UFPDF'); $propbag->add('license', 'GPL (Uses LGPL FPDF, HTML2PDF, UFPDF');
$propbag->add('version', '1.82'); $propbag->add('version', '1.82.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -268,7 +268,7 @@ class serendipity_event_blogpdf extends serendipity_event
$entryLink = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath', true, array('timestamp' => $entry['timestamp'])); $entryLink = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath', true, array('timestamp' => $entry['timestamp']));
serendipity_plugin_api::hook_event('frontend_display', $entry, array('no_scramble' => true)); serendipity_plugin_api::hook_event('frontend_display', $entry, array('no_scramble' => true));
$posted_by = ' ' . POSTED_BY . ' ' . htmlspecialchars($entry['author']); $posted_by = ' ' . POSTED_BY . ' ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['author']) : htmlspecialchars($entry['author'], ENT_COMPAT, LANG_CHARSET));
if (is_array($entry['categories']) && sizeof($entry['categories']) > 0) { if (is_array($entry['categories']) && sizeof($entry['categories']) > 0) {
$posted_by .= ' ' . IN . ' '; $posted_by .= ' ' . IN . ' ';
$cats = array(); $cats = array();
@ -309,7 +309,7 @@ class serendipity_event_blogpdf extends serendipity_event
} }
foreach ($comments as $i => $comment) { foreach ($comments as $i => $comment) {
$comment['comment'] = htmlspecialchars(strip_tags($comment['body'])); $comment['comment'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($comment['body'])) : htmlspecialchars(strip_tags($comment['body']), ENT_COMPAT, LANG_CHARSET));
if (!empty($comment['url']) && substr($comment['url'], 0, 7) != 'http://' && substr($comment['url'], 0, 8) != 'https://') { if (!empty($comment['url']) && substr($comment['url'], 0, 7) != 'http://' && substr($comment['url'], 0, 8) != 'https://') {
$comment['url'] = 'http://' . $comment['url']; $comment['url'] = 'http://' . $comment['url'];
} }

4
serendipity_event_cachesimple/serendipity_event_cachesimple.php
View file

@ -75,7 +75,7 @@ class serendipity_event_cachesimple extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_CACHESIMPLE_DESC); $propbag->add('description', PLUGIN_EVENT_CACHESIMPLE_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '1.2'); $propbag->add('version', '1.2.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -271,7 +271,7 @@ document.getElementById('serendipity_commentform_url').value = getCommentCooki
$post_import = array('name', 'email', 'url'); $post_import = array('name', 'email', 'url');
foreach($post_import AS $importvar) { foreach($post_import AS $importvar) {
if (!empty($serendipity['POST'][$importvar])) { if (!empty($serendipity['POST'][$importvar])) {
echo "document.getElementById('serendipity_commentform_$importvar').value = '" . htmlspecialchars($serendipity['POST'][$importvar]) . "';\n"; echo "document.getElementById('serendipity_commentform_$importvar').value = '" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST'][$importvar]) : htmlspecialchars($serendipity['POST'][$importvar], ENT_COMPAT, LANG_CHARSET)) . "';\n";
} }
} }
?> ?>

10
serendipity_event_cal/serendipity_event_cal.php
View file

@ -76,7 +76,7 @@ class serendipity_event_cal extends serendipity_event {
) )
); );
$propbag->add('author', 'Ian (Timbalu)'); $propbag->add('author', 'Ian (Timbalu)');
$propbag->add('version', '1.69'); $propbag->add('version', '1.69.1');
$propbag->add('groups', array('FRONTEND_FEATURES', 'BACKEND_FEATURES')); $propbag->add('groups', array('FRONTEND_FEATURES', 'BACKEND_FEATURES'));
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.4', 'serendipity' => '1.4',
@ -262,15 +262,15 @@ class serendipity_event_cal extends serendipity_event {
if (is_array($val)) { if (is_array($val)) {
foreach($val as $akey => $aval) { foreach($val as $akey => $aval) {
if($savearrayname == true) if($savearrayname == true)
$row[$key][$akey] = ($outputformfield == true) ? stripslashes(htmlspecialchars($aval)) : stripslashes($aval); // array e.g. $row['name'] $row[$key][$akey] = ($outputformfield == true) ? stripslashes((function_exists('serendipity_specialchars') ? serendipity_specialchars($aval) : htmlspecialchars($aval, ENT_COMPAT, LANG_CHARSET))) : stripslashes($aval); // array e.g. $row['name']
else else
$$key[$akey] = ($outputformfield == true) ? stripslashes(htmlspecialchars($aval)) : stripslashes($aval); // $key-name e.g. $name $$key[$akey] = ($outputformfield == true) ? stripslashes((function_exists('serendipity_specialchars') ? serendipity_specialchars($aval) : htmlspecialchars($aval, ENT_COMPAT, LANG_CHARSET))) : stripslashes($aval); // $key-name e.g. $name
} }
} else { } else {
if($savearrayname == true) if($savearrayname == true)
$row[$key] = ($outputformfield == true) ? stripslashes(htmlspecialchars($val)) : stripslashes($val); // array e.g. $row['name'] $row[$key] = ($outputformfield == true) ? stripslashes((function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET))) : stripslashes($val); // array e.g. $row['name']
else else
$$key = ($outputformfield == true) ? stripslashes(htmlspecialchars($val)) : stripslashes($val); // $key-name e.g. $name $$key = ($outputformfield == true) ? stripslashes((function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET))) : stripslashes($val); // $key-name e.g. $name
} }
} }
} }

6
serendipity_event_categorytemplates/serendipity_event_categorytemplates.php
View file

@ -29,7 +29,7 @@ class serendipity_event_categorytemplates extends serendipity_event
$propbag->add('description', PLUGIN_CATEGORYTEMPLATES_DESC); $propbag->add('description', PLUGIN_CATEGORYTEMPLATES_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Judebert'); $propbag->add('author', 'Garvin Hicking, Judebert');
$propbag->add('version', '0.35'); $propbag->add('version', '0.35.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.9', 'serendipity' => '0.9',
'php' => '4.1.0' 'php' => '4.1.0'
@ -515,7 +515,7 @@ class serendipity_event_categorytemplates extends serendipity_event
foreach ($styles AS $style => $path) { foreach ($styles AS $style => $path) {
$templateInfo = serendipity_fetchTemplateInfo($style); $templateInfo = serendipity_fetchTemplateInfo($style);
?> ?>
<option value="<?php echo htmlspecialchars($style); ?>" <?php echo ($style == $template? 'selected="selected"' : ''); ?>><?php echo htmlspecialchars($templateInfo['name']); ?></option> <option value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($style) : htmlspecialchars($style, ENT_COMPAT, LANG_CHARSET)); ?>" <?php echo ($style == $template? 'selected="selected"' : ''); ?>><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($templateInfo['name']) : htmlspecialchars($templateInfo['name'], ENT_COMPAT, LANG_CHARSET)); ?></option>
<?php <?php
} }
?> ?>
@ -536,7 +536,7 @@ class serendipity_event_categorytemplates extends serendipity_event
<td><select id="language" name="serendipity[cat][lang]"> <td><select id="language" name="serendipity[cat][lang]">
<option value="default"><?php echo USE_DEFAULT; ?></option> <option value="default"><?php echo USE_DEFAULT; ?></option>
<?php foreach($serendipity['languages'] AS $langkey => $lang) { ?> <?php foreach($serendipity['languages'] AS $langkey => $lang) { ?>
<option value="<?php echo $lang; ?>" <?php echo ($langkey == $clang ? 'selected="selected"' : ''); ?>><?php echo htmlspecialchars($lang); ?></option> <option value="<?php echo $lang; ?>" <?php echo ($langkey == $clang ? 'selected="selected"' : ''); ?>><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($lang) : htmlspecialchars($lang, ENT_COMPAT, LANG_CHARSET)); ?></option>
<?php } ?> <?php } ?>
</select></td> </select></td>
</tr> </tr>

8
serendipity_event_ckeditor/serendipity_event_ckeditor.php
View file

@ -157,7 +157,7 @@ class serendipity_event_ckeditor extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_CKEDITOR_DESC); $propbag->add('description', PLUGIN_EVENT_CKEDITOR_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Rustam Abdullaev, Ian'); $propbag->add('author', 'Rustam Abdullaev, Ian');
$propbag->add('version', '4.4.0'); // is CKEDITOR Series 4 (hidden) - revision .4.4 - and appended plugin revision .0 $propbag->add('version', '4.4.1'); // is CKEDITOR Series 4 (hidden) - revision .4.4 - and appended plugin revision .0
$propbag->add('copyright', 'GPL or LGPL License'); $propbag->add('copyright', 'GPL or LGPL License');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.7', 'serendipity' => '1.7',
@ -351,7 +351,7 @@ class serendipity_event_ckeditor extends serendipity_event
case 'frontend_footer': case 'frontend_footer':
// set prettify.css and prettify.js in frontend footer by plugin option (too much overhead to split this into head css and food js!) // set prettify.css and prettify.js in frontend footer by plugin option (too much overhead to split this into head css and food js!)
if (serendipity_db_bool($this->get_config('prettify', false))) { if (serendipity_db_bool($this->get_config('prettify', false))) {
$plugingpath = htmlspecialchars($this->get_config('plugpath')); $plugingpath = (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_config('plugpath')) : htmlspecialchars($this->get_config('plugpath'), ENT_COMPAT, LANG_CHARSET));
?> ?>
<link rel="stylesheet" type="text/css" href="<?php echo $plugingpath . 'serendipity_event_ckeditor/prettify.css'; ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo $plugingpath . 'serendipity_event_ckeditor/prettify.css'; ?>" />
<script type="text/javascript" src="<?php echo $plugingpath . 'serendipity_event_ckeditor/prettify.js'; ?>"></script> <script type="text/javascript" src="<?php echo $plugingpath . 'serendipity_event_ckeditor/prettify.js'; ?>"></script>
@ -368,8 +368,8 @@ class serendipity_event_ckeditor extends serendipity_event
case 'backend_header': case 'backend_header':
if (isset($serendipity['wysiwyg']) && $serendipity['wysiwyg'] && isset($eventData)) { if (isset($serendipity['wysiwyg']) && $serendipity['wysiwyg'] && isset($eventData)) {
$relpath = htmlspecialchars($this->get_config('path')); $relpath = (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_config('path')) : htmlspecialchars($this->get_config('path'), ENT_COMPAT, LANG_CHARSET));
$plgpath = htmlspecialchars($this->get_config('plugpath')); $plgpath = (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_config('plugpath')) : htmlspecialchars($this->get_config('plugpath'), ENT_COMPAT, LANG_CHARSET));
$acf_off = serendipity_db_bool($this->get_config('acf_off')) ? 'true' : 'false'; // need this, to be passed correctly as boolean true/false to custom cke_config.js $acf_off = serendipity_db_bool($this->get_config('acf_off')) ? 'true' : 'false'; // need this, to be passed correctly as boolean true/false to custom cke_config.js
$pbck_on = serendipity_db_bool($this->get_config('codebutton')) ? 'true' : 'false'; // same here for cke_plugins.js $pbck_on = serendipity_db_bool($this->get_config('codebutton')) ? 'true' : 'false'; // same here for cke_plugins.js
/* set some global vars */ /* set some global vars */

4
serendipity_event_comics/serendipity_event_comics.php
View file

@ -26,7 +26,7 @@ class serendipity_event_comics extends serendipity_event {
$propbag->add('description', PLUGIN_COMICS_DESC); $propbag->add('description', PLUGIN_COMICS_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Wesley Hwang-Chung'); $propbag->add('author', 'Wesley Hwang-Chung');
$propbag->add('version', '1.4'); $propbag->add('version', '1.4.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -189,7 +189,7 @@ class serendipity_event_comics extends serendipity_event {
if ($event == 'entries_header' && $serendipity['GET']['page'] == '1') { if ($event == 'entries_header' && $serendipity['GET']['page'] == '1') {
if ($show_t == 'true') { if ($show_t == 'true') {
echo '<h4 class="serendipity_title"><a href="' . serendipity_archiveURL($comic[0]['id'], $comic[0]['title'], 'baseURL', true, array('timestamp' => $comic[0]['timestamp'])) . '">'; echo '<h4 class="serendipity_title"><a href="' . serendipity_archiveURL($comic[0]['id'], $comic[0]['title'], 'baseURL', true, array('timestamp' => $comic[0]['timestamp'])) . '">';
echo PLUGIN_COMICS_LATEST . htmlspecialchars(serendipity_strftime(DATE_FORMAT_ENTRY, $comic['0']['timestamp'])) . '</a></h4>'; echo PLUGIN_COMICS_LATEST . (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_strftime(DATE_FORMAT_ENTRY, $comic['0']['timestamp'])) : htmlspecialchars(serendipity_strftime(DATE_FORMAT_ENTRY, $comic['0']['timestamp']), ENT_COMPAT, LANG_CHARSET)) . '</a></h4>';
} }
if ($show_raw == 'true') { if ($show_raw == 'true') {
echo $comic['0']['body']; echo $comic['0']['body'];

6
serendipity_event_communityrating/serendipity_event_communityrating.php
View file

@ -26,7 +26,7 @@ class serendipity_event_communityrating extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_COMMUNITYRATING_DESC); $propbag->add('description', PLUGIN_EVENT_COMMUNITYRATING_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Lewe Zipfel'); $propbag->add('author', 'Garvin Hicking, Lewe Zipfel');
$propbag->add('version', '1.11'); $propbag->add('version', '1.11.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.9', 'serendipity' => '0.9',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -148,8 +148,8 @@ class serendipity_event_communityrating extends serendipity_event
} }
?> ?>
<strong><?php echo $prop; ?>:</strong><br /> <strong><?php echo $prop; ?>:</strong><br />
<label title="<?php echo PLUGIN_EVENT_COMMUNITYRATING_ID; ?>" for="properties_rating_id"><?php echo PLUGIN_EVENT_COMMUNITYRATING_ID; ?></label>: <input class="input_textbox" id="properties_rating_id" type="text" name="serendipity[properties][<?php echo $prop . '_id'; ?>]" value="<?php echo htmlspecialchars($vals['id']); ?>" size="10" /> <label title="<?php echo PLUGIN_EVENT_COMMUNITYRATING_ID; ?>" for="properties_rating_id"><?php echo PLUGIN_EVENT_COMMUNITYRATING_ID; ?></label>: <input class="input_textbox" id="properties_rating_id" type="text" name="serendipity[properties][<?php echo $prop . '_id'; ?>]" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($vals['id']) : htmlspecialchars($vals['id'], ENT_COMPAT, LANG_CHARSET)); ?>" size="10" />
<label title="<?php echo PLUGIN_EVENT_COMMUNITYRATING_RATING; ?>" for="properties_rating_points"><?php echo PLUGIN_EVENT_COMMUNITYRATING_RATING; ?></label>: <input class="input_textbox" id="properties_rating_points" type="text" name="serendipity[properties][<?php echo $prop . '_rating'; ?>]" value="<?php echo htmlspecialchars($vals['rating']); ?>" size="2" /> <label title="<?php echo PLUGIN_EVENT_COMMUNITYRATING_RATING; ?>" for="properties_rating_points"><?php echo PLUGIN_EVENT_COMMUNITYRATING_RATING; ?></label>: <input class="input_textbox" id="properties_rating_points" type="text" name="serendipity[properties][<?php echo $prop . '_rating'; ?>]" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($vals['rating']) : htmlspecialchars($vals['rating'], ENT_COMPAT, LANG_CHARSET)); ?>" size="2" />
<br /> <br />
<?php <?php
} }

4
serendipity_event_communityrating/serendipity_plugin_communityrating.php
View file

@ -25,7 +25,7 @@ class serendipity_plugin_communityrating extends serendipity_plugin
$propbag->add('description', PLUGIN_EVENT_COMMUNITYRATING_AVGRATING_DESC); $propbag->add('description', PLUGIN_EVENT_COMMUNITYRATING_AVGRATING_DESC);
$propbag->add('stackable', true); $propbag->add('stackable', true);
$propbag->add('author', 'Lewe Zipfel, Garvin Hicking'); $propbag->add('author', 'Lewe Zipfel, Garvin Hicking');
$propbag->add('version', '1.2'); $propbag->add('version', '1.2.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.9', 'serendipity' => '0.9',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -99,7 +99,7 @@ class serendipity_plugin_communityrating extends serendipity_plugin
'serendipityHTTPPath', 'serendipityHTTPPath',
true, true,
array('timestamp' => $row['timestamp'])); array('timestamp' => $row['timestamp']));
echo '<li><a href="'. $url . '">' . htmlspecialchars($row['title']) . '</a> (' . ($row['rating']) . ')</li>'; echo '<li><a href="'. $url . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['title']) : htmlspecialchars($row['title'], ENT_COMPAT, LANG_CHARSET)) . '</a> (' . ($row['rating']) . ')</li>';
} }
echo '</ol>'; echo '</ol>';

2
serendipity_event_communityrating/smarty.inc.php
View file

@ -126,7 +126,7 @@ function communityrating_serendipity_show($params, &$smarty) {
$serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion;
if (!empty($params['escaped'])) { if (!empty($params['escaped'])) {
echo serendipity_utf8_encode(htmlspecialchars($content)); echo serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($content) : htmlspecialchars($content, ENT_COMPAT, LANG_CHARSET)));
} else { } else {
echo $content; echo $content;
} }

48
serendipity_event_contactform/serendipity_event_contactform.php
View file

@ -30,7 +30,7 @@ class serendipity_event_contactform extends serendipity_event {
$propbag->add('event_hooks', array('entries_header' => true, 'entry_display' => true, 'genpage' => true)); $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('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('author', 'Garvin Hicking');
$propbag->add('version', '1.16'); $propbag->add('version', '1.16.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.7', 'serendipity' => '0.7',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -222,10 +222,10 @@ class serendipity_event_contactform extends serendipity_event {
$commentInfo = array( $commentInfo = array(
'type' => 'NORMAL', 'type' => 'NORMAL',
'source' => 'commentform', 'source' => 'commentform',
'name' => htmlspecialchars(strip_tags($serendipity['POST']['name'])), 'name' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['name'])) : htmlspecialchars(strip_tags($serendipity['POST']['name']), ENT_COMPAT, LANG_CHARSET)),
'url' => htmlspecialchars(strip_tags($serendipity['POST']['url'])), 'url' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)),
'comment' => htmlspecialchars(strip_tags($serendipity['POST']['comment'])), 'comment' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['comment'])) : htmlspecialchars(strip_tags($serendipity['POST']['comment']), ENT_COMPAT, LANG_CHARSET)),
'email' => htmlspecialchars(strip_tags($serendipity['POST']['email'])), 'email' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['email'])) : htmlspecialchars(strip_tags($serendipity['POST']['email']), ENT_COMPAT, LANG_CHARSET)),
'source2' => 'adduser' // Allow the contactform to bypass "only registered users may post" option of the adduser-plugin 'source2' => 'adduser' // Allow the contactform to bypass "only registered users may post" option of the adduser-plugin
); );
@ -245,10 +245,10 @@ class serendipity_event_contactform extends serendipity_event {
if ($this->sendComment( if ($this->sendComment(
$this->get_config('email'), $this->get_config('email'),
htmlspecialchars(strip_tags($serendipity['POST']['name'])), (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['name'])) : htmlspecialchars(strip_tags($serendipity['POST']['name']), ENT_COMPAT, LANG_CHARSET)),
htmlspecialchars(strip_tags($serendipity['POST']['email'])), (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['email'])) : htmlspecialchars(strip_tags($serendipity['POST']['email']), ENT_COMPAT, LANG_CHARSET)),
htmlspecialchars(strip_tags($serendipity['POST']['url'])), (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)),
htmlspecialchars(strip_tags($serendipity['POST']['comment'])))) { (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['comment'])) : htmlspecialchars(strip_tags($serendipity['POST']['comment']) ENT_COMPAT, LANG_CHARSET)))) {
$serendipity['smarty']->assign('is_contactform_sent', true); $serendipity['smarty']->assign('is_contactform_sent', true);
return true; return true;
@ -318,10 +318,10 @@ class serendipity_event_contactform extends serendipity_event {
$commentInfo = array( $commentInfo = array(
'type' => 'NORMAL', 'type' => 'NORMAL',
'source' => 'commentform', 'source' => 'commentform',
'name' => htmlspecialchars(strip_tags($serendipity['POST']['name'])), 'name' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['name'])) : htmlspecialchars(strip_tags($serendipity['POST']['name']), ENT_COMPAT, LANG_CHARSET)),
'url' => htmlspecialchars(strip_tags($serendipity['POST']['url'])), 'url' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)),
'comment' => htmlspecialchars(strip_tags($comment)), 'comment' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($comment)) : htmlspecialchars(strip_tags($comment), ENT_COMPAT, LANG_CHARSET)),
'email' => htmlspecialchars(strip_tags($serendipity['POST']['email'])), 'email' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['email'])) : htmlspecialchars(strip_tags($serendipity['POST']['email']), ENT_COMPAT, LANG_CHARSET)),
'source2' => 'adduser' // Allow the contactform to bypass "only registered users may post" option of the adduser-plugin 'source2' => 'adduser' // Allow the contactform to bypass "only registered users may post" option of the adduser-plugin
); );
serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo); serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo);
@ -340,10 +340,10 @@ class serendipity_event_contactform extends serendipity_event {
if ($this->sendComment( if ($this->sendComment(
$this->get_config('email'), $this->get_config('email'),
htmlspecialchars(strip_tags($serendipity['POST']['name'])), (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['name'])) : htmlspecialchars(strip_tags($serendipity['POST']['name']), ENT_COMPAT, LANG_CHARSET)),
htmlspecialchars(strip_tags($serendipity['POST']['email'])), (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['email'])) : htmlspecialchars(strip_tags($serendipity['POST']['email']), ENT_COMPAT, LANG_CHARSET)),
htmlspecialchars(strip_tags($serendipity['POST']['url'])), (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)),
htmlspecialchars(strip_tags($comment)), (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($comment)) : htmlspecialchars(strip_tags($comment), ENT_COMPAT, LANG_CHARSET)),
true)) { true)) {
$serendipity['smarty']->assign('is_contactform_sent', true); $serendipity['smarty']->assign('is_contactform_sent', true);
@ -398,7 +398,7 @@ class serendipity_event_contactform extends serendipity_event {
$form_fields[$item['name']]['default'] = 'checked="checked"'; $form_fields[$item['name']]['default'] = 'checked="checked"';
break; break;
default: default:
$form_fields[$item['name']]['default'] = htmlspecialchars(strip_tags($item['value'])); $form_fields[$item['name']]['default'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($item['value'])) : htmlspecialchars(strip_tags($item['value']), ENT_COMPAT, LANG_CHARSET));
break; break;
} }
} }
@ -415,11 +415,11 @@ class serendipity_event_contactform extends serendipity_event {
'plugin_contactform_sent' => $this->get_config('sent', PLUGIN_CONTACTFORM_SENT_HTML), 'plugin_contactform_sent' => $this->get_config('sent', PLUGIN_CONTACTFORM_SENT_HTML),
'plugin_contactform_message' => PLUGIN_CONTACTFORM_MESSAGE, 'plugin_contactform_message' => PLUGIN_CONTACTFORM_MESSAGE,
'commentform_action' => $serendipity['baseURL'] . $serendipity['indexFile'], 'commentform_action' => $serendipity['baseURL'] . $serendipity['indexFile'],
'commentform_sname' => htmlspecialchars($serendipity['GET']['subpage']), 'commentform_sname' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['subpage']) : htmlspecialchars($serendipity['GET']['subpage'], ENT_COMPAT, LANG_CHARSET)),
'commentform_name' => htmlspecialchars(strip_tags($serendipity['POST']['name'])), 'commentform_name' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['name'])) : htmlspecialchars(strip_tags($serendipity['POST']['name']), ENT_COMPAT, LANG_CHARSET)),
'commentform_url' => htmlspecialchars(strip_tags($serendipity['POST']['url'])), 'commentform_url' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)),
'commentform_email' => htmlspecialchars(strip_tags($serendipity['POST']['email'])), 'commentform_email' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['email'])) : htmlspecialchars(strip_tags($serendipity['POST']['email']), ENT_COMPAT, LANG_CHARSET)),
'commentform_data' => htmlspecialchars(strip_tags($serendipity['POST']['comment'])), 'commentform_data' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['comment'])) : htmlspecialchars(strip_tags($serendipity['POST']['comment']), ENT_COMPAT, LANG_CHARSET)),
'comments_messagestack' => $serendipity['messagestack']['comments'], 'comments_messagestack' => $serendipity['messagestack']['comments'],
'commentform_entry' => array( 'commentform_entry' => array(
'timestamp' => 1, // force captchas! 'timestamp' => 1, // force captchas!
@ -497,7 +497,7 @@ class serendipity_event_contactform extends serendipity_event {
} }
if ($this->selected()) { if ($this->selected()) {
$serendipity['head_title'] = $this->get_config('pagetitle'); $serendipity['head_title'] = $this->get_config('pagetitle');
$serendipity['head_subtitle'] = htmlspecialchars($serendipity['blogTitle']); $serendipity['head_subtitle'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogTitle']) : htmlspecialchars($serendipity['blogTitle'], ENT_COMPAT, LANG_CHARSET));
} else { } else {
// Put subpage back so static page plugin will work // Put subpage back so static page plugin will work
$serendipity['GET']['subpage'] = $oldsubpage; $serendipity['GET']['subpage'] = $oldsubpage;

6
serendipity_event_contentrewrite/serendipity_event_contentrewrite.php
View file

@ -24,7 +24,7 @@ class serendipity_event_contentrewrite extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_CONTENTREWRITE_DESCRIPTION); $propbag->add('description', PLUGIN_EVENT_CONTENTREWRITE_DESCRIPTION);
$propbag->add('stackable', true); $propbag->add('stackable', true);
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '1.4'); $propbag->add('version', '1.4.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -218,8 +218,8 @@ class serendipity_event_contentrewrite extends serendipity_event
foreach($this->rewrite_from AS $key => $val) { foreach($this->rewrite_from AS $key => $val) {
?> ?>
<tr> <tr>
<th style="font-size: 8pt; font-color: white;"><?php echo htmlspecialchars($val); ?></th> <th style="font-size: 8pt; font-color: white;"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET)); ?></th>
<td><?php echo htmlspecialchars($this->rewrite_to[$key]); ?></td> <td><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->rewrite_to[$key]) : htmlspecialchars($this->rewrite_to[$key], ENT_COMPAT, LANG_CHARSET)); ?></td>
</tr> </tr>
<?php <?php
} }

10
serendipity_event_cpgselector/cpgselector.inc.php
View file

@ -208,7 +208,7 @@ function cpg_displayImageList($page = 0, $lineBreak = NULL, $manage = false, $ur
<?php <?php
foreach($CPG['get'] AS $g_key => $g_val) { foreach($CPG['get'] AS $g_key => $g_val) {
if ( !is_array($g_val) && $g_key != 'page' ) { if ( !is_array($g_val) && $g_key != 'page' ) {
echo '<input type="hidden" name="CPG_POST[' . $g_key . ']" value="' . htmlspecialchars($g_val) . '" />'; echo '<input type="hidden" name="CPG_POST[' . $g_key . ']" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($g_val) : htmlspecialchars($g_val, ENT_COMPAT, LANG_CHARSET)) . '" />';
} }
} }
?> ?>
@ -628,10 +628,10 @@ function cpg_imageSelector_done(textarea)
<input type="hidden" name="thumbName" value="<?php echo $image['thumbnail']; ?>" /> <input type="hidden" name="thumbName" value="<?php echo $image['thumbnail']; ?>" />
<input type="hidden" name="cpg_link" value="<?php echo $image['link']; ?>" /> <input type="hidden" name="cpg_link" value="<?php echo $image['link']; ?>" />
<?php if (!empty($CPG['htmltarget'])) { ?> <?php if (!empty($CPG['htmltarget'])) { ?>
<input type="hidden" name="htmltarget" value="<?php echo htmlspecialchars($CPG['htmltarget']); ?>" /> <input type="hidden" name="htmltarget" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($CPG['htmltarget']) : htmlspecialchars($CPG['htmltarget'], ENT_COMPAT, LANG_CHARSET)); ?>" />
<?php } ?> <?php } ?>
<?php if (!empty($CPG['filename_only'])) { ?> <?php if (!empty($CPG['filename_only'])) { ?>
<input type="hidden" name="filename_only" value="<?php echo htmlspecialchars($CPG['filename_only']); ?>" /> <input type="hidden" name="filename_only" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($CPG['filename_only']) : htmlspecialchars($CPG['filename_only'], ENT_COMPAT, LANG_CHARSET)); ?>" />
<?php } ?> <?php } ?>
<b><?php echo IMAGE_SIZE; ?>:</b> <b><?php echo IMAGE_SIZE; ?>:</b>
@ -679,14 +679,14 @@ function cpg_imageSelector_done(textarea)
if (!empty($CPG['filename_only'])) { if (!empty($CPG['filename_only'])) {
?> ?>
<script type="text/javascript"> <script type="text/javascript">
self.opener.serendipity_imageSelector_addToElement('<?php echo htmlspecialchars($imgName); ?>', '<?php echo htmlspecialchars($CPG['htmltarget']); ?>'); self.opener.serendipity_imageSelector_addToElement('<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($imgName) : htmlspecialchars($imgName, ENT_COMPAT, LANG_CHARSET)); ?>', '<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($CPG['htmltarget']) : htmlspecialchars($CPG['htmltarget'], ENT_COMPAT, LANG_CHARSET)); ?>');
self.close(); self.close();
</script> </script>
<?php <?php
} else { } else {
?> ?>
<script type="text/javascript"> <script type="text/javascript">
block = '<a href="<?php echo htmlspecialchars($imgName); ?>" title="<?php echo htmlspecialchars($file['name'] . '.' . $file['extension']); ?>" target="_blank"><?php echo htmlspecialchars($file['name'] . '.' . $file['extension']); ?></a>'; block = '<a href="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($imgName) : htmlspecialchars($imgName, ENT_COMPAT, LANG_CHARSET)); ?>" title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($file['name'] . '.' . $file['extension']) : htmlspecialchars($file['name'] . '.' . $file['extension'], ENT_COMPAT, LANG_CHARSET)); ?>" target="_blank"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($file['name'] . '.' . $file['extension']) : htmlspecialchars($file['name'] . '.' . $file['extension'], ENT_COMPAT, LANG_CHARSET)); ?></a>';
if (self.opener.editorref) { if (self.opener.editorref) {
self.opener.editorref.surroundHTML(block, ''); self.opener.editorref.surroundHTML(block, '');
} else { } else {

2
serendipity_event_cpgselector/serendipity_event_cpgselector.php
View file

@ -33,7 +33,7 @@ class serendipity_event_cpgselector extends serendipity_event
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Matthew Maude (modified by Jim Davies)'); $propbag->add('author', 'Matthew Maude (modified by Jim Davies)');
$propbag->add('version', '2.08'); $propbag->add('version', '2.08.1');
$propbag->add('requirements', array('serendipity' => '0.8')); $propbag->add('requirements', array('serendipity' => '0.8'));
$propbag->add('configuration', array('server', 'database', 'prefix', 'user', 'password', 'path', 'button', 'usenormal', 'maxwidth', 'maxheight')); $propbag->add('configuration', array('server', 'database', 'prefix', 'user', 'password', 'path', 'button', 'usenormal', 'maxwidth', 'maxheight'));

4
serendipity_event_cronjob/serendipity_event_cronjob.php
View file

@ -22,7 +22,7 @@ class serendipity_event_cronjob extends serendipity_event {
$propbag->add('description', PLUGIN_EVENT_CRONJOB_DESC); $propbag->add('description', PLUGIN_EVENT_CRONJOB_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '0.9'); $propbag->add('version', '0.9.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'php' => '4.1.0' 'php' => '4.1.0'
@ -72,7 +72,7 @@ class serendipity_event_cronjob extends serendipity_event {
$res = serendipity_db_query("SELECT timestamp, type, reason FROM {$serendipity['dbPrefix']}cronjoblog ORDER BY timestamp DESC"); $res = serendipity_db_query("SELECT timestamp, type, reason FROM {$serendipity['dbPrefix']}cronjoblog ORDER BY timestamp DESC");
if (is_array($res)) { if (is_array($res)) {
foreach($res AS $row) { foreach($res AS $row) {
$s .= '<tr><td>' . date('d.m.Y H:i', $row['timestamp']) . '</td><td>' . htmlspecialchars($row['type']) . '</td><td>' . htmlspecialchars($row['reason']) . '</td></tr>' . "\n"; $s .= '<tr><td>' . date('d.m.Y H:i', $row['timestamp']) . '</td><td>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['type']) : htmlspecialchars($row['type'], ENT_COMPAT, LANG_CHARSET)) . '</td><td>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['reason']) : htmlspecialchars($row['reason'], ENT_COMPAT, LANG_CHARSET)) . '</td></tr>' . "\n";
} }
} }
$s .= '</table></fieldset>'; $s .= '</table></fieldset>';

4
serendipity_event_custom_permalinks/serendipity_event_custom_permalinks.php
View file

@ -30,7 +30,7 @@ class serendipity_event_custom_permalinks extends serendipity_event {
'backend_display' => true)); 'backend_display' => true));
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '1.14'); $propbag->add('version', '1.14.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -166,7 +166,7 @@ class serendipity_event_custom_permalinks extends serendipity_event {
<fieldset style="margin: 5px"> <fieldset style="margin: 5px">
<legend><?php echo PLUGIN_EVENT_CUSTOM_PERMALINKS_PL; ?></legend> <legend><?php echo PLUGIN_EVENT_CUSTOM_PERMALINKS_PL; ?></legend>
<div><?php echo PLUGIN_EVENT_CUSTOM_PERMALINKS_PL_DESC; ?><br /><br /></div> <div><?php echo PLUGIN_EVENT_CUSTOM_PERMALINKS_PL_DESC; ?><br /><br /></div>
<label for="permalink" title="<?php echo htmlentities(PLUGIN_EVENT_CUSTOM_PERMALINKS_PL); ?>"><?php echo PLUGIN_EVENT_CUSTOM_PERMALINKS_PL; ?>:</label> <input class="input_textbox" type="text" style="width: 60%" name="serendipity[permalink]" id="permalink" value="<?php echo htmlspecialchars($permalink); ?>" /> <label for="permalink" title="<?php echo htmlentities(PLUGIN_EVENT_CUSTOM_PERMALINKS_PL); ?>"><?php echo PLUGIN_EVENT_CUSTOM_PERMALINKS_PL; ?>:</label> <input class="input_textbox" type="text" style="width: 60%" name="serendipity[permalink]" id="permalink" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($permalink) : htmlspecialchars($permalink, ENT_COMPAT, LANG_CHARSET)); ?>" />
</fieldset> </fieldset>
<?php <?php
return true; return true;

6
serendipity_event_customarchive/serendipity_event_customarchive.php
View file

@ -94,7 +94,7 @@ class serendipity_event_customarchive extends serendipity_event {
$propbag->add('event_hooks', array('entries_header' => true, 'entry_display' => true, 'genpage' => true)); $propbag->add('event_hooks', array('entries_header' => true, 'entry_display' => true, 'genpage' => true));
$propbag->add('configuration', array('permalink', 'pagetitle', 'articleformat')); $propbag->add('configuration', array('permalink', 'pagetitle', 'articleformat'));
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '1.12'); $propbag->add('version', '1.12.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -143,7 +143,7 @@ class serendipity_event_customarchive extends serendipity_event {
echo '<select name="serendipity[' . $name . ']">' . "\n"; echo '<select name="serendipity[' . $name . ']">' . "\n";
foreach ($values AS $value) { foreach ($values AS $value) {
echo '<option value="' . $value['value'] . '" ' . ($serendipity['GET'][$name] == $value['value'] ? 'selected="selected"' : '') . '>' . htmlspecialchars($value['desc']) . '</option>' . "\n"; echo '<option value="' . $value['value'] . '" ' . ($serendipity['GET'][$name] == $value['value'] ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($value['desc']) : htmlspecialchars($value['desc'], ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
echo '</select>' . "\n"; echo '</select>' . "\n";
} }
@ -211,7 +211,7 @@ class serendipity_event_customarchive extends serendipity_event {
array('timestamp' => $entry['timestamp']) array('timestamp' => $entry['timestamp'])
); );
$entryHTML = '<a href="' . $entryLink . '" title="' . htmlspecialchars($entry['title']) . '">' . $entry['title'] . '</a><br />'; $entryHTML = '<a href="' . $entryLink . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '">' . $entry['title'] . '</a><br />';
$key = ''; $key = '';
switch($serendipity['GET']['custom_sortfield']) { switch($serendipity['GET']['custom_sortfield']) {

26
serendipity_event_dashboard/serendipity_event_dashboard.php
View file

@ -27,7 +27,7 @@ class serendipity_event_dashboard extends serendipity_event {
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '0.6.8'); $propbag->add('version', '0.6.9');
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('configuration', array('read_only', 'limit_draft', 'limit_comments', 'limit_comments_pending', 'limit_future', 'sequence', 'update')); $propbag->add('configuration', array('read_only', 'limit_draft', 'limit_comments', 'limit_comments_pending', 'limit_future', 'sequence', 'update'));
@ -164,12 +164,12 @@ class serendipity_event_dashboard extends serendipity_event {
$comment['excerpt'] = true; $comment['excerpt'] = true;
// When summary is not the full body, strip HTML tags from summary, as it might break and leave unclosed HTML. // When summary is not the full body, strip HTML tags from summary, as it might break and leave unclosed HTML.
$comment['fullBody'] = nl2br(htmlspecialchars($comment['fullBody'])); $comment['fullBody'] = nl2br((function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['fullBody']) : htmlspecialchars($comment['fullBody'], ENT_COMPAT, LANG_CHARSET)));
$comment['summary'] = nl2br(strip_tags($comment['summary'])); $comment['summary'] = nl2br(strip_tags($comment['summary']));
} else { } else {
$comment['excerpt'] = false; $comment['excerpt'] = false;
$comment['fullBody'] = $comment['summary'] = nl2br(htmlspecialchars($comment['fullBody'])); $comment['fullBody'] = $comment['summary'] = nl2br((function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['fullBody']) : htmlspecialchars($comment['fullBody'], ENT_COMPAT, LANG_CHARSET)));
} }
#serendipity_plugin_api::hook_event('backend_view_comment', $comment, '&amp;serendipity[page]='. $page . $searchString); #serendipity_plugin_api::hook_event('backend_view_comment', $comment, '&amp;serendipity[page]='. $page . $searchString);
@ -185,21 +185,21 @@ class serendipity_event_dashboard extends serendipity_event {
<img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="<?php echo serendipity_getTemplateFile('admin/img/admin_msg_note.png'); ?>" alt="" /> <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="<?php echo serendipity_getTemplateFile('admin/img/admin_msg_note.png'); ?>" alt="" />
<?php }?> <?php }?>
<a name="c<?php echo $comment['id'] ?>"></a> <a name="c<?php echo $comment['id'] ?>"></a>
<?php echo ($comment['type'] == 'NORMAL' ? COMMENT : ($comment['type'] == 'TRACKBACK' ? TRACKBACK : PINGBACK )) . ' #'. $comment['id'] .', '. IN_REPLY_TO .' <strong><a href="' . $comment['entry_url'] . '">'. htmlspecialchars($comment['title']) .'</a></strong>, '. ON . ' ' . serendipity_formatTime('%b %e %Y, %H:%M', $comment['timestamp'])?> <?php echo ($comment['type'] == 'NORMAL' ? COMMENT : ($comment['type'] == 'TRACKBACK' ? TRACKBACK : PINGBACK )) . ' #'. $comment['id'] .', '. IN_REPLY_TO .' <strong><a href="' . $comment['entry_url'] . '">'. (function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['title']) : htmlspecialchars($comment['title'], ENT_COMPAT, LANG_CHARSET)) .'</a></strong>, '. ON . ' ' . serendipity_formatTime('%b %e %Y, %H:%M', $comment['timestamp'])?>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="serendipity_admin_list_item <?php echo $class ?>" id="comment_<?php echo $comment['id'] ?>"> <td class="serendipity_admin_list_item <?php echo $class ?>" id="comment_<?php echo $comment['id'] ?>">
<table width="100%" cellspacing="0" cellpadding="3" border="0"> <table width="100%" cellspacing="0" cellpadding="3" border="0">
<tr> <tr>
<td width="40%"><strong><?php echo AUTHOR ?></strong>: <?php echo htmlspecialchars(serendipity_truncateString($comment['author'],30)) . $comment['action_author']; ?></td> <td width="40%"><strong><?php echo AUTHOR ?></strong>: <?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_truncateString($comment['author'],30)) : htmlspecialchars(serendipity_truncateString($comment['author'],30), ENT_COMPAT, LANG_CHARSET)) . $comment['action_author']; ?></td>
<td><strong><?php echo EMAIL ?></strong>: <td><strong><?php echo EMAIL ?></strong>:
<?php <?php
if ( empty($comment['email']) ) { if ( empty($comment['email']) ) {
echo 'N/A'; echo 'N/A';
} else { } else {
?> ?>
<a href="mailto:<?php echo htmlspecialchars($comment['email']) ?>" title="<?php echo htmlspecialchars($comment['email']) ?>"><?php echo htmlspecialchars(serendipity_truncateString($comment['email'],30)) ?></a> <a href="mailto:<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['email']) : htmlspecialchars($comment['email'], ENT_COMPAT, LANG_CHARSET)) ?>" title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['email']) : htmlspecialchars($comment['email'], ENT_COMPAT, LANG_CHARSET)) ?>"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_truncateString($comment['email'],30)) : htmlspecialchars(serendipity_truncateString($comment['email'],30), ENT_COMPAT, LANG_CHARSET)) ?></a>
<?php } ?> <?php } ?>
<?php echo $comment['action_email']; ?> <?php echo $comment['action_email']; ?>
</td> </td>
@ -210,7 +210,7 @@ class serendipity_event_dashboard extends serendipity_event {
if ( empty($comment['ip']) ) { if ( empty($comment['ip']) ) {
echo '0.0.0.0'; echo '0.0.0.0';
} else { } else {
echo htmlspecialchars($comment['ip']); echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['ip']) : htmlspecialchars($comment['ip'], ENT_COMPAT, LANG_CHARSET));
} }
?> ?>
<?php echo $comment['action_ip']; ?> <?php echo $comment['action_ip']; ?>
@ -221,7 +221,7 @@ class serendipity_event_dashboard extends serendipity_event {
echo 'N/A'; echo 'N/A';
} else { } else {
?> ?>
<a href="<?php echo htmlspecialchars($comment['url']) ?>" title="<?php echo htmlspecialchars($comment['url']) ?>" target="_blank"><?php echo htmlspecialchars(serendipity_truncateString($comment['url'],30)) ?></a> <a href="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['url']) : htmlspecialchars($comment['url'], ENT_COMPAT, LANG_CHARSET)) ?>" title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['url']) : htmlspecialchars($comment['url'], ENT_COMPAT, LANG_CHARSET)) ?>" target="_blank"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_truncateString($comment['url'],30)) : htmlspecialchars(serendipity_truncateString($comment['url'],30), ENT_COMPAT, LANG_CHARSET)) ?></a>
<?php } ?> <?php } ?>
<?php echo $comment['action_url']; ?> <?php echo $comment['action_url']; ?>
</td> </td>
@ -234,7 +234,7 @@ class serendipity_event_dashboard extends serendipity_event {
echo 'N/A'; echo 'N/A';
} else { } else {
?> ?>
<a href="<?php echo htmlspecialchars($comment['referer']) ?>" title="<?php echo htmlspecialchars($comment['referer']) ?>" target="_blank"><?php echo htmlspecialchars(serendipity_truncateString($comment['referer'],30)) ?></a> <a href="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['referer']) : htmlspecialchars($comment['referer'], ENT_COMPAT, LANG_CHARSET)) ?>" title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['referer']) : htmlspecialchars($comment['referer'], ENT_COMPAT, LANG_CHARSET)) ?>" target="_blank"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_truncateString($comment['referer'],30)) : htmlspecialchars(serendipity_truncateString($comment['referer'],30), ENT_COMPAT, LANG_CHARSET)) ?></a>
<?php } ?> <?php } ?>
<?php echo $comment['action_referer']; ?> <?php echo $comment['action_referer']; ?>
</td> </td>
@ -257,7 +257,7 @@ class serendipity_event_dashboard extends serendipity_event {
<a target="_blank" href="<?php echo $entrylink; ?>" title="<?php echo VIEW; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><?php echo VIEW ?></a> <a target="_blank" href="<?php echo $entrylink; ?>" title="<?php echo VIEW; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><?php echo VIEW ?></a>
<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" title="<?php echo EDIT; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a> <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" title="<?php echo EDIT; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>
<?php if (!serendipity_db_bool($this->get_config('read_only'))) { ?> <?php if (!serendipity_db_bool($this->get_config('read_only'))) { ?>
<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" onclick='return confirm("<?php echo sprintf(COMMENT_DELETE_CONFIRM, $comment['id'], htmlspecialchars($comment['author'])) ?>")' title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a> <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" onclick='return confirm("<?php echo sprintf(COMMENT_DELETE_CONFIRM, $comment['id'], (function_exists('serendipity_specialchars') ? serendipity_specialchars($comment['author']) : htmlspecialchars($comment['author'], ENT_COMPAT, LANG_CHARSET))) ?>")' title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
<?php } ?> <?php } ?>
<a target="_blank" onclick="cf = window.open(this.href, 'CommentForm', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1'); cf.focus(); return false;" href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=reply&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;serendipity[noBanner]=true&amp;serendipity[noSidebar]=true&amp;<?php echo serendipity_setFormToken('url'); ?>" title="<?php echo REPLY ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/user_editor.png'); ?>" alt="<?php echo REPLY; ?>" /><?php echo REPLY ?></a> <a target="_blank" onclick="cf = window.open(this.href, 'CommentForm', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1'); cf.focus(); return false;" href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=reply&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;serendipity[noBanner]=true&amp;serendipity[noSidebar]=true&amp;<?php echo serendipity_setFormToken('url'); ?>" title="<?php echo REPLY ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/user_editor.png'); ?>" alt="<?php echo REPLY; ?>" /><?php echo REPLY ?></a>
<?php echo $comment['action_more']; ?> <?php echo $comment['action_more']; ?>
@ -318,7 +318,7 @@ class serendipity_event_dashboard extends serendipity_event {
<table width="100%" cellspacing="0" cellpadding="3"> <table width="100%" cellspacing="0" cellpadding="3">
<tr> <tr>
<td> <td>
<strong><?php echo $entry_pre; ?><a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo serendipity_truncateString(htmlspecialchars($entry['title']),50) ?></a></strong> <strong><?php echo $entry_pre; ?><a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo serendipity_truncateString((function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)),50) ?></a></strong>
</td> </td>
<td align="right"> <td align="right">
<?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entry['timestamp']) . ' ' .$lm; ?> <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entry['timestamp']) . ' ' .$lm; ?>
@ -327,13 +327,13 @@ class serendipity_event_dashboard extends serendipity_event {
<tr> <tr>
<td> <td>
<?php <?php
echo POSTED_BY . ' ' . htmlspecialchars($entry['author']); echo POSTED_BY . ' ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['author']) : htmlspecialchars($entry['author'], ENT_COMPAT, LANG_CHARSET));
if (count($entry['categories'])) { if (count($entry['categories'])) {
echo ' ' . IN . ' '; echo ' ' . IN . ' ';
$cats = array(); $cats = array();
foreach ($entry['categories'] as $cat) { foreach ($entry['categories'] as $cat) {
$caturl = serendipity_categoryURL($cat); $caturl = serendipity_categoryURL($cat);
$cats[] = '<a href="' . $caturl . '">' . htmlspecialchars($cat['category_name']) . '</a>'; $cats[] = '<a href="' . $caturl . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($cat['category_name']) : htmlspecialchars($cat['category_name'], ENT_COMPAT, LANG_CHARSET)) . '</a>';
} }
echo implode(', ', $cats); echo implode(', ', $cats);
} }

6
serendipity_event_entrypaging/serendipity_event_entrypaging.php
View file

@ -26,7 +26,7 @@ class serendipity_event_entrypaging extends serendipity_event
$propbag->add('description', PLUGIN_ENTRYPAGING_BLAHBLAH); $propbag->add('description', PLUGIN_ENTRYPAGING_BLAHBLAH);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Wesley Hwang-Chung'); $propbag->add('author', 'Garvin Hicking, Wesley Hwang-Chung');
$propbag->add('version', '1.39'); $propbag->add('version', '1.39.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -109,9 +109,9 @@ class serendipity_event_entrypaging extends serendipity_event
} }
// what above does is to retrieve the multilingual title, if available // what above does is to retrieve the multilingual title, if available
$title = htmlspecialchars($localtitle[0]); $title = (function_exists('serendipity_specialchars') ? serendipity_specialchars($localtitle[0]) : htmlspecialchars($localtitle[0], ENT_COMPAT, LANG_CHARSET));
if ($this->get_config($type) != '') { if ($this->get_config($type) != '') {
$title = htmlspecialchars($this->get_config($type)); $title = (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_config($type)) : htmlspecialchars($this->get_config($type), ENT_COMPAT, LANG_CHARSET));
} }
if (empty($title)) { if (empty($title)) {
if ($type == 'next') { if ($type == 'next') {

6
serendipity_event_facebook/serendipity_event_facebook.php
View file

@ -33,7 +33,7 @@ class serendipity_event_facebook extends serendipity_event {
'smarty' => '2.6.7', 'smarty' => '2.6.7',
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '0.5'); $propbag->add('version', '0.5.1');
$propbag->add('groups', array('FRONTEND_VIEWS')); $propbag->add('groups', array('FRONTEND_VIEWS'));
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
'frontend_display' => true, 'frontend_display' => true,
@ -362,13 +362,13 @@ class serendipity_event_facebook extends serendipity_event {
// Taken from: http://developers.facebook.com/docs/opengraph/ // Taken from: http://developers.facebook.com/docs/opengraph/
echo '<!--serendipity_event_facebook-->' . "\n"; echo '<!--serendipity_event_facebook-->' . "\n";
echo '<meta property="og:title" content="' . htmlspecialchars($GLOBALS['entry'][0]['title']) . '" />' . "\n"; echo '<meta property="og:title" content="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($GLOBALS['entry'][0]['title']) : htmlspecialchars($GLOBALS['entry'][0]['title'], ENT_COMPAT, LANG_CHARSET)) . '" />' . "\n";
echo '<meta property="og:description" content="' . substr(strip_tags($GLOBALS['entry'][0]['body']), 0, 200) . '..." />' . "\n"; echo '<meta property="og:description" content="' . substr(strip_tags($GLOBALS['entry'][0]['body']), 0, 200) . '..." />' . "\n";
echo '<meta property="og:type" content="article" />' . "\n"; echo '<meta property="og:type" content="article" />' . "\n";
echo '<meta property="og:site_name" content="' . $serendipity['blogTitle'] . '" />' . "\n"; echo '<meta property="og:site_name" content="' . $serendipity['blogTitle'] . '" />' . "\n";
echo '<meta property="og:url" content="http' . ($_SERVER['HTTPS'] ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . htmlspecialchars($_SERVER['REQUEST_URI']) . '" />' . "\n"; echo '<meta property="og:url" content="http' . ($_SERVER['HTTPS'] ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . (function_exists('serendipity_specialchars') ? serendipity_specialchars($_SERVER['REQUEST_URI']) : htmlspecialchars($_SERVER['REQUEST_URI'], ENT_COMPAT, LANG_CHARSET)) . '" />' . "\n";
if (preg_match('@<img.*src=["\'](.+)["\']@imsU', $GLOBALS['entry'][0]['body'] . $GLOBALS['entry'][0]['extended'], $im)) { if (preg_match('@<img.*src=["\'](.+)["\']@imsU', $GLOBALS['entry'][0]['body'] . $GLOBALS['entry'][0]['extended'], $im)) {
if (preg_match('/^http/i', $im[1])) { if (preg_match('/^http/i', $im[1])) {

50
serendipity_event_faq/serendipity_event_faq.php
View file

@ -88,7 +88,7 @@ class serendipity_event_faq extends serendipity_event
$propbag->add('name', FAQ_NAME); $propbag->add('name', FAQ_NAME);
$propbag->add('description', FAQ_NAME_DESC); $propbag->add('description', FAQ_NAME_DESC);
$propbag->add('author', 'Falk Doering'); $propbag->add('author', 'Falk Doering');
$propbag->add('version', '1.12'); $propbag->add('version', '1.12.1');
$propbag->add('copyright', 'LGPL'); $propbag->add('copyright', 'LGPL');
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('requirements', array( $propbag->add('requirements', array(
@ -620,8 +620,8 @@ class serendipity_event_faq extends serendipity_event
$serendipity['POST']['typeSubmit'] = true; $serendipity['POST']['typeSubmit'] = true;
$bag = new serendipity_property_bag(); $bag = new serendipity_property_bag();
$this->introspect($bag); $this->introspect($bag);
$name = htmlspecialchars($bag->get('name')); $name = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('name')) : htmlspecialchars($bag->get('name'), ENT_COMPAT, LANG_CHARSET));
$desc = htmlspecialchars($bag->get('description')); $desc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('description')) : htmlspecialchars($bag->get('description'), ENT_COMPAT, LANG_CHARSET));
$config_faq = $bag->get('configuration_faq'); $config_faq = $bag->get('configuration_faq');
foreach ($config_faq as $config_item) { foreach ($config_faq as $config_item) {
@ -682,8 +682,8 @@ class serendipity_event_faq extends serendipity_event
$serendipity['POST']['categorySubmit'] = true; $serendipity['POST']['categorySubmit'] = true;
$bag = new serendipity_property_bag(); $bag = new serendipity_property_bag();
$this->introspect($bag); $this->introspect($bag);
$name = htmlspecialchars($bag->get('name')); $name = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('name')) : htmlspecialchars($bag->get('name'), ENT_COMPAT, LANG_CHARSET));
$desc = htmlspecialchars($bag->get('description')); $desc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('description')) : htmlspecialchars($bag->get('description'), ENT_COMPAT, LANG_CHARSET));
$config_faq = $bag->get('configuration_category'); $config_faq = $bag->get('configuration_category');
foreach ($config_faq as $config_item) { foreach ($config_faq as $config_item) {
$cbag = new serendipity_property_bag(); $cbag = new serendipity_property_bag();
@ -1113,7 +1113,7 @@ class serendipity_event_faq extends serendipity_event
$results = serendipity_db_query($querystring); $results = serendipity_db_query($querystring);
if (!is_array($results)) { if (!is_array($results)) {
if ($results !== 1 && $results !== true) { if ($results !== 1 && $results !== true) {
echo htmlspecialchars($results); echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($results) : htmlspecialchars($results, ENT_COMPAT, LANG_CHARSET));
} }
$results = array(); $results = array();
} }
@ -1167,10 +1167,10 @@ class serendipity_event_faq extends serendipity_event
$cbag = new serendipity_property_bag(); $cbag = new serendipity_property_bag();
$this->introspect_faq_item($config_item, $cbag); $this->introspect_faq_item($config_item, $cbag);
$cname = htmlspecialchars($cbag->get('name')); $cname = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET));
$cdesc = htmlspecialchars($cbag->get('description')); $cdesc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('description')) : htmlspecialchars($cbag->get('description'), ENT_COMPAT, LANG_CHARSET));
$value = $this->getFaq($config_item, 'unset'); $value = $this->getFaq($config_item, 'unset');
$lang_direction = htmlspecialchars($cbag->get('lang_direction')); $lang_direction = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('lang_direction')) : htmlspecialchars($cbag->get('lang_direction'), ENT_COMPAT, LANG_CHARSET));
if (empty($lang_direction)) { if (empty($lang_direction)) {
$lang_direction = LANG_DIRECTION; $lang_direction = LANG_DIRECTION;
@ -1180,7 +1180,7 @@ class serendipity_event_faq extends serendipity_event
$value = $cbag->get('default'); $value = $cbag->get('default');
} }
$hvalue = (!isset($serendipity['POST']['faqSubmit']) && isset($serendipity['POST']['plugin'][$config_item]) ? htmlspecialchars($serendipity['POST']['plugin'][$config_item]) : htmlspecialchars($value)); $hvalue = (!isset($serendipity['POST']['faqSubmit']) && isset($serendipity['POST']['plugin'][$config_item]) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['plugin'][$config_item]) : htmlspecialchars($serendipity['POST']['plugin'][$config_item], ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($value) : htmlspecialchars($value, ENT_COMPAT, LANG_CHARSET)));
$radio = array(); $radio = array();
$select = array(); $select = array();
$per_row = null; $per_row = null;
@ -1210,10 +1210,10 @@ class serendipity_event_faq extends serendipity_event
<select class="direction_<?php echo $lang_direction; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]"> <select class="direction_<?php echo $lang_direction; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]">
<?php <?php
foreach($select AS $select_value => $select_desc) { foreach($select AS $select_value => $select_desc) {
$id = htmlspecialchars($config_item . $select_value); $id = (function_exists('serendipity_specialchars') ? serendipity_specialchars($config_item . $select_value) : htmlspecialchars($config_item . $select_value, ENT_COMPAT, LANG_CHARSET));
?> ?>
<option value="<?php echo $select_value; ?>" <?php echo ($select_value == $hvalue ? 'selected="selected"' : ''); ?> title="<?php echo htmlspecialchars($select_desc); ?>" /> <option value="<?php echo $select_value; ?>" <?php echo ($select_value == $hvalue ? 'selected="selected"' : ''); ?> title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($select_desc) : htmlspecialchars($select_desc, ENT_COMPAT, LANG_CHARSET)); ?>" />
<?php echo htmlspecialchars($select_desc); ?> <?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($select_desc) : htmlspecialchars($select_desc, ENT_COMPAT, LANG_CHARSET)); ?>
</option> </option>
<?php <?php
} }
@ -1263,7 +1263,7 @@ class serendipity_event_faq extends serendipity_event
<?php <?php
$counter = 0; $counter = 0;
foreach($radio['value'] AS $radio_index => $radio_value) { foreach($radio['value'] AS $radio_index => $radio_value) {
$id = htmlspecialchars($config_item . $radio_value); $id = (function_exists('serendipity_specialchars') ? serendipity_specialchars($config_item . $radio_value) : htmlspecialchars($config_item . $radio_value, ENT_COMPAT, LANG_CHARSET));
$counter++; $counter++;
$checked = ""; $checked = "";
@ -1281,8 +1281,8 @@ class serendipity_event_faq extends serendipity_event
<?php <?php
} }
?> ?>
<input class="direction_<?php echo $lang_direction; ?> input_radio" type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo $checked ?> title="<?php echo htmlspecialchars($radio['desc'][$radio_index]); ?>" /> <input class="direction_<?php echo $lang_direction; ?> input_radio" type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo $checked ?> title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($radio['desc'][$radio_index]) : htmlspecialchars($radio['desc'][$radio_index], ENT_COMPAT, LANG_CHARSET)); ?>" />
<label for="serendipity_plugin_<?php echo $id; ?>"><?php echo htmlspecialchars($radio['desc'][$radio_index]); ?></label> <label for="serendipity_plugin_<?php echo $id; ?>"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($radio['desc'][$radio_index]) : htmlspecialchars($radio['desc'][$radio_index], ENT_COMPAT, LANG_CHARSET)); ?></label>
<?php <?php
if ($counter == $per_row) { if ($counter == $per_row) {
$counter = 0; $counter = 0;
@ -1438,10 +1438,10 @@ class serendipity_event_faq extends serendipity_event
$cbag = new serendipity_property_bag(); $cbag = new serendipity_property_bag();
$this->introspect_category_item($config_item, $cbag); $this->introspect_category_item($config_item, $cbag);
$cname = htmlspecialchars($cbag->get('name')); $cname = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name') : htmlspecialchars($cbag->get('name', ENT_COMPAT, LANG_CHARSET)));
$cdesc = htmlspecialchars($cbag->get('description')); $cdesc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('description') : htmlspecialchars($cbag->get('description', ENT_COMPAT, LANG_CHARSET)));
$value = $this->getCategory($config_item, 'unset'); $value = $this->getCategory($config_item, 'unset');
$lang_direction = htmlspecialchars($cbag->get('lang_direction')); $lang_direction = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('lang_direction') : htmlspecialchars($cbag->get('lang_direction', ENT_COMPAT, LANG_CHARSET)));
if (empty($lang_direction)) { if (empty($lang_direction)) {
$lang_direction = LANG_DIRECTION; $lang_direction = LANG_DIRECTION;
@ -1451,7 +1451,7 @@ class serendipity_event_faq extends serendipity_event
$value = $cbag->get('default'); $value = $cbag->get('default');
} }
$hvalue = (!isset($serendipity['POST']['categorySubmit']) && isset($serendipity['POST']['plugin'][$config_item]) ? htmlspecialchars($serendipity['POST']['plugin'][$config_item]) : htmlspecialchars($value)); $hvalue = (!isset($serendipity['POST']['categorySubmit']) && isset($serendipity['POST']['plugin'][$config_item]) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['plugin'][$config_item]) : htmlspecialchars($serendipity['POST']['plugin'][$config_item], ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($value) : htmlspecialchars($value, ENT_COMPAT, LANG_CHARSET)));
$radio = array(); $radio = array();
$select = array(); $select = array();
$per_row = null; $per_row = null;
@ -1477,8 +1477,8 @@ class serendipity_event_faq extends serendipity_event
<select class="direction_<?php echo $lang_direction; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]"> <select class="direction_<?php echo $lang_direction; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]">
<?php <?php
foreach($select AS $select_value => $select_desc) { foreach($select AS $select_value => $select_desc) {
$id = htmlspecialchars($config_item . $select_value); $id = (function_exists('serendipity_specialchars') ? serendipity_specialchars($config_item . $select_value) : htmlspecialchars($config_item . $select_value, ENT_COMPAT, LANG_CHARSET));
echo '<option value="'.$select_value.'" '.($select_value == $hvalue ? 'selected="selected"' : '').' title="'.htmlspecialchars($select_desc).'" />'.htmlspecialchars($select_desc).'</option>'; echo '<option value="'.$select_value.'" '.($select_value == $hvalue ? 'selected="selected"' : '').' title="'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($select_desc) : htmlspecialchars($select_desc, ENT_COMPAT, LANG_CHARSET)).'" />'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($select_desc) : htmlspecialchars($select_desc, ENT_COMPAT, LANG_CHARSET)).'</option>';
} }
?> ?>
</select> </select>
@ -1526,7 +1526,7 @@ class serendipity_event_faq extends serendipity_event
<?php <?php
$counter = 0; $counter = 0;
foreach($radio['value'] AS $radio_index => $radio_value) { foreach($radio['value'] AS $radio_index => $radio_value) {
$id = htmlspecialchars($config_item . $radio_value); $id = (function_exists('serendipity_specialchars') ? serendipity_specialchars($config_item . $radio_value) : htmlspecialchars($config_item . $radio_value, ENT_COMPAT, LANG_CHARSET));
$counter++; $counter++;
$checked = ""; $checked = "";
@ -1544,8 +1544,8 @@ class serendipity_event_faq extends serendipity_event
<?php <?php
} }
?> ?>
<input class="direction_<?php echo $lang_direction; ?> input_radio" type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo $checked ?> title="<?php echo htmlspecialchars($radio['desc'][$radio_index]); ?>" /> <input class="direction_<?php echo $lang_direction; ?> input_radio" type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo $checked ?> title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($radio['desc'][$radio_index]) : htmlspecialchars($radio['desc'][$radio_index], ENT_COMPAT, LANG_CHARSET)); ?>" />
<label for="serendipity_plugin_<?php echo $id; ?>"><?php echo htmlspecialchars($radio['desc'][$radio_index]); ?></label> <label for="serendipity_plugin_<?php echo $id; ?>"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($radio['desc'][$radio_index]) : htmlspecialchars($radio['desc'][$radio_index], ENT_COMPAT, LANG_CHARSET)); ?></label>
<?php <?php
if ($counter == $per_row) { if ($counter == $per_row) {
$counter = 0; $counter = 0;

4
serendipity_event_fckeditor/serendipity_event_fckeditor.php
View file

@ -29,7 +29,7 @@ class serendipity_event_fckeditor extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_FCKEDITOR_DESC); $propbag->add('description', PLUGIN_EVENT_FCKEDITOR_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Ziyad Saeed, Garvin Hicking, Ian'); $propbag->add('author', 'Ziyad Saeed, Garvin Hicking, Ian');
$propbag->add('version', '0.9'); $propbag->add('version', '0.9.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.9', 'serendipity' => '0.9',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -82,7 +82,7 @@ class serendipity_event_fckeditor extends serendipity_event
break; break;
case 'backend_wysiwyg_finish': case 'backend_wysiwyg_finish':
$path = htmlspecialchars($this->get_config('path')); $path = (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_config('path')) : htmlspecialchars($this->get_config('path'), ENT_COMPAT, LANG_CHARSET));
if ($this->init) { if ($this->init) {
return true; return true;
} }

6
serendipity_event_filter_entries/serendipity_event_filter_entries.php
View file

@ -26,7 +26,7 @@ class serendipity_event_filter_entries extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_FILTER_ENTRIES_DESC); $propbag->add('description', PLUGIN_EVENT_FILTER_ENTRIES_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '1.7'); $propbag->add('version', '1.7.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -96,7 +96,7 @@ class serendipity_event_filter_entries extends serendipity_event
$users = serendipity_fetchUsers(); $users = serendipity_fetchUsers();
if (is_array($users)) { if (is_array($users)) {
foreach ($users AS $user) { foreach ($users AS $user) {
echo '<option value="' . $user['authorid'] . '" ' . (isset($_SESSION['filter']['author']) && $_SESSION['filter']['author'] == $user['authorid'] ? 'selected="selected"' : '') . '>' . htmlspecialchars($user['realname']) . '</option>' . "\n"; echo '<option value="' . $user['authorid'] . '" ' . (isset($_SESSION['filter']['author']) && $_SESSION['filter']['author'] == $user['authorid'] ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($user['realname']) : htmlspecialchars($user['realname'], ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
} }
?> </select> ?> </select>
@ -114,7 +114,7 @@ class serendipity_event_filter_entries extends serendipity_event
?> </select> ?> </select>
</td> </td>
<td width="80"><?php echo CONTENT ?></td> <td width="80"><?php echo CONTENT ?></td>
<td><input size="10" type="text" name="filter[body]" value="<?php echo (isset($_SESSION['filter']['body']) ? htmlspecialchars($_SESSION['filter']['body']) : '') ?>" /></td> <td><input size="10" type="text" name="filter[body]" value="<?php echo (isset($_SESSION['filter']['body']) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($_SESSION['filter']['body']) : htmlspecialchars($_SESSION['filter']['body'], ENT_COMPAT, LANG_CHARSET)) : '') ?>" /></td>
</tr> </tr>
<tr> <tr>
<td colspan="6" style="text-align: left"><strong><?php echo SORT_ORDER ?></strong></td> <td colspan="6" style="text-align: left"><strong><?php echo SORT_ORDER ?></strong></td>

8
serendipity_event_flattr/serendipity_event_flattr.php
View file

@ -60,7 +60,7 @@ class serendipity_event_flattr extends serendipity_event {
'add_to_feed', 'add_to_feed',
)); ));
$propbag->add('author', 'Garvin Hicking, Joachim Breitner', 'Matthias Gutjahr'); $propbag->add('author', 'Garvin Hicking, Joachim Breitner', 'Matthias Gutjahr');
$propbag->add('version', '1.12'); $propbag->add('version', '1.12.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.7', 'serendipity' => '0.7',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -280,11 +280,11 @@ class serendipity_event_flattr extends serendipity_event {
$opt = array('1' => YES, '-1' => NO); $opt = array('1' => YES, '-1' => NO);
} }
foreach($opt AS $key => $kval) { foreach($opt AS $key => $kval) {
echo '<option value="' . $key . '" ' . ((string)$val == (string)$key ? 'selected="selected"' : '') . '>' . htmlspecialchars($kval) . '</option>' . "\n"; echo '<option value="' . $key . '" ' . ((string)$val == (string)$key ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($kval) : htmlspecialchars($kval, ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
echo '</select>'; echo '</select>';
} else { } else {
echo '<input type="text" name="serendipity[properties][ep_' . $attr . ']" id="properties_' . $attr . '" class="input_textbox" value="' . htmlspecialchars($val) . '" style="width: 100%" />' . "\n"; echo '<input type="text" name="serendipity[properties][ep_' . $attr . ']" id="properties_' . $attr . '" class="input_textbox" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET)) . '" style="width: 100%" />' . "\n";
} }
echo '<br />'; echo '<br />';
} }
@ -406,7 +406,7 @@ class serendipity_event_flattr extends serendipity_event {
if ($addData['from'] == 'functions_entries:updertEntry') { if ($addData['from'] == 'functions_entries:updertEntry') {
} elseif ($addData['from'] == 'functions_entries:printEntries_rss') { } elseif ($addData['from'] == 'functions_entries:printEntries_rss') {
$entryText =& $this->getFieldReference($field, $eventData); $entryText =& $this->getFieldReference($field, $eventData);
$entryText .= htmlspecialchars($flattr); $entryText .= (function_exists('serendipity_specialchars') ? serendipity_specialchars($flattr) : htmlspecialchars($flattr, ENT_COMPAT, LANG_CHARSET));
} else { } else {
$entryText =& $this->getFieldReference($field, $eventData); $entryText =& $this->getFieldReference($field, $eventData);
$entryText .= $flattr; $entryText .= $flattr;

20
serendipity_event_flickr/serendipity_event_flickr.php
View file

@ -31,7 +31,7 @@ class serendipity_event_flickr extends serendipity_event
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('license', 'GPL'); $propbag->add('license', 'GPL');
$propbag->add('author', 'Jay Bertrand'); $propbag->add('author', 'Jay Bertrand');
$propbag->add('version', '0.5'); $propbag->add('version', '0.5.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.9', 'serendipity' => '0.9',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -133,14 +133,14 @@ class serendipity_event_flickr extends serendipity_event
<input type="hidden" name="serendipity[adminAction]" value="flickr" /> <input type="hidden" name="serendipity[adminAction]" value="flickr" />
<input type="hidden" name="serendipity[flickr_page]" value="1" /> <input type="hidden" name="serendipity[flickr_page]" value="1" />
Flickr username: <input class="input_textbox" name="serendipity[flickr_username]" value="<?php echo htmlspecialchars($serendipity['POST']['flickr_username']) ?>" /> Flickr username: <input class="input_textbox" name="serendipity[flickr_username]" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['flickr_username']) : htmlspecialchars($serendipity['POST']['flickr_username'], ENT_COMPAT, LANG_CHARSET)) ?>" />
<input type="submit" value="<?php echo GO; ?>" class="serendipityPrettyButton input_button" /><br /><br /> <input type="submit" value="<?php echo GO; ?>" class="serendipityPrettyButton input_button" /><br /><br />
<a style="border: 0pt none ; text-decoration: none;" href="#" onclick="flickr_toggleExtended(); return false" <a style="border: 0pt none ; text-decoration: none;" href="#" onclick="flickr_toggleExtended(); return false"
title="<?php echo TOGGLE_OPTION ?>"> title="<?php echo TOGGLE_OPTION ?>">
<img border="0" src="<?php echo serendipity_getTemplateFile('img/plus.png') ?>" /> <?php echo TOGGLE_ALL ?></a> <img border="0" src="<?php echo serendipity_getTemplateFile('img/plus.png') ?>" /> <?php echo TOGGLE_ALL ?></a>
<div id="flickr_extendedCriteria" <?php echo (strlen($serendipity['POST']['flickr_username']) ? '':'style="display:none;"') ?>> <div id="flickr_extendedCriteria" <?php echo (strlen($serendipity['POST']['flickr_username']) ? '':'style="display:none;"') ?>>
<p><?php echo PLUGIN_EVENT_FLICKR_TAGS ?> <input class="input_textbox" name="serendipity[flickr_tags]" value="<?php echo htmlspecialchars($serendipity['POST']['flickr_tags']) ?>" /> <p><?php echo PLUGIN_EVENT_FLICKR_TAGS ?> <input class="input_textbox" name="serendipity[flickr_tags]" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['flickr_tags']) : htmlspecialchars($serendipity['POST']['flickr_tags'], ENT_COMPAT, LANG_CHARSET)) ?>" />
<?php echo PLUGIN_EVENT_FLICKR_KEYWORDS ?> <input class="input_textbox" name="serendipity[flickr_keywords]" value="<?php echo htmlspecialchars($serendipity['POST']['flickr_keywords']) ?>" size="30" /></p> <?php echo PLUGIN_EVENT_FLICKR_KEYWORDS ?> <input class="input_textbox" name="serendipity[flickr_keywords]" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['flickr_keywords']) : htmlspecialchars($serendipity['POST']['flickr_keywords'], ENT_COMPAT, LANG_CHARSET)) ?>" size="30" /></p>
<?php echo SORT_BY ?> <select id="flickr_sort" name="serendipity[flickr_sort]"> <?php echo SORT_BY ?> <select id="flickr_sort" name="serendipity[flickr_sort]">
<option value=""></option> <option value=""></option>
<? <?
@ -158,7 +158,7 @@ class serendipity_event_flickr extends serendipity_event
// compute sort order // compute sort order
$sortOrder = (isset($serendipity['POST']['flickr_keywords']) && $sortOrder = (isset($serendipity['POST']['flickr_keywords']) &&
array_key_exists($serendipity['POST']['flickr_keywords'], $flickr_goodSortOrders) ? array_key_exists($serendipity['POST']['flickr_keywords'], $flickr_goodSortOrders) ?
htmlspecialchars($serendipity['POST']['flickr_keywords']) : ''); (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['flickr_keywords']) : htmlspecialchars($serendipity['POST']['flickr_keywords'], ENT_COMPAT, LANG_CHARSET)) : '');
// display possible options for sort order // display possible options for sort order
foreach($flickr_goodSortOrders as $value => $description) { foreach($flickr_goodSortOrders as $value => $description) {
@ -187,7 +187,7 @@ class serendipity_event_flickr extends serendipity_event
// Get the friendly URL of the user's photos // Get the friendly URL of the user's photos
$photos_url = $f->urls_getUserPhotos($nsid); $photos_url = $f->urls_getUserPhotos($nsid);
echo '<h4 style="margin-bottom: 0; padding-bottom: 0;">Photos of <em>'; echo '<h4 style="margin-bottom: 0; padding-bottom: 0;">Photos of <em>';
echo htmlspecialchars($serendipity['POST']['flickr_username']).'</em> at '; echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['flickr_username']) : htmlspecialchars($serendipity['POST']['flickr_username'], ENT_COMPAT, LANG_CHARSET)).'</em> at ';
echo '<a href="'.$photos_url.'" target="_blank">'.$photos_url.'</a></h4>'; echo '<a href="'.$photos_url.'" target="_blank">'.$photos_url.'</a></h4>';
// default page is number one // default page is number one
@ -196,7 +196,7 @@ class serendipity_event_flickr extends serendipity_event
} }
// make sure page is a number between 1 and 500 (range allowed by flickr API) // make sure page is a number between 1 and 500 (range allowed by flickr API)
$serendipity['POST']['flickr_page'] = min(500,max(1,(int)$serendipity['POST']['flickr_page'])); $serendipity['POST']['flickr_page'] = min(500,max(1,(int)$serendipity['POST']['flickr_page']));
echo '<h5 style="margin-top: 0; padding-top: 0;">Displaying page '.htmlspecialchars($serendipity['POST']['flickr_page']).'</h5>'; echo '<h5 style="margin-top: 0; padding-top: 0;">Displaying page '.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['flickr_page']) : htmlspecialchars($serendipity['POST']['flickr_page'], ENT_COMPAT, LANG_CHARSET)).'</h5>';
// Search is made depending on selected criterias // Search is made depending on selected criterias
$searchCriteria = array(); $searchCriteria = array();
@ -204,15 +204,15 @@ class serendipity_event_flickr extends serendipity_event
// make sure sort order is non empty AND valid // make sure sort order is non empty AND valid
if(isset($serendipity['POST']['flickr_sort']) && strlen(trim($serendipity['POST']['flickr_sort'])) && if(isset($serendipity['POST']['flickr_sort']) && strlen(trim($serendipity['POST']['flickr_sort'])) &&
array_key_exists($serendipity['POST']['flickr_keywords'], $flickr_goodSortOrders)) array_key_exists($serendipity['POST']['flickr_keywords'], $flickr_goodSortOrders))
$searchCriteria['sort'] = htmlspecialchars($serendipity['POST']['flickr_sort']); $searchCriteria['sort'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['flickr_sort']) : htmlspecialchars($serendipity['POST']['flickr_sort'], ENT_COMPAT, LANG_CHARSET));
// TODO: clean up tags of unwanted characters (keep only [a-zA-Z0-9_-]) // TODO: clean up tags of unwanted characters (keep only [a-zA-Z0-9_-])
if(isset($serendipity['POST']['flickr_tags']) && strlen(trim($serendipity['POST']['flickr_tags']))) if(isset($serendipity['POST']['flickr_tags']) && strlen(trim($serendipity['POST']['flickr_tags'])))
$searchCriteria['tags'] = implode(',',explode(' ', htmlspecialchars($serendipity['POST']['flickr_tags']))); $searchCriteria['tags'] = implode(',',explode(' ', (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['flickr_tags']) : htmlspecialchars($serendipity['POST']['flickr_tags'], ENT_COMPAT, LANG_CHARSET))));
// TODO: cleanup keywords // TODO: cleanup keywords
if(isset($serendipity['POST']['flickr_keywords']) && strlen(trim($serendipity['POST']['flickr_keywords']))) if(isset($serendipity['POST']['flickr_keywords']) && strlen(trim($serendipity['POST']['flickr_keywords'])))
$searchCriteria['text'] = htmlspecialchars($serendipity['POST']['flickr_keywords']); $searchCriteria['text'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['flickr_keywords']) : htmlspecialchars($serendipity['POST']['flickr_keywords'], ENT_COMPAT, LANG_CHARSET));
if(count($searchCriteria)) { if(count($searchCriteria)) {
// It seems the user wants an advanced search // It seems the user wants an advanced search

6
serendipity_event_forgotpassword/serendipity_event_forgotpassword.php
View file

@ -23,7 +23,7 @@ class serendipity_event_forgotpassword extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_FORGOTPASSWORD_DESC); $propbag->add('description', PLUGIN_EVENT_FORGOTPASSWORD_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Omid Mottaghi'); $propbag->add('author', 'Omid Mottaghi');
$propbag->add('version', '0.12'); $propbag->add('version', '0.12.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.9.1', 'serendipity' => '0.9.1',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -179,8 +179,8 @@ class serendipity_event_forgotpassword extends serendipity_event
<tr> <tr>
<td>'.PASSWORD.'</td> <td>'.PASSWORD.'</td>
<td><input class="input_textbox" type="password" name="password" /> <td><input class="input_textbox" type="password" name="password" />
<input type="hidden" name="username" value="'.htmlspecialchars($_GET['username']).'" /> <input type="hidden" name="username" value="'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($_GET['username']) : htmlspecialchars($_GET['username'], ENT_COMPAT, LANG_CHARSET)).'" />
<input type="hidden" name="uid" value="'.htmlspecialchars($_GET['uid']).'" /></td> <input type="hidden" name="uid" value="'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($_GET['uid']) : htmlspecialchars($_GET['uid'], ENT_COMPAT, LANG_CHARSET)).'" /></td>
</tr> </tr>
<tr> <tr>

12
serendipity_event_forum/include/functions.inc.php
View file

@ -444,8 +444,8 @@
$body = str_replace("{postauthor}", trim($authorname), $body); $body = str_replace("{postauthor}", trim($authorname), $body);
$body = str_replace("{forumurl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl, $body); $body = str_replace("{forumurl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl, $body);
$body = str_replace("{threadtitle}", htmlspecialchars(trim($notifylist[0]['title'])), $body); $body = str_replace("{threadtitle}", (function_exists('serendipity_specialchars') ? serendipity_specialchars(trim($notifylist[0]['title'])) : htmlspecialchars(trim($notifylist[0]['title']), ENT_COMPAT, LANG_CHARSET)), $body);
$body = str_replace("{replytext}", htmlspecialchars(strip_tags(trim($message))), $body); $body = str_replace("{replytext}", (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags(trim($message))) : htmlspecialchars(strip_tags(trim($message)), ENT_COMPAT, LANG_CHARSET)), $body);
$body = str_replace("{posturl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl . "&boardid=".intval($boardid)."&threadid=".intval($threadid)."&page=".$page."#".$lastpostid, $body); $body = str_replace("{posturl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl . "&boardid=".intval($boardid)."&threadid=".intval($threadid)."&page=".$page."#".$lastpostid, $body);
$from = "$fromname <$frommail>"; $from = "$fromname <$frommail>";
@ -465,8 +465,8 @@
$body = str_replace("{postauthor}", trim($authorname), $body); $body = str_replace("{postauthor}", trim($authorname), $body);
$body = str_replace("{forumurl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl, $body); $body = str_replace("{forumurl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl, $body);
$body = str_replace("{threadtitle}", htmlspecialchars(trim($notifylist[0]['title'])), $body); $body = str_replace("{threadtitle}", (function_exists('serendipity_specialchars') ? serendipity_specialchars(trim($notifylist[0]['title'])) : htmlspecialchars(trim($notifylist[0]['title']), ENT_COMPAT, LANG_CHARSET)), $body);
$body = str_replace("{replytext}", htmlspecialchars(strip_tags(trim($message))), $body); $body = str_replace("{replytext}", (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags(trim($message))) : htmlspecialchars(strip_tags(trim($message)), ENT_COMPAT, LANG_CHARSET)), $body);
$body = str_replace("{posturl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl . "&boardid=".intval($boardid)."&threadid=".intval($threadid)."&page=".$page."#".$lastpostid, $body); $body = str_replace("{posturl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl . "&boardid=".intval($boardid)."&threadid=".intval($threadid)."&page=".$page."#".$lastpostid, $body);
$from = "$fromname <$frommail>"; $from = "$fromname <$frommail>";
@ -575,8 +575,8 @@
$body = str_replace("{postauthor}", trim($authorname), $body); $body = str_replace("{postauthor}", trim($authorname), $body);
$body = str_replace("{forumurl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl, $body); $body = str_replace("{forumurl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl, $body);
$body = str_replace("{threadtitle}", htmlspecialchars(trim($title)), $body); $body = str_replace("{threadtitle}", (function_exists('serendipity_specialchars') ? serendipity_specialchars(trim($title)) : htmlspecialchars(trim($title), ENT_COMPAT, LANG_CHARSET)), $body);
$body = str_replace("{replytext}", htmlspecialchars(strip_tags(trim($message))), $body); $body = str_replace("{replytext}", (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags(trim($message))) : htmlspecialchars(strip_tags(trim($message)), ENT_COMPAT, LANG_CHARSET)), $body);
$body = str_replace("{posturl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl . "&boardid=".intval($boardid)."&threadid=".intval($threadid), $body); $body = str_replace("{posturl}", $serendipity['baseURL'] . "index.php?serendipity[subpage]=" . $pageurl . "&boardid=".intval($boardid)."&threadid=".intval($threadid), $body);
$from = "$fromname <$frommail>"; $from = "$fromname <$frommail>";

68
serendipity_event_forum/serendipity_event_forum.php
View file

@ -53,7 +53,7 @@ class serendipity_event_forum extends serendipity_event {
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '0.38'); $propbag->add('version', '0.38.1');
$propbag->add('author', 'Alexander \'dma147\' Mieland, http://blog.linux-stats.org, dma147@linux-stats.org'); $propbag->add('author', 'Alexander \'dma147\' Mieland, http://blog.linux-stats.org, dma147@linux-stats.org');
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
@ -1096,16 +1096,16 @@ class serendipity_event_forum extends serendipity_event {
array( array(
'pagetitle' => $this->get_config('pagetitle'), 'pagetitle' => $this->get_config('pagetitle'),
'headline' => $this->get_config('headline'), 'headline' => $this->get_config('headline'),
'threadtitle' => htmlspecialchars(stripslashes(trim($thread[0]['title']))), 'threadtitle' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($thread[0]['title']))) : htmlspecialchars(stripslashes(trim($thread[0]['title'])), ENT_COMPAT, LANG_CHARSET)),
'bgcolor2' => $this->get_config('bgcolor2'), 'bgcolor2' => $this->get_config('bgcolor2'),
'ACTUALURL' => $serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."&amp;threadid=".intval($_GET['threadid']), 'ACTUALURL' => $serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."&amp;threadid=".intval($_GET['threadid']),
'boardid' => intval($_GET['boardid']), 'boardid' => intval($_GET['boardid']),
'threadid' => intval($_GET['threadid']), 'threadid' => intval($_GET['threadid']),
'replyto' => intval($_GET['replyto']), 'replyto' => intval($_GET['replyto']),
'relpath' => $this->DMA_forum_getRelPath(), 'relpath' => $this->DMA_forum_getRelPath(),
'POST_AUTHORNAME' => htmlspecialchars($POST_AUTHORNAME), 'POST_AUTHORNAME' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($POST_AUTHORNAME) : htmlspecialchars($POST_AUTHORNAME, ENT_COMPAT, LANG_CHARSET)),
'POST_TITLE' => htmlspecialchars($POST_TITLE), 'POST_TITLE' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($POST_TITLE) : htmlspecialchars($POST_TITLE, ENT_COMPAT, LANG_CHARSET)),
'POST_MESSAGE' => htmlspecialchars($POST_MESSAGE), 'POST_MESSAGE' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($POST_MESSAGE) : htmlspecialchars($POST_MESSAGE, ENT_COMPAT, LANG_CHARSET)),
) )
); );
$serendipity['smarty']->assign('bbcode', BBCODE); $serendipity['smarty']->assign('bbcode', BBCODE);
@ -1171,7 +1171,7 @@ class serendipity_event_forum extends serendipity_event {
array( array(
'pagetitle' => $this->get_config('pagetitle'), 'pagetitle' => $this->get_config('pagetitle'),
'headline' => $this->get_config('headline'), 'headline' => $this->get_config('headline'),
'threadtitle' => htmlspecialchars(stripslashes(trim($thread[0]['title']))), 'threadtitle' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($thread[0]['title']))) : htmlspecialchars(stripslashes(trim($thread[0]['title'])), ENT_COMPAT, LANG_CHARSET)),
'bgcolor2' => $this->get_config('bgcolor2'), 'bgcolor2' => $this->get_config('bgcolor2'),
'ACTUALURL' => $serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."&amp;threadid=".intval($_GET['threadid'])."&amp;page=".intval($_GET['page']), 'ACTUALURL' => $serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."&amp;threadid=".intval($_GET['threadid'])."&amp;page=".intval($_GET['page']),
'boardid' => intval($_GET['boardid']), 'boardid' => intval($_GET['boardid']),
@ -1179,9 +1179,9 @@ class serendipity_event_forum extends serendipity_event {
'relpath' => $this->DMA_forum_getRelPath(), 'relpath' => $this->DMA_forum_getRelPath(),
'page' => intval($_GET['page']), 'page' => intval($_GET['page']),
'edit' => intval($_GET['edit']), 'edit' => intval($_GET['edit']),
'POST_AUTHORNAME' => htmlspecialchars(stripslashes(trim($post[0]['authorname']))), 'POST_AUTHORNAME' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($post[0]['authorname']))) : htmlspecialchars(stripslashes(trim($post[0]['authorname'])), ENT_COMPAT, LANG_CHARSET)),
'POST_TITLE' => htmlspecialchars(stripslashes(trim($post[0]['title']))), 'POST_TITLE' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($post[0]['title']))) : htmlspecialchars(stripslashes(trim($post[0]['title'])), ENT_COMPAT, LANG_CHARSET)),
'POST_MESSAGE' => htmlspecialchars(stripslashes(trim($post[0]['message']))) 'POST_MESSAGE' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($post[0]['message']))) : htmlspecialchars(stripslashes(trim($post[0]['message'])), ENT_COMPAT, LANG_CHARSET))
) )
); );
$serendipity['smarty']->assign('bbcode', BBCODE); $serendipity['smarty']->assign('bbcode', BBCODE);
@ -1255,17 +1255,17 @@ class serendipity_event_forum extends serendipity_event {
$serendipity['smarty']->assign('ERRORMSG', $ERRORMSG); $serendipity['smarty']->assign('ERRORMSG', $ERRORMSG);
} }
if ($this->get_config('apply_markup')) { if ($this->get_config('apply_markup')) {
$temp_array = array('body' => htmlspecialchars(stripslashes(trim($post[0]['message'])))); $temp_array = array('body' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($post[0]['message'])))) : htmlspecialchars(stripslashes(trim($post[0]['message']))), ENT_COMPAT, LANG_CHARSET));
serendipity_plugin_api::hook_event('frontend_display', $temp_array); serendipity_plugin_api::hook_event('frontend_display', $temp_array);
$post['message'] = trim($temp_array['body']); $post['message'] = trim($temp_array['body']);
} else { } else {
$post['message'] = nl2br(htmlspecialchars(stripslashes(trim($post[0]['message'])))); $post['message'] = nl2br((function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($post[0]['message']))) : htmlspecialchars(stripslashes(trim($post[0]['message'])), ENT_COMPAT, LANG_CHARSET));
} }
$serendipity['smarty']->assign( $serendipity['smarty']->assign(
array( array(
'pagetitle' => $this->get_config('pagetitle'), 'pagetitle' => $this->get_config('pagetitle'),
'headline' => $this->get_config('headline'), 'headline' => $this->get_config('headline'),
'threadtitle' => htmlspecialchars(stripslashes(trim($thread[0]['title']))), 'threadtitle' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($thread[0]['title']))) : htmlspecialchars(stripslashes(trim($thread[0]['title'])), ENT_COMPAT, LANG_CHARSET)),
'bgcolor1' => $this->get_config('bgcolor1'), 'bgcolor1' => $this->get_config('bgcolor1'),
'bgcolor2' => $this->get_config('bgcolor2'), 'bgcolor2' => $this->get_config('bgcolor2'),
'ACTUALURL' => $serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."&amp;threadid=".intval($_GET['threadid'])."&amp;page=".intval($_GET['page']), 'ACTUALURL' => $serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."&amp;threadid=".intval($_GET['threadid'])."&amp;page=".intval($_GET['page']),
@ -1273,9 +1273,9 @@ class serendipity_event_forum extends serendipity_event {
'threadid' => intval($_GET['threadid']), 'threadid' => intval($_GET['threadid']),
'page' => intval($_GET['page']), 'page' => intval($_GET['page']),
'delete' => intval($_GET['delete']), 'delete' => intval($_GET['delete']),
'POST_AUTHORNAME' => htmlspecialchars(stripslashes(trim($post[0]['authorname']))), 'POST_AUTHORNAME' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($post[0]['authorname']))) : htmlspecialchars(stripslashes(trim($post[0]['authorname'])), ENT_COMPAT, LANG_CHARSET)),
'POST_DATE' => date($this->get_config('dateformat')." ".$this->get_config('timeformat'), $post[0]['postdate']), 'POST_DATE' => date($this->get_config('dateformat')." ".$this->get_config('timeformat'), $post[0]['postdate']),
'POST_TITLE' => htmlspecialchars(stripslashes(trim($post[0]['title']))), 'POST_TITLE' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($post[0]['title']))) : htmlspecialchars(stripslashes(trim($post[0]['title'])), ENT_COMPAT, LANG_CHARSET)),
'POST_MESSAGE' => $post['message'], 'POST_MESSAGE' => $post['message'],
'relpath' => $this->DMA_forum_getRelPath() 'relpath' => $this->DMA_forum_getRelPath()
) )
@ -1379,7 +1379,7 @@ class serendipity_event_forum extends serendipity_event {
$lastpost = date($this->get_config('dateformat')." ".$this->get_config('timeformat'), $boards[$a]['lastposttime'])."<br />"; $lastpost = date($this->get_config('dateformat')." ".$this->get_config('timeformat'), $boards[$a]['lastposttime'])."<br />";
} }
$lastpost .= htmlspecialchars(stripslashes($boards[$a]['lastauthorname']))." "; $lastpost .= (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes($boards[$a]['lastauthorname'])) : htmlspecialchars(stripslashes($boards[$a]['lastauthorname']), ENT_COMPAT, LANG_CHARSET))." ";
$sql = "SELECT COUNT(*) FROM {$serendipity['dbPrefix']}dma_forum_posts WHERE threadid='".intval($boards[$a]['lastthreadid'])."'"; $sql = "SELECT COUNT(*) FROM {$serendipity['dbPrefix']}dma_forum_posts WHERE threadid='".intval($boards[$a]['lastthreadid'])."'";
$postnum = serendipity_db_query($sql); $postnum = serendipity_db_query($sql);
$page = ceil(intval($postnum[0][0]) / intval($this->get_config('itemsperpage'))); $page = ceil(intval($postnum[0][0]) / intval($this->get_config('itemsperpage')));
@ -1390,8 +1390,8 @@ class serendipity_event_forum extends serendipity_event {
} }
if ($thiscolor == $this->get_config('bgcolor2')) { $thiscolor = $this->get_config('bgcolor1'); } else { $thiscolor = $this->get_config('bgcolor2'); } if ($thiscolor == $this->get_config('bgcolor2')) { $thiscolor = $this->get_config('bgcolor1'); } else { $thiscolor = $this->get_config('bgcolor2'); }
$boards[$a]['color'] = $thiscolor; $boards[$a]['color'] = $thiscolor;
$boards[$a]['name'] = htmlspecialchars($boards[$a]['name']); $boards[$a]['name'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($boards[$a]['name']) : htmlspecialchars($boards[$a]['name'], ENT_COMPAT, LANG_CHARSET));
$temp_array = array('body' => htmlspecialchars(trim(stripslashes($boards[$a]['description'])))); $temp_array = array('body' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(trim(stripslashes($boards[$a]['description']))) : htmlspecialchars(trim(stripslashes($boards[$a]['description'])), ENT_COMPAT, LANG_CHARSET)));
serendipity_plugin_api::hook_event('frontend_display', $temp_array); serendipity_plugin_api::hook_event('frontend_display', $temp_array);
$boards[$a]['description'] = trim($temp_array['body']); $boards[$a]['description'] = trim($temp_array['body']);
@ -1434,12 +1434,12 @@ class serendipity_event_forum extends serendipity_event {
'bgcolor2' => $this->get_config('bgcolor2'), 'bgcolor2' => $this->get_config('bgcolor2'),
'ACTUALURL' => $serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid']), 'ACTUALURL' => $serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid']),
'boardid' => intval($_GET['boardid']), 'boardid' => intval($_GET['boardid']),
'POST_AUTHORNAME' => htmlspecialchars($POST_AUTHORNAME), 'POST_AUTHORNAME' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($POST_AUTHORNAME) : htmlspecialchars($POST_AUTHORNAME, ENT_COMPAT, LANG_CHARSET)),
'POST_TITLE' => htmlspecialchars($POST_TITLE), 'POST_TITLE' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($POST_TITLE) : htmlspecialchars($POST_TITLE, ENT_COMPAT, LANG_CHARSET)),
'POST_MESSAGE' => htmlspecialchars($POST_MESSAGE), 'POST_MESSAGE' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($POST_MESSAGE) : htmlspecialchars($POST_MESSAGE, ENT_COMPAT, LANG_CHARSET)),
'relpath' => $this->DMA_forum_getRelPath(), 'relpath' => $this->DMA_forum_getRelPath(),
'newthreadurl' => $serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;action=newthread&amp;boardid=".intval($_GET['boardid']), 'newthreadurl' => $serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;action=newthread&amp;boardid=".intval($_GET['boardid']),
'boardname' => htmlspecialchars(stripslashes(trim($board[0]['name']))) 'boardname' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes(trim($board[0]['name']))) : htmlspecialchars(stripslashes(trim($board[0]['name'])), ENT_COMPAT, LANG_CHARSET))
) )
); );
@ -1560,7 +1560,7 @@ class serendipity_event_forum extends serendipity_event {
$sql = "SELECT * FROM {$serendipity['dbPrefix']}dma_forum_threads WHERE boardid='".intval($_GET['boardid'])."' ORDER BY announce DESC, lastposttime DESC".$LIMIT; $sql = "SELECT * FROM {$serendipity['dbPrefix']}dma_forum_threads WHERE boardid='".intval($_GET['boardid'])."' ORDER BY announce DESC, lastposttime DESC".$LIMIT;
$threads = serendipity_db_query($sql); $threads = serendipity_db_query($sql);
$mainpage_link = "<a href=\"".$serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."\">".$this->get_config('pagetitle')."</a>"; $mainpage_link = "<a href=\"".$serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."\">".$this->get_config('pagetitle')."</a>";
$threadlist_link = "<a href=\"".$serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."\">".htmlspecialchars($board[0]['name'])."</a>"; $threadlist_link = "<a href=\"".$serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."\">".(function_exists('serendipity_specialchars') ? serendipity_specialchars($board[0]['name']) : htmlspecialchars($board[0]['name'], ENT_COMPAT, LANG_CHARSET))."</a>";
$serendipity['smarty']->assign('MAINPAGE', $mainpage_link); $serendipity['smarty']->assign('MAINPAGE', $mainpage_link);
$serendipity['smarty']->assign('THREADLIST', $threadlist_link); $serendipity['smarty']->assign('THREADLIST', $threadlist_link);
if (is_array($threads) && count($threads) >= 1) { if (is_array($threads) && count($threads) >= 1) {
@ -1576,7 +1576,7 @@ class serendipity_event_forum extends serendipity_event {
$lastpost = date($this->get_config('dateformat')." ".$this->get_config('timeformat'), $threads[$a]['lastposttime'])."<br />"; $lastpost = date($this->get_config('dateformat')." ".$this->get_config('timeformat'), $threads[$a]['lastposttime'])."<br />";
} }
$lastpost .= htmlspecialchars(stripslashes($threads[$a]['lastauthorname']))." "; $lastpost .= (function_exists('serendipity_specialchars') ? serendipity_specialchars(stripslashes($threads[$a]['lastauthorname'])) : htmlspecialchars(stripslashes($threads[$a]['lastauthorname']), ENT_COMPAT, LANG_CHARSET))." ";
$sql = "SELECT COUNT(*) FROM {$serendipity['dbPrefix']}dma_forum_posts WHERE threadid='".intval($threads[$a]['threadid'])."'"; $sql = "SELECT COUNT(*) FROM {$serendipity['dbPrefix']}dma_forum_posts WHERE threadid='".intval($threads[$a]['threadid'])."'";
$postnum = serendipity_db_query($sql); $postnum = serendipity_db_query($sql);
$page = ceil(intval($postnum[0][0]) / intval($this->get_config('itemsperpage'))); $page = ceil(intval($postnum[0][0]) / intval($this->get_config('itemsperpage')));
@ -1587,7 +1587,7 @@ class serendipity_event_forum extends serendipity_event {
$threads[$a]['lastpost'] = $lastpost; $threads[$a]['lastpost'] = $lastpost;
if ($thiscolor == $this->get_config('bgcolor2')) { $thiscolor = $this->get_config('bgcolor1'); } else { $thiscolor = $this->get_config('bgcolor2'); } if ($thiscolor == $this->get_config('bgcolor2')) { $thiscolor = $this->get_config('bgcolor1'); } else { $thiscolor = $this->get_config('bgcolor2'); }
$threads[$a]['color'] = $thiscolor; $threads[$a]['color'] = $thiscolor;
$threads[$a]['title'] = htmlspecialchars($threads[$a]['title']); $threads[$a]['title'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($threads[$a]['title']) : htmlspecialchars($threads[$a]['title'], ENT_COMPAT, LANG_CHARSET));
if ((intval($threads[$a]['announce']) == 1) && (intval($threads[($a+1)]['announce']) != 1)) { if ((intval($threads[$a]['announce']) == 1) && (intval($threads[($a+1)]['announce']) != 1)) {
$threads[$a]['trenner'] = true; $threads[$a]['trenner'] = true;
@ -1697,8 +1697,8 @@ class serendipity_event_forum extends serendipity_event {
$sql = "SELECT * FROM {$serendipity['dbPrefix']}dma_forum_threads WHERE threadid='".intval($_GET['threadid'])."'"; $sql = "SELECT * FROM {$serendipity['dbPrefix']}dma_forum_threads WHERE threadid='".intval($_GET['threadid'])."'";
$thread = serendipity_db_query($sql); $thread = serendipity_db_query($sql);
$mainpage_link = "<a href=\"".$serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."\">".$this->get_config('pagetitle')."</a>"; $mainpage_link = "<a href=\"".$serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."\">".$this->get_config('pagetitle')."</a>";
$threadlist_link = "<a href=\"".$serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."\">".htmlspecialchars($board[0]['name'])."</a>"; $threadlist_link = "<a href=\"".$serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."\">".(function_exists('serendipity_specialchars') ? serendipity_specialchars($board[0]['name']) : htmlspecialchars($board[0]['name'], ENT_COMPAT, LANG_CHARSET))."</a>";
$posts_link = "<a href=\"".$serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."&amp;threadid=".intval($thread[0]['threadid'])."\">".htmlspecialchars($thread[0]['title'])."</a>"; $posts_link = "<a href=\"".$serendipity['baseURL']."index.php?serendipity[subpage]=".$this->get_config('pageurl')."&amp;boardid=".intval($_GET['boardid'])."&amp;threadid=".intval($thread[0]['threadid'])."\">".(function_exists('serendipity_specialchars') ? serendipity_specialchars($thread[0]['title']) : htmlspecialchars($thread[0]['title'], ENT_COMPAT, LANG_CHARSET))."</a>";
$serendipity['smarty']->assign('MAINPAGE', $mainpage_link); $serendipity['smarty']->assign('MAINPAGE', $mainpage_link);
$serendipity['smarty']->assign('THREADLIST', $threadlist_link); $serendipity['smarty']->assign('THREADLIST', $threadlist_link);
$serendipity['smarty']->assign('POSTS', $posts_link); $serendipity['smarty']->assign('POSTS', $posts_link);
@ -1762,7 +1762,7 @@ class serendipity_event_forum extends serendipity_event {
$posts = serendipity_db_query($sql); $posts = serendipity_db_query($sql);
if (is_array($posts) && count($posts) >= 1) { if (is_array($posts) && count($posts) >= 1) {
$serendipity['smarty']->assign('threadtitle', htmlspecialchars($thread[0]['title'])); $serendipity['smarty']->assign('threadtitle', (function_exists('serendipity_specialchars') ? serendipity_specialchars($thread[0]['title']) : htmlspecialchars($thread[0]['title'], ENT_COMPAT, LANG_CHARSET)));
$serendipity['smarty']->assign('bgcolor_head', $this->get_config('bgcolor_head')); $serendipity['smarty']->assign('bgcolor_head', $this->get_config('bgcolor_head'));
for ($a=0,$b=count($posts);$a<$b;$a++) { for ($a=0,$b=count($posts);$a<$b;$a++) {
@ -1771,14 +1771,14 @@ class serendipity_event_forum extends serendipity_event {
if ($this->get_config('apply_markup')) { if ($this->get_config('apply_markup')) {
if ($this->get_config('unreg_nomarkups') && (!isset($posts[$a]['authorid']) || intval($posts[$a]['authorid']) <= 0)) { if ($this->get_config('unreg_nomarkups') && (!isset($posts[$a]['authorid']) || intval($posts[$a]['authorid']) <= 0)) {
$posts[$a]['message'] = nl2br(htmlspecialchars(trim(stripslashes($posts[$a]['message'])))); $posts[$a]['message'] = nl2br((function_exists('serendipity_specialchars') ? serendipity_specialchars(trim(stripslashes($posts[$a]['message']))) : htmlspecialchars(trim(stripslashes($posts[$a]['message'])), ENT_COMPAT, LANG_CHARSET)));
} else { } else {
$temp_array = array('body' => htmlspecialchars(trim(stripslashes($posts[$a]['message'])))); $temp_array = array('body' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(trim(stripslashes($posts[$a]['message']))) : htmlspecialchars(trim(stripslashes($posts[$a]['message'])), ENT_COMPAT, LANG_CHARSET)))));
serendipity_plugin_api::hook_event('frontend_display', $temp_array); serendipity_plugin_api::hook_event('frontend_display', $temp_array);
$posts[$a]['message'] = trim($temp_array['body']); $posts[$a]['message'] = trim($temp_array['body']);
} }
} else { } else {
$posts[$a]['message'] = nl2br(htmlspecialchars(trim(stripslashes($posts[$a]['message'])))); $posts[$a]['message'] = nl2br((function_exists('serendipity_specialchars') ? serendipity_specialchars(trim(stripslashes($posts[$a]['message']))) : htmlspecialchars(trim(stripslashes($posts[$a]['message'])), ENT_COMPAT, LANG_CHARSET)));
} }
@ -1844,11 +1844,11 @@ class serendipity_event_forum extends serendipity_event {
$posts[$a]['uploads'] = true; $posts[$a]['uploads'] = true;
for($y=0,$z=count($uploads);$y<$z;$y++) { for($y=0,$z=count($uploads);$y<$z;$y++) {
$filesize = DMA_forum_calcFilesize($uploads[$y]['filesize']); $filesize = DMA_forum_calcFilesize($uploads[$y]['filesize']);
$mime = DMA_forum_getMime(htmlspecialchars(basename($uploads[$y]['realfilename'])), $this->DMA_forum_getRelPath()); $mime = DMA_forum_getMime((function_exists('serendipity_specialchars') ? serendipity_specialchars(basename($uploads[$y]['realfilename'])) : htmlspecialchars(basename($uploads[$y]['realfilename']), ENT_COMPAT, LANG_CHARSET)), $this->DMA_forum_getRelPath());
$fileicon = "<img src=\"".$mime['ICON']."\" width=\"18\" height=\"20\" border=\"0\" />"; $fileicon = "<img src=\"".$mime['ICON']."\" width=\"18\" height=\"20\" border=\"0\" />";
$content_type = $mime['TYPE']; $content_type = $mime['TYPE'];
$posts[$a]['upload'][$y]['filename'] = "<a href=\"".$serendipity['baseURL'] . ($serendipity['rewrite'] == "none" ? $serendipity['indexFile'] . "?/" : "") . "plugin/forumdl_".intval($uploads[$y]['uploadid'])."\">".htmlspecialchars(basename($uploads[$y]['realfilename']))."</a>"; $posts[$a]['upload'][$y]['filename'] = "<a href=\"".$serendipity['baseURL'] . ($serendipity['rewrite'] == "none" ? $serendipity['indexFile'] . "?/" : "") . "plugin/forumdl_".intval($uploads[$y]['uploadid'])."\">".(function_exists('serendipity_specialchars') ? serendipity_specialchars(basename($uploads[$y]['realfilename'])) : htmlspecialchars(basename($uploads[$y]['realfilename']), ENT_COMPAT, LANG_CHARSET))."</a>";
@ -1867,8 +1867,8 @@ class serendipity_event_forum extends serendipity_event {
} }
$posts[$a]['authordetails'] = $AUTHORDETAILS; $posts[$a]['authordetails'] = $AUTHORDETAILS;
$posts[$a]['title'] = htmlspecialchars($posts[$a]['title']); $posts[$a]['title'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($posts[$a]['title']) : htmlspecialchars($posts[$a]['title'], ENT_COMPAT, LANG_CHARSET));
$posts[$a]['authorname'] = htmlspecialchars($posts[$a]['authorname']); $posts[$a]['authorname'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($posts[$a]['authorname']) : htmlspecialchars($posts[$a]['authorname'], ENT_COMPAT, LANG_CHARSET));
if (intval($posts[$a]['postdate']) >= (intval($yesterday_lasttstamp)+1)) { if (intval($posts[$a]['postdate']) >= (intval($yesterday_lasttstamp)+1)) {
$posts[$a]['postdate'] = "<span style=\"color:".$this->get_config('color_today').";font-weight:bolder\">".PLUGIN_FORUM_TODAY." ".date($this->get_config('timeformat'), $posts[$a]['postdate'])."</span>"; $posts[$a]['postdate'] = "<span style=\"color:".$this->get_config('color_today').";font-weight:bolder\">".PLUGIN_FORUM_TODAY." ".date($this->get_config('timeformat'), $posts[$a]['postdate'])."</span>";

84
serendipity_event_freetag/serendipity_event_freetag.php
View file

@ -72,7 +72,7 @@ class serendipity_event_freetag extends serendipity_event
'smarty' => '2.6.7', 'smarty' => '2.6.7',
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '3.58'); $propbag->add('version', '3.58.1');
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
'frontend_fetchentries' => true, 'frontend_fetchentries' => true,
'frontend_fetchentry' => true, 'frontend_fetchentry' => true,
@ -421,8 +421,8 @@ class serendipity_event_freetag extends serendipity_event
continue; continue;
} }
$links[] = '<a href="' . $taglink . serendipity_event_freetag::makeURLTag($tag) . '"' . $links[] = '<a href="' . $taglink . serendipity_event_freetag::makeURLTag($tag) . '"' .
' title="' . htmlspecialchars($tag) . '"' . ' title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($tag) : htmlspecialchars($tag, ENT_COMPAT, LANG_CHARSET)) . '"' .
' rel="tag">' . htmlspecialchars($tag) . '</a>'; ' rel="tag">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($tag) : htmlspecialchars($tag, ENT_COMPAT, LANG_CHARSET)) . '</a>';
} }
@ -453,8 +453,8 @@ class serendipity_event_freetag extends serendipity_event
continue; continue;
} }
$links[] = '<a href="' . $taglink . serendipity_event_freetag::makeURLTag($tag) . '"' . $links[] = '<a href="' . $taglink . serendipity_event_freetag::makeURLTag($tag) . '"' .
' title="' . htmlspecialchars($tag) . '"' . ' title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($tag) : htmlspecialchars($tag, ENT_COMPAT, LANG_CHARSET)) . '"' .
' rel="tag">' . htmlspecialchars($tag) . '</a>' . ' rel="tag">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($tag) : htmlspecialchars($tag, ENT_COMPAT, LANG_CHARSET)) . '</a>' .
($technorati?'<a href="http://technorati.com/tag/' . urlencode($tag) . '" class="serendipity_freeTag_technoratiTag" rel="tag"><img style="border:0;vertical-align:middle;margin-left:.4em" src="' . $technorati_img . '?tag=' . urlencode($tag) . '" alt="technorati" /></a>':''); ($technorati?'<a href="http://technorati.com/tag/' . urlencode($tag) . '" class="serendipity_freeTag_technoratiTag" rel="tag"><img style="border:0;vertical-align:middle;margin-left:.4em" src="' . $technorati_img . '?tag=' . urlencode($tag) . '" alt="technorati" /></a>':'');
} }
@ -511,12 +511,12 @@ class serendipity_event_freetag extends serendipity_event
$return = array(); $return = array();
$return['description'] = PLUGIN_EVENT_FREETAG_RELATED_ENTRIES; $return['description'] = PLUGIN_EVENT_FREETAG_RELATED_ENTRIES;
foreach($entries AS $entryid => $title) { foreach($entries AS $entryid => $title) {
$return['entries'][] = '<a href="' . serendipity_archiveURL($entryid, $title) . '" title="' . htmlspecialchars($title) . '">' . htmlspecialchars($title) . '</a>'; $return['entries'][] = '<a href="' . serendipity_archiveURL($entryid, $title) . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($title) : htmlspecialchars($title, ENT_COMPAT, LANG_CHARSET)) . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($title) : htmlspecialchars($title, ENT_COMPAT, LANG_CHARSET)) . '</a>';
} }
} else { } else {
$return = '<div class="serendipity_freeTag_related">' . PLUGIN_EVENT_FREETAG_RELATED_ENTRIES . '<ul class="plainList">'; $return = '<div class="serendipity_freeTag_related">' . PLUGIN_EVENT_FREETAG_RELATED_ENTRIES . '<ul class="plainList">';
foreach($entries AS $entryid => $title) { foreach($entries AS $entryid => $title) {
$return .= '<li> <a href="' . serendipity_archiveURL($entryid, $title) . '" title="' . htmlspecialchars($title) . '">' . htmlspecialchars($title) . '</a></li>'; $return .= '<li> <a href="' . serendipity_archiveURL($entryid, $title) . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($title) : htmlspecialchars($title, ENT_COMPAT, LANG_CHARSET)) . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($title) : htmlspecialchars($title, ENT_COMPAT, LANG_CHARSET)) . '</a></li>';
} }
$return .= '</ul></div>'; $return .= '</ul></div>';
} }
@ -603,7 +603,7 @@ class serendipity_event_freetag extends serendipity_event
} }
if ($xml) { if ($xml) {
$html .= '<span class="serendipity_freeTag_xmlTagEntry"><a rel="tag" class="serendipity_xml_icon" href="' . $rsslink . urlencode($name) . '" title="' . htmlspecialchars($name) . '">'. $html .= '<span class="serendipity_freeTag_xmlTagEntry"><a rel="tag" class="serendipity_xml_icon" href="' . $rsslink . urlencode($name) . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($name) : htmlspecialchars($name, ENT_COMPAT, LANG_CHARSET)) . '">'.
'<img alt="xml" src="' . $xmlImg . '" class="serendipity_freeTag_xmlButton" /></a> '; '<img alt="xml" src="' . $xmlImg . '" class="serendipity_freeTag_xmlButton" /></a> ';
} }
@ -624,7 +624,7 @@ class serendipity_event_freetag extends serendipity_event
$fontSize = 100; $fontSize = 100;
} }
$html .= '<a rel="tag" href="' . $taglink . serendipity_event_freetag::makeURLTag($name) . '" title="' . htmlspecialchars($name) . ($quantity > 0 ? ' (' . $quantity . ') ' : '') . '">' . htmlspecialchars($name) . '</a>'; $html .= '<a rel="tag" href="' . $taglink . serendipity_event_freetag::makeURLTag($name) . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($name) : htmlspecialchars($name, ENT_COMPAT, LANG_CHARSET)) . ($quantity > 0 ? ' (' . $quantity . ') ' : '') . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($name) : htmlspecialchars($name, ENT_COMPAT, LANG_CHARSET)) . '</a>';
if ($scaling) { if ($scaling) {
$html .= '</span>'; $html .= '</span>';
@ -639,7 +639,7 @@ class serendipity_event_freetag extends serendipity_event
} }
$first = false; $first = false;
$tagparam .= "%3Ca href='" . $taglink . serendipity_event_freetag::makeURLTag($name) . "' style='" . round($fontSize/5) . "'%3E" . str_replace(' ','&nbsp;',htmlspecialchars($name)) . "%3C/a%3E"; $tagparam .= "%3Ca href='" . $taglink . serendipity_event_freetag::makeURLTag($name) . "' style='" . round($fontSize/5) . "'%3E" . str_replace(' ','&nbsp;',(function_exists('serendipity_specialchars') ? serendipity_specialchars($name) : htmlspecialchars($name, ENT_COMPAT, LANG_CHARSET))) . "%3C/a%3E";
} }
if ($useFlash) { if ($useFlash) {
@ -727,7 +727,7 @@ class serendipity_event_freetag extends serendipity_event
if (count($param) > 1) { if (count($param) > 1) {
$serendipity['smarty']->assign('head_subtitle', sprintf(PLUGIN_EVENT_FREETAG_USING, implode(' + ', array_map('htmlspecialchars', $param)))); $serendipity['smarty']->assign('head_subtitle', sprintf(PLUGIN_EVENT_FREETAG_USING, implode(' + ', array_map('htmlspecialchars', $param))));
} else { } else {
$serendipity['smarty']->assign('head_subtitle', sprintf(PLUGIN_EVENT_FREETAG_USING, htmlspecialchars($param[0]))); $serendipity['smarty']->assign('head_subtitle', sprintf(PLUGIN_EVENT_FREETAG_USING, (function_exists('serendipity_specialchars') ? serendipity_specialchars($param[0]) : htmlspecialchars($param[0], ENT_COMPAT, LANG_CHARSET))));
} }
} }
$serendipity['smarty']->assign('taglist', true); $serendipity['smarty']->assign('taglist', true);
@ -759,7 +759,7 @@ class serendipity_event_freetag extends serendipity_event
$param = urldecode($param[0]); $param = urldecode($param[0]);
$param = urldecode($param); // for doubled encoded tag umlauts via searchengines backlinks $param = urldecode($param); // for doubled encoded tag umlauts via searchengines backlinks
$param = strip_tags($param); $param = strip_tags($param);
$serendipity['head_subtitle'] = sprintf(PLUGIN_EVENT_FREETAG_USING, htmlspecialchars($param)); $serendipity['head_subtitle'] = sprintf(PLUGIN_EVENT_FREETAG_USING, (function_exists('serendipity_specialchars') ? serendipity_specialchars($param) : htmlspecialchars($param, ENT_COMPAT, LANG_CHARSET)));
$emit_404 = true; $emit_404 = true;
} else { } else {
if (!$tagged_as_list) { if (!$tagged_as_list) {
@ -776,7 +776,7 @@ class serendipity_event_freetag extends serendipity_event
if (is_array($param)) { if (is_array($param)) {
array_filter($param); // empty removed XSS by strip_tags array_filter($param); // empty removed XSS by strip_tags
} }
$param = is_array($param) ? array_map('htmlspecialchars', $param) : htmlspecialchars($param); $param = is_array($param) ? array_map('htmlspecialchars', $param) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($param) : htmlspecialchars($param, ENT_COMPAT, LANG_CHARSET));
$this->tags['show'] = $param; $this->tags['show'] = $param;
$serendipity['plugin_vars']['tag'] = $param; $serendipity['plugin_vars']['tag'] = $param;
@ -879,7 +879,7 @@ class serendipity_event_freetag extends serendipity_event
} }
$tags[] = $tag; $tags[] = $tag;
printf(PLUGIN_EVENT_FREETAG_KEYWORDS_ADD, htmlspecialchars($keyword), htmlspecialchars($tag)); printf(PLUGIN_EVENT_FREETAG_KEYWORDS_ADD, (function_exists('serendipity_specialchars') ? serendipity_specialchars($keyword) : htmlspecialchars($keyword, ENT_COMPAT, LANG_CHARSET)), (function_exists('serendipity_specialchars') ? serendipity_specialchars($tag) : htmlspecialchars($tag, ENT_COMPAT, LANG_CHARSET)));
} }
} }
} }
@ -1078,7 +1078,7 @@ addLoadEvent(enableAutocomplete);
<legend><?php echo PLUGIN_EVENT_FREETAG_TITLE; ?></legend> <legend><?php echo PLUGIN_EVENT_FREETAG_TITLE; ?></legend>
<label for="serendipity[properties][freetag_tagList]" title="<?php echo PLUGIN_EVENT_FREETAG_TITLE; ?>"> <label for="serendipity[properties][freetag_tagList]" title="<?php echo PLUGIN_EVENT_FREETAG_TITLE; ?>">
<?php echo PLUGIN_EVENT_FREETAG_ENTERDESC; ?>:</label><br/> <?php echo PLUGIN_EVENT_FREETAG_ENTERDESC; ?>:</label><br/>
<input type="text" name="serendipity[properties][freetag_tagList]" id="properties_freetag_tagList" class="wickEnabled input_textbox" value="<?php echo htmlspecialchars($tagList); ?>" style="width: 100%" /> <input type="text" name="serendipity[properties][freetag_tagList]" id="properties_freetag_tagList" class="wickEnabled input_textbox" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($tagList) : htmlspecialchars($tagList, ENT_COMPAT, LANG_CHARSET)); ?>" style="width: 100%" />
<input type="checkbox" name="serendipity[properties][freetag_kill]" id="properties_freetag_kill" class="input_checkbox" /> <input type="checkbox" name="serendipity[properties][freetag_kill]" id="properties_freetag_kill" class="input_checkbox" />
<label for="serendipity[properties][freetag_kill]" title="<?php echo PLUGIN_EVENT_FREETAG_KILL; ?>"> <label for="serendipity[properties][freetag_kill]" title="<?php echo PLUGIN_EVENT_FREETAG_KILL; ?>">
@ -1089,7 +1089,7 @@ addLoadEvent(enableAutocomplete);
<span class="wrap_legend"><legend><?php echo PLUGIN_EVENT_FREETAG_TITLE; ?></legend></span> <span class="wrap_legend"><legend><?php echo PLUGIN_EVENT_FREETAG_TITLE; ?></legend></span>
<div class="form_field"> <div class="form_field">
<label for="properties_freetag_tagList" class="block_level"><?php echo PLUGIN_EVENT_FREETAG_ENTERDESC; ?>:</label> <label for="properties_freetag_tagList" class="block_level"><?php echo PLUGIN_EVENT_FREETAG_ENTERDESC; ?>:</label>
<input id="properties_freetag_tagList" type="text" name="serendipity[properties][freetag_tagList]" class="wickEnabled" value="<?php echo htmlspecialchars($tagList); ?>"> <input id="properties_freetag_tagList" type="text" name="serendipity[properties][freetag_tagList]" class="wickEnabled" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($tagList) : htmlspecialchars($tagList, ENT_COMPAT, LANG_CHARSET)); ?>">
</div> </div>
<div class="form_check"> <div class="form_check">
<input id="properties_freetag_kill" type="checkbox" name="serendipity[properties][freetag_kill]"> <input id="properties_freetag_kill" type="checkbox" name="serendipity[properties][freetag_kill]">
@ -1205,7 +1205,7 @@ addLoadEvent(enableAutocomplete);
case 'frontend_rss': case 'frontend_rss':
if (!empty($this->displayTag)) { if (!empty($this->displayTag)) {
$eventData['title'] .= serendipity_utf8_encode(htmlspecialchars(' (' . sprintf(PLUGIN_EVENT_FREETAG_USING, $this->displayTag) . ')')); $eventData['title'] .= serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars(' (' . sprintf(PLUGIN_EVENT_FREETAG_USING, $this->displayTag) . ')') : htmlspecialchars(' (' . sprintf(PLUGIN_EVENT_FREETAG_USING, $this->displayTag) . ')', ENT_COMPAT, LANG_CHARSET)));
} }
return true; return true;
@ -1444,7 +1444,7 @@ addLoadEvent(enableAutocomplete);
global $serendipity; global $serendipity;
$tags = $this->getTagCloudTags($tag); $tags = $this->getTagCloudTags($tag);
$serendipity['smarty']->assign('freetag_tagTitle', htmlspecialchars(is_array($this->displayTag) ? implode(' + ',$this->displayTag) : $this->displayTag)); $serendipity['smarty']->assign('freetag_tagTitle', (function_exists('serendipity_specialchars') ? serendipity_specialchars(is_array($this->displayTag) ? implode(' + ',$this->displayTag) : $this->displayTag) : htmlspecialchars(is_array($this->displayTag) ? implode(' + ',$this->displayTag) : $this->displayTag), ENT_COMPAT, LANG_CHARSET));
if (!empty($tags)) { if (!empty($tags)) {
$serendipity['smarty']->assign('freetag_hasTags', true); $serendipity['smarty']->assign('freetag_hasTags', true);
@ -1623,7 +1623,7 @@ addLoadEvent(enableAutocomplete);
continue; continue;
} }
$not_first ? print(', ') : $not_first = true; $not_first ? print(', ') : $not_first = true;
echo htmlspecialchars($r['tag']); echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($r['tag']) : htmlspecialchars($r['tag'], ENT_COMPAT, LANG_CHARSET));
} }
echo "\" />"; echo "\" />";
} }
@ -1756,7 +1756,7 @@ addLoadEvent(enableAutocomplete);
} }
foreach($tagList as $tag) { foreach($tagList as $tag) {
$out .= serendipity_utf8_encode("<$element>".htmlspecialchars($tag)."</$element>\n"); $out .= serendipity_utf8_encode("<$element>".(function_exists('serendipity_specialchars') ? serendipity_specialchars($tag)."</$element>\n") : htmlspecialchars($tag)."</$element>\n", ENT_COMPAT, LANG_CHARSET));
} }
return $out; return $out;
} }
@ -1788,7 +1788,7 @@ addLoadEvent(enableAutocomplete);
<li> <a href="<?php echo FREETAG_MANAGE_URL ?>&amp;serendipity[tagview]=entryleaf"><?php echo PLUGIN_EVENT_FREETAG_MANAGE_LEAFTAGGED ?></a> </li> <li> <a href="<?php echo FREETAG_MANAGE_URL ?>&amp;serendipity[tagview]=entryleaf"><?php echo PLUGIN_EVENT_FREETAG_MANAGE_LEAFTAGGED ?></a> </li>
<li> <a href="<?php echo FREETAG_MANAGE_URL ?>&amp;serendipity[tagview]=keywords"><?php echo PLUGIN_EVENT_FREETAG_KEYWORDS; ?></a></li> <li> <a href="<?php echo FREETAG_MANAGE_URL ?>&amp;serendipity[tagview]=keywords"><?php echo PLUGIN_EVENT_FREETAG_KEYWORDS; ?></a></li>
<li> <a href="<?php echo FREETAG_MANAGE_URL ?>&amp;serendipity[tagview]=cat2tag"><?php echo PLUGIN_EVENT_FREETAG_GLOBALLINKS; ?></a></li> <li> <a href="<?php echo FREETAG_MANAGE_URL ?>&amp;serendipity[tagview]=cat2tag"><?php echo PLUGIN_EVENT_FREETAG_GLOBALLINKS; ?></a></li>
<li> <a href="<?php echo FREETAG_MANAGE_URL ?>&amp;serendipity[tagview]=tagupdate" onclick="return confirm('<?php echo htmlspecialchars(PLUGIN_EVENT_FREETAG_REBUILD_DESC); ?>');" ><?php echo PLUGIN_EVENT_FREETAG_REBUILD; ?></a></li> <li> <a href="<?php echo FREETAG_MANAGE_URL ?>&amp;serendipity[tagview]=tagupdate" onclick="return confirm('<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_EVENT_FREETAG_REBUILD_DESC) : htmlspecialchars(PLUGIN_EVENT_FREETAG_REBUILD_DESC, ENT_COMPAT, LANG_CHARSET)); ?>');" ><?php echo PLUGIN_EVENT_FREETAG_REBUILD; ?></a></li>
<li> <a href="<?php echo FREETAG_MANAGE_URL ?>&amp;serendipity[tagview]=cleanupmappings"><?php echo PLUGIN_EVENT_FREETAG_MANAGE_CLEANUP; ?></a></li> <li> <a href="<?php echo FREETAG_MANAGE_URL ?>&amp;serendipity[tagview]=cleanupmappings"><?php echo PLUGIN_EVENT_FREETAG_MANAGE_CLEANUP; ?></a></li>
</ul> </ul>
</div> </div>
@ -1859,9 +1859,9 @@ addLoadEvent(enableAutocomplete);
unset($entry['loginname']); unset($entry['loginname']);
unset($entry['email']); unset($entry['email']);
if ($serendipity['version'][0] < 2) { if ($serendipity['version'][0] < 2) {
printf('%d - "%s"<br />', $entry['id'], htmlspecialchars($entry['title'])); printf('%d - "%s"<br />', $entry['id'], (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)));
} else { } else {
printf('<li>%d - "%s"', $entry['id'], htmlspecialchars($entry['title'])); printf('<li>%d - "%s"', $entry['id'], (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)));
} }
$serendipity['POST']['properties']['fake'] = 'fake'; $serendipity['POST']['properties']['fake'] = 'fake';
$current_cat = $entry['categories']; $current_cat = $entry['categories'];
@ -1891,10 +1891,10 @@ addLoadEvent(enableAutocomplete);
if ($to < $total) { if ($to < $total) {
?> ?>
<script type="text/javascript"> <script type="text/javascript">
if (confirm("<?php echo htmlspecialchars(PLUGIN_EVENT_FREETAG_REBUILD_FETCHNEXT); ?>")) { if (confirm("<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_EVENT_FREETAG_REBUILD_FETCHNEXT) : htmlspecialchars(PLUGIN_EVENT_FREETAG_REBUILD_FETCHNEXT, ENT_COMPAT, LANG_CHARSET)); ?>")) {
location.href = "?serendipity[adminModule]=event_display&serendipity[adminAction]=managetags&serendipity[tagview]=tagupdate&serendipity[page]=<?php echo ($page+1); ?>"; location.href = "?serendipity[adminModule]=event_display&serendipity[adminAction]=managetags&serendipity[tagview]=tagupdate&serendipity[page]=<?php echo ($page+1); ?>";
} else { } else {
alert("<?php echo htmlspecialchars(DONE); ?>"); alert("<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars(DONE) : htmlspecialchars(DONE, ENT_COMPAT, LANG_CHARSET)); ?>");
} }
</script> </script>
<?php <?php
@ -1954,16 +1954,16 @@ addLoadEvent(enableAutocomplete);
printf( printf(
PLUGIN_EVENT_FREETAG_GLOBALCAT2TAG_ENTRY . '<br />', PLUGIN_EVENT_FREETAG_GLOBALCAT2TAG_ENTRY . '<br />',
$id, $id,
htmlspecialchars($props['title']), (function_exists('serendipity_specialchars') ? serendipity_specialchars($props['title']) : htmlspecialchars($props['title'], ENT_COMPAT, LANG_CHARSET)),
htmlspecialchars(implode(', ', $newtags)) (function_exists('serendipity_specialchars') ? serendipity_specialchars(implode(', ', $newtags)) : htmlspecialchars(implode(', ', $newtags), ENT_COMPAT, LANG_CHARSET))
); );
} else { } else {
echo '<li>'; echo '<li>';
printf( printf(
PLUGIN_EVENT_FREETAG_GLOBALCAT2TAG_ENTRY, PLUGIN_EVENT_FREETAG_GLOBALCAT2TAG_ENTRY,
$id, $id,
htmlspecialchars($props['title']), (function_exists('serendipity_specialchars') ? serendipity_specialchars($props['title']) : htmlspecialchars($props['title'], ENT_COMPAT, LANG_CHARSET)),
htmlspecialchars(implode(', ', $newtags)) (function_exists('serendipity_specialchars') ? serendipity_specialchars(implode(', ', $newtags)) : htmlspecialchars(implode(', ', $newtags), ENT_COMPAT, LANG_CHARSET))
); );
echo '</li>'; echo '</li>';
} }
@ -2069,7 +2069,7 @@ addLoadEvent(enableAutocomplete);
$keys[$key['tag']] = $key['keywords']; $keys[$key['tag']] = $key['keywords'];
} }
} }
$url = FREETAG_MANAGE_URL . "&amp;serendipity[tagview]=".htmlspecialchars($this->eventData['GET']['tagview']); $url = FREETAG_MANAGE_URL . "&amp;serendipity[tagview]=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($this->eventData['GET']['tagview']) : htmlspecialchars($this->eventData['GET']['tagview'], ENT_COMPAT, LANG_CHARSET));
if ($serendipity['version'][0] < 2) { if ($serendipity['version'][0] < 2) {
echo '<br />' . PLUGIN_EVENT_FREETAG_KEYWORDS_DESC . '<br /><br />'; echo '<br />' . PLUGIN_EVENT_FREETAG_KEYWORDS_DESC . '<br /><br />';
@ -2097,7 +2097,7 @@ addLoadEvent(enableAutocomplete);
if (urldecode($serendipity['GET']['tag']) == $tag) { if (urldecode($serendipity['GET']['tag']) == $tag) {
?> ?>
<a id="edit"></a> <a id="edit"></a>
<textarea rows="4" cols="40" name="serendipity[keywords]"><?php echo htmlspecialchars($keys[$tag]); ?></textarea> <textarea rows="4" cols="40" name="serendipity[keywords]"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($keys[$tag]) : htmlspecialchars($keys[$tag], ENT_COMPAT, LANG_CHARSET)); ?></textarea>
<?php <?php
} else { } else {
echo $keys[$tag]; echo $keys[$tag];
@ -2151,7 +2151,7 @@ addLoadEvent(enableAutocomplete);
if (count($taglist) === 0) { if (count($taglist) === 0) {
return; return;
} }
$url = FREETAG_MANAGE_URL . "&amp;serendipity[tagview]=".htmlspecialchars($this->eventData['GET']['tagview']); $url = FREETAG_MANAGE_URL . "&amp;serendipity[tagview]=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($this->eventData['GET']['tagview']) : htmlspecialchars($this->eventData['GET']['tagview'], ENT_COMPAT, LANG_CHARSET));
?> ?>
<table> <table>
<thead> <thead>
@ -2228,11 +2228,11 @@ addLoadEvent(enableAutocomplete);
?> ?>
<form action="" method="GET"> <form action="" method="GET">
<?php echo $this->getManageUrlAsHidden($this->eventData) ?> <?php echo $this->getManageUrlAsHidden($this->eventData) ?>
<input type="hidden" name="serendipity[tagview]" value="<?php echo htmlspecialchars($this->eventData['GET']['tagview']) ?>"> <input type="hidden" name="serendipity[tagview]" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->eventData['GET']['tagview']) : htmlspecialchars($this->eventData['GET']['tagview'], ENT_COMPAT, LANG_CHARSET)) ?>">
<input type="hidden" name="serendipity[tagaction]" value="rename" /> <input type="hidden" name="serendipity[tagaction]" value="rename" />
<input type="hidden" name="serendipity[commit]" value="true" /> <input type="hidden" name="serendipity[commit]" value="true" />
<input type="hidden" name="serendipity[tag]" value="<?php echo htmlspecialchars($tag); ?>" /> <input type="hidden" name="serendipity[tag]" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($tag) : htmlspecialchars($tag, ENT_COMPAT, LANG_CHARSET)); ?>" />
<?php echo htmlspecialchars($tag) ?> =&gt; <input class="input_textbox" type="text" name="serendipity[newtag]" /> <input class="serendipityPrettyButton input_button" type="submit" name="submit" value="<?php echo PLUGIN_EVENT_FREETAG_MANAGE_ACTION_RENAME ?>" /> <?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($tag) : htmlspecialchars($tag, ENT_COMPAT, LANG_CHARSET)) ?> =&gt; <input class="input_textbox" type="text" name="serendipity[newtag]" /> <input class="serendipityPrettyButton input_button" type="submit" name="submit" value="<?php echo PLUGIN_EVENT_FREETAG_MANAGE_ACTION_RENAME ?>" />
</form> </form>
<?php <?php
} }
@ -2275,12 +2275,12 @@ addLoadEvent(enableAutocomplete);
} }
function displayDeleteTag($tag, &$eventData) { function displayDeleteTag($tag, &$eventData) {
$no = FREETAG_MANAGE_URL . "&amp;serendipity[tagview]=".htmlspecialchars($this->eventData['GET']['tagview']); $no = FREETAG_MANAGE_URL . "&amp;serendipity[tagview]=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($this->eventData['GET']['tagview']) : htmlspecialchars($this->eventData['GET']['tagview'], ENT_COMPAT, LANG_CHARSET));
$yes = FREETAG_MANAGE_URL . "&amp;serendipity[tagview]=".htmlspecialchars($this->eventData['GET']['tagview']). $yes = FREETAG_MANAGE_URL . "&amp;serendipity[tagview]=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($this->eventData['GET']['tagview']) : htmlspecialchars($this->eventData['GET']['tagview'], ENT_COMPAT, LANG_CHARSET)).
"&amp;serendipity[tagaction]=delete". "&amp;serendipity[tagaction]=delete".
"&amp;serendipity[tag]=".urlencode($tag)."&amp;serendipity[commit]=true"; "&amp;serendipity[tag]=".urlencode($tag)."&amp;serendipity[commit]=true";
?> ?>
<h2> <?php printf(PLUGIN_EVENT_FREETAG_MANAGE_CONFIRM_DELETE, htmlspecialchars($tag))?></h2> <h2> <?php printf(PLUGIN_EVENT_FREETAG_MANAGE_CONFIRM_DELETE, (function_exists('serendipity_specialchars') ? serendipity_specialchars($tag)) : htmlspecialchars($tag), ENT_COMPAT, LANG_CHARSET))?></h2>
<h3> <a href="<?php echo $yes; ?>"><?php echo YES; ?></a> &nbsp; &nbsp; <a href="<?php echo $no; ?>"><?php echo NO; ?></a> </h3> <h3> <a href="<?php echo $yes; ?>"><?php echo YES; ?></a> &nbsp; &nbsp; <a href="<?php echo $no; ?>"><?php echo NO; ?></a> </h3>
<?php <?php
} }
@ -2308,13 +2308,13 @@ addLoadEvent(enableAutocomplete);
?> ?>
<form action="" method="GET"> <form action="" method="GET">
<?php echo $this->getManageUrlAsHidden($this->eventData) ?> <?php echo $this->getManageUrlAsHidden($this->eventData) ?>
<input type="hidden" name="serendipity[tagview]" value="<?php echo htmlspecialchars($this->eventData['GET']['tagview']) ?>"> <input type="hidden" name="serendipity[tagview]" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->eventData['GET']['tagview']) : htmlspecialchars($this->eventData['GET']['tagview'], ENT_COMPAT, LANG_CHARSET)) ?>">
<input type="hidden" name="serendipity[tagaction]" value="split" /> <input type="hidden" name="serendipity[tagaction]" value="split" />
<input type="hidden" name="serendipity[commit]" value="true" /> <input type="hidden" name="serendipity[commit]" value="true" />
<input type="hidden" name="serendipity[tag]" value="<?php echo htmlspecialchars($tag) ?>" /> <input type="hidden" name="serendipity[tag]" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($tag) : htmlspecialchars($tag, ENT_COMPAT, LANG_CHARSET)) ?>" />
<p> <?php echo PLUGIN_EVENT_FREETAG_MANAGE_INFO_SPLIT ?> <br/> <p> <?php echo PLUGIN_EVENT_FREETAG_MANAGE_INFO_SPLIT ?> <br/>
foobarbaz =&gt; foo,bar,baz</p> foobarbaz =&gt; foo,bar,baz</p>
<?php echo htmlspecialchars($tag) ?> =&gt; <input class="input_textbox" type="text" name="serendipity[newtags]" value="<?php echo htmlspecialchars($newtag); ?>" /> <?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($tag) : htmlspecialchars($tag, ENT_COMPAT, LANG_CHARSET)) ?> =&gt; <input class="input_textbox" type="text" name="serendipity[newtags]" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($newtag) : htmlspecialchars($newtag, ENT_COMPAT, LANG_CHARSET)); ?>" />
<input class="serendipityPrettyButton input_button" type="submit" name="submit" value="split" /> <input class="serendipityPrettyButton input_button" type="submit" name="submit" value="split" />
</form> </form>
<?php <?php
@ -2419,7 +2419,7 @@ addLoadEvent(enableAutocomplete);
// Display submit form to start cleanup process // Display submit form to start cleanup process
echo '<form action="" method="GET">'; echo '<form action="" method="GET">';
echo $this->getManageUrlAsHidden($this->eventData); echo $this->getManageUrlAsHidden($this->eventData);
echo '<input type="hidden" name="serendipity[tagview]" value="'.htmlspecialchars($this->eventData['GET']['tagview']).'">'; echo '<input type="hidden" name="serendipity[tagview]" value="'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($this->eventData['GET']['tagview']) : htmlspecialchars($this->eventData['GET']['tagview'], ENT_COMPAT, LANG_CHARSET)).'">';
echo '<input type="hidden" name="serendipity[perform]" value="true" />'; echo '<input type="hidden" name="serendipity[perform]" value="true" />';
if ($serendipity['version'][0] < 2) { if ($serendipity['version'][0] < 2) {
echo '<input class="serendipityPrettyButton input_button" type="submit" name="submit" value="'.PLUGIN_EVENT_FREETAG_MANAGE_CLEANUP_PERFORM.'" />'; echo '<input class="serendipityPrettyButton input_button" type="submit" name="submit" value="'.PLUGIN_EVENT_FREETAG_MANAGE_CLEANUP_PERFORM.'" />';

2
serendipity_event_geotag/plugin_version.inc.php
View file

@ -1,5 +1,5 @@
<?php <?php
// Actual version of both plugins // Actual version of both plugins
@define('PLUGIN_EVENT_GEOTAG_VERSION', '1.33'); @define('PLUGIN_EVENT_GEOTAG_VERSION', '1.33.1');
@define('PLUGIN_EVENT_GEOTAG_AUTHOR', 'Zoran Kovacevic, Grischa Brockhaus, Matthias Gutjahr'); @define('PLUGIN_EVENT_GEOTAG_AUTHOR', 'Zoran Kovacevic, Grischa Brockhaus, Matthias Gutjahr');

2
serendipity_event_geotag/serendipity_event_geotag.php
View file

@ -675,7 +675,7 @@ class serendipity_event_geotag extends serendipity_event
function headerGeoTagging($lat, $long, $title) { function headerGeoTagging($lat, $long, $title) {
if (empty($lat) || empty($long)) return; if (empty($lat) || empty($long)) return;
$title = htmlspecialchars($title); $title = (function_exists('serendipity_specialchars') ? serendipity_specialchars($title) : htmlspecialchars($title, ENT_COMPAT, LANG_CHARSET));
echo '<meta name="geo.placename" content="' . $title . '" />' . "\n"; echo '<meta name="geo.placename" content="' . $title . '" />' . "\n";
echo '<meta name="geo.position" content="'. $lat . ';' . $long . '" />' . "\n"; echo '<meta name="geo.position" content="'. $lat . ';' . $long . '" />' . "\n";
echo '<meta name="geo.region" content="" />' . "\n"; echo '<meta name="geo.region" content="" />' . "\n";

4
serendipity_event_geourl/serendipity_event_geourl.php
View file

@ -32,7 +32,7 @@ class serendipity_event_geourl extends serendipity_event {
$propbag->add('event_hooks', array('frontend_header' => true)); $propbag->add('event_hooks', array('frontend_header' => true));
$propbag->add('configuration', array('lat', 'long')); $propbag->add('configuration', array('lat', 'long'));
$propbag->add('description', PLUGIN_EVENT_GEOURL_DESC); $propbag->add('description', PLUGIN_EVENT_GEOURL_DESC);
$propbag->add('version', '1.4'); $propbag->add('version', '1.4.1');
$propbag->add('groups', array('BACKEND_METAINFORMATION')); $propbag->add('groups', array('BACKEND_METAINFORMATION'));
} }
@ -71,7 +71,7 @@ class serendipity_event_geourl extends serendipity_event {
$long = $this->get_config('long'); $long = $this->get_config('long');
print "\n" . ' <meta name="ICBM" content="' . $lat . ', ' . $long . '" />' . "\n"; print "\n" . ' <meta name="ICBM" content="' . $lat . ', ' . $long . '" />' . "\n";
print ' <meta name="geo.position" content="' . $lat . ';' . $long . '" />' . "\n"; print ' <meta name="geo.position" content="' . $lat . ';' . $long . '" />' . "\n";
print ' <meta name="DC.title" content="' . htmlspecialchars($serendipity['blogTitle']) . '" />' . "\n"; print ' <meta name="DC.title" content="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogTitle']) : htmlspecialchars($serendipity['blogTitle'], ENT_COMPAT, LANG_CHARSET)) . '" />' . "\n";
return true; return true;
break; break;

4
serendipity_event_glossary/serendipity_event_glossary.php
View file

@ -36,7 +36,7 @@ class serendipity_event_glossary extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_GLOSSARY_DESC); $propbag->add('description', PLUGIN_EVENT_GLOSSARY_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Rob Antonishen'); $propbag->add('author', 'Rob Antonishen');
$propbag->add('version', '1.7'); $propbag->add('version', '1.7.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -157,7 +157,7 @@ class serendipity_event_glossary extends serendipity_event
$s = trim($temp[0]); $s = trim($temp[0]);
$r = trim($temp[1]); $r = trim($temp[1]);
if ((strlen($s) > 0) && ctype_alnum($s) && (strlen($r) > 0)){ if ((strlen($s) > 0) && ctype_alnum($s) && (strlen($r) > 0)){
$terms[] = array($s,htmlspecialchars($r)); $terms[] = array($s,(function_exists('serendipity_specialchars') ? serendipity_specialchars($r) : htmlspecialchars($r, ENT_COMPAT, LANG_CHARSET)));
} }
} }

8
serendipity_event_google_analytics/serendipity_event_google_analytics.php
View file

@ -21,7 +21,7 @@ class serendipity_event_google_analytics extends serendipity_event {
$propbag->add ('description', PLUGIN_EVENT_GOOGLE_ANALYTICS_DESC); $propbag->add ('description', PLUGIN_EVENT_GOOGLE_ANALYTICS_DESC);
$propbag->add ('stackable', false); $propbag->add ('stackable', false);
$propbag->add ('author', '<a href="https://github.com/kleinerChemiker" target="_blank">kleinerChemiker</a>'); $propbag->add ('author', '<a href="https://github.com/kleinerChemiker" target="_blank">kleinerChemiker</a>');
$propbag->add ('version', '1.4.0'); $propbag->add ('version', '1.4.1');
$propbag->add ('requirements', array ('serendipity' => '0.8', 'smarty' => '2.6.7', 'php' => '4.1.0' )); $propbag->add ('requirements', array ('serendipity' => '0.8', 'smarty' => '2.6.7', 'php' => '4.1.0' ));
$propbag->add ('groups', array ('STATISTICS' )); $propbag->add ('groups', array ('STATISTICS' ));
$propbag->add ('cachable_events', array ('frontend_display' => true )); $propbag->add ('cachable_events', array ('frontend_display' => true ));
@ -175,9 +175,9 @@ class serendipity_event_google_analytics extends serendipity_event {
$host = parse_url ('http://' . $matches[4]); $host = parse_url ('http://' . $matches[4]);
preg_match ('/\.([a-z0-9]+)$/i', $host['path'], $extension); preg_match ('/\.([a-z0-9]+)$/i', $host['path'], $extension);
if (!in_array ($host['host'], $internal_hosts) && $analytics_track_external) { if (!in_array ($host['host'], $internal_hosts) && $analytics_track_external) {
return '<a onclick="_gaq.push([\'_trackPageview\', \'/extlink/' . htmlspecialchars ($matches[4]) . '\']);" ' . substr ($matches[0], 2); return '<a onclick="_gaq.push([\'_trackPageview\', \'/extlink/' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($matches[4]) : htmlspecialchars($matches[4], ENT_COMPAT, LANG_CHARSET)) . '\']);" ' . substr ($matches[0], 2);
} elseif (in_array ($host['host'], $internal_hosts) && in_array ($extension[1], $download_extensions) && $analytics_track_downloads) { } elseif (in_array ($host['host'], $internal_hosts) && in_array ($extension[1], $download_extensions) && $analytics_track_downloads) {
return '<a onclick="_gaq.push([\'_trackPageview\', \'/download' . htmlspecialchars ($host['path']) . '\']);" ' . substr ($matches[0], 2); return '<a onclick="_gaq.push([\'_trackPageview\', \'/download' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($host['path']) : htmlspecialchars($host['path'], ENT_COMPAT, LANG_CHARSET)) . '\']);" ' . substr ($matches[0], 2);
} else { } else {
return $matches[0]; return $matches[0];
} }
@ -188,7 +188,7 @@ class serendipity_event_google_analytics extends serendipity_event {
$host = parse_url ('http://www.example.com/' . $matches[4]); $host = parse_url ('http://www.example.com/' . $matches[4]);
preg_match ('/\.([a-z0-9]+)$/i', $host['path'], $extension); preg_match ('/\.([a-z0-9]+)$/i', $host['path'], $extension);
if (in_array ($extension[1], $download_extensions)) { if (in_array ($extension[1], $download_extensions)) {
return '<a onclick="_gaq.push([\'_trackPageview\', \'/download' . htmlspecialchars ($host['path']) . '\']);" ' . substr ($matches[0], 2); return '<a onclick="_gaq.push([\'_trackPageview\', \'/download' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($host['path']) : htmlspecialchars($host['path'], ENT_COMPAT, LANG_CHARSET)) . '\']);" ' . substr ($matches[0], 2);
} else { } else {
return $matches[0]; return $matches[0];
} }

12
serendipity_event_google_sitemap/serendipity_event_google_sitemap.php
View file

@ -30,7 +30,7 @@ class serendipity_event_google_sitemap extends serendipity_event {
$propbag->add('name', PLUGIN_EVENT_SITEMAP_TITLE); $propbag->add('name', PLUGIN_EVENT_SITEMAP_TITLE);
$propbag->add('description', PLUGIN_EVENT_SITEMAP_DESC); $propbag->add('description', PLUGIN_EVENT_SITEMAP_DESC);
$propbag->add('author', 'Boris'); $propbag->add('author', 'Boris');
$propbag->add('version', '0.58'); $propbag->add('version', '0.58.1');
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
'backend_publish' => true, 'backend_publish' => true,
'backend_save' => true, 'backend_save' => true,
@ -159,7 +159,7 @@ class serendipity_event_google_sitemap extends serendipity_event {
function addtoxml(&$str, $url, $lastmod = null, $priority = null, $changefreq = null, $props = null) { function addtoxml(&$str, $url, $lastmod = null, $priority = null, $changefreq = null, $props = null) {
/* Sitemap requires this. /* Sitemap requires this.
* I think that s9y does not include these specialchars, so this is just a precaution */ * I think that s9y does not include these specialchars, so this is just a precaution */
$url = htmlspecialchars($url, ENT_QUOTES); $url = (function_exists('serendipity_specialchars') ? serendipity_specialchars($url, ENT_QUOTES) : htmlspecialchars($url, ENT_QUOTES| ENT_COMPAT, LANG_CHARSET));
$str .= "\t<url>\n"; $str .= "\t<url>\n";
$str .= "\t\t<loc>$url</loc>\n"; $str .= "\t\t<loc>$url</loc>\n";
@ -170,8 +170,8 @@ class serendipity_event_google_sitemap extends serendipity_event {
$str .= "\t\t<news:news>\n"; $str .= "\t\t<news:news>\n";
$str .= "\t\t\t<news:publication>\n"; $str .= "\t\t\t<news:publication>\n";
$str .= "\t\t\t\t<news:name>" . htmlspecialchars($this->get_config('gnews_name')) . '</news:name>' . "\n"; $str .= "\t\t\t\t<news:name>" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_config('gnews_name')) : htmlspecialchars($this->get_config('gnews_name'), ENT_COMPAT, LANG_CHARSET)) . '</news:name>' . "\n";
$str .= "\t\t\t\t<news:language>" . htmlspecialchars($GLOBALS['serendipity']['lang']) . '</news:language>' . "\n"; $str .= "\t\t\t\t<news:language>" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($GLOBALS['serendipity']['lang']) : htmlspecialchars($GLOBALS['serendipity']['lang'], ENT_COMPAT, LANG_CHARSET)) . '</news:language>' . "\n";
$str .= "\t\t\t</news:publication>\n"; $str .= "\t\t\t</news:publication>\n";
$sub = $this->get_config('gnews_subscription'); $sub = $this->get_config('gnews_subscription');
@ -194,11 +194,11 @@ class serendipity_event_google_sitemap extends serendipity_event {
if (!empty($genre) && $genre != 'none') { if (!empty($genre) && $genre != 'none') {
$str .= "\t\t\t<news:genres>" . $genre . "</news:genres>\n"; $str .= "\t\t\t<news:genres>" . $genre . "</news:genres>\n";
} }
$str .= "\t\t\t<news:title>" . htmlspecialchars($props['title']) . "</news:title>\n"; $str .= "\t\t\t<news:title>" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($props['title']) : htmlspecialchars($props['title'], ENT_COMPAT, LANG_CHARSET)) . "</news:title>\n";
$str .= "\t\t\t<news:publication_date>$str_lastmod</news:publication_date>\n"; $str .= "\t\t\t<news:publication_date>$str_lastmod</news:publication_date>\n";
if (is_array($props) && isset($props['meta_keywords'])) { if (is_array($props) && isset($props['meta_keywords'])) {
$str .= "\t\t\t<news:keywords>" . htmlspecialchars($props['meta_keywords']) . "</news:keywords>\n"; $str .= "\t\t\t<news:keywords>" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($props['meta_keywords']) : htmlspecialchars($props['meta_keywords'], ENT_COMPAT, LANG_CHARSET)) . "</news:keywords>\n";
} }
$str .= "\t\t</news:news>\n"; $str .= "\t\t</news:news>\n";
} }

4
serendipity_event_gravatar/serendipity_event_gravatar.php
View file

@ -14,7 +14,7 @@ if (file_exists($probelang)) {
include dirname(__FILE__) . '/lang_en.inc.php'; include dirname(__FILE__) . '/lang_en.inc.php';
// Actual version of this plugin // Actual version of this plugin
@define('PLUGIN_EVENT_GRAVATAR_VERSION', '1.58'); @define('PLUGIN_EVENT_GRAVATAR_VERSION', '1.58.1');
// Defines the maximum available method slots in the configuration. // Defines the maximum available method slots in the configuration.
@define('PLUGIN_EVENT_GRAVATAR_METHOD_MAX', 6); @define('PLUGIN_EVENT_GRAVATAR_METHOD_MAX', 6);
@ -438,7 +438,7 @@ class serendipity_event_gravatar extends serendipity_event
$title = ''; $title = '';
$author = 'unknown'; $author = 'unknown';
if (isset($eventData['author'])) { if (isset($eventData['author'])) {
$author = htmlspecialchars($eventData['author']); $author = (function_exists('serendipity_specialchars') ? serendipity_specialchars($eventData['author']) : htmlspecialchars($eventData['author'], ENT_COMPAT, LANG_CHARSET));
$title = $author; $title = $author;
} }

20
serendipity_event_guestbook/serendipity_event_guestbook.php
View file

@ -67,7 +67,7 @@ class serendipity_event_guestbook extends serendipity_event {
'dateformat' 'dateformat'
)); ));
$propbag->add('author', 'Ian'); $propbag->add('author', 'Ian');
$propbag->add('version', '3.51'); $propbag->add('version', '3.51.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.7.0', 'serendipity' => '1.7.0',
'smarty' => '3.1.0', 'smarty' => '3.1.0',
@ -477,12 +477,12 @@ class serendipity_event_guestbook extends serendipity_event {
function strip_security($parr = null, $keys = null, $single = false, $compare = true) { function strip_security($parr = null, $keys = null, $single = false, $compare = true) {
$authenticated_user = serendipity_userLoggedIn() ? true : false; $authenticated_user = serendipity_userLoggedIn() ? true : false;
if ($single) { if ($single) {
return $authenticated_user ? htmlspecialchars($parr) : htmlspecialchars(strip_tags($parr)); return $authenticated_user ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($parr) : htmlspecialchars($parr, ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($parr) : htmlspecialchars(strip_tags($parr, ENT_COMPAT, LANG_CHARSET)));
} else { } else {
foreach ($parr AS $k => $v) { foreach ($parr AS $k => $v) {
if (in_array($k, $keys)) { if (in_array($k, $keys)) {
$valuelength = strlen($v); $valuelength = strlen($v);
$parrsec[$k] = $authenticated_user ? htmlspecialchars($v) : htmlspecialchars(strip_tags($v)); $parrsec[$k] = $authenticated_user ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($v) : htmlspecialchars($v, ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($v) : htmlspecialchars(strip_tags($v, ENT_COMPAT, LANG_CHARSET)));
if (!$authenticated_user && $compare && ($valuelength != strlen($parrsec[$k]))) { if (!$authenticated_user && $compare && ($valuelength != strlen($parrsec[$k]))) {
$parrsec['stripped'] = true; $parrsec['stripped'] = true;
$parrsec['stripped-by-key'] = $k; $parrsec['stripped-by-key'] = $k;
@ -871,7 +871,7 @@ class serendipity_event_guestbook extends serendipity_event {
if (isset($serendipity['POST']['email']) && !empty($serendipity['POST']['email']) && trim($serendipity['POST']['email']) != '') { if (isset($serendipity['POST']['email']) && !empty($serendipity['POST']['email']) && trim($serendipity['POST']['email']) != '') {
if (!$this->is_valid_email($serendipity['POST']['email'])) { if (!$this->is_valid_email($serendipity['POST']['email'])) {
array_push($messages, ERROR_NOVALIDEMAIL . ' <span class="gb_msgred">' . htmlspecialchars($serendipity['POST']['email']) . '</span>'); array_push($messages, ERROR_NOVALIDEMAIL . ' <span class="gb_msgred">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['email']) : htmlspecialchars($serendipity['POST']['email'], ENT_COMPAT, LANG_CHARSET)) . '</span>');
} else { } else {
$valid['data_email'] = TRUE; $valid['data_email'] = TRUE;
} }
@ -1101,12 +1101,12 @@ class serendipity_event_guestbook extends serendipity_event {
'plugin_guestbook_intro' => $this->get_config('intro'), 'plugin_guestbook_intro' => $this->get_config('intro'),
'plugin_guestbook_sent' => $this->get_config('sent', PLUGIN_GUESTBOOK_SENT_HTML), 'plugin_guestbook_sent' => $this->get_config('sent', PLUGIN_GUESTBOOK_SENT_HTML),
'plugin_guestbook_action' => $serendipity['baseURL'] . $serendipity['indexFile'], 'plugin_guestbook_action' => $serendipity['baseURL'] . $serendipity['indexFile'],
'plugin_guestbook_sname' => htmlspecialchars($serendipity['GET']['subpage']), 'plugin_guestbook_sname' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['subpage']) : htmlspecialchars($serendipity['GET']['subpage'], ENT_COMPAT, LANG_CHARSET)),
'plugin_guestbook_name' => htmlspecialchars(strip_tags($serendipity['POST']['name'])), 'plugin_guestbook_name' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['name'])) : htmlspecialchars(strip_tags($serendipity['POST']['name']), ENT_COMPAT, LANG_CHARSET)),
'plugin_guestbook_email' => htmlspecialchars(strip_tags($serendipity['POST']['email'])), 'plugin_guestbook_email' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['email'])) : htmlspecialchars(strip_tags($serendipity['POST']['email']), ENT_COMPAT, LANG_CHARSET)),
'plugin_guestbook_emailprotect' => PLUGIN_GUESTBOOK_PROTECTION, 'plugin_guestbook_emailprotect' => PLUGIN_GUESTBOOK_PROTECTION,
'plugin_guestbook_url' => htmlspecialchars(strip_tags($serendipity['POST']['url'])), 'plugin_guestbook_url' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)),
'plugin_guestbook_comment' => htmlspecialchars(strip_tags($serendipity['POST']['comment'])), 'plugin_guestbook_comment' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['comment'])) : htmlspecialchars(strip_tags($serendipity['POST']['comment']), ENT_COMPAT, LANG_CHARSET)),
'plugin_guestbook_messagestack' => $serendipity['messagestack']['comments'], 'plugin_guestbook_messagestack' => $serendipity['messagestack']['comments'],
'plugin_guestbook_entry' => array('timestamp' => 1) 'plugin_guestbook_entry' => array('timestamp' => 1)
) )
@ -1285,7 +1285,7 @@ class serendipity_event_guestbook extends serendipity_event {
if ($this->selected()) { if ($this->selected()) {
$serendipity['head_title'] = $this->get_config('headline'); $serendipity['head_title'] = $this->get_config('headline');
$serendipity['head_subtitle'] = htmlspecialchars($serendipity['blogTitle']); $serendipity['head_subtitle'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogTitle']) : htmlspecialchars($serendipity['blogTitle'], ENT_COMPAT, LANG_CHARSET));
} }
break; break;

12
serendipity_event_guestbook/serendipity_plugin_guestbook.php
View file

@ -28,7 +28,7 @@ class serendipity_plugin_guestbook extends serendipity_plugin {
$propbag->add('description', PLUGIN_GUESTSIDE_BLAHBLAH); $propbag->add('description', PLUGIN_GUESTSIDE_BLAHBLAH);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Jaap Boerma ( j@webbict.com ), Tadashi Jokagi <elf2000@users.sourceforge.net>, Ian (Timbalu)'); $propbag->add('author', 'Jaap Boerma ( j@webbict.com ), Tadashi Jokagi <elf2000@users.sourceforge.net>, Ian (Timbalu)');
$propbag->add('version', '1.22'); $propbag->add('version', '1.22.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.7', 'serendipity' => '0.7',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -182,8 +182,8 @@ class serendipity_plugin_guestbook extends serendipity_plugin {
$entries = serendipity_db_query($sql); $entries = serendipity_db_query($sql);
if($entries && is_array($entries)) { if($entries && is_array($entries)) {
foreach($entries as $e => $row) { foreach($entries as $e => $row) {
echo "<strong>" . htmlspecialchars(serendipity_strftime($dateformat, $row['timestamp'])) . '</strong> <br />' . "\n"; echo "<strong>" . (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_strftime($dateformat, $row['timestamp'])) : htmlspecialchars(serendipity_strftime($dateformat, $row['timestamp']), ENT_COMPAT, LANG_CHARSET)) . '</strong> <br />' . "\n";
$row['body'] = htmlspecialchars($row['body']); $row['body'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['body']) : htmlspecialchars($row['body'], ENT_COMPAT, LANG_CHARSET));
$row['body'] = serendipity_event_guestbook::bbc_reverse($row['body']); $row['body'] = serendipity_event_guestbook::bbc_reverse($row['body']);
if (strlen($row['body'])>$max_chars) { if (strlen($row['body'])>$max_chars) {
if (function_exists('mb_strimwidth')) { if (function_exists('mb_strimwidth')) {
@ -196,17 +196,17 @@ class serendipity_plugin_guestbook extends serendipity_plugin {
serendipity_plugin_api::hook_event('frontend_display', $entry); serendipity_plugin_api::hook_event('frontend_display', $entry);
echo $entry['comment'] . "<br />"; echo $entry['comment'] . "<br />";
echo "<strong>" . htmlspecialchars($row['name']) . "</strong><br />"; echo "<strong>" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['name']) : htmlspecialchars($row['name'], ENT_COMPAT, LANG_CHARSET)) . "</strong><br />";
if ($showemail){ if ($showemail){
echo "<a href=\"mailto:" . htmlspecialchars($row['email']) . "\">" . htmlspecialchars($row['email']) . "</a>"; echo "<a href=\"mailto:" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['email']) : htmlspecialchars($row['email'], ENT_COMPAT, LANG_CHARSET)) . "\">" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['email']) : htmlspecialchars($row['email'], ENT_COMPAT, LANG_CHARSET)) . "</a>";
} }
if ($showhomepage) { if ($showhomepage) {
if ($showemail) { if ($showemail) {
echo "<br />"; echo "<br />";
} }
echo "<a href=\"" . htmlspecialchars($row['homepage']) . "\">" . htmlspecialchars($row['homepage']) . "</a>"; echo "<a href=\"" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['homepage']) : htmlspecialchars($row['homepage'], ENT_COMPAT, LANG_CHARSET)) . "\">" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['homepage']) : htmlspecialchars($row['homepage'], ENT_COMPAT, LANG_CHARSET)) . "</a>";
} }
echo "<br />\n\n"; echo "<br />\n\n";

12
serendipity_event_imageselectorplus/serendipity_event_imageselectorplus.php
View file

@ -26,7 +26,7 @@ class serendipity_event_imageselectorplus extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_IMAGESELECTORPLUS_DESC); $propbag->add('description', PLUGIN_EVENT_IMAGESELECTORPLUS_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Vladimir Ajgl, Adam Charnock, Ian'); $propbag->add('author', 'Garvin Hicking, Vladimir Ajgl, Adam Charnock, Ian');
$propbag->add('version', '0.45'); $propbag->add('version', '0.45.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.3', 'serendipity' => '1.3',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -548,7 +548,7 @@ class serendipity_event_imageselectorplus extends serendipity_event
// New draft post // New draft post
$entry = array(); $entry = array();
$entry['isdraft'] = 'false'; $entry['isdraft'] = 'false';
$entry['title'] = htmlspecialchars($serendipity['POST']['quickblog']['title']); $entry['title'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['quickblog']['title']) : htmlspecialchars($serendipity['POST']['quickblog']['title'], ENT_COMPAT, LANG_CHARSET));
if (isset($objpath) && !empty($objpath)) { if (isset($objpath) && !empty($objpath)) {
$entry['body'] = '<a href="' . $objpath . '"><img alt="" class="serendipity_image_left serendipity_quickblog_image" src="' . $objpreview . '">' . $filename . '</a> (-'.$obj_mime.'-)<p>' . $serendipity['POST']['quickblog']['body'] . '</p>'; $entry['body'] = '<a href="' . $objpath . '"><img alt="" class="serendipity_image_left serendipity_quickblog_image" src="' . $objpreview . '">' . $filename . '</a> (-'.$obj_mime.'-)<p>' . $serendipity['POST']['quickblog']['body'] . '</p>';
} else { } else {
@ -556,7 +556,7 @@ class serendipity_event_imageselectorplus extends serendipity_event
} }
$entry['authorid'] = $serendipity['authorid']; $entry['authorid'] = $serendipity['authorid'];
$entry['exflag'] = false; $entry['exflag'] = false;
$entry['categories'][0] = htmlspecialchars($serendipity['POST']['quickblog']['category']); $entry['categories'][0] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['quickblog']['category']) : htmlspecialchars($serendipity['POST']['quickblog']['category'], ENT_COMPAT, LANG_CHARSET));
#$entry['allow_comments'] = 'true'; // both disabled #$entry['allow_comments'] = 'true'; // both disabled
#$entry['moderate_comments'] = 'false'; // to take default values #$entry['moderate_comments'] = 'false'; // to take default values
$serendipity['POST']['properties']['fake'] = 'fake'; $serendipity['POST']['properties']['fake'] = 'fake';
@ -668,7 +668,7 @@ class serendipity_event_imageselectorplus extends serendipity_event
echo '<div class="serendipity_Entry_Date"> echo '<div class="serendipity_Entry_Date">
<h3 class="serendipity_date">' . serendipity_formatTime(DATE_FORMAT_ENTRY, $entry['timestamp']) . '</h3>'; <h3 class="serendipity_date">' . serendipity_formatTime(DATE_FORMAT_ENTRY, $entry['timestamp']) . '</h3>';
echo '<h4 class="serendipity_title"><a href="#">' . htmlspecialchars($entry['title']) . '</a></h4>'; echo '<h4 class="serendipity_title"><a href="#">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '</a></h4>';
echo '<div class="serendipity_entry"><div class="serendipity_entry_body">'; echo '<div class="serendipity_entry"><div class="serendipity_entry_body">';
echo '<div class="serendipity_center">' . $link . '<!-- s9ymdb:' . $entry['id'] . ' --><img src="' . $imgsrc . '" /></a></div>'; echo '<div class="serendipity_center">' . $link . '<!-- s9ymdb:' . $entry['id'] . ' --><img src="' . $imgsrc . '" /></a></div>';
@ -749,9 +749,9 @@ class serendipity_event_imageselectorplus extends serendipity_event
case 'frontend_image_selector': case 'frontend_image_selector':
if ($serendipity['version'][0] < 2) { if ($serendipity['version'][0] < 2) {
$eventData['finishJSFunction'] = 'serendipity_imageSelectorPlus_done(\'' . htmlspecialchars($serendipity['GET']['textarea']) . '\')'; $eventData['finishJSFunction'] = 'serendipity_imageSelectorPlus_done(\'' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['textarea']) : htmlspecialchars($serendipity['GET']['textarea'], ENT_COMPAT, LANG_CHARSET)) . '\')';
} else { } else {
$eventData['finishJSFunction'] = 'serendipity.serendipity_imageSelector_done(\'' . htmlspecialchars($serendipity['GET']['textarea']) . '\')'; $eventData['finishJSFunction'] = 'serendipity.serendipity_imageSelector_done(\'' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['textarea']) : htmlspecialchars($serendipity['GET']['textarea'], ENT_COMPAT, LANG_CHARSET)) . '\')';
} }
return true; return true;
break; break;

20
serendipity_event_includeentry/form.inc.php
View file

@ -9,10 +9,10 @@
$cbag = new serendipity_property_bag; $cbag = new serendipity_property_bag;
$this->introspect_item($config_item, $cbag); $this->introspect_item($config_item, $cbag);
$cname = htmlspecialchars($cbag->get('name')); $cname = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET));
$cdesc = htmlspecialchars($cbag->get('description')); $cdesc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('description')) : htmlspecialchars($cbag->get('description'), ENT_COMPAT, LANG_CHARSET));
$value = $this->get_static($config_item, 'unset'); $value = $this->get_static($config_item, 'unset');
$lang_direction = htmlspecialchars($cbag->get('lang_direction')); $lang_direction = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('lang_direction')) : htmlspecialchars($cbag->get('lang_direction'), ENT_COMPAT, LANG_CHARSET));
$only_type = $cbag->get('only_type'); $only_type = $cbag->get('only_type');
if (!empty($only_type) && $type != $only_type) { if (!empty($only_type) && $type != $only_type) {
$elcount--; $elcount--;
@ -28,7 +28,7 @@
/* Try and the default value for the config item */ /* Try and the default value for the config item */
$value = $cbag->get('default'); $value = $cbag->get('default');
} }
$hvalue = (!isset($_POST["serendipity"]["staticSubmit"]) && isset($_POST['serendipity']['plugin'][$config_item]) ? htmlspecialchars($_POST['serendipity']['plugin'][$config_item]) : htmlspecialchars($value)); $hvalue = (!isset($_POST["serendipity"]["staticSubmit"]) && isset($_POST['serendipity']['plugin'][$config_item]) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($_POST['serendipity']['plugin'][$config_item]) : htmlspecialchars($_POST['serendipity']['plugin'][$config_item], ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($value) : htmlspecialchars($value, ENT_COMPAT, LANG_CHARSET)));
$radio = array(); $radio = array();
$select = array(); $select = array();
$per_row = null; $per_row = null;
@ -58,10 +58,10 @@
<select class="direction_<?php echo $lang_direction; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]"> <select class="direction_<?php echo $lang_direction; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]">
<?php <?php
foreach($select AS $select_value => $select_desc) { foreach($select AS $select_value => $select_desc) {
$id = htmlspecialchars($config_item . $select_value); $id = (function_exists('serendipity_specialchars') ? serendipity_specialchars($config_item . $select_value) : htmlspecialchars($config_item . $select_value, ENT_COMPAT, LANG_CHARSET));
?> ?>
<option value="<?php echo $select_value; ?>" <?php echo ($select_value == $hvalue ? 'selected="selected"' : ''); ?> title="<?php echo htmlspecialchars($select_desc); ?>" /> <option value="<?php echo $select_value; ?>" <?php echo ($select_value == $hvalue ? 'selected="selected"' : ''); ?> title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($select_desc) : htmlspecialchars($select_desc, ENT_COMPAT, LANG_CHARSET)); ?>" />
<?php echo htmlspecialchars($select_desc); ?> <?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($select_desc) : htmlspecialchars($select_desc, ENT_COMPAT, LANG_CHARSET)); ?>
</option> </option>
<?php <?php
} }
@ -111,7 +111,7 @@
<?php <?php
$counter = 0; $counter = 0;
foreach($radio['value'] AS $radio_index => $radio_value) { foreach($radio['value'] AS $radio_index => $radio_value) {
$id = htmlspecialchars($config_item . $radio_value); $id = (function_exists('serendipity_specialchars') ? serendipity_specialchars($config_item . $radio_value) : htmlspecialchars($config_item . $radio_value, ENT_COMPAT, LANG_CHARSET));
$counter++; $counter++;
$checked = ""; $checked = "";
@ -129,8 +129,8 @@
<?php <?php
} }
?> ?>
<input class="direction_<?php echo $lang_direction; ?> input_radio" type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo $checked ?> title="<?php echo htmlspecialchars($radio['desc'][$radio_index]); ?>" /> <input class="direction_<?php echo $lang_direction; ?> input_radio" type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo $checked ?> title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($radio['desc'][$radio_index]) : htmlspecialchars($radio['desc'][$radio_index], ENT_COMPAT, LANG_CHARSET)); ?>" />
<label for="serendipity_plugin_<?php echo $id; ?>"><?php echo htmlspecialchars($radio['desc'][$radio_index]); ?></label> <label for="serendipity_plugin_<?php echo $id; ?>"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($radio['desc'][$radio_index]) : htmlspecialchars($radio['desc'][$radio_index], ENT_COMPAT, LANG_CHARSET)); ?></label>
<?php <?php
if ($counter == $per_row) { if ($counter == $per_row) {
$counter = 0; $counter = 0;

8
serendipity_event_includeentry/serendipity_event_includeentry.php
View file

@ -38,7 +38,7 @@ class serendipity_event_includeentry extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_INCLUDEENTRY_DESC); $propbag->add('description', PLUGIN_EVENT_INCLUDEENTRY_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '2.14'); $propbag->add('version', '2.14.1');
$propbag->add('scrambles_true_content', true); $propbag->add('scrambles_true_content', true);
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
@ -471,7 +471,7 @@ class serendipity_event_includeentry extends serendipity_event
continue; continue;
} }
$html .= ' <option value="' . $block['id'] . '" ' . ($sel == $block['id'] ? 'selected="selected"' : '') . '>'; $html .= ' <option value="' . $block['id'] . '" ' . ($sel == $block['id'] ? 'selected="selected"' : '') . '>';
$html .= htmlspecialchars($block['title']) . '</option>'; $html .= (function_exists('serendipity_specialchars') ? serendipity_specialchars($block['title']) : htmlspecialchars($block['title'], ENT_COMPAT, LANG_CHARSET)) . '</option>';
} }
return $html; return $html;
@ -522,8 +522,8 @@ class serendipity_event_includeentry extends serendipity_event
$serendipity['POST']['staticSubmit'] = true; $serendipity['POST']['staticSubmit'] = true;
$bag = new serendipity_property_bag; $bag = new serendipity_property_bag;
$this->introspect($bag); $this->introspect($bag);
$name = htmlspecialchars($bag->get('name')); $name = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('name')) : htmlspecialchars($bag->get('name'), ENT_COMPAT, LANG_CHARSET));
$desc = htmlspecialchars($bag->get('description')); $desc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('description')) : htmlspecialchars($bag->get('description'), ENT_COMPAT, LANG_CHARSET));
$config_names = $bag->get('page_configuration'); $config_names = $bag->get('page_configuration');
foreach ($config_names as $config_item) { foreach ($config_names as $config_item) {

20
serendipity_event_karma/serendipity_event_karma.php
View file

@ -1115,7 +1115,7 @@ END_IMG_CSS;
if (is_array($sql_rows)) { if (is_array($sql_rows)) {
foreach($sql_rows AS $id => $row) { foreach($sql_rows AS $id => $row) {
?> ?>
<dt><a href="<?php echo serendipity_archiveURL($row['id'], $row['title'], 'serendipityHTTPPath', true, array('timestamp' => $row['timestamp'])); ?>"><?php echo htmlspecialchars($row['title']); ?></a></dt> <dt><a href="<?php echo serendipity_archiveURL($row['id'], $row['title'], 'serendipityHTTPPath', true, array('timestamp' => $row['timestamp'])); ?>"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['title']) : htmlspecialchars($row['title'], ENT_COMPAT, LANG_CHARSET)); ?></a></dt>
<dd><?php echo $row['no']; ?> <?php echo constant('PLUGIN_KARMA_STATISTICS_' . strtoupper($rows[0]) . '_NO'); ?></dd> <dd><?php echo $row['no']; ?> <?php echo constant('PLUGIN_KARMA_STATISTICS_' . strtoupper($rows[0]) . '_NO'); ?></dd>
<?php <?php
} }
@ -1538,7 +1538,7 @@ END_IMG_CSS;
} }
// URL; expected to be event_display and karmalog, respectively // URL; expected to be event_display and karmalog, respectively
$url = '?serendipity[adminModule]='.htmlspecialchars($serendipity['GET']['adminModule']).'&serendipity[adminAction]='.htmlspecialchars($serendipity['GET']['adminAction']); $url = '?serendipity[adminModule]='.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['adminModule']) : htmlspecialchars($serendipity['GET']['adminModule'], ENT_COMPAT, LANG_CHARSET)).'&serendipity[adminAction]='.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['adminAction']) : htmlspecialchars($serendipity['GET']['adminAction'], ENT_COMPAT, LANG_CHARSET));
// Filters // Filters
print(" print("
@ -1558,22 +1558,22 @@ END_IMG_CSS;
<div class='clearfix'> <div class='clearfix'>
<div class='form_field'> <div class='form_field'>
<label for='serendipity_filter_useragent'>User Agent</label> <label for='serendipity_filter_useragent'>User Agent</label>
<input id='serendipity_filter_useragent' name='serendipity[filter][user_agent]' type='text' value='".htmlspecialchars($serendipity['GET']['filter']['user_agent'])."'> <input id='serendipity_filter_useragent' name='serendipity[filter][user_agent]' type='text' value='".(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['filter']['user_agent']) : htmlspecialchars($serendipity['GET']['filter']['user_agent'], ENT_COMPAT, LANG_CHARSET))."'>
</div> </div>
<div class='form_field'> <div class='form_field'>
<label for='serendipity_filter_ip'>".IP."</label> <label for='serendipity_filter_ip'>".IP."</label>
<input id='serendipity_filter_ip' name='serendipity[filter][ip]' type='text' value='".htmlspecialchars($serendipity['GET']['filter']['ip'])."'> <input id='serendipity_filter_ip' name='serendipity[filter][ip]' type='text' value='".(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['filter']['ip']) : htmlspecialchars($serendipity['GET']['filter']['ip'], ENT_COMPAT, LANG_CHARSET))."'>
</div> </div>
<div class='form_field'> <div class='form_field'>
<label for='serendipity_filter_entryid'>Entry ID</label> <label for='serendipity_filter_entryid'>Entry ID</label>
<input id='serendipity_filter_entryid' name='serendipity[filter][entryid]' type='text' value='".htmlspecialchars($serendipity['GET']['filter']['entryid'])."'> <input id='serendipity_filter_entryid' name='serendipity[filter][entryid]' type='text' value='".(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['filter']['entryid']) : htmlspecialchars($serendipity['GET']['filter']['entryid'], ENT_COMPAT, LANG_CHARSET))."'>
</div> </div>
<div class='form_field'> <div class='form_field'>
<label for='serendipity_filter_title'>Entry title</label> <label for='serendipity_filter_title'>Entry title</label>
<input id='serendipity_filter_title' name='serendipity[filter][title]' type='text' value='".htmlspecialchars($serendipity['GET']['filter']['title'])."'> <input id='serendipity_filter_title' name='serendipity[filter][title]' type='text' value='".(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['filter']['title']) : htmlspecialchars($serendipity['GET']['filter']['title'], ENT_COMPAT, LANG_CHARSET))."'>
</div> </div>
</div> </div>
@ -1586,22 +1586,22 @@ END_IMG_CSS;
if (!empty($serendipity['GET']['filter']['entryid'])) { if (!empty($serendipity['GET']['filter']['entryid'])) {
$val = $serendipity['GET']['filter']['entryid']; $val = $serendipity['GET']['filter']['entryid'];
$and .= "AND l.entryid = '" . serendipity_db_escape_string($val) . "'"; $and .= "AND l.entryid = '" . serendipity_db_escape_string($val) . "'";
$searchString .= "&amp;serendipity['filter']['entryid']=".htmlspecialchars($val); $searchString .= "&amp;serendipity['filter']['entryid']=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($serendipity['GET']['filter']['ip'])) { if (!empty($serendipity['GET']['filter']['ip'])) {
$val = $serendipity['GET']['filter']['ip']; $val = $serendipity['GET']['filter']['ip'];
$and .= "AND l.ip = '" . serendipity_db_escape_string($val) . "'"; $and .= "AND l.ip = '" . serendipity_db_escape_string($val) . "'";
$searchString .= "&amp;serendipity['filter']['ip']=".htmlspecialchars($val); $searchString .= "&amp;serendipity['filter']['ip']=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($serendipity['GET']['filter']['user_agent'])) { if (!empty($serendipity['GET']['filter']['user_agent'])) {
$val = $serendipity['GET']['filter']['user_agent']; $val = $serendipity['GET']['filter']['user_agent'];
$and .= "AND l.user_agent LIKE '%" . serendipity_db_escape_string($val) . "%'"; $and .= "AND l.user_agent LIKE '%" . serendipity_db_escape_string($val) . "%'";
$searchString .= "&amp;serendipity['filter']['user_agent']=".htmlspecialchars($val); $searchString .= "&amp;serendipity['filter']['user_agent']=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET));
} }
if (!empty($serendipity['GET']['filter']['title'])) { if (!empty($serendipity['GET']['filter']['title'])) {
$val = $serendipity['GET']['filter']['title']; $val = $serendipity['GET']['filter']['title'];
$and .= "AND e.title LIKE '%" . serendipity_db_escape_string($val) . "%'"; $and .= "AND e.title LIKE '%" . serendipity_db_escape_string($val) . "%'";
$searchString .= "&amp;serendipity['filter']['title']=".htmlspecialchars($val); $searchString .= "&amp;serendipity['filter']['title']=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET));
} }
// Sorting (controls go after filtering controls in form above) // Sorting (controls go after filtering controls in form above)

12
serendipity_event_linklist/serendipity_event_linklist.php
View file

@ -30,7 +30,7 @@ class serendipity_event_linklist extends serendipity_event {
'external_plugin' => true 'external_plugin' => true
)); ));
$propbag->add('author', 'Matthew Groeninger, Omid Mottaghi Rad'); $propbag->add('author', 'Matthew Groeninger, Omid Mottaghi Rad');
$propbag->add('version', '1.99'); $propbag->add('version', '1.99.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -291,7 +291,7 @@ class serendipity_event_linklist extends serendipity_event {
$link = $row['link']; $link = $row['link'];
$id = $row['id']; $id = $row['id'];
$descrip = $row['descrip']; $descrip = $row['descrip'];
$output .= '<link name="'.htmlspecialchars($name).'" link="http://'.$link.'" descrip="'.htmlspecialchars($descrip).'" />'."\n"; $output .= '<link name="'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($name) : htmlspecialchars($name, ENT_COMPAT, LANG_CHARSET)).'" link="http://'.$link.'" descrip="'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($descrip) : htmlspecialchars($descrip, ENT_COMPAT, LANG_CHARSET)).'" />'."\n";
} }
} }
} }
@ -333,7 +333,7 @@ class serendipity_event_linklist extends serendipity_event {
$cat_name = $sql[0]['category_name']; $cat_name = $sql[0]['category_name'];
$cat_open = true; $cat_open = true;
$open_category = str_replace($replace_name,htmlspecialchars($cat_name),$open_category); $open_category = str_replace($replace_name,(function_exists('serendipity_specialchars') ? serendipity_specialchars($cat_name) : htmlspecialchars($cat_name, ENT_COMPAT, LANG_CHARSET)),$open_category);
$output .= $open_category; $output .= $open_category;
} else { } else {
$cat_open = false; $cat_open = false;
@ -368,9 +368,9 @@ class serendipity_event_linklist extends serendipity_event {
$replace_link = "_link_"; $replace_link = "_link_";
$replace_descrip = "_descrip_"; $replace_descrip = "_descrip_";
$link_out = str_replace($replace_linkname,htmlspecialchars($name),$link_out); $link_out = str_replace($replace_linkname,(function_exists('serendipity_specialchars') ? serendipity_specialchars($name) : htmlspecialchars($name, ENT_COMPAT, LANG_CHARSET)),$link_out);
$link_out = str_replace($replace_link,$link,$link_out); $link_out = str_replace($replace_link,$link,$link_out);
$link_out = str_replace($replace_descrip,htmlspecialchars($descrip),$link_out); $link_out = str_replace($replace_descrip,(function_exists('serendipity_specialchars') ? serendipity_specialchars($descrip) : htmlspecialchars($descrip, ENT_COMPAT, LANG_CHARSET)),$link_out);
$output .= $link_out; $output .= $link_out;
} }
} }
@ -739,7 +739,7 @@ class serendipity_event_linklist extends serendipity_event {
<td width="16"> <td width="16">
<input class="input_checkbox" type="checkbox" name="serendipity[category_to_remove][]" value="<?php echo $category['categoryid']; ?>" /> <input class="input_checkbox" type="checkbox" name="serendipity[category_to_remove][]" value="<?php echo $category['categoryid']; ?>" />
</td> </td>
<td width="300" style="padding-left: <?php echo ($category['depth']*15)+20 ?>px"><img src="<?php echo serendipity_getTemplateFile('admin/img/folder.png') ?>" style="vertical-align: bottom;"> <?php echo htmlspecialchars($category['category_name']) ?></td> <td width="300" style="padding-left: <?php echo ($category['depth']*15)+20 ?>px"><img src="<?php echo serendipity_getTemplateFile('admin/img/folder.png') ?>" style="vertical-align: bottom;"> <?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($category['category_name']) : htmlspecialchars($category['category_name'], ENT_COMPAT, LANG_CHARSET)) ?></td>
</tr> </tr>
<?php <?php
} }

14
serendipity_event_linktoolbar/serendipity_event_linktoolbar.php
View file

@ -22,7 +22,7 @@ class serendipity_event_linktoolbar extends serendipity_event {
$propbag->add('description', PLUGIN_LINKTOOLBAR_TITLE_DESC); $propbag->add('description', PLUGIN_LINKTOOLBAR_TITLE_DESC);
$propbag->add('event_hooks', array('frontend_header' => true)); $propbag->add('event_hooks', array('frontend_header' => true));
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '1.5'); $propbag->add('version', '1.5.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.7', 'serendipity' => '0.7',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -75,7 +75,7 @@ class serendipity_event_linktoolbar extends serendipity_event {
if (is_array($resultset) && is_numeric($resultset[0]['id'])) { if (is_array($resultset) && is_numeric($resultset[0]['id'])) {
return array( return array(
'link' => serendipity_archiveURL($resultset[0]['id'], $resultset[0]['title'], 'baseURL', true, array('timestamp' => $resultset[0]['timestamp'])), 'link' => serendipity_archiveURL($resultset[0]['id'], $resultset[0]['title'], 'baseURL', true, array('timestamp' => $resultset[0]['timestamp'])),
'title' => htmlspecialchars($resultset[0]['title']) 'title' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($resultset[0]['title']) : htmlspecialchars($resultset[0]['title'], ENT_COMPAT, LANG_CHARSET))
); );
} }
@ -136,7 +136,7 @@ class serendipity_event_linktoolbar extends serendipity_event {
return array( return array(
'link' => $link, 'link' => $link,
'title' => htmlspecialchars($cat['category_name']) 'title' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($cat['category_name']) : htmlspecialchars($cat['category_name'], ENT_COMPAT, LANG_CHARSET))
); );
} }
@ -156,7 +156,7 @@ class serendipity_event_linktoolbar extends serendipity_event {
return array( return array(
'link' => $link, 'link' => $link,
'title' => AUTHOR . ' ' . htmlspecialchars($user['realname']) 'title' => AUTHOR . ' ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($user['realname']) : htmlspecialchars($user['realname'], ENT_COMPAT, LANG_CHARSET))
); );
} }
@ -234,12 +234,12 @@ class serendipity_event_linktoolbar extends serendipity_event {
$start_url = $serendipity['baseURL']; $start_url = $serendipity['baseURL'];
$start_title = $serendipity['blogTitle']; $start_title = $serendipity['blogTitle'];
echo '<link rel="start" href="' . $start_url . '" title="' . htmlspecialchars($start_title) . '" />' . "\n"; echo '<link rel="start" href="' . $start_url . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($start_title) : htmlspecialchars($start_title, ENT_COMPAT, LANG_CHARSET)) . '" />' . "\n";
if ($serendipity['GET']['action'] == 'read' && !empty($serendipity['GET']['id'])) { if ($serendipity['GET']['action'] == 'read' && !empty($serendipity['GET']['id'])) {
// Article detail view // Article detail view
echo '<link rel="up" href="' . $start_url . '" title="' . htmlspecialchars($start_title) . '" />' . "\n"; echo '<link rel="up" href="' . $start_url . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($start_title) : htmlspecialchars($start_title, ENT_COMPAT, LANG_CHARSET)) . '" />' . "\n";
$this->backAndForth( $this->backAndForth(
$this->showPaging($serendipity['GET']['id']) $this->showPaging($serendipity['GET']['id'])
); );
@ -348,7 +348,7 @@ class serendipity_event_linktoolbar extends serendipity_event {
), ),
'serendipityHTTPPath'); 'serendipityHTTPPath');
} }
echo '<link rel="up" href="' . $categories_url . '" title="' . htmlspecialchars($cInfo['category_name']) . '" />' . "\n"; echo '<link rel="up" href="' . $categories_url . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($cInfo['category_name']) : htmlspecialchars($cInfo['category_name'], ENT_COMPAT, LANG_CHARSET)) . '" />' . "\n";
echo '<link rel="canonical" href="' . $categories_url . '" />' . "\n"; echo '<link rel="canonical" href="' . $categories_url . '" />' . "\n";
$categories = serendipity_fetchCategories('all'); $categories = serendipity_fetchCategories('all');

4
serendipity_event_livesearch/serendipity_event_livesearch.php
View file

@ -14,7 +14,7 @@ class serendipity_event_livesearch extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_LIVESEARCH_DESC); $propbag->add('description', PLUGIN_EVENT_LIVESEARCH_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Christian Stocker, Garvin Hicking'); $propbag->add('author', 'Christian Stocker, Garvin Hicking');
$propbag->add('version', '1.4'); $propbag->add('version', '1.4.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -133,7 +133,7 @@ class serendipity_event_livesearch extends serendipity_event
if (is_array($res) && count($res) > 0) { if (is_array($res) && count($res) > 0) {
foreach($res AS $id => $entry) { foreach($res AS $id => $entry) {
echo '<div class="serendipity_livesearch_row"><a href="' . serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', true, array('timestamp' => $entry['timestamp'])) . '">' . htmlspecialchars($entry['title']) . '</a></div>'; echo '<div class="serendipity_livesearch_row"><a href="' . serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', true, array('timestamp' => $entry['timestamp'])) . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '</a></div>';
} }
} else { } else {
echo '<div class="serendipity_livesearch_row">' . print_r($res, true) . '</div>'; echo '<div class="serendipity_livesearch_row">' . print_r($res, true) . '</div>';

6
serendipity_event_ljupdate/serendipity_event_ljupdate.php
View file

@ -26,7 +26,7 @@ class serendipity_event_ljupdate extends serendipity_event
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('author', 'Kaustubh Srikanth, Ivan Makhonin'); $propbag->add('author', 'Kaustubh Srikanth, Ivan Makhonin');
$propbag->add('version', '1.13'); $propbag->add('version', '1.13.1');
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
@ -359,7 +359,7 @@ class serendipity_event_ljupdate extends serendipity_event
$login_url = 'http://blog.myspace.com/index.cfm?fuseaction=login.process'; $login_url = 'http://blog.myspace.com/index.cfm?fuseaction=login.process';
$login_params = "email=$ms_userid&password=$ms_passwd&Remember=0"; $login_params = "email=$ms_userid&password=$ms_passwd&Remember=0";
echo "Opening URL $login_url with data " . htmlspecialchars($login_params) . "<br />\n"; echo "Opening URL $login_url with data " . (function_exists('serendipity_specialchars') ? serendipity_specialchars($login_params) : htmlspecialchars($login_params, ENT_COMPAT, LANG_CHARSET)) . "<br />\n";
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $login_url); curl_setopt($ch, CURLOPT_URL, $login_url);
@ -379,7 +379,7 @@ class serendipity_event_ljupdate extends serendipity_event
$post_url = 'http://blog.myspace.com/index.cfm?fuseaction=blog.processCreate'; $post_url = 'http://blog.myspace.com/index.cfm?fuseaction=blog.processCreate';
$post_params = "postMonth=$month&postDay=$day&postYear=$year&postHour=$hour&postMinute=$minute&postTimeMarker=$marker&subject=$subject&body=$content"; $post_params = "postMonth=$month&postDay=$day&postYear=$year&postHour=$hour&postMinute=$minute&postTimeMarker=$marker&subject=$subject&body=$content";
echo "Opening URL $post_url with data " . htmlspecialchars($post_params) . "<br />\n"; echo "Opening URL $post_url with data " . (function_exists('serendipity_specialchars') ? serendipity_specialchars($post_params) : htmlspecialchars($post_params, ENT_COMPAT, LANG_CHARSET)) . "<br />\n";
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $post_url); curl_setopt($ch, CURLOPT_URL, $post_url);

18
serendipity_event_metadesc/serendipity_event_metadesc.php
View file

@ -25,7 +25,7 @@ class serendipity_event_metadesc extends serendipity_event {
$propbag->add('description', PLUGIN_METADESC_DESC); $propbag->add('description', PLUGIN_METADESC_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Judebert, Don Chambers'); $propbag->add('author', 'Garvin Hicking, Judebert, Don Chambers');
$propbag->add('version', '0.15'); $propbag->add('version', '0.15.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'php' => '4.1.0' 'php' => '4.1.0'
@ -143,7 +143,7 @@ class serendipity_event_metadesc extends serendipity_event {
$this->meta_title = $property['meta_head_title']; $this->meta_title = $property['meta_head_title'];
$this->save_title = $serendipity['head_title']; $this->save_title = $serendipity['head_title'];
$this->save_subtitle = $serendipity['head_subtitle']; $this->save_subtitle = $serendipity['head_subtitle'];
$serendipity['head_title'] = htmlspecialchars($this->meta_title); $serendipity['head_title'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->meta_title) : htmlspecialchars($this->meta_title, ENT_COMPAT, LANG_CHARSET));
// Clear the subtitle (many templates use it along with the title) // Clear the subtitle (many templates use it along with the title)
$serendipity['head_subtitle'] = ''; $serendipity['head_subtitle'] = '';
} }
@ -192,8 +192,8 @@ class serendipity_event_metadesc extends serendipity_event {
if (serendipity_db_bool($this->get_config('escape'))) { if (serendipity_db_bool($this->get_config('escape'))) {
$md = htmlspecialchars($meta_description); $md = (function_exists('serendipity_specialchars') ? serendipity_specialchars($meta_description) : htmlspecialchars($meta_description, ENT_COMPAT, LANG_CHARSET));
$mk = htmlspecialchars($meta_keywords); $mk = (function_exists('serendipity_specialchars') ? serendipity_specialchars($meta_keywords) : htmlspecialchars($meta_keywords, ENT_COMPAT, LANG_CHARSET));
} else { } else {
$md = $meta_description; $md = $meta_description;
$mk = $meta_keywords; $mk = $meta_keywords;
@ -207,8 +207,8 @@ class serendipity_event_metadesc extends serendipity_event {
// emit default meta description and meta keyword, if not blank, for pages other than single entry // emit default meta description and meta keyword, if not blank, for pages other than single entry
if (serendipity_db_bool($this->get_config('escape'))) { if (serendipity_db_bool($this->get_config('escape'))) {
$md = htmlspecialchars($default_description); $md = (function_exists('serendipity_specialchars') ? serendipity_specialchars($default_description) : htmlspecialchars($default_description, ENT_COMPAT, LANG_CHARSET));
$mk = htmlspecialchars($default_keywords); $mk = (function_exists('serendipity_specialchars') ? serendipity_specialchars($default_keywords) : htmlspecialchars($default_keywords, ENT_COMPAT, LANG_CHARSET));
} else { } else {
$md = $default_description; $md = $default_description;
$mk = $default_keywords; $mk = $default_keywords;
@ -281,18 +281,18 @@ class serendipity_event_metadesc extends serendipity_event {
<p class="meta_description"><em><?php echo PLUGIN_METADESC_FORM; ?></em></p> <p class="meta_description"><em><?php echo PLUGIN_METADESC_FORM; ?></em></p>
<label for="serendipity[properties][meta_description]"><?php echo PLUGIN_METADESC_DESCRIPTION; ?></label><br /> <label for="serendipity[properties][meta_description]"><?php echo PLUGIN_METADESC_DESCRIPTION; ?></label><br />
<input class="input_textbox" type="text" style="width: 100%" value="<?php echo htmlspecialchars($meta_description); ?>" name="serendipity[properties][meta_description]" id="properties_meta_description" /> <input class="input_textbox" type="text" style="width: 100%" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($meta_description) : htmlspecialchars($meta_description, ENT_COMPAT, LANG_CHARSET)); ?>" name="serendipity[properties][meta_description]" id="properties_meta_description" />
<span class="meta_string_length"><?php echo PLUGIN_METADESC_LENGTH . ': ' . str_word_count($meta_description) . ' '. PLUGIN_METADESC_WORDS . ', ' . strlen($meta_description) . ' ' . PLUGIN_METADESC_CHARACTERS; ?></span> <span class="meta_string_length"><?php echo PLUGIN_METADESC_LENGTH . ': ' . str_word_count($meta_description) . ' '. PLUGIN_METADESC_WORDS . ', ' . strlen($meta_description) . ' ' . PLUGIN_METADESC_CHARACTERS; ?></span>
<br /><br /> <br /><br />
<label for="serendipity[properties][meta_keywords]"><?php echo PLUGIN_METADESC_KEYWORDS; ?></label><br /> <label for="serendipity[properties][meta_keywords]"><?php echo PLUGIN_METADESC_KEYWORDS; ?></label><br />
<input class="input_textbox" type="text" style="width: 100%" value="<?php echo htmlspecialchars($meta_keywords); ?>" name="serendipity[properties][meta_keywords]" id="properties_meta_keywords" /> <input class="input_textbox" type="text" style="width: 100%" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($meta_keywords) : htmlspecialchars($meta_keywords, ENT_COMPAT, LANG_CHARSET)); ?>" name="serendipity[properties][meta_keywords]" id="properties_meta_keywords" />
<span class="meta_string_length"><?php echo PLUGIN_METADESC_LENGTH . ': ' . str_word_count($meta_keywords) . ' '. PLUGIN_METADESC_WORDS . ', ' . strlen($meta_keywords) . ' ' . PLUGIN_METADESC_CHARACTERS; ?></span> <span class="meta_string_length"><?php echo PLUGIN_METADESC_LENGTH . ': ' . str_word_count($meta_keywords) . ' '. PLUGIN_METADESC_WORDS . ', ' . strlen($meta_keywords) . ' ' . PLUGIN_METADESC_CHARACTERS; ?></span>
<br /><br /> <br /><br />
<p class="meta_description"><em><?php echo PLUGIN_METADESC_HEADTITLE_DESC; ?></em></p> <p class="meta_description"><em><?php echo PLUGIN_METADESC_HEADTITLE_DESC; ?></em></p>
<label for="serendipity[properties][meta_head_title]"><?php echo PLUGIN_METADESC_HEADTITLE; ?></label><br /> <label for="serendipity[properties][meta_head_title]"><?php echo PLUGIN_METADESC_HEADTITLE; ?></label><br />
<input class="input_textbox" type="text" style="width: 100%" value="<?php echo htmlspecialchars($meta_head_title); ?>" name="serendipity[properties][meta_head_title]" id="properties_headtitle" /> <input class="input_textbox" type="text" style="width: 100%" value="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($meta_head_title) : htmlspecialchars($meta_head_title, ENT_COMPAT, LANG_CHARSET)); ?>" name="serendipity[properties][meta_head_title]" id="properties_headtitle" />
<span class="meta_string_length"><?php echo PLUGIN_METADESC_LENGTH . ': ' . str_word_count($meta_head_title) . ' '. PLUGIN_METADESC_WORDS . ', ' . strlen($meta_head_title) . ' ' . PLUGIN_METADESC_CHARACTERS; ?></span> <span class="meta_string_length"><?php echo PLUGIN_METADESC_LENGTH . ': ' . str_word_count($meta_head_title) . ' '. PLUGIN_METADESC_WORDS . ', ' . strlen($meta_head_title) . ' ' . PLUGIN_METADESC_CHARACTERS; ?></span>
<p class="meta_stringlength_disclaimer"><em><?php echo '<sup>*</sup> ' . PLUGIN_METADESC_STRINGLENGTH_DISCLAIMER; ?></em></p> <p class="meta_stringlength_disclaimer"><em><?php echo '<sup>*</sup> ' . PLUGIN_METADESC_STRINGLENGTH_DISCLAIMER; ?></em></p>

2
serendipity_event_microformats/serendipity_event_microformats.php
View file

@ -59,7 +59,7 @@ class serendipity_event_microformats extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_MICROFORMATS_DESC); $propbag->add('description', PLUGIN_EVENT_MICROFORMATS_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Matthias Gutjahr'); $propbag->add('author', 'Matthias Gutjahr');
$propbag->add('version', '0.46'); $propbag->add('version', '0.46.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.9', 'serendipity' => '0.9',
'smarty' => '2.6.7', 'smarty' => '2.6.7',

2
serendipity_event_microformats/smarty.inc.php
View file

@ -161,7 +161,7 @@ echo '</pre>';*/
$serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion;
if (!empty($params['escaped'])) { if (!empty($params['escaped'])) {
echo serendipity_utf8_encode(htmlspecialchars($content)); echo serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($content) : htmlspecialchars($content, ENT_COMPAT, LANG_CHARSET)));
} else { } else {
echo $content; echo $content;
} }

4
serendipity_event_mobile_output/serendipity_event_mobile_output.php
View file

@ -14,7 +14,7 @@ TODO:
if (IN_serendipity !== true) { if (IN_serendipity !== true) {
die ("Don't hack!"); die ("Don't hack!");
} }
@define('PLUGIN_EVENT_MOBILE_VERSION','1.04'); @define('PLUGIN_EVENT_MOBILE_VERSION','1.04.1');
@define('PLUGIN_EVENT_MOBILE_AUTHORS','Pelle Boese, Grischa Brockhaus'); @define('PLUGIN_EVENT_MOBILE_AUTHORS','Pelle Boese, Grischa Brockhaus');
@define('PLUGIN_EVENT_MOBILE_TPL_IPHONE','iphone.app'); @define('PLUGIN_EVENT_MOBILE_TPL_IPHONE','iphone.app');
@ -555,7 +555,7 @@ class serendipity_event_mobile_output extends serendipity_event
function addtoxml(&$str, $url, $lastmod = null, $priority = null, $changefreq = null) { function addtoxml(&$str, $url, $lastmod = null, $priority = null, $changefreq = null) {
/* Sitemap requires this. /* Sitemap requires this.
* I think that s9y does not include these specialchars, so this is just a precaution */ * I think that s9y does not include these specialchars, so this is just a precaution */
$url = htmlspecialchars($url, ENT_QUOTES); $url = (function_exists('serendipity_specialchars') ? serendipity_specialchars($url, ENT_QUOTES) : htmlspecialchars($url, ENT_QUOTES| ENT_COMPAT, LANG_CHARSET));
$str .= "\t<url>\n"; $str .= "\t<url>\n";
$str .= "\t\t<loc>$url</loc>\n"; $str .= "\t\t<loc>$url</loc>\n";

4
serendipity_event_multilingual/serendipity_event_multilingual.php
View file

@ -34,7 +34,7 @@ class serendipity_event_multilingual extends serendipity_event
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('groups', array('FRONTEND_ENTRY_RELATED', 'BACKEND_EDITOR')); $propbag->add('groups', array('FRONTEND_ENTRY_RELATED', 'BACKEND_EDITOR'));
$propbag->add('version', '2.15'); $propbag->add('version', '2.15.1');
$propbag->add('configuration', array('copytext', 'placement', 'tagged_title', 'tagged_entries', 'tagged_sidebar', 'langswitch')); $propbag->add('configuration', array('copytext', 'placement', 'tagged_title', 'tagged_entries', 'tagged_sidebar', 'langswitch'));
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
'frontend_fetchentries' => true, 'frontend_fetchentries' => true,
@ -521,7 +521,7 @@ class serendipity_event_multilingual extends serendipity_event
$langs = ''; $langs = '';
foreach($use_lang AS $code => $desc) { foreach($use_lang AS $code => $desc) {
$langs .= '<option value="' . $code . '" ' . ($lang_selected == $code ? 'selected="selected"' : '') . '>' . htmlspecialchars($desc) . '</option>' . "\n"; $langs .= '<option value="' . $code . '" ' . ($lang_selected == $code ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($desc) : htmlspecialchars($desc, ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
?> ?>
<fieldset style="margin: 5px"> <fieldset style="margin: 5px">

4
serendipity_event_multilingual/serendipity_plugin_multilingual.php
View file

@ -37,7 +37,7 @@ class serendipity_plugin_multilingual extends serendipity_event
$conf[] = $lkey; $conf[] = $lkey;
} }
$propbag->add('configuration', $conf); $propbag->add('configuration', $conf);
$propbag->add('version', '1.11'); $propbag->add('version', '1.11.1');
$propbag->add('groups', array('FRONTEND_VIEWS')); $propbag->add('groups', array('FRONTEND_VIEWS'));
$this->dependencies = array('serendipity_event_multilingual' => 'remove'); $this->dependencies = array('serendipity_event_multilingual' => 'remove');
} }
@ -91,7 +91,7 @@ class serendipity_plugin_multilingual extends serendipity_event
echo '<select style="font-size: ' . $this->get_config('size', '9') . 'px" name="user_language" onchange="document.getElementById(\'language_chooser\').submit();">'; echo '<select style="font-size: ' . $this->get_config('size', '9') . 'px" name="user_language" onchange="document.getElementById(\'language_chooser\').submit();">';
foreach ($serendipity['languages'] as $lang_key => $language) { foreach ($serendipity['languages'] as $lang_key => $language) {
if ($this->get_config($lang_key, 'false') == 'true') { if ($this->get_config($lang_key, 'false') == 'true') {
echo '<option value="' . $lang_key . '" ' . ($serendipity['lang'] == $lang_key ? 'selected="selected"' : '') . '>' . htmlspecialchars($language) . '</option>'; echo '<option value="' . $lang_key . '" ' . ($serendipity['lang'] == $lang_key ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($language) : htmlspecialchars($language, ENT_COMPAT, LANG_CHARSET)) . '</option>';
} }
} }
echo '</select>'; echo '</select>';

20
serendipity_event_mycalendar/serendipity_event_mycalendar.php
View file

@ -28,7 +28,7 @@ class serendipity_event_mycalendar extends serendipity_event {
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '0.16'); $propbag->add('version', '0.16.1');
$propbag->add('author', 'Garvin Hicking, Markus Gerstel, Grischa Brockhaus'); $propbag->add('author', 'Garvin Hicking, Markus Gerstel, Grischa Brockhaus');
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
@ -229,12 +229,12 @@ class serendipity_event_mycalendar extends serendipity_event {
if ($i == $selected) { if ($i == $selected) {
$found = true; $found = true;
} }
$html .= '<option value="' . $i . '" ' . ($i == $selected ? ' selected="selected"' : '') . '>' . htmlspecialchars($value) . '</option>' . "\n"; $html .= '<option value="' . $i . '" ' . ($i == $selected ? ' selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($value) : htmlspecialchars($value, ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
if (!$found) { if (!$found) {
$html .= '<option value=""></option>' . "\n"; $html .= '<option value=""></option>' . "\n";
$html .= '<option value="' . $selected . '" selected="selected">' . htmlspecialchars($selected) . '</option>' . "\n"; $html .= '<option value="' . $selected . '" selected="selected">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($selected) : htmlspecialchars($selected, ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
$html .= '</select>'; $html .= '</select>';
@ -314,8 +314,8 @@ class serendipity_event_mycalendar extends serendipity_event {
echo "<tr style='padding: 10px;' class='serendipity_admin_list_item serendipity_admin_list_item_$even'>\n"; echo "<tr style='padding: 10px;' class='serendipity_admin_list_item serendipity_admin_list_item_$even'>\n";
echo " <td><em>$idx</em></td>\n"; echo " <td><em>$idx</em></td>\n";
echo " <td><input class='input_textbox' id='eventname_{$event['eventid']}' type='text' name=\"serendipity[event][{$event['eventid']}][eventname]\" value=\"" . htmlspecialchars($event['eventname']) . "\" /></td>\n"; echo " <td><input class='input_textbox' id='eventname_{$event['eventid']}' type='text' name=\"serendipity[event][{$event['eventid']}][eventname]\" value=\"" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($event['eventname']) : htmlspecialchars($event['eventname'], ENT_COMPAT, LANG_CHARSET)) . "\" /></td>\n";
echo " <td><input class='input_textbox' id='eventurl_{$event['eventid']}' style='width: 100%' type='text' name=\"serendipity[event][{$event['eventid']}][eventurl]\" value=\"" . htmlspecialchars($event['eventurl']) . "\" /></td>\n"; echo " <td><input class='input_textbox' id='eventurl_{$event['eventid']}' style='width: 100%' type='text' name=\"serendipity[event][{$event['eventid']}][eventurl]\" value=\"" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($event['eventurl']) : htmlspecialchars($event['eventurl'], ENT_COMPAT, LANG_CHARSET)) . "\" /></td>\n";
echo " <td>"; echo " <td>";
echo $this->getDropdown('day', $event['eventid'], range(1, 31), $day, false, 'changeDate('. $event['eventid'] .')') . "."; echo $this->getDropdown('day', $event['eventid'], range(1, 31), $day, false, 'changeDate('. $event['eventid'] .')') . ".";
echo $this->getDropdown('month', $event['eventid'], range(1, 12), $month, false, 'changeDate('. $event['eventid'] .')') . "."; echo $this->getDropdown('month', $event['eventid'], range(1, 12), $month, false, 'changeDate('. $event['eventid'] .')') . ".";
@ -343,7 +343,7 @@ class serendipity_event_mycalendar extends serendipity_event {
echo "<tr style='padding: 10px;' class='serendipity_admin_list_item serendipity_admin_list_item_$even'>\n"; echo "<tr style='padding: 10px;' class='serendipity_admin_list_item serendipity_admin_list_item_$even'>\n";
echo " <td>&nbsp;</td>\n"; echo " <td>&nbsp;</td>\n";
echo " <td>" . PLUGIN_MYCALENDAR_EVENTURI_TITLE . ": </td>\n"; echo " <td>" . PLUGIN_MYCALENDAR_EVENTURI_TITLE . ": </td>\n";
echo " <td colspan='3'><input class='input_textbox' style='width: 100%' type='text' name=\"serendipity[event][{$event['eventid']}][eventurltitle]\" value=\"" . htmlspecialchars($event['eventurltitle']) . "\" /></td>\n"; echo " <td colspan='3'><input class='input_textbox' style='width: 100%' type='text' name=\"serendipity[event][{$event['eventid']}][eventurltitle]\" value=\"" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($event['eventurltitle']) : htmlspecialchars($event['eventurltitle'], ENT_COMPAT, LANG_CHARSET)) . "\" /></td>\n";
echo "</tr>\n"; echo "</tr>\n";
} }
@ -415,14 +415,14 @@ class serendipity_event_mycalendar extends serendipity_event {
foreach($items AS $item) { foreach($items AS $item) {
?> ?>
<item> <item>
<title><?php echo serendipity_utf8_encode(htmlspecialchars($item['title'])); ?></title> <title><?php echo serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($item['title']) : htmlspecialchars($item['title'], ENT_COMPAT, LANG_CHARSET))); ?></title>
<link><?php echo serendipity_utf8_encode(htmlspecialchars($item['url'])); ?></link> <link><?php echo serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($item['url']) : htmlspecialchars($item['url'], ENT_COMPAT, LANG_CHARSET))); ?></link>
<author><?php echo $serendipity['blogTitle']; ?></author> <author><?php echo $serendipity['blogTitle']; ?></author>
<content:encoded> <content:encoded>
<?php echo serendipity_utf8_encode(htmlspecialchars($item['content'])); ?> <?php echo serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($item['content']) : htmlspecialchars($item['content'], ENT_COMPAT, LANG_CHARSET))); ?>
</content:encoded> </content:encoded>
<pubDate><?php echo $item['date']; ?></pubDate> <pubDate><?php echo $item['date']; ?></pubDate>
<guid isPermaLink="false"><?php echo serendipity_utf8_encode(htmlspecialchars($item['url'])); ?></guid> <guid isPermaLink="false"><?php echo serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($item['url']) : htmlspecialchars($item['url'], ENT_COMPAT, LANG_CHARSET))); ?></guid>
</item> </item>
<?php <?php
} }

6
serendipity_event_mycalendar/serendipity_plugin_mycalendar.php
View file

@ -20,7 +20,7 @@ class serendipity_plugin_mycalendar extends serendipity_plugin {
$propbag->add('description', PLUGIN_MYCALENDAR_SIDE_DESC); $propbag->add('description', PLUGIN_MYCALENDAR_SIDE_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Markus Gerstel'); $propbag->add('author', 'Garvin Hicking, Markus Gerstel');
$propbag->add('version', '0.13'); $propbag->add('version', '0.13.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -135,14 +135,14 @@ class serendipity_plugin_mycalendar extends serendipity_plugin {
$olddays = 0; $olddays = 0;
foreach($items AS $item) { foreach($items AS $item) {
$cont = htmlspecialchars($item['eventname']); $cont = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['eventname']) : htmlspecialchars($item['eventname'], ENT_COMPAT, LANG_CHARSET));
if (!empty($item['eventurl'])) { if (!empty($item['eventurl'])) {
if (!empty($item['eventurltitle'])) { if (!empty($item['eventurltitle'])) {
$ltitle = $item['eventurltitle']; $ltitle = $item['eventurltitle'];
} else { } else {
$ltitle = $item['eventname']; $ltitle = $item['eventname'];
} }
$cont = '<a href="' . htmlspecialchars($item['eventurl']) . '" title="' . htmlspecialchars($ltitle) . '">' . $cont . '</a>'; $cont = '<a href="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['eventurl']) : htmlspecialchars($item['eventurl'], ENT_COMPAT, LANG_CHARSET)) . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($ltitle) : htmlspecialchars($ltitle, ENT_COMPAT, LANG_CHARSET)) . '">' . $cont . '</a>';
} }
$daystostart = ceil(($item['eventdate'] - $ts) / 86400); $daystostart = ceil(($item['eventdate'] - $ts) / 86400);

8
serendipity_event_mymood/serendipity_event_mymood.php
View file

@ -56,7 +56,7 @@ class serendipity_event_mymood extends serendipity_event {
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '0.11'); $propbag->add('version', '0.11.1');
$propbag->add('author', 'Brett Profitt'); $propbag->add('author', 'Brett Profitt');
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
@ -348,9 +348,9 @@ class serendipity_event_mymood extends serendipity_event {
echo "<tr style='padding: 10px;' class='serendipity_admin_list_item serendipity_admin_list_item_$even'>\n"; echo "<tr style='padding: 10px;' class='serendipity_admin_list_item serendipity_admin_list_item_$even'>\n";
echo " <td><em>$count</em></td>\n"; echo " <td><em>$count</em></td>\n";
echo " <td style='text-align: center'><input class='input_checkbox' type='checkbox' value='1' name=\"serendipity[mymood][{$mood['mood_id']}][mood_delete]\"></td>\n"; echo " <td style='text-align: center'><input class='input_checkbox' type='checkbox' value='1' name=\"serendipity[mymood][{$mood['mood_id']}][mood_delete]\"></td>\n";
echo " <td><input class='input_textbox' type='text' name=\"serendipity[mymood][{$mood['mood_id']}][mood_name]\" value=\"" . htmlspecialchars($mood['mood_name']) . "\" /></td>\n"; echo " <td><input class='input_textbox' type='text' name=\"serendipity[mymood][{$mood['mood_id']}][mood_name]\" value=\"" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($mood['mood_name']) : htmlspecialchars($mood['mood_name'], ENT_COMPAT, LANG_CHARSET)) . "\" /></td>\n";
echo " <td><input class='input_textbox' style='width: 100%' type='text' name=\"serendipity[mymood][{$mood['mood_id']}][mood_img]\" value=\"" . htmlspecialchars($mood['mood_img']) . "\" /></td>\n"; echo " <td><input class='input_textbox' style='width: 100%' type='text' name=\"serendipity[mymood][{$mood['mood_id']}][mood_img]\" value=\"" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($mood['mood_img']) : htmlspecialchars($mood['mood_img'], ENT_COMPAT, LANG_CHARSET)) . "\" /></td>\n";
echo " <td style='text-align: center'><input class='input_textbox' style='text-align: center' type='text' size='5' name=\"serendipity[mymood][{$mood['mood_id']}][mood_ascii]\" value=\"" . htmlspecialchars($mood['mood_ascii']) . "\" /></td>\n"; echo " <td style='text-align: center'><input class='input_textbox' style='text-align: center' type='text' size='5' name=\"serendipity[mymood][{$mood['mood_id']}][mood_ascii]\" value=\"" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($mood['mood_ascii']) : htmlspecialchars($mood['mood_ascii'], ENT_COMPAT, LANG_CHARSET)) . "\" /></td>\n";
echo "</tr>\n"; echo "</tr>\n";
$count++; $count++;

6
serendipity_event_openid/common.inc.php
View file

@ -8,7 +8,7 @@ if (file_exists($probelang)) {
include_once dirname(__FILE__) . '/lang_en.inc.php'; include_once dirname(__FILE__) . '/lang_en.inc.php';
function escape($message) { function escape($message) {
return htmlspecialchars($message, ENT_QUOTES); return (function_exists('serendipity_specialchars') ? serendipity_specialchars($message, ENT_QUOTES) : htmlspecialchars($message, ENT_QUOTES | ENT_COMPAT, LANG_CHARSET));
} }
class serendipity_common_openid { class serendipity_common_openid {
@ -255,7 +255,7 @@ class serendipity_common_openid {
$form .= '<form name="openid" id="openid" method="post" action="' . $url . '">'; $form .= '<form name="openid" id="openid" method="post" action="' . $url . '">';
$form .='<input type="hidden" name="serendipity[openidflag]" value="1" />'; $form .='<input type="hidden" name="serendipity[openidflag]" value="1" />';
foreach($hidden AS $key => $val) { foreach($hidden AS $key => $val) {
$form .= '<input type="hidden" name="serendipity[' . $key . ']" value="' . htmlspecialchars($val) . '" />'; $form .= '<input type="hidden" name="serendipity[' . $key . ']" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET)) . '" />';
} }
$form .= '<img src="' . $imgopenid . '" alt="OpenID"> '; $form .= '<img src="' . $imgopenid . '" alt="OpenID"> ';
@ -271,7 +271,7 @@ class serendipity_common_openid {
$form .= '<form name="openid" id="openid" method="post" action="' . $url . '">'; $form .= '<form name="openid" id="openid" method="post" action="' . $url . '">';
$form .='<input type="hidden" name="serendipity[openidflag]" value="1" />'; $form .='<input type="hidden" name="serendipity[openidflag]" value="1" />';
foreach($hidden AS $key => $val) { foreach($hidden AS $key => $val) {
$form .= '<input type="hidden" name="serendipity[' . $key . ']" value="' . htmlspecialchars($val) . '" />'; $form .= '<input type="hidden" name="serendipity[' . $key . ']" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET)) . '" />';
} }
$form .= '<input name="openIDLoginGoogle" type="image" src="' . $imggoogle . '" alt="' . PLUGIN_OPENID_LOGIN_WITH_GOOGLE . '" title="' . PLUGIN_OPENID_LOGIN_WITH_GOOGLE .'"/> '; $form .= '<input name="openIDLoginGoogle" type="image" src="' . $imggoogle . '" alt="' . PLUGIN_OPENID_LOGIN_WITH_GOOGLE . '" title="' . PLUGIN_OPENID_LOGIN_WITH_GOOGLE .'"/> ';
$form .= '<input name="openIDLoginYahoo" type="image" src="' . $imgyahoo . '" alt="' . PLUGIN_OPENID_LOGIN_WITH_YAHOO . '" title="' . PLUGIN_OPENID_LOGIN_WITH_YAHOO .'"/> '; $form .= '<input name="openIDLoginYahoo" type="image" src="' . $imgyahoo . '" alt="' . PLUGIN_OPENID_LOGIN_WITH_YAHOO . '" title="' . PLUGIN_OPENID_LOGIN_WITH_YAHOO .'"/> ';

12
serendipity_event_openid/serendipity_event_openid.php
View file

@ -13,7 +13,7 @@ class serendipity_event_openid extends serendipity_event
$propbag->add('description', PLUGIN_OPENID_DESC); $propbag->add('description', PLUGIN_OPENID_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Grischa Brockhaus, Rob Richards'); $propbag->add('author', 'Grischa Brockhaus, Rob Richards');
$propbag->add('version', '1.2'); $propbag->add('version', '1.2.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.2', 'serendipity' => '1.2',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -246,17 +246,17 @@ class serendipity_event_openid extends serendipity_event
if (! empty($serendipity['GET']['openidflag']) && ($serendipity['GET']['openidflag']==3)) { if (! empty($serendipity['GET']['openidflag']) && ($serendipity['GET']['openidflag']==3)) {
if ($checkRet = serendipity_common_openid::authenticate_openid($_GET, $this->get_consumertest_path(), true)) { if ($checkRet = serendipity_common_openid::authenticate_openid($_GET, $this->get_consumertest_path(), true)) {
if (serendipity_common_openid::updateOpenID($checkRet['openID'], $serendipity['authorid'])) { if (serendipity_common_openid::updateOpenID($checkRet['openID'], $serendipity['authorid'])) {
echo '<strong>' . htmlspecialchars(PLUGIN_OPENID_UPDATE_SUCCESS) . '</strong><br /><br />'; echo '<strong>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_OPENID_UPDATE_SUCCESS) : htmlspecialchars(PLUGIN_OPENID_UPDATE_SUCCESS, ENT_COMPAT, LANG_CHARSET)) . '</strong><br /><br />';
} else { } else {
echo '<strong>' . htmlspecialchars(PLUGIN_OPENID_UPDATE_FAIL) . '</strong><br /><br />'; echo '<strong>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_OPENID_UPDATE_FAIL) : htmlspecialchars(PLUGIN_OPENID_UPDATE_FAIL, ENT_COMPAT, LANG_CHARSET)) . '</strong><br /><br />';
} }
} else { } else {
echo '<strong>' . htmlspecialchars(PLUGIN_OPENID_INVALID_RESPONSE) . '</strong><br /><br />'; echo '<strong>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_OPENID_INVALID_RESPONSE) : htmlspecialchars(PLUGIN_OPENID_INVALID_RESPONSE, ENT_COMPAT, LANG_CHARSET)) . '</strong><br /><br />';
} }
// Job done. // Job done.
unset($serendipity['GET']['openidflag']); unset($serendipity['GET']['openidflag']);
} elseif (! empty($serendipity['POST']['openidflag']) && ($serendipity['POST']['openidflag']==3)) { } elseif (! empty($serendipity['POST']['openidflag']) && ($serendipity['POST']['openidflag']==3)) {
echo '<strong>' . htmlspecialchars(PLUGIN_OPENID_INVALID_RESPONSE) . '</strong><br /><br />'; echo '<strong>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_OPENID_INVALID_RESPONSE) : htmlspecialchars(PLUGIN_OPENID_INVALID_RESPONSE, ENT_COMPAT, LANG_CHARSET)) . '</strong><br /><br />';
} }
} }
$imgopenid = $serendipity['baseURL'] . 'index.php?/plugin/openid.png'; $imgopenid = $serendipity['baseURL'] . 'index.php?/plugin/openid.png';
@ -265,7 +265,7 @@ class serendipity_event_openid extends serendipity_event
$imgaol = $serendipity['baseURL'] . 'index.php?/plugin/oids_aol.png'; $imgaol = $serendipity['baseURL'] . 'index.php?/plugin/oids_aol.png';
echo '<div>'; echo '<div>';
echo '<strong>' . htmlspecialchars(PLUGIN_EVENT_OPENID_SELECT) . '</strong><br /><br />'; echo '<strong>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_EVENT_OPENID_SELECT) : htmlspecialchars(PLUGIN_EVENT_OPENID_SELECT, ENT_COMPAT, LANG_CHARSET)) . '</strong><br /><br />';
// To allow ENTER in the input line we have to create two forms: // To allow ENTER in the input line we have to create two forms:

4
serendipity_event_picasa/serendipity_event_picasa.php
View file

@ -256,7 +256,7 @@ class serendipity_event_picasa extends serendipity_event {
)); ));
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Thomas Nesges, Greg Greenway'); $propbag->add('author', 'Thomas Nesges, Greg Greenway');
$propbag->add('version', '1.14'); $propbag->add('version', '1.14.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -467,7 +467,7 @@ class serendipity_event_picasa extends serendipity_event {
$albumItemCount = $xmlData['albumItemCount']; $albumItemCount = $xmlData['albumItemCount'];
foreach($xmlData['images'] as $ikey => $ivalue) { foreach($xmlData['images'] as $ikey => $ivalue) {
$xmlData['images'][$ikey]['itemCaption'] = htmlspecialchars($ivalue['itemCaption'], ENT_QUOTES, false); $xmlData['images'][$ikey]['itemCaption'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($ivalue['itemCaption'], ENT_QUOTES) : htmlspecialchars($ivalue['itemCaption'], ENT_QUOTES | ENT_COMPAT, LANG_CHARSET));
} }
if($smarty_template == 'none') { if($smarty_template == 'none') {

18
serendipity_event_podcast/serendipity_event_podcast.php
View file

@ -14,7 +14,7 @@ if (file_exists($probelang)) {
include_once dirname(__FILE__) . '/lang_en.inc.php'; include_once dirname(__FILE__) . '/lang_en.inc.php';
include_once dirname(__FILE__) . '/podcast_player.php'; include_once dirname(__FILE__) . '/podcast_player.php';
@define("SERENDIPITY_EVENT_PODCAST_VERSION", "1.37"); @define("SERENDIPITY_EVENT_PODCAST_VERSION", "1.37.1");
class serendipity_event_podcast extends serendipity_event { class serendipity_event_podcast extends serendipity_event {
/** /**
@ -134,7 +134,7 @@ class serendipity_event_podcast extends serendipity_event{
switch($name) { switch($name) {
case 'info': case 'info':
$propbag->add('type', 'content'); $propbag->add('type', 'content');
$propbag->add('default', nl2br(htmlspecialchars(PLUGIN_PODCAST_USAGE) . "\n" . PLUGIN_PODCAST_USAGE_RSS)); $propbag->add('default', nl2br((function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_PODCAST_USAGE) : htmlspecialchars(PLUGIN_PODCAST_USAGE, ENT_COMPAT, LANG_CHARSET)) . "\n" . PLUGIN_PODCAST_USAGE_RSS));
break; break;
case 'easy': case 'easy':
@ -393,9 +393,9 @@ class serendipity_event_podcast extends serendipity_event{
$propbag->add('description', PLUGIN_PODCAST_ITUNES_DESC); $propbag->add('description', PLUGIN_PODCAST_ITUNES_DESC);
$propbag->add('default', " $propbag->add('default', "
<itunes:subtitle>" . htmlspecialchars($serendipity['blogTitle']) . "</itunes:subtitle> <itunes:subtitle>" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogTitle']) : htmlspecialchars($serendipity['blogTitle'], ENT_COMPAT, LANG_CHARSET)) . "</itunes:subtitle>
<itunes:author>" . htmlspecialchars($serendipity['blogTitle']) . "</itunes:author> <itunes:author>" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogTitle']) : htmlspecialchars($serendipity['blogTitle'], ENT_COMPAT, LANG_CHARSET)) . "</itunes:author>
<itunes:summary>" . htmlspecialchars($serendipity['blogDescription']) . "</itunes:summary> <itunes:summary>" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogDescription']) : htmlspecialchars($serendipity['blogDescription'], ENT_COMPAT, LANG_CHARSET)) . "</itunes:summary>
<itunes:image href=\"" . $serendipity['baseURL'] . "itunes.jpg\" /> <itunes:image href=\"" . $serendipity['baseURL'] . "itunes.jpg\" />
<itunes:category text=\"Technology\" /> <itunes:category text=\"Technology\" />
"); ");
@ -414,9 +414,9 @@ class serendipity_event_podcast extends serendipity_event{
} }
function iTunify(&$eventData) { function iTunify(&$eventData) {
$eventData['per_entry_display_dat'] .= '<itunes:author>' . htmlspecialchars($eventData['author']) . '</itunes:author>' . "\n"; $eventData['per_entry_display_dat'] .= '<itunes:author>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($eventData['author']) : htmlspecialchars($eventData['author'], ENT_COMPAT, LANG_CHARSET)) . '</itunes:author>' . "\n";
$eventData['per_entry_display_dat'] .= '<itunes:subtitle>' . htmlspecialchars($eventData['title']) . '</itunes:subtitle>' . "\n"; $eventData['per_entry_display_dat'] .= '<itunes:subtitle>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($eventData['title']) : htmlspecialchars($eventData['title'], ENT_COMPAT, LANG_CHARSET)) . '</itunes:subtitle>' . "\n";
$eventData['per_entry_display_dat'] .= '<itunes:summary>' . htmlspecialchars(strip_tags($eventData['feed_body'])) . '</itunes:summary>' . "\n"; $eventData['per_entry_display_dat'] .= '<itunes:summary>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($eventData['feed_body']) : htmlspecialchars(strip_tags($eventData['feed_body'], ENT_COMPAT, LANG_CHARSET))) . '</itunes:summary>' . "\n";
} }
/** /**
@ -592,7 +592,7 @@ class serendipity_event_podcast extends serendipity_event{
$fileInfo = $this->GetFileInfo($eventData['properties'][$eattr]); $fileInfo = $this->GetFileInfo($eventData['properties'][$eattr]);
$type = $fileInfo['mime']; $type = $fileInfo['mime'];
$fileUrl = str_replace(' ','%20',$eventData['properties'][$eattr]); $fileUrl = str_replace(' ','%20',$eventData['properties'][$eattr]);
$enclosure = $this->GetEnclosure($event, $this->GetHostUrl() . htmlspecialchars($fileUrl), $type, $fileInfo['length'], $fileInfo['md5']); $enclosure = $this->GetEnclosure($event, $this->GetHostUrl() . (function_exists('serendipity_specialchars') ? serendipity_specialchars($fileUrl) : htmlspecialchars($fileUrl, ENT_COMPAT, LANG_CHARSET)), $type, $fileInfo['length'], $fileInfo['md5']);
if (!empty($enclosure)) { if (!empty($enclosure)) {
$this->iTunify($eventData, $enclosure); $this->iTunify($eventData, $enclosure);

10
serendipity_event_popfetcher/serendipity_event_popfetcher.php
View file

@ -12,7 +12,7 @@ require_once('tmobile.php');
require_once('o2.php'); require_once('o2.php');
// Default values // Default values
define('POPFETCHER_VERSION', '1.44'); // This version of Popfetcher define('POPFETCHER_VERSION', '1.44.1'); // This version of Popfetcher
define('DEFAULT_ADMINMENU', 'true'); // True if run as sidebar plugin. False if external plugin. define('DEFAULT_ADMINMENU', 'true'); // True if run as sidebar plugin. False if external plugin.
define('DEFAULT_HIDENAME', 'popfetcher'); // User should set this to something unguessable define('DEFAULT_HIDENAME', 'popfetcher'); // User should set this to something unguessable
define('DEFAULT_MAILSERVER', ''); define('DEFAULT_MAILSERVER', '');
@ -793,7 +793,7 @@ class serendipity_event_popfetcher extends serendipity_event
$displayed_class = "popfetcherimage"; $displayed_class = "popfetcherimage";
} }
$attfile = $serendipity['serendipityHTTPPath'].$serendipity['uploadHTTPPath'].$maildir.$filename; $attfile = $serendipity['serendipityHTTPPath'].$serendipity['uploadHTTPPath'].$maildir.$filename;
$attlink = '<a class="'. $displayed_class .'" href="' . $attfile . '" target="_blank"><img src="'.$serendipity['serendipityHTTPPath'].$serendipity['uploadPath'].$maildir.$displayed_file.'" alt="'.htmlspecialchars($this->stripsubject($subject)).'" /></a>'; $attlink = '<a class="'. $displayed_class .'" href="' . $attfile . '" target="_blank"><img src="'.$serendipity['serendipityHTTPPath'].$serendipity['uploadPath'].$maildir.$displayed_file.'" alt="'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($this->stripsubject($subject)) : htmlspecialchars($this->stripsubject($subject), ENT_COMPAT, LANG_CHARSET)).'" /></a>';
if ($this->inline_picture($p->headers['content-id'], $postbody, $postex, $attfile, $attlink)) { if ($this->inline_picture($p->headers['content-id'], $postbody, $postex, $attfile, $attlink)) {
return true; return true;
@ -1107,7 +1107,7 @@ class serendipity_event_popfetcher extends serendipity_event
$date = (isset($s->headers['date'])) ? $s->headers['date'] : MF_MSG3; $date = (isset($s->headers['date'])) ? $s->headers['date'] : MF_MSG3;
$from = (isset($s->headers['from'])) ? $s->headers['from'] : MF_MSG4; $from = (isset($s->headers['from'])) ? $s->headers['from'] : MF_MSG4;
if (!empty($onlyfrom) && trim($from) != trim($onlyfrom)) { if (!empty($onlyfrom) && trim($from) != trim($onlyfrom)) {
$this->out('<br />'.sprintf(MF_ERROR_ONLYFROM, '"' . htmlspecialchars($from) . '"', '"' . htmlspecialchars($onlyfrom) . '"')); $this->out('<br />'.sprintf(MF_ERROR_ONLYFROM, '"' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($from) : htmlspecialchars($from, ENT_COMPAT, LANG_CHARSET)) . '"', '"' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($onlyfrom) : htmlspecialchars($onlyfrom, ENT_COMPAT, LANG_CHARSET)) . '"'));
continue; continue;
} }
@ -1120,7 +1120,7 @@ class serendipity_event_popfetcher extends serendipity_event
$this->out( '<hr />'); $this->out( '<hr />');
$this->out( MF_MSG5 . $date . '<br />'); $this->out( MF_MSG5 . $date . '<br />');
$this->out( MF_MSG6 . htmlspecialchars($from) . '<br />'); $this->out( MF_MSG6 . (function_exists('serendipity_specialchars') ? serendipity_specialchars($from) : htmlspecialchars($from, ENT_COMPAT, LANG_CHARSET)) . '<br />');
$this->out( MF_MSG16 . $subject . '<br />'); $this->out( MF_MSG16 . $subject . '<br />');
// Find the author associated with the from address and // Find the author associated with the from address and
@ -1144,7 +1144,7 @@ class serendipity_event_popfetcher extends serendipity_event
} }
if (is_null($useAuthor)) { if (is_null($useAuthor)) {
$this->out( '<br />'.sprintf(MF_ERROR_NOAUTHOR, '"' . htmlspecialchars($clean) . '"')); $this->out( '<br />'.sprintf(MF_ERROR_NOAUTHOR, '"' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($clean) : htmlspecialchars($clean, ENT_COMPAT, LANG_CHARSET)) . '"'));
continue; continue;
} }
} else { } else {

6
serendipity_event_relatedlinks/serendipity_event_relatedlinks.php
View file

@ -30,7 +30,7 @@ class serendipity_event_relatedlinks extends serendipity_event
'smarty' => '2.6.7', 'smarty' => '2.6.7',
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '1.8'); $propbag->add('version', '1.8.1');
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
'frontend_display:html:per_entry' => true, 'frontend_display:html:per_entry' => true,
'backend_publish' => true, 'backend_publish' => true,
@ -159,7 +159,7 @@ class serendipity_event_relatedlinks extends serendipity_event
$html_links[] = array( $html_links[] = array(
'url' => $parts[0], 'url' => $parts[0],
'title' => htmlspecialchars($parts[1]) 'title' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($parts[1]) : htmlspecialchars($parts[1], ENT_COMPAT, LANG_CHARSET))
); );
} }
@ -210,7 +210,7 @@ class serendipity_event_relatedlinks extends serendipity_event
<legend><?php echo PLUGIN_EVENT_RELATEDLINKS_TITLE; ?></legend> <legend><?php echo PLUGIN_EVENT_RELATEDLINKS_TITLE; ?></legend>
<label for="serendipity[properties][relatedentries]" title="<?php echo PLUGIN_EVENT_RELATEDLINKS_TITLE; ?>"> <label for="serendipity[properties][relatedentries]" title="<?php echo PLUGIN_EVENT_RELATEDLINKS_TITLE; ?>">
<?php echo PLUGIN_EVENT_RELATEDLINKS_ENTERDESC; ?>:</label><br /> <?php echo PLUGIN_EVENT_RELATEDLINKS_ENTERDESC; ?>:</label><br />
<textarea name="serendipity[properties][relatedentries]" style="width: 90%; height: 100px" id="properties_relatedentries"><?php echo htmlspecialchars($links); ?></textarea> <textarea name="serendipity[properties][relatedentries]" style="width: 90%; height: 100px" id="properties_relatedentries"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($links) : htmlspecialchars($links, ENT_COMPAT, LANG_CHARSET)); ?></textarea>
</fieldset> </fieldset>
<?php <?php
return true; return true;

4
serendipity_event_searchhighlight/serendipity_event_searchhighlight.php
View file

@ -18,7 +18,7 @@ class serendipity_event_searchhighlight extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_SEARCHHIGHLIGHT_DESC); $propbag->add('description', PLUGIN_EVENT_SEARCHHIGHLIGHT_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Tom Sommer'); $propbag->add('author', 'Tom Sommer');
$propbag->add('version', '1.8'); $propbag->add('version', '1.8.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -156,7 +156,7 @@ class serendipity_event_searchhighlight extends serendipity_event
: parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY) : parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY)
); );
if ( strpos($urlpath, 'search/') ) { if ( strpos($urlpath, 'search/') ) {
$urlpath = htmlspecialchars(strip_tags($urlpath)); // avoid spoofing $urlpath = (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($urlpath)) : htmlspecialchars(strip_tags($urlpath), ENT_COMPAT, LANG_CHARSET)); // avoid spoofing
$path = explode('/', urldecode($urlpath)); // split and decode non ASCII $path = explode('/', urldecode($urlpath)); // split and decode non ASCII
$query = $path[(array_search('search', $path)+1)]; $query = $path[(array_search('search', $path)+1)];
} }

10
serendipity_event_sidebarhider/serendipity_event_sidebarhider.php
View file

@ -26,7 +26,7 @@ class serendipity_event_sidebarhider extends serendipity_event
$propbag->add('description', PLUGIN_SIDEBAR_HIDER_DESC); $propbag->add('description', PLUGIN_SIDEBAR_HIDER_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Tys von Gaza, Garvin Hicking'); $propbag->add('author', 'Tys von Gaza, Garvin Hicking');
$propbag->add('version', '1.25'); $propbag->add('version', '1.25.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.9', 'serendipity' => '0.9',
'php' => '4.1.0' 'php' => '4.1.0'
@ -468,7 +468,7 @@ class serendipity_event_sidebarhider extends serendipity_event
$group['name'] = constant($group['confvalue']); $group['name'] = constant($group['confvalue']);
} }
?> ?>
<option value="<?php echo $group['id']; ?>" <?php echo (in_array($group['id'], $selected_groups) ? 'selected="selected"' : ''); ?>><?php echo htmlspecialchars($group['name']); ?></option> <option value="<?php echo $group['id']; ?>" <?php echo (in_array($group['id'], $selected_groups) ? 'selected="selected"' : ''); ?>><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($group['name']) : htmlspecialchars($group['name'], ENT_COMPAT, LANG_CHARSET)); ?></option>
<?php <?php
} }
echo "</select></td>\n"; echo "</select></td>\n";
@ -480,14 +480,14 @@ class serendipity_event_sidebarhider extends serendipity_event
$selected = explode(',', $category_viewlist[$plugin->instance]); $selected = explode(',', $category_viewlist[$plugin->instance]);
echo "<select name='plugin_category_view[" . base64_encode($plugin->instance) . "][]' multiple='multiple'>\n"; echo "<select name='plugin_category_view[" . base64_encode($plugin->instance) . "][]' multiple='multiple'>\n";
// --JAM: 2005-10-18: The front page selection goes on the top // --JAM: 2005-10-18: The front page selection goes on the top
echo '<option value="" ' . (in_array('', $selected) ? 'selected="selected"' : '') . '>' . htmlspecialchars(ALL_CATEGORIES) . '</option>' . "\n"; echo '<option value="" ' . (in_array('', $selected) ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(ALL_CATEGORIES) : htmlspecialchars(ALL_CATEGORIES, ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
echo '<option value="' . PLUGIN_SIDEBAR_HIDER_FRONTPAGE_ID . '" ' . (in_array(PLUGIN_SIDEBAR_HIDER_FRONTPAGE_ID, $selected) ? 'selected="selected"' : '') . '>' . htmlspecialchars(PLUGIN_SIDEBAR_HIDER_FRONTPAGE_DESC) . '</option>' . "\n"; echo '<option value="' . PLUGIN_SIDEBAR_HIDER_FRONTPAGE_ID . '" ' . (in_array(PLUGIN_SIDEBAR_HIDER_FRONTPAGE_ID, $selected) ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_SIDEBAR_HIDER_FRONTPAGE_DESC) : htmlspecialchars(PLUGIN_SIDEBAR_HIDER_FRONTPAGE_DESC, ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
// Now add regular categories to the selection list // Now add regular categories to the selection list
$cats = serendipity_fetchCategories(); $cats = serendipity_fetchCategories();
if (is_array($cats)) { if (is_array($cats)) {
$cats = serendipity_walkRecursive($cats, 'categoryid', 'parentid', VIEWMODE_THREADED); $cats = serendipity_walkRecursive($cats, 'categoryid', 'parentid', VIEWMODE_THREADED);
foreach($cats as $cat) { foreach($cats as $cat) {
echo '<option value="' . $cat['categoryid'] . '" ' . (in_array($cat['categoryid'], $selected) ? 'selected="selected"' : '') . '>' . str_repeat('&nbsp;', $cat['depth']) . htmlspecialchars($cat['category_name']) . '</option>' . "\n"; echo '<option value="' . $cat['categoryid'] . '" ' . (in_array($cat['categoryid'], $selected) ? 'selected="selected"' : '') . '>' . str_repeat('&nbsp;', $cat['depth']) . (function_exists('serendipity_specialchars') ? serendipity_specialchars($cat['category_name']) : htmlspecialchars($cat['category_name'], ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
} }

14
serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php
View file

@ -42,7 +42,7 @@ class serendipity_event_spamblock_bayes extends serendipity_event {
$this->title = PLUGIN_EVENT_SPAMBLOCK_BAYES_NAME; $this->title = PLUGIN_EVENT_SPAMBLOCK_BAYES_NAME;
$propbag->add ( 'description', PLUGIN_EVENT_SPAMBLOCK_BAYES_DESC); $propbag->add ( 'description', PLUGIN_EVENT_SPAMBLOCK_BAYES_DESC);
$propbag->add ( 'name', $this->title); $propbag->add ( 'name', $this->title);
$propbag->add ( 'version', '0.4.14' ); $propbag->add ( 'version', '0.4.15' );
$propbag->add ( 'event_hooks', array ('frontend_saveComment' => true, $propbag->add ( 'event_hooks', array ('frontend_saveComment' => true,
'backend_spamblock_comments_shown' => true, 'backend_spamblock_comments_shown' => true,
'external_plugin' => true, 'external_plugin' => true,
@ -1301,23 +1301,23 @@ class serendipity_event_spamblock_bayes extends serendipity_event {
global $serendipity; global $serendipity;
if (isset($serendipity['GET']['message'])) { if (isset($serendipity['GET']['message'])) {
if ($serendipity['version'][0] == '1') { if ($serendipity['version'][0] == '1') {
echo '<p class="serendipityAdminMsgNote">'.htmlspecialchars($serendipity['GET']['message']).'</p>'; echo '<p class="serendipityAdminMsgNote">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['message']) : htmlspecialchars($serendipity['GET']['message'], ENT_COMPAT, LANG_CHARSET)).'</p>';
} else { } else {
echo '<span class="msg_notice"><span class="icon-info-circled"></span> ' . htmlspecialchars($serendipity['GET']['message']) . '</span>'; echo '<span class="msg_notice"><span class="icon-info-circled"></span> ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['message']) : htmlspecialchars($serendipity['GET']['message'], ENT_COMPAT, LANG_CHARSET)) . '</span>';
} }
} }
if (isset($serendipity['GET']['success'])) { if (isset($serendipity['GET']['success'])) {
if ($serendipity['version'][0] == '1') { if ($serendipity['version'][0] == '1') {
echo '<p class="serendipityAdminMsgSuccess">'.htmlspecialchars($serendipity['GET']['success']).'</p>'; echo '<p class="serendipityAdminMsgSuccess">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['success']) : htmlspecialchars($serendipity['GET']['success'], ENT_COMPAT, LANG_CHARSET)).'</p>';
} else { } else {
echo '<span class="msg_success"><span class="icon-ok-circled"></span> ' . htmlspecialchars($serendipity['GET']['success']) . '</span>'; echo '<span class="msg_success"><span class="icon-ok-circled"></span> ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['success']) : htmlspecialchars($serendipity['GET']['success'], ENT_COMPAT, LANG_CHARSET)) . '</span>';
} }
} }
if (isset($serendipity['GET']['error'])) { if (isset($serendipity['GET']['error'])) {
if ($serendipity['version'][0] == '1') { if ($serendipity['version'][0] == '1') {
echo '<p class="serendipityAdminMsgError">'.htmlspecialchars($serendipity['GET']['error']).'</p>'; echo '<p class="serendipityAdminMsgError">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['error']) : htmlspecialchars($serendipity['GET']['error'], ENT_COMPAT, LANG_CHARSET)).'</p>';
} else { } else {
echo '<span class="msg_error"><span class="icon-attention-circled"></span> ' . htmlspecialchars($serendipity['GET']['error']) . '</span>'; echo '<span class="msg_error"><span class="icon-attention-circled"></span> ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['error']) : htmlspecialchars($serendipity['GET']['error'], ENT_COMPAT, LANG_CHARSET)) . '</span>';
} }
} }
$this->get = $serendipity['GET']; $this->get = $serendipity['GET'];

58
serendipity_event_staticpage/serendipity_event_staticpage.php
View file

@ -91,7 +91,7 @@ class serendipity_event_staticpage extends serendipity_event
$propbag->add('page_configuration', $this->config); $propbag->add('page_configuration', $this->config);
$propbag->add('type_configuration', $this->config_types); $propbag->add('type_configuration', $this->config_types);
$propbag->add('author', 'Marco Rinck, Garvin Hicking, David Rolston, Falk Doering, Stephan Manske, Pascal Uhlmann, Ian, Don Chambers'); $propbag->add('author', 'Marco Rinck, Garvin Hicking, David Rolston, Falk Doering, Stephan Manske, Pascal Uhlmann, Ian, Don Chambers');
$propbag->add('version', '4.07.1'); $propbag->add('version', '4.07.2');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.3', 'serendipity' => '1.3',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -1260,7 +1260,7 @@ class serendipity_event_staticpage extends serendipity_event
array( array(
$pagevar . 'articleformat' => serendipity_db_bool($this->get_static('articleformat')), $pagevar . 'articleformat' => serendipity_db_bool($this->get_static('articleformat')),
$pagevar . 'form_pass' => isset($serendipity['POST']['pass']) ? $serendipity['POST']['pass'] : '', $pagevar . 'form_pass' => isset($serendipity['POST']['pass']) ? $serendipity['POST']['pass'] : '',
$pagevar . 'form_url' => $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[subpage]=' . htmlspecialchars($this->get_static('pagetitle')), $pagevar . 'form_url' => $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[subpage]=' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_static('pagetitle')) : htmlspecialchars($this->get_static('pagetitle'), ENT_COMPAT, LANG_CHARSET)),
$pagevar . 'content' => $staticpage_content, $pagevar . 'content' => $staticpage_content,
$pagevar . 'childpages' => serendipity_db_bool($this->get_static('show_childpages')) ? $this->getChildPages() : false, $pagevar . 'childpages' => serendipity_db_bool($this->get_static('show_childpages')) ? $this->getChildPages() : false,
$pagevar . 'extchildpages' => $childpages, $pagevar . 'extchildpages' => $childpages,
@ -1833,8 +1833,8 @@ class serendipity_event_staticpage extends serendipity_event
$serendipity['POST']['typeSubmit'] = true; $serendipity['POST']['typeSubmit'] = true;
$bag = new serendipity_property_bag(); $bag = new serendipity_property_bag();
$this->introspect($bag); $this->introspect($bag);
$name = htmlspecialchars($bag->get('name')); $name = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('name')) : htmlspecialchars($bag->get('name'), ENT_COMPAT, LANG_CHARSET));
$desc = htmlspecialchars($bag->get('description')); $desc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('description')) : htmlspecialchars($bag->get('description'), ENT_COMPAT, LANG_CHARSET));
$config_t = $bag->get('type_configuration'); $config_t = $bag->get('type_configuration');
foreach($config_t as $config_item) { foreach($config_t as $config_item) {
@ -1864,7 +1864,7 @@ class serendipity_event_staticpage extends serendipity_event
$types = $this->fetchPageTypes(); $types = $this->fetchPageTypes();
if(is_array($types)) { if(is_array($types)) {
foreach($types as $type) { foreach($types as $type) {
echo ' <option value="' . $type['id'] . '" ' . ($serendipity['POST']['pagetype'] == $type['id'] ? 'selected="selected"' : '') . '>' . htmlspecialchars($type['description']) . '</option>'; echo ' <option value="' . $type['id'] . '" ' . ($serendipity['POST']['pagetype'] == $type['id'] ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($type['description']) : htmlspecialchars($type['description'], ENT_COMPAT, LANG_CHARSET)) . '</option>';
} }
} }
echo '</select> <input type="submit" class="serendipityPrettyButton input_button" name="serendipity[typeSubmit]" value="' . GO . '" /> <strong>-' . WORD_OR . '-</strong> <input type="submit" class="serendipityPrettyButton input_button" name="serendipity[typeDelete]" value="' . DELETE . '" />'; echo '</select> <input type="submit" class="serendipityPrettyButton input_button" name="serendipity[typeSubmit]" value="' . GO . '" /> <strong>-' . WORD_OR . '-</strong> <input type="submit" class="serendipityPrettyButton input_button" name="serendipity[typeDelete]" value="' . DELETE . '" />';
@ -1952,8 +1952,8 @@ class serendipity_event_staticpage extends serendipity_event
$serendipity['POST']['staticSubmit'] = true; $serendipity['POST']['staticSubmit'] = true;
$bag = new serendipity_property_bag; $bag = new serendipity_property_bag;
$this->introspect($bag); $this->introspect($bag);
$name = htmlspecialchars($bag->get('name')); $name = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('name')) : htmlspecialchars($bag->get('name'), ENT_COMPAT, LANG_CHARSET));
$desc = htmlspecialchars($bag->get('description')); $desc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('description')) : htmlspecialchars($bag->get('description'), ENT_COMPAT, LANG_CHARSET));
$config_names = $bag->get('page_configuration'); $config_names = $bag->get('page_configuration');
foreach ($config_names as $config_item) { foreach ($config_names as $config_item) {
@ -2004,7 +2004,7 @@ class serendipity_event_staticpage extends serendipity_event
if ($dh) { if ($dh) {
while ($file = readdir($dh)) { while ($file = readdir($dh)) {
if ($file != 'default_staticpage_backend.tpl' && preg_match('@^(.*).tpl$@i', $file, $m)) { if ($file != 'default_staticpage_backend.tpl' && preg_match('@^(.*).tpl$@i', $file, $m)) {
echo '<option ' . ($file == $serendipity['POST']['backend_template'] ? 'selected="selected"' : '') . ' value="' . htmlspecialchars($file) . '">' . htmlspecialchars($m[1]) . '</option>' . "\n"; echo '<option ' . ($file == $serendipity['POST']['backend_template'] ? 'selected="selected"' : '') . ' value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($file) : htmlspecialchars($file, ENT_COMPAT, LANG_CHARSET)) . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($m[1]) : htmlspecialchars($m[1], ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
} }
} }
@ -2012,7 +2012,7 @@ class serendipity_event_staticpage extends serendipity_event
if ($dh) { if ($dh) {
while ($file = readdir($dh)) { while ($file = readdir($dh)) {
if ($file != 'default_staticpage_backend.tpl' && preg_match('@^(.*).tpl$@i', $file, $m)) { if ($file != 'default_staticpage_backend.tpl' && preg_match('@^(.*).tpl$@i', $file, $m)) {
echo '<option ' . ($file == $serendipity['POST']['backend_template'] ? 'selected="selected"' : '') . ' value="' . htmlspecialchars($file) . '">' . htmlspecialchars($m[1]) . '</option>' . "\n"; echo '<option ' . ($file == $serendipity['POST']['backend_template'] ? 'selected="selected"' : '') . ' value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($file) : htmlspecialchars($file, ENT_COMPAT, LANG_CHARSET)) . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($m[1]) : htmlspecialchars($m[1], ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
} }
} }
@ -2030,7 +2030,7 @@ class serendipity_event_staticpage extends serendipity_event
foreach ($pages as $page) { foreach ($pages as $page) {
if ($this->checkPageUser($page['authorid'])) { if ($this->checkPageUser($page['authorid'])) {
echo ' <option value="' . $page['id'] . '" ' . ($serendipity['POST']['staticpage'] == $page['id'] ? 'selected="selected"' : '') . '>'; echo ' <option value="' . $page['id'] . '" ' . ($serendipity['POST']['staticpage'] == $page['id'] ? 'selected="selected"' : '') . '>';
echo str_repeat('&nbsp;&nbsp;', $page['depth']) . htmlspecialchars($page['pagetitle']) . '</option>'; echo str_repeat('&nbsp;&nbsp;', $page['depth']) . (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['pagetitle']) : htmlspecialchars($page['pagetitle'], ENT_COMPAT, LANG_CHARSET)) . '</option>';
} }
} }
} }
@ -2189,9 +2189,9 @@ class serendipity_event_staticpage extends serendipity_event
<select class="direction_<?php echo $lang_direction; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]"> <select class="direction_<?php echo $lang_direction; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]">
<?php <?php
foreach($select AS $select_value => $select_desc) { foreach($select AS $select_value => $select_desc) {
$id = htmlspecialchars($config_item . $select_value); $id = (function_exists('serendipity_specialchars') ? serendipity_specialchars($config_item . $select_value) : htmlspecialchars($config_item . $select_value, ENT_COMPAT, LANG_CHARSET));
?> ?>
<option title="<?php echo htmlspecialchars($select_desc); ?>"<?php echo ($select_value == $hvalue ? ' selected="selected"' : ''); ?> value="<?php echo $select_value; ?>"><?php echo htmlspecialchars($select_desc); ?></option> <option title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($select_desc) : htmlspecialchars($select_desc, ENT_COMPAT, LANG_CHARSET)); ?>"<?php echo ($select_value == $hvalue ? ' selected="selected"' : ''); ?> value="<?php echo $select_value; ?>"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($select_desc) : htmlspecialchars($select_desc, ENT_COMPAT, LANG_CHARSET)); ?></option>
<?php } ?> <?php } ?>
</select> </select>
<?php if (!$is_smarty) { ?> <?php if (!$is_smarty) { ?>
@ -2243,7 +2243,7 @@ foreach($select AS $select_value => $select_desc) {
} }
$counter = 0; $counter = 0;
foreach($radio['value'] AS $radio_index => $radio_value) { foreach($radio['value'] AS $radio_index => $radio_value) {
$id = htmlspecialchars($config_item . $radio_value); $id = (function_exists('serendipity_specialchars') ? serendipity_specialchars($config_item . $radio_value) : htmlspecialchars($config_item . $radio_value, ENT_COMPAT, LANG_CHARSET));
$counter++; $counter++;
$checked = ""; $checked = "";
@ -2261,8 +2261,8 @@ foreach($select AS $select_value => $select_desc) {
<?php <?php
} }
?> ?>
<input class="input_radio direction_<?php echo $lang_direction; ?>" type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo $checked ?> title="<?php echo htmlspecialchars($radio['desc'][$radio_index]); ?>" /> <input class="input_radio direction_<?php echo $lang_direction; ?>" type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo $checked ?> title="<?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($radio['desc'][$radio_index]) : htmlspecialchars($radio['desc'][$radio_index], ENT_COMPAT, LANG_CHARSET)); ?>" />
<label for="serendipity_plugin_<?php echo $id; ?>"><?php echo htmlspecialchars($radio['desc'][$radio_index]); ?></label> <label for="serendipity_plugin_<?php echo $id; ?>"><?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($radio['desc'][$radio_index]) : htmlspecialchars($radio['desc'][$radio_index], ENT_COMPAT, LANG_CHARSET)); ?></label>
<?php <?php
if ($counter == $per_row) { if ($counter == $per_row) {
$counter = 0; $counter = 0;
@ -2455,11 +2455,11 @@ foreach($select AS $select_value => $select_desc) {
$cbag = new serendipity_property_bag; $cbag = new serendipity_property_bag;
$this->introspect_item($config_item, $cbag); $this->introspect_item($config_item, $cbag);
$cname = htmlspecialchars($cbag->get('name')); $cname = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET));
$cdesc = htmlspecialchars($cbag->get('description')); $cdesc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('description')) : htmlspecialchars($cbag->get('description'), ENT_COMPAT, LANG_CHARSET));
$value = $this->get_static($config_item, 'unset'); $value = $this->get_static($config_item, 'unset');
$lang_direction = htmlspecialchars($cbag->get('lang_direction')); $lang_direction = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('lang_direction')) : htmlspecialchars($cbag->get('lang_direction'), ENT_COMPAT, LANG_CHARSET));
if (empty($lang_direction)) { if (empty($lang_direction)) {
$lang_direction = LANG_DIRECTION; $lang_direction = LANG_DIRECTION;
@ -2470,7 +2470,7 @@ foreach($select AS $select_value => $select_desc) {
/* Try and the default value for the config item */ /* Try and the default value for the config item */
$value = $cbag->get('default'); $value = $cbag->get('default');
} }
$hvalue = ((!isset($serendipity['POST']['staticSubmit']) || is_array($serendipity['GET']['pre'])) && isset($serendipity['POST']['plugin'][$config_item]) ? htmlspecialchars($serendipity['POST']['plugin'][$config_item]) : htmlspecialchars($value)); $hvalue = ((!isset($serendipity['POST']['staticSubmit']) || is_array($serendipity['GET']['pre'])) && isset($serendipity['POST']['plugin'][$config_item]) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['plugin'][$config_item]) : htmlspecialchars($serendipity['POST']['plugin'][$config_item], ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($value) : htmlspecialchars($value, ENT_COMPAT, LANG_CHARSET)));
$radio = array(); $radio = array();
$select = array(); $select = array();
$per_row = null; $per_row = null;
@ -2587,11 +2587,11 @@ foreach($select AS $select_value => $select_desc) {
$cbag = new serendipity_property_bag; $cbag = new serendipity_property_bag;
$this->$introspec_func($config_item, $cbag); $this->$introspec_func($config_item, $cbag);
$cname = htmlspecialchars($cbag->get('name')); $cname = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET));
$cdesc = htmlspecialchars($cbag->get('description')); $cdesc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('description')) : htmlspecialchars($cbag->get('description'), ENT_COMPAT, LANG_CHARSET));
$value = $this->$value_func($config_item, 'unset'); $value = $this->$value_func($config_item, 'unset');
$lang_direction = htmlspecialchars($cbag->get('lang_direction')); $lang_direction = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('lang_direction')) : htmlspecialchars($cbag->get('lang_direction'), ENT_COMPAT, LANG_CHARSET));
if (empty($lang_direction)) { if (empty($lang_direction)) {
$lang_direction = LANG_DIRECTION; $lang_direction = LANG_DIRECTION;
@ -2602,7 +2602,7 @@ foreach($select AS $select_value => $select_desc) {
/* Try and the default value for the config item */ /* Try and the default value for the config item */
$value = $cbag->get('default'); $value = $cbag->get('default');
} }
$hvalue = ((!isset($serendipity['POST'][$submit_name]) || is_array($serendipity['GET']['pre'])) && isset($serendipity['POST']['plugin'][$config_item]) ? htmlspecialchars($serendipity['POST']['plugin'][$config_item]) : htmlspecialchars($value)); $hvalue = ((!isset($serendipity['POST'][$submit_name]) || is_array($serendipity['GET']['pre'])) && isset($serendipity['POST']['plugin'][$config_item]) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['plugin'][$config_item]) : htmlspecialchars($serendipity['POST']['plugin'][$config_item], ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($value) : htmlspecialchars($value, ENT_COMPAT, LANG_CHARSET)));
$radio = array(); $radio = array();
$select = array(); $select = array();
$per_row = null; $per_row = null;
@ -2696,7 +2696,7 @@ foreach($select AS $select_value => $select_desc) {
<table width="100%" cellspacing="0" cellpadding="3"> <table width="100%" cellspacing="0" cellpadding="3">
<tr> <tr>
<td> <td>
<strong><?php echo $entry_pre; ?><a href="?serendipity[action]=admin&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=staticpages&amp;serendipity[staticpagecategory]=pages&amp;serendipity[staticid]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['pagetitle']; ?>"><?php echo serendipity_truncateString(htmlspecialchars($entry['headline']),50) ?></a></strong> <strong><?php echo $entry_pre; ?><a href="?serendipity[action]=admin&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=staticpages&amp;serendipity[staticpagecategory]=pages&amp;serendipity[staticid]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['pagetitle']; ?>"><?php echo serendipity_truncateString((function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['headline']) : htmlspecialchars($entry['headline'], ENT_COMPAT, LANG_CHARSET)),50) ?></a></strong>
</td> </td>
<td align="right"> <td align="right">
<?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entry['timestamp']) . ' ' .$lm; ?> <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entry['timestamp']) . ' ' .$lm; ?>
@ -2704,7 +2704,7 @@ foreach($select AS $select_value => $select_desc) {
</tr> </tr>
<tr> <tr>
<td> <td>
<?php echo POSTED_BY . ' ' . htmlspecialchars($this->selectAuthor($entry['authorid'])); ?> <?php echo POSTED_BY . ' ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->selectAuthor($entry['authorid'])) : htmlspecialchars($this->selectAuthor($entry['authorid']), ENT_COMPAT, LANG_CHARSET)); ?>
</td> </td>
<td align="right"> <td align="right">
<?php <?php
@ -3007,7 +3007,7 @@ foreach($select AS $select_value => $select_desc) {
foreach ($pages as $page) { foreach ($pages as $page) {
if ($this->checkPageUser($page['authorid'])) { if ($this->checkPageUser($page['authorid'])) {
echo ' <option value="' . $page['id'] . '" ' . ($page['id'] == $this->fetchCatProp((int)$eventData) ? 'selected="selected"' : '') . '>'; echo ' <option value="' . $page['id'] . '" ' . ($page['id'] == $this->fetchCatProp((int)$eventData) ? 'selected="selected"' : '') . '>';
echo str_repeat('&nbsp;&nbsp;', $page['depth']) . htmlspecialchars($page['pagetitle']) . '</option>'; echo str_repeat('&nbsp;&nbsp;', $page['depth']) . (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['pagetitle']) : htmlspecialchars($page['pagetitle'], ENT_COMPAT, LANG_CHARSET)) . '</option>';
} }
} }
} }
@ -3098,7 +3098,7 @@ foreach($select AS $select_value => $select_desc) {
if ($this->selected()) { if ($this->selected()) {
$te = $this->get_static('title_element'); $te = $this->get_static('title_element');
if (!empty($te)) { if (!empty($te)) {
$serendipity['head_title'] = htmlspecialchars($te); $serendipity['head_title'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($te) : htmlspecialchars($te, ENT_COMPAT, LANG_CHARSET));
$serendipity['head_subtitle'] =''; $serendipity['head_subtitle'] ='';
} else { } else {
$serendipity['head_title'] = $this->get_static('headline'); $serendipity['head_title'] = $this->get_static('headline');
@ -3108,8 +3108,8 @@ foreach($select AS $select_value => $select_desc) {
break; break;
case 'frontend_header': case 'frontend_header':
$md = htmlspecialchars($this->get_static('meta_description')); $md = (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_static('meta_description')) : htmlspecialchars($this->get_static('meta_description'), ENT_COMPAT, LANG_CHARSET));
$mk = htmlspecialchars($this->get_static('meta_keywords')); $mk = (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_static('meta_keywords')) : htmlspecialchars($this->get_static('meta_keywords'), ENT_COMPAT, LANG_CHARSET));
if (!empty($md)) if (!empty($md))
{ {
echo ' <meta name="description" content="' . $md . '" />' . "\n"; echo ' <meta name="description" content="' . $md . '" />' . "\n";

18
serendipity_event_staticpage/serendipity_plugin_staticpage.php
View file

@ -24,7 +24,7 @@ class serendipity_plugin_staticpage extends serendipity_plugin {
$propbag->add('description', PLUGIN_STATICPAGELIST_NAME_DESC); $propbag->add('description', PLUGIN_STATICPAGELIST_NAME_DESC);
$propbag->add('author', "Rob Antonishen, Falk Doering, Ian (Timbalu)"); $propbag->add('author', "Rob Antonishen, Falk Doering, Ian (Timbalu)");
$propbag->add('stackable', true); $propbag->add('stackable', true);
$propbag->add('version', '1.19'); $propbag->add('version', '1.19.1');
$propbag->add('configuration', array( $propbag->add('configuration', array(
'title', 'title',
'limit', 'limit',
@ -187,9 +187,9 @@ class serendipity_plugin_staticpage extends serendipity_plugin {
$str .= 'fd_' . $fdid . '.add(' $str .= 'fd_' . $fdid . '.add('
. $value['id'] . ',' . $value['id'] . ','
. $value['parent_id'] . ',' . $value['parent_id'] . ','
. '"' . htmlspecialchars((empty($value['headline']) ? $value['pagetitle'] : $value['headline'])) . '",' . '"' . (function_exists('serendipity_specialchars') ? serendipity_specialchars((empty($value['headline']) ? $value['pagetitle'] : $value['headline'])) : htmlspecialchars((empty($value['headline']) ? $value['pagetitle'] : $value['headline']), ENT_COMPAT, LANG_CHARSET)) . '",'
. '"' . htmlspecialchars($value['permalink']) . '",' . '"' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($value['permalink']) : htmlspecialchars($value['permalink'], ENT_COMPAT, LANG_CHARSET)) . '",'
. '"' . htmlspecialchars($value['pagetitle']) .'",' . '"' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($value['pagetitle']) : htmlspecialchars($value['pagetitle'], ENT_COMPAT, LANG_CHARSET)) .'",'
. '"",' . '"",'
. '"",' . '"",'
. '"",' . '"",'
@ -295,10 +295,10 @@ class serendipity_plugin_staticpage extends serendipity_plugin {
/* smartify the staticpage sidebar plugin */ /* smartify the staticpage sidebar plugin */
$content[] = array( $content[] = array(
'id' => $page['id'], 'id' => $page['id'],
'headline' => (!empty($page['headline']) ? htmlspecialchars($page['headline']) : htmlspecialchars($page['pagetitle'])), 'headline' => (!empty($page['headline']) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['headline']) : htmlspecialchars($page['headline'], ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['pagetitle']) : htmlspecialchars($page['pagetitle'], ENT_COMPAT, LANG_CHARSET))),
'parent_id' => $page['parent_id'], 'parent_id' => $page['parent_id'],
'permalink' => (!empty($page['permalink']) ? $page['permalink'] : NULL), 'permalink' => (!empty($page['permalink']) ? $page['permalink'] : NULL),
'pagetitle' => (!empty($page['permalink']) ? htmlspecialchars($page['pagetitle']) : NULL), 'pagetitle' => (!empty($page['permalink']) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['pagetitle']) : htmlspecialchars($page['pagetitle'], ENT_COMPAT, LANG_CHARSET)) : NULL),
'is_startpage' => $page['is_startpage'], 'is_startpage' => $page['is_startpage'],
'depth' => $page['depth']*10 'depth' => $page['depth']*10
); );
@ -307,13 +307,13 @@ class serendipity_plugin_staticpage extends serendipity_plugin {
? sprintf( ? sprintf(
"<a href=\"%s\" title=\"%s\" style=\"padding-left: %dpx;\">%s</a><br />\n", "<a href=\"%s\" title=\"%s\" style=\"padding-left: %dpx;\">%s</a><br />\n",
$page['permalink'], $page['permalink'],
htmlspecialchars($page['pagetitle']), (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['pagetitle']) : htmlspecialchars($page['pagetitle'], ENT_COMPAT, LANG_CHARSET)),
$page['depth']*10, $page['depth']*10,
(!empty($page['headline']) ? htmlspecialchars($page['headline']) : htmlspecialchars($page['pagetitle']))) (!empty($page['headline']) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['headline']) : htmlspecialchars($page['headline'], ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['pagetitle']) : htmlspecialchars($page['pagetitle'], ENT_COMPAT, LANG_CHARSET))))
: sprintf( : sprintf(
"<div style=\"padding-left: %dpx;\">%s</div>", "<div style=\"padding-left: %dpx;\">%s</div>",
$page['depth']*10, $page['depth']*10,
(!empty($page['headline']) ? htmlspecialchars($page['headline']) : htmlspecialchars($page['pagetitle'])))); (!empty($page['headline']) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['headline']) : htmlspecialchars($page['headline'], ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['pagetitle']) : htmlspecialchars($page['pagetitle'], ENT_COMPAT, LANG_CHARSET)))));
} }
} }
} }

18
serendipity_event_suggest/serendipity_event_suggest.php
View file

@ -31,7 +31,7 @@ class serendipity_event_suggest extends serendipity_event {
)); ));
$propbag->add('configuration', array('permalink', 'pagetitle', 'authorid', 'email')); $propbag->add('configuration', array('permalink', 'pagetitle', 'authorid', 'email'));
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '0.11'); $propbag->add('version', '0.11.1');
$propbag->add('groups', array('FRONTEND_FEATURES')); $propbag->add('groups', array('FRONTEND_FEATURES'));
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.9', 'serendipity' => '0.9',
@ -237,10 +237,10 @@ class serendipity_event_suggest extends serendipity_event {
$res = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}suggestmails WHERE validation = '" . serendipity_db_escape_string($_REQUEST['suggestkey']) . "'", true, 'assoc'); $res = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}suggestmails WHERE validation = '" . serendipity_db_escape_string($_REQUEST['suggestkey']) . "'", true, 'assoc');
if (!is_array($res) || $res['validation'] != $_REQUEST['suggestkey']) { if (!is_array($res) || $res['validation'] != $_REQUEST['suggestkey']) {
$validation_error = true; $validation_error = true;
$validation_error_code = htmlspecialchars($_REQUEST['suggestkey']); $validation_error_code = (function_exists('serendipity_specialchars') ? serendipity_specialchars($_REQUEST['suggestkey']) : htmlspecialchars($_REQUEST['suggestkey'], ENT_COMPAT, LANG_CHARSET));
} else { } else {
$validation_success = true; $validation_success = true;
$validation_error_code = htmlspecialchars($_REQUEST['suggestkey']); $validation_error_code = (function_exists('serendipity_specialchars') ? serendipity_specialchars($_REQUEST['suggestkey']) : htmlspecialchars($_REQUEST['suggestkey'], ENT_COMPAT, LANG_CHARSET));
serendipity_db_query("UPDATE {$serendipity['dbPrefix']}suggestmails SET validation = '' WHERE id = " . (int)$res['id']); serendipity_db_query("UPDATE {$serendipity['dbPrefix']}suggestmails SET validation = '' WHERE id = " . (int)$res['id']);
$entry = array( $entry = array(
@ -272,11 +272,11 @@ class serendipity_event_suggest extends serendipity_event {
'suggest_backend' => $metaout, 'suggest_backend' => $metaout,
'suggest_action' => $serendipity['baseURL'] . $serendipity['indexFile'], 'suggest_action' => $serendipity['baseURL'] . $serendipity['indexFile'],
'suggest_sname' => $serendipity['GET']['subpage'], 'suggest_sname' => $serendipity['GET']['subpage'],
'suggest_name' => htmlspecialchars($serendipity['POST']['name']), 'suggest_name' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['name']) : htmlspecialchars($serendipity['POST']['name'], ENT_COMPAT, LANG_CHARSET)),
'suggest_url' => htmlspecialchars($serendipity['POST']['url']), 'suggest_url' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['url']) : htmlspecialchars($serendipity['POST']['url'], ENT_COMPAT, LANG_CHARSET)),
'suggest_email' => htmlspecialchars($serendipity['POST']['email']), 'suggest_email' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['email']) : htmlspecialchars($serendipity['POST']['email'], ENT_COMPAT, LANG_CHARSET)),
'suggest_entry_title' => htmlspecialchars($serendipity['POST']['entry_title']), 'suggest_entry_title' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['entry_title']) : htmlspecialchars($serendipity['POST']['entry_title'], ENT_COMPAT, LANG_CHARSET)),
'suggest_data' => htmlspecialchars($serendipity['POST']['comment']), 'suggest_data' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['comment']) : htmlspecialchars($serendipity['POST']['comment'], ENT_COMPAT, LANG_CHARSET)),
'comments_messagestack' => $serendipity['messagestack']['comments'], 'comments_messagestack' => $serendipity['messagestack']['comments'],
'suggest_validation_error' => $validation_error, 'suggest_validation_error' => $validation_error,
'suggest_validation_success' => $validation_success, 'suggest_validation_success' => $validation_success,
@ -407,7 +407,7 @@ class serendipity_event_suggest extends serendipity_event {
<fieldset style="margin: 5px"> <fieldset style="margin: 5px">
<legend><?php echo PLUGIN_SUGGEST_TITLE; ?></legend> <legend><?php echo PLUGIN_SUGGEST_TITLE; ?></legend>
<div> <div>
<?php printf(PLUGIN_SUGGEST_META, htmlspecialchars($res['name']), strftime('%d.%m.%Y %H:%M', $res['submitted']), htmlspecialchars($res['ip']), htmlspecialchars($res['email'])); ?> <?php printf(PLUGIN_SUGGEST_META, (function_exists('serendipity_specialchars') ? serendipity_specialchars($res['name']) : htmlspecialchars($res['name'], ENT_COMPAT, LANG_CHARSET)), strftime('%d.%m.%Y %H:%M', $res['submitted']), (function_exists('serendipity_specialchars') ? serendipity_specialchars($res['ip']) : htmlspecialchars($res['ip'], ENT_COMPAT, LANG_CHARSET)), (function_exists('serendipity_specialchars') ? serendipity_specialchars($res['email']) : htmlspecialchars($res['email'], ENT_COMPAT, LANG_CHARSET))); ?>
</div> </div>
</fieldset> </fieldset>
<?php <?php

14
serendipity_event_template_editor/serendipity_event_template_editor.php
View file

@ -25,7 +25,7 @@ class serendipity_event_template_editor extends serendipity_event {
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Malte Paskuda'); $propbag->add('author', 'Malte Paskuda');
$propbag->add('license', 'GPL'); $propbag->add('license', 'GPL');
$propbag->add('version', '0.7'); $propbag->add('version', '0.7.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8' 'serendipity' => '0.8'
)); ));
@ -190,13 +190,13 @@ class serendipity_event_template_editor extends serendipity_event {
} }
if (isset($serendipity['GET']['message'])) { if (isset($serendipity['GET']['message'])) {
echo '<p class="serendipityAdminMsgNote">'.htmlspecialchars($serendipity['GET']['message']).'</p>'; echo '<p class="serendipityAdminMsgNote">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['message']) : htmlspecialchars($serendipity['GET']['message'], ENT_COMPAT, LANG_CHARSET)).'</p>';
} }
if (isset($serendipity['GET']['success'])) { if (isset($serendipity['GET']['success'])) {
echo '<p class="serendipityAdminMsgSuccess">'.htmlspecialchars($serendipity['GET']['success']).'</p>'; echo '<p class="serendipityAdminMsgSuccess">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['success']) : htmlspecialchars($serendipity['GET']['success'], ENT_COMPAT, LANG_CHARSET)).'</p>';
} }
if (isset($serendipity['GET']['error'])) { if (isset($serendipity['GET']['error'])) {
echo '<p class="serendipityAdminMsgError">'.htmlspecialchars($serendipity['GET']['error']).'</p>'; echo '<p class="serendipityAdminMsgError">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['error']) : htmlspecialchars($serendipity['GET']['error'], ENT_COMPAT, LANG_CHARSET)).'</p>';
} }
@ -316,7 +316,7 @@ class serendipity_event_template_editor extends serendipity_event {
echo '<h3>'.$heading.'</h3> echo '<h3>'.$heading.'</h3>
<form action="'.$serendipity ['baseURL'] . 'index.php?/plugin/template_editor_save" method="post"> <form action="'.$serendipity ['baseURL'] . 'index.php?/plugin/template_editor_save" method="post">
<input type="hidden" name="path" value="'.$path.'" /> <input type="hidden" name="path" value="'.$path.'" />
<textarea name="content" id="template_editor" cols="80" rows="38">'.htmlspecialchars($content).'</textarea> <textarea name="content" id="template_editor" cols="80" rows="38">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($content) : htmlspecialchars($content, ENT_COMPAT, LANG_CHARSET)).'</textarea>
<input class="serendipityPrettyButton input_button" type="submit" value="'.SAVE.'" /> <input class="serendipityPrettyButton input_button" type="submit" value="'.SAVE.'" />
</form>'; </form>';
@ -471,8 +471,8 @@ class serendipity_event_template_editor extends serendipity_event {
//Now that the fork is created we need to set it instantly //Now that the fork is created we need to set it instantly
//but only if copying succeeded //but only if copying succeeded
if (is_dir($template_path . $fork_template)) { if (is_dir($template_path . $fork_template)) {
$themeInfo = serendipity_fetchTemplateInfo(htmlspecialchars($fork_template)); $themeInfo = serendipity_fetchTemplateInfo((function_exists('serendipity_specialchars') ? serendipity_specialchars($fork_template) : htmlspecialchars($fork_template, ENT_COMPAT, LANG_CHARSET)));
serendipity_set_config_var('template', htmlspecialchars($fork_template)); serendipity_set_config_var('template', (function_exists('serendipity_specialchars') ? serendipity_specialchars($fork_template) : htmlspecialchars($fork_template, ENT_COMPAT, LANG_CHARSET)));
serendipity_set_config_var('template_engine', isset($themeInfo['engine']) ? $themeInfo['engine'] : 'default'); serendipity_set_config_var('template_engine', isset($themeInfo['engine']) ? $themeInfo['engine'] : 'default');
} }
} else { } else {

4
serendipity_event_textlinkads/serendipity_event_textlinkads.php
View file

@ -30,7 +30,7 @@ class serendipity_event_textlinkads extends serendipity_event
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('groups', array('FRONTEND_EXTERNAL_SERVICES')); $propbag->add('groups', array('FRONTEND_EXTERNAL_SERVICES'));
$propbag->add('version', '0.12'); $propbag->add('version', '0.12.1');
$propbag->add('configuration', array('htmlid', 'xmlfilename')); $propbag->add('configuration', array('htmlid', 'xmlfilename'));
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
'css' => true, 'css' => true,
@ -211,7 +211,7 @@ class serendipity_event_textlinkads extends serendipity_event
$basedir = dirname(__FILE__) . '/'; $basedir = dirname(__FILE__) . '/';
if (!is_dir($basedir . $params['dir'])) { if (!is_dir($basedir . $params['dir'])) {
echo __FUNCTION__ .": dir '{$basedir}" . htmlspecialchars($params['dir']) . " does not exist"; echo __FUNCTION__ .": dir '{$basedir}" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($params['dir']) : htmlspecialchars($params['dir'], ENT_COMPAT, LANG_CHARSET)) . " does not exist";
return; return;
} }

4
serendipity_event_thumbnails/serendipity_event_thumbnails.php
View file

@ -25,7 +25,7 @@ class serendipity_event_thumbnails extends serendipity_event {
$propbag->add('configuration', array('number')); $propbag->add('configuration', array('number'));
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Cameron MacFarland'); $propbag->add('author', 'Cameron MacFarland');
$propbag->add('version', '1.4'); $propbag->add('version', '1.4.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.7', 'serendipity' => '0.7',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -119,7 +119,7 @@ class serendipity_event_thumbnails extends serendipity_event {
$thumbsize = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename); $thumbsize = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename);
} }
echo '<a href="' . $entryLink . '" title="' . htmlspecialchars($entry['title']) . '">'; echo '<a href="' . $entryLink . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '">';
if (isset($photo)) { if (isset($photo)) {
echo '<img style="margin:5px;" src="' . $imgsrc . '" width=' . $thumbsize[0] . ' height=' . $thumbsize[1]; echo '<img style="margin:5px;" src="' . $imgsrc . '" width=' . $thumbsize[0] . ' height=' . $thumbsize[1];
if (isset($id) && ($id == $entry['id'])) { if (isset($id) && ($id == $entry['id'])) {

8
serendipity_event_todolist/serendipity_event_todolist.php
View file

@ -40,7 +40,7 @@ class serendipity_event_todolist extends serendipity_event {
'backend_sidebar_entries' => true 'backend_sidebar_entries' => true
)); ));
$propbag->add('author', 'Steven Tonnesen'); $propbag->add('author', 'Steven Tonnesen');
$propbag->add('version', '1.24'); $propbag->add('version', '1.24.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -1302,9 +1302,9 @@ class serendipity_event_todolist extends serendipity_event {
} }
if ($entry['id'] == $default) { if ($entry['id'] == $default) {
$entrytext.= '<option value="' . $entry['id'] . '" selected="selected">' . htmlspecialchars($title) . "</option>\n"; $entrytext.= '<option value="' . $entry['id'] . '" selected="selected">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($title) : htmlspecialchars($title, ENT_COMPAT, LANG_CHARSET)) . "</option>\n";
} else { } else {
$entrytext .= '<option value="' . $entry['id'] . '">' . htmlspecialchars($title) . "</option>\n"; $entrytext .= '<option value="' . $entry['id'] . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($title) : htmlspecialchars($title, ENT_COMPAT, LANG_CHARSET)) . "</option>\n";
} }
} }
} }
@ -1884,7 +1884,7 @@ class serendipity_event_todolist extends serendipity_event {
<input class="input_checkbox" type="checkbox" name="serendipity[category_to_remove][]" value="<?php echo $category['categoryid']; ?>" /> <input class="input_checkbox" type="checkbox" name="serendipity[category_to_remove][]" value="<?php echo $category['categoryid']; ?>" />
</td> </td>
<td width="300" style="padding-left: <?php echo ($category['depth']*15)+20 ?>px"><img src="<?php echo serendipity_getTemplateFile('admin/img/folder.png') ?>" style="vertical-align: bottom;" alt=""> <?php echo htmlspecialchars($category['category_name']) ?></td> <td width="300" style="padding-left: <?php echo ($category['depth']*15)+20 ?>px"><img src="<?php echo serendipity_getTemplateFile('admin/img/folder.png') ?>" style="vertical-align: bottom;" alt=""> <?php echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($category['category_name']) : htmlspecialchars($category['category_name'], ENT_COMPAT, LANG_CHARSET)) ?></td>
<td> <td>
<select name="serendipity[category_to_recolor][<?php echo $category['categoryid']?>]"><?php echo $colortext?></select> <select name="serendipity[category_to_recolor][<?php echo $category['categoryid']?>]"><?php echo $colortext?></select>

6
serendipity_event_trackback/serendipity_event_trackback.php
View file

@ -26,7 +26,7 @@ class serendipity_event_trackback extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_MTRACKBACK_TITLEDESC); $propbag->add('description', PLUGIN_EVENT_MTRACKBACK_TITLEDESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Malte Paskuda'); $propbag->add('author', 'Garvin Hicking, Malte Paskuda');
$propbag->add('version', '1.16'); $propbag->add('version', '1.16.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -174,7 +174,7 @@ class serendipity_event_trackback extends serendipity_event
$urls = serendipity_db_query("SELECT link FROM {$serendipity['dbPrefix']}references WHERE entry_id = '". (int)$eventData['id'] ."'"); $urls = serendipity_db_query("SELECT link FROM {$serendipity['dbPrefix']}references WHERE entry_id = '". (int)$eventData['id'] ."'");
if (is_array($urls)) { if (is_array($urls)) {
foreach($urls AS $row) { foreach($urls AS $row) {
$trackbackURLs[] = htmlspecialchars($row['link']); $trackbackURLs[] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['link']) : htmlspecialchars($row['link'], ENT_COMPAT, LANG_CHARSET));
} }
} }
} }
@ -184,7 +184,7 @@ class serendipity_event_trackback extends serendipity_event
foreach($additional_urls AS $additional_url) { foreach($additional_urls AS $additional_url) {
$additional_url = trim($additional_url); $additional_url = trim($additional_url);
if (!in_array($additional_url, $trackbackURLs)) { if (!in_array($additional_url, $trackbackURLs)) {
$trackbackURLs[] = htmlspecialchars($additional_url); $trackbackURLs[] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($additional_url) : htmlspecialchars($additional_url, ENT_COMPAT, LANG_CHARSET));
} }
} }
} }

14
serendipity_event_trackexits/serendipity_event_trackexits.php
View file

@ -15,7 +15,7 @@ class serendipity_event_trackexits extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_TRACKBACK_DESC); $propbag->add('description', PLUGIN_EVENT_TRACKBACK_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Serendipity Team'); $propbag->add('author', 'Serendipity Team');
$propbag->add('version', '1.9'); $propbag->add('version', '1.9.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -208,8 +208,8 @@ class serendipity_event_trackexits extends serendipity_event
$buffer[1], $buffer[1],
'http://bmi.pifo.biz/?' . $url, 'http://bmi.pifo.biz/?' . $url,
(!$is_title ? htmlspecialchars($url) : ''), (!$is_title ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''),
(!$is_over ? htmlspecialchars($url) : ''), (!$is_over ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''),
$buffer[6]); $buffer[6]);
} }
@ -221,8 +221,8 @@ class serendipity_event_trackexits extends serendipity_event
'_id', '_id',
$this->links[$url], $this->links[$url],
($entry_id != 0) ? '&amp;entry_id=' . $entry_id : '', ($entry_id != 0) ? '&amp;entry_id=' . $entry_id : '',
(!$is_title ? htmlspecialchars($url) : ''), (!$is_title ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''),
(!$is_over ? htmlspecialchars($url) : ''), (!$is_over ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''),
$buffer[6] $buffer[6]
); );
} else { } else {
@ -233,8 +233,8 @@ class serendipity_event_trackexits extends serendipity_event
'', '',
base64_encode($url), base64_encode($url),
($entry_id != 0) ? '&amp;entry_id=' . $entry_id : '', ($entry_id != 0) ? '&amp;entry_id=' . $entry_id : '',
(!$is_title ? htmlspecialchars($url) : ''), (!$is_title ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''),
(!$is_over ? htmlspecialchars($url) : ''), (!$is_over ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''),
$buffer[6] $buffer[6]
); );
} }

4
serendipity_event_typesetbuttons/serendipity_event_typesetbuttons.php
View file

@ -36,7 +36,7 @@ class serendipity_event_typesetbuttons extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_TYPESETBUTTONS_DESC); $propbag->add('description', PLUGIN_EVENT_TYPESETBUTTONS_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Matthew Groeninger, Malte Diers, Matthias Gutjahr'); $propbag->add('author', 'Matthew Groeninger, Malte Diers, Matthias Gutjahr');
$propbag->add('version', '0.22'); $propbag->add('version', '0.22.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.7', 'serendipity' => '1.7',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -454,7 +454,7 @@ class serendipity_event_typesetbuttons extends serendipity_event
private function getCustomButton($txtarea, $part) private function getCustomButton($txtarea, $part)
{ {
$buttons = explode('@', $part); $buttons = explode('@', $part);
$b_name = htmlspecialchars($buttons[0]); $b_name = (function_exists('serendipity_specialchars') ? serendipity_specialchars($buttons[0]) : htmlspecialchars($buttons[0], ENT_COMPAT, LANG_CHARSET));
$b_title = preg_replace('@[^a-z0-9]@i', '_', $buttons[0]); $b_title = preg_replace('@[^a-z0-9]@i', '_', $buttons[0]);
$b_open = str_replace(array('"', "'"), array('&quot;', "\\'"), $buttons[1]); $b_open = str_replace(array('"', "'"), array('&quot;', "\\'"), $buttons[1]);
$b_close = str_replace(array('"', "'"), array('&quot;', "\\'"), $buttons[2]); $b_close = str_replace(array('"', "'"), array('&quot;', "\\'"), $buttons[2]);

4
serendipity_event_unstrip_tags/serendipity_event_unstrip_tags.php
View file

@ -24,7 +24,7 @@ class serendipity_event_unstrip_tags extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_UNSTRIP_DESC); $propbag->add('description', PLUGIN_EVENT_UNSTRIP_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '1.03'); $propbag->add('version', '1.03.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.7', 'serendipity' => '0.7',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -47,7 +47,7 @@ class serendipity_event_unstrip_tags extends serendipity_event
case 'frontend_display': case 'frontend_display':
if (isset($eventData ['comment']) && !empty($eventData['body'])) { if (isset($eventData ['comment']) && !empty($eventData['body'])) {
$eventData['comment'] = htmlspecialchars($eventData['body']); $eventData['comment'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($eventData['body']) : htmlspecialchars($eventData['body'], ENT_COMPAT, LANG_CHARSET));
} }
return true; return true;
break; break;

14
serendipity_event_userprofiles/serendipity_event_userprofiles.php
View file

@ -96,7 +96,7 @@ class serendipity_event_userprofiles extends serendipity_event {
'genpage' => true 'genpage' => true
)); ));
$propbag->add('author', 'Garvin Hicking, Falk Doering'); $propbag->add('author', 'Garvin Hicking, Falk Doering');
$propbag->add('version', '0.28'); $propbag->add('version', '0.28.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -223,11 +223,11 @@ class serendipity_event_userprofiles extends serendipity_event {
echo '<input type="hidden" name="serendipity[adminModule]" value="event_display" />'; echo '<input type="hidden" name="serendipity[adminModule]" value="event_display" />';
echo '<input type="hidden" name="serendipity[adminAction]" value="profiles" />'; echo '<input type="hidden" name="serendipity[adminAction]" value="profiles" />';
echo '<div>'; echo '<div>';
echo '<strong>' . htmlspecialchars(PLUGIN_EVENT_USERPROFILES_SELECT) . '</strong><br /><br />'; echo '<strong>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_EVENT_USERPROFILES_SELECT) : htmlspecialchars(PLUGIN_EVENT_USERPROFILES_SELECT, ENT_COMPAT, LANG_CHARSET)) . '</strong><br /><br />';
echo USER . ' <select name="serendipity[profileUser]">'; echo USER . ' <select name="serendipity[profileUser]">';
$users = serendipity_fetchUsers(); $users = serendipity_fetchUsers();
foreach($users as $user) { foreach($users as $user) {
echo '<option value="' . $user['authorid'] . '" ' . (((empty($serendipity['POST']['profileUser']) && ($serendipity['authorid'] == $user['authorid'])) || ($serendipity['POST']['profileUser'] == $user['authorid'])) ? 'selected="selected"' : '') . '>' . htmlspecialchars($user['realname']) . '</option>'; echo '<option value="' . $user['authorid'] . '" ' . (((empty($serendipity['POST']['profileUser']) && ($serendipity['authorid'] == $user['authorid'])) || ($serendipity['POST']['profileUser'] == $user['authorid'])) ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($user['realname']) : htmlspecialchars($user['realname'], ENT_COMPAT, LANG_CHARSET)) . '</option>';
} }
echo '</select>'; echo '</select>';
echo ' <input class="serendipityPrettyButton input_button" type="submit" name="serendipity[viewUser]" value="'. VIEW .'" />'; echo ' <input class="serendipityPrettyButton input_button" type="submit" name="serendipity[viewUser]" value="'. VIEW .'" />';
@ -350,7 +350,7 @@ class serendipity_event_userprofiles extends serendipity_event {
echo ' <td>'; echo ' <td>';
switch($info['type']) { switch($info['type']) {
case 'html': case 'html':
echo '<textarea cols="80" rows="10" name="serendipity[profile' . $property . ']">' . htmlspecialchars($user[$property]) . "</textarea>\n"; echo '<textarea cols="80" rows="10" name="serendipity[profile' . $property . ']">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($user[$property]) : htmlspecialchars($user[$property], ENT_COMPAT, LANG_CHARSET)) . "</textarea>\n";
break; break;
case 'boolean': case 'boolean':
@ -370,7 +370,7 @@ class serendipity_event_userprofiles extends serendipity_event {
case 'string': case 'string':
default: default:
echo '<input class="input_textbox" type="text" name="serendipity[profile' . $property . ']" value="' . htmlspecialchars($user[$property]) . '" />'; echo '<input class="input_textbox" type="text" name="serendipity[profile' . $property . ']" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($user[$property]) : htmlspecialchars($user[$property], ENT_COMPAT, LANG_CHARSET)) . '" />';
} }
echo ' </td>'; echo ' </td>';
echo '</tr>'; echo '</tr>';
@ -627,14 +627,14 @@ class serendipity_event_userprofiles extends serendipity_event {
. '&amp;gravatar_id=' . md5($eventData['email']) . '&amp;gravatar_id=' . md5($eventData['email'])
. '&amp;size=' . $this->get_config('gravatar_size','80') . '&amp;size=' . $this->get_config('gravatar_size','80')
. '&amp;border=&amp;rating=' . $this->get_config('gravatar_rating','R'); . '&amp;border=&amp;rating=' . $this->get_config('gravatar_rating','R');
$this->found_images[$author] = '<div class="serendipity_authorpic"><img src="' . $img . '" alt="' . AUTHOR . '" title="' . htmlspecialchars($authorname) . '" /><br /><span>' . htmlspecialchars($authorname) . '</span></div>'; $this->found_images[$author] = '<div class="serendipity_authorpic"><img src="' . $img . '" alt="' . AUTHOR . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($authorname) : htmlspecialchars($authorname, ENT_COMPAT, LANG_CHARSET)) . '" /><br /><span>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($authorname) : htmlspecialchars($authorname, ENT_COMPAT, LANG_CHARSET)) . '</span></div>';
$eventData['body'] = $this->found_images[$author] . $eventData['body']; $eventData['body'] = $this->found_images[$author] . $eventData['body'];
} elseif (isset($this->found_images[$author])) { } elseif (isset($this->found_images[$author])) {
// Author image was already found previously. Display it. // Author image was already found previously. Display it.
$eventData['body'] = $this->found_images[$author] . $eventData['body']; $eventData['body'] = $this->found_images[$author] . $eventData['body'];
} elseif ($img = serendipity_getTemplateFile('img/' . preg_replace('@[^a-z0-9]@i', '_', $author) . '.' . $this->get_config('extension'))) { } elseif ($img = serendipity_getTemplateFile('img/' . preg_replace('@[^a-z0-9]@i', '_', $author) . '.' . $this->get_config('extension'))) {
// Author image exists, save it in cache and display it. // Author image exists, save it in cache and display it.
$this->found_images[$author] = '<div class="serendipity_authorpic"><img src="' . $img . '" alt="' . AUTHOR . '" title="' . htmlspecialchars($authorname) . '" /><br /><span>' .htmlspecialchars($authorname) . '</span></div>'; $this->found_images[$author] = '<div class="serendipity_authorpic"><img src="' . $img . '" alt="' . AUTHOR . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($authorname) : htmlspecialchars($authorname, ENT_COMPAT, LANG_CHARSET)) . '" /><br /><span>' .(function_exists('serendipity_specialchars') ? serendipity_specialchars($authorname) : htmlspecialchars($authorname, ENT_COMPAT, LANG_CHARSET)) . '</span></div>';
$eventData['body'] = $this->found_images[$author] . $eventData['body']; $eventData['body'] = $this->found_images[$author] . $eventData['body'];
} else { } else {
// No image found, do not try again in next article. // No image found, do not try again in next article.

6
serendipity_event_userprofiles/serendipity_plugin_userprofiles.php
View file

@ -22,7 +22,7 @@ class serendipity_plugin_userprofiles extends serendipity_plugin {
$propbag->add('description', PLUGIN_USERPROFILES_NAME_DESC); $propbag->add('description', PLUGIN_USERPROFILES_NAME_DESC);
$propbag->add('author', "Falk Döring"); $propbag->add('author', "Falk Döring");
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('version', '1.2'); $propbag->add('version', '1.2.1');
$propbag->add('configuration', array('title', 'show_groups', 'show_users')); $propbag->add('configuration', array('title', 'show_groups', 'show_users'));
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
@ -101,8 +101,8 @@ class serendipity_plugin_userprofiles extends serendipity_plugin {
$content .= sprintf("<a href=\"%s\" title=\"%s\">%s</a><br />\n", $content .= sprintf("<a href=\"%s\" title=\"%s\">%s</a><br />\n",
$entryLink, $entryLink,
htmlspecialchars($user['realname']), (function_exists('serendipity_specialchars') ? serendipity_specialchars($user['realname']) : htmlspecialchars($user['realname'], ENT_COMPAT, LANG_CHARSET)),
htmlspecialchars($user['realname'])); (function_exists('serendipity_specialchars') ? serendipity_specialchars($user['realname']) : htmlspecialchars($user['realname'], ENT_COMPAT, LANG_CHARSET)));
} }
return $content; return $content;

10
serendipity_event_versioning/serendipity_event_versioning.php
View file

@ -34,7 +34,7 @@ class serendipity_event_versioning extends serendipity_event {
)); ));
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '0.11'); $propbag->add('version', '0.11.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -261,10 +261,7 @@ class serendipity_event_versioning extends serendipity_event {
$msg = '<div class="serendipity_versioningInfo">' . VERSIONING_TITLE . ':<br />%s</div>'; $msg = '<div class="serendipity_versioningInfo">' . VERSIONING_TITLE . ':<br />%s</div>';
$html = '<ul>'; $html = '<ul>';
foreach($versions AS $version) { foreach($versions AS $version) {
$html .= '<li><a href="' . $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?' . serendipity_archiveURL($eventData[0]['id'], 'revision' . $version['version'], 'serendipityHTTPPath', false) . '&amp;serendipity[version_selected]=' . $version['id'] . '">' . htmlspecialchars(sprintf(VERSIONING_REVISION, $html .= '<li><a href="' . $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?' . serendipity_archiveURL($eventData[0]['id'], 'revision' . $version['version'], 'serendipityHTTPPath', false) . '&amp;serendipity[version_selected]=' . $version['id'] . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(sprintf(VERSIONING_REVISION, $version['version'], serendipity_strftime($date_time_format, $version['version_date'], true), $version['realname'])) : htmlspecialchars(sprintf(VERSIONING_REVISION, $version['version'], serendipity_strftime($date_time_format, $version['version_date'], true), $version['realname']), ENT_COMPAT, LANG_CHARSET)) . '</a></li>';
$version['version'],
serendipity_strftime($date_time_format, $version['version_date'], true),
$version['realname'])) . '</a></li>';
} }
$html .= '</ul>'; $html .= '</ul>';
@ -314,7 +311,8 @@ class serendipity_event_versioning extends serendipity_event {
} }
?> ?>
</select> </select>
<input class="serendipityPrettyButton input_button" type="submit" name="serendipity[versioning_change]" value="<?php echo VERSIONING_CHANGE; ?>" onclick="return confirm('<?php echo str_replace("'", "\'", htmlspecialchars(VERSIONING_CHANGE_WARNING)); ?>');" /> <input class="serendipityPrettyButton input_button" type="submit" name="serendipity[versioning_change]" value="<?php echo VERSIONING_CHANGE; ?>" onclick="return confirm('<?php echo str_replace("'", "\'", (function_exists('serendipity_specialchars') ? serendipity_specialchars(VERSIONING_CHANGE_WARNING) : htmlspecialchars(VERSIONING_CHANGE_WARNING, ENT_COMPAT, LANG_CHARSET)));
?>');" />
</div> </div>
</fieldset> </fieldset>
<?php <?php

4
serendipity_event_weblogping/serendipity_event_weblogping.php
View file

@ -15,7 +15,7 @@ class serendipity_event_weblogping extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_WEBLOGPING_DESC); $propbag->add('description', PLUGIN_EVENT_WEBLOGPING_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Serendipity Team'); $propbag->add('author', 'Serendipity Team');
$propbag->add('version', '1.08'); $propbag->add('version', '1.08.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -221,7 +221,7 @@ class serendipity_event_weblogping extends serendipity_event
$http_response = $req->getResponseBody(); $http_response = $req->getResponseBody();
$xmlrpc_result = $message->parseResponse($http_response); $xmlrpc_result = $message->parseResponse($http_response);
if ($xmlrpc_result->faultCode()) { if ($xmlrpc_result->faultCode()) {
$out = sprintf(PLUGIN_EVENT_WEBLOGPING_SEND_FAILURE . "<br />", htmlspecialchars($xmlrpc_result->faultString())); $out = sprintf(PLUGIN_EVENT_WEBLOGPING_SEND_FAILURE . "<br />", (function_exists('serendipity_specialchars') ? serendipity_specialchars($xmlrpc_result->faultString()) : htmlspecialchars($xmlrpc_result->faultString(), ENT_COMPAT, LANG_CHARSET));
} else { } else {
$out = PLUGIN_EVENT_WEBLOGPING_SEND_SUCCESS . "<br />"; $out = PLUGIN_EVENT_WEBLOGPING_SEND_SUCCESS . "<br />";
} }

18
serendipity_event_wikilinks/serendipity_event_wikilinks.php
View file

@ -30,7 +30,7 @@ class serendipity_event_wikilinks extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_WIKILINKS_DESC); $propbag->add('description', PLUGIN_EVENT_WIKILINKS_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Grischa Brockhaus'); $propbag->add('author', 'Garvin Hicking, Grischa Brockhaus');
$propbag->add('version', '0.25'); $propbag->add('version', '0.25.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.0', 'serendipity' => '1.0',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -198,13 +198,13 @@ class serendipity_event_wikilinks extends serendipity_event
echo '<div>'; echo '<div>';
echo '<label>' . PLUGIN_EVENT_WIKILINKS_DB_REFNAME . '</label><br />'; echo '<label>' . PLUGIN_EVENT_WIKILINKS_DB_REFNAME . '</label><br />';
echo '<input type="text" name="serendipity[wikireference_refname]" value="' . htmlspecialchars($ref['refname']) . '" />'; echo '<input type="text" name="serendipity[wikireference_refname]" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($ref['refname']) : htmlspecialchars($ref['refname'], ENT_COMPAT, LANG_CHARSET)) . '" />';
echo '<input type="submit" class="serendipityPrettyButton input_button" name="serendipity[saveSubmit]" value="' . SAVE . '" />'; echo '<input type="submit" class="serendipityPrettyButton input_button" name="serendipity[saveSubmit]" value="' . SAVE . '" />';
echo '</div>'; echo '</div>';
echo '<div>'; echo '<div>';
echo '<label>' . PLUGIN_EVENT_WIKILINKS_DB_REF . '</label><br />'; echo '<label>' . PLUGIN_EVENT_WIKILINKS_DB_REF . '</label><br />';
echo '<textarea cols="80" rows="20" name="serendipity[wikireference_ref]">' . htmlspecialchars($ref['ref']) . '</textarea>'; echo '<textarea cols="80" rows="20" name="serendipity[wikireference_ref]">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($ref['ref']) : htmlspecialchars($ref['ref'], ENT_COMPAT, LANG_CHARSET)) . '</textarea>';
echo '</div>'; echo '</div>';
echo '<div>'; echo '<div>';
@ -307,9 +307,9 @@ class serendipity_event_wikilinks extends serendipity_event
if (is_array($e)) { if (is_array($e)) {
foreach($e AS $entry) { foreach($e AS $entry) {
$link = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath', true, array('timestamp' => $entry['timestamp'])); $link = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath', true, array('timestamp' => $entry['timestamp']));
$jslink = "'<a href=\'$link\'>" . htmlspecialchars($entry['title']) . "<' + '/a>'"; $jslink = "'<a href=\'$link\'>" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . "<' + '/a>'";
echo '<li style="margin-bottom: 10px">' echo '<li style="margin-bottom: 10px">'
. '<a href="javascript:parent.self.opener.use_link_' . $what . '(' . $jslink . '); self.close();" title="' . htmlspecialchars($entry['title']) . '"><strong>' . htmlspecialchars($entry['title']) . '</strong></a> (<a href="' . $link . '" title="' . htmlspecialchars($entry['title']) . '">#' . $entry['id'] . '</a>)<br />' . '<a href="javascript:parent.self.opener.use_link_' . $what . '(' . $jslink . '); self.close();" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '"><strong>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '</strong></a> (<a href="' . $link . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '">#' . $entry['id'] . '</a>)<br />'
. POSTED_BY . ' ' . $entry['author'] . ' ' . POSTED_BY . ' ' . $entry['author'] . ' '
. ON . ' ' . serendipity_formatTime(DATE_FORMAT_SHORT, $entry['timestamp']) . . ON . ' ' . serendipity_formatTime(DATE_FORMAT_SHORT, $entry['timestamp']) .
($entry['isdraft'] != 'false' ? ' (' . DRAFT . ')' : '') . '</a></li>' . "\n"; ($entry['isdraft'] != 'false' ? ' (' . DRAFT . ')' : '') . '</a></li>' . "\n";
@ -505,8 +505,8 @@ function use_link_<?php echo $func; ?>(txt) {
array( array(
$refix, $refix,
htmlspecialchars($buffer['ref']), (function_exists('serendipity_specialchars') ? serendipity_specialchars($buffer['ref']) : htmlspecialchars($buffer['ref'], ENT_COMPAT, LANG_CHARSET)),
htmlspecialchars($buffer['refname']), (function_exists('serendipity_specialchars') ? serendipity_specialchars($buffer['refname']) : htmlspecialchars($buffer['refname'], ENT_COMPAT, LANG_CHARSET)),
), ),
$result $result
); );
@ -539,7 +539,7 @@ function use_link_<?php echo $func; ?>(txt) {
array( array(
$count2, $count2,
htmlspecialchars($buffer), (function_exists('serendipity_specialchars') ? serendipity_specialchars($buffer) : htmlspecialchars($buffer, ENT_COMPAT, LANG_CHARSET)),
$key $key
), ),
$format $format
@ -627,7 +627,7 @@ function use_link_<?php echo $func; ?>(txt) {
if (serendipity_userLoggedIn()) { if (serendipity_userLoggedIn()) {
$mode = 'create'; $mode = 'create';
$title = urlencode($ltitle); $title = urlencode($ltitle);
$body = '<h1>' . htmlspecialchars($ltitle) . '</h1>'; $body = '<h1>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($ltitle) : htmlspecialchars($ltitle, ENT_COMPAT, LANG_CHARSET)) . '</h1>';
$admin_url2 = $serendipity['baseURL'] . 'serendipity_admin.php?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=staticpages&amp;serendipity[pre][headline]=' . $title . '&amp;serendipity[pre][content]=' . $body . '&amp;serendipity[pre][pagetitle]=' . $title; $admin_url2 = $serendipity['baseURL'] . 'serendipity_admin.php?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=staticpages&amp;serendipity[pre][headline]=' . $title . '&amp;serendipity[pre][content]=' . $body . '&amp;serendipity[pre][pagetitle]=' . $title;
if ($otype == 'staticpage') { if ($otype == 'staticpage') {

4
serendipity_event_wrapurl/serendipity_event_wrapurl.php
View file

@ -27,7 +27,7 @@ class serendipity_event_wrapURL extends serendipity_event {
$propbag->add('event_hooks', array('entries_header' => true, 'entry_display' => true, 'genpage' => true, 'frontend_generate_plugins' => true, 'css' => true)); $propbag->add('event_hooks', array('entries_header' => true, 'entry_display' => true, 'genpage' => true, 'frontend_generate_plugins' => true, 'css' => true));
$propbag->add('configuration', array('headline', 'permalink', 'pagetitle', 'wrapurl', 'height', 'wrapurl_append', 'hide_sidebar')); $propbag->add('configuration', array('headline', 'permalink', 'pagetitle', 'wrapurl', 'height', 'wrapurl_append', 'hide_sidebar'));
$propbag->add('author', 'Rob Antonishen, Ian (Timbalu)'); $propbag->add('author', 'Rob Antonishen, Ian (Timbalu)');
$propbag->add('version', '0.10'); $propbag->add('version', '0.10.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.7', 'serendipity' => '0.7',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -126,7 +126,7 @@ class serendipity_event_wrapURL extends serendipity_event {
continue; continue;
} }
$url .= htmlspecialchars($key) . '=' . htmlspecialchars($value) . '&amp;'; $url .= (function_exists('serendipity_specialchars') ? serendipity_specialchars($key) : htmlspecialchars($key, ENT_COMPAT, LANG_CHARSET)) . '=' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($value) : htmlspecialchars($value, ENT_COMPAT, LANG_CHARSET)) . '&amp;';
} }
} }

8
serendipity_event_xsstrust/serendipity_event_xsstrust.php
View file

@ -31,7 +31,7 @@ class serendipity_event_xsstrust extends serendipity_event
'smarty' => '2.6.7', 'smarty' => '2.6.7',
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('version', '0.5'); $propbag->add('version', '0.5.1');
$propbag->add('event_hooks', array( $propbag->add('event_hooks', array(
'frontend_display' => true, 'frontend_display' => true,
'backend_media_check' => true)); 'backend_media_check' => true));
@ -61,7 +61,7 @@ class serendipity_event_xsstrust extends serendipity_event
$users = (array)serendipity_fetchUsers(); $users = (array)serendipity_fetchUsers();
$valid =& $this->trusted_authors; $valid =& $this->trusted_authors;
foreach($users as $user) { foreach($users as $user) {
$html .= '<option value="' . $user['authorid'] . '" ' . ($user['authorid'] == $serendipity['authorid'] || isset($valid[$user['authorid']]) ? 'selected="selected"' : '') . '>' . htmlspecialchars($user['realname']) . '</option>' . "\n"; $html .= '<option value="' . $user['authorid'] . '" ' . ($user['authorid'] == $serendipity['authorid'] || isset($valid[$user['authorid']]) ? 'selected="selected"' : '') . '>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($user['realname']) : htmlspecialchars($user['realname'], ENT_COMPAT, LANG_CHARSET)) . '</option>' . "\n";
} }
$html .= '</select>'; $html .= '</select>';
@ -137,8 +137,8 @@ class serendipity_event_xsstrust extends serendipity_event
if (!isset($this->trusted_authors[$eventData['authorid']])) { if (!isset($this->trusted_authors[$eventData['authorid']])) {
// Not trusted. // Not trusted.
#$eventData['title'] = htmlspecialchars($eventData['title']); #$eventData['title'] = htmlspecialchars($eventData['title']);
$eventData['body'] = htmlspecialchars($eventData['body']); $eventData['body'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($eventData['body']) : htmlspecialchars($eventData['body'], ENT_COMPAT, LANG_CHARSET));
$eventData['extended'] = htmlspecialchars($eventData['extended']); $eventData['extended'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($eventData['extended']) : htmlspecialchars($eventData['extended'], ENT_COMPAT, LANG_CHARSET));
} else { } else {
// Trusted. // Trusted.
} }

4
serendipity_event_xsstrust/serendipity_plugin_xsstrust.php
View file

@ -28,7 +28,7 @@ class serendipity_plugin_xsstrust extends serendipity_plugin
$propbag->add('description', PLUGIN_ETHICS_BLAHBLAH); $propbag->add('description', PLUGIN_ETHICS_BLAHBLAH);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Loris Zena'); $propbag->add('author', 'Loris Zena');
$propbag->add('version', '1.1'); $propbag->add('version', '1.1.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -218,7 +218,7 @@ class serendipity_plugin_xsstrust extends serendipity_plugin
if ($sql && is_array($sql)) { if ($sql && is_array($sql)) {
foreach($sql AS $key => $row) { foreach($sql AS $key => $row) {
echo "<tr><td>"; echo "<tr><td>";
echo htmlspecialchars($row['villan'])."</td><td>"; echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['villan']) : htmlspecialchars($row['villan'], ENT_COMPAT, LANG_CHARSET))."</td><td>";
if ($row['ethics'] == 3) { if ($row['ethics'] == 3) {
?> ?>
<img src="<?php echo $serendipity['serendipityHTTPPath']; ?>plugins/serendipity_plugin_ethics/img/red_light.gif"> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>plugins/serendipity_plugin_ethics/img/red_light.gif">

6
serendipity_plugin_adduser/common.inc.php
View file

@ -66,7 +66,7 @@ class serendipity_common_adduser {
} }
$author = serendipity_db_query($q, true); $author = serendipity_db_query($q, true);
serendipity_common_adduser::sendMail($author['username'], htmlspecialchars($string), $author['email'], false, false); serendipity_common_adduser::sendMail($author['username'], (function_exists('serendipity_specialchars') ? serendipity_specialchars($string) : htmlspecialchars($string, ENT_COMPAT, LANG_CHARSET)), $author['email'], false, false);
echo PLUGIN_ADDUSER_SENTMAIL_APPROVE_ADMIN; echo PLUGIN_ADDUSER_SENTMAIL_APPROVE_ADMIN;
return true; return true;
@ -92,7 +92,7 @@ class serendipity_common_adduser {
if (is_array($author)) { if (is_array($author)) {
$user = serendipity_db_query("SELECT authorid FROM {$serendipity['dbPrefix']}authors WHERE username = '" . serendipity_db_escape_string($author['username']) . "'", true); $user = serendipity_db_query("SELECT authorid FROM {$serendipity['dbPrefix']}authors WHERE username = '" . serendipity_db_escape_string($author['username']) . "'", true);
if (is_array($user) && !empty($user['authorid'])) { if (is_array($user) && !empty($user['authorid'])) {
printf(PLUGIN_ADDUSER_EXISTS . '<hr />', htmlspecialchars($author['username'])); printf(PLUGIN_ADDUSER_EXISTS . '<hr />', (function_exists('serendipity_specialchars') ? serendipity_specialchars($author['username']) : htmlspecialchars($author['username'], ENT_COMPAT, LANG_CHARSET)));
return false; return false;
} }
@ -221,7 +221,7 @@ class serendipity_common_adduser {
$user = serendipity_db_query("SELECT authorid FROM {$serendipity['dbPrefix']}authors WHERE username = '" . serendipity_db_escape_string($username) . "'", true); $user = serendipity_db_query("SELECT authorid FROM {$serendipity['dbPrefix']}authors WHERE username = '" . serendipity_db_escape_string($username) . "'", true);
if (is_array($user) && !empty($user['authorid'])) { if (is_array($user) && !empty($user['authorid'])) {
printf(PLUGIN_ADDUSER_EXISTS . '<hr />', htmlspecialchars($username)); printf(PLUGIN_ADDUSER_EXISTS . '<hr />', (function_exists('serendipity_specialchars') ? serendipity_specialchars($username) : htmlspecialchars($username, ENT_COMPAT, LANG_CHARSET)));
return false; return false;
} }

2
serendipity_plugin_adduser/serendipity_event_adduser.php
View file

@ -12,7 +12,7 @@ class serendipity_event_adduser extends serendipity_event
$propbag->add('description', PLUGIN_ADDUSER_DESC); $propbag->add('description', PLUGIN_ADDUSER_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '2.37'); $propbag->add('version', '2.37.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',

4
serendipity_plugin_adduser/serendipity_plugin_adduser.php
View file

@ -12,7 +12,7 @@ class serendipity_plugin_adduser extends serendipity_plugin {
$propbag->add('description', PLUGIN_ADDUSER_DESC); $propbag->add('description', PLUGIN_ADDUSER_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '2.34'); $propbag->add('version', '2.34.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -158,7 +158,7 @@ class serendipity_plugin_adduser extends serendipity_plugin {
$html .= '<select name="serendipity[plugin][usergroups][]" multiple="true" size="5">'; $html .= '<select name="serendipity[plugin][usergroups][]" multiple="true" size="5">';
if (is_array($groups)) { if (is_array($groups)) {
foreach($groups AS $group) { foreach($groups AS $group) {
$html .= '<option value="'. $group['id'] .'"'. (isset($valid[$group['id']]) ? ' selected="selected"' : '') .'>'. htmlspecialchars($group['name']) .'</option>' . "\n"; $html .= '<option value="'. $group['id'] .'"'. (isset($valid[$group['id']]) ? ' selected="selected"' : '') .'>'. (function_exists('serendipity_specialchars') ? serendipity_specialchars($group['name']) : htmlspecialchars($group['name'], ENT_COMPAT, LANG_CHARSET)) .'</option>' . "\n";
} }
} }

28
serendipity_plugin_audioscrobbler/serendipity_plugin_audioscrobbler.php
View file

@ -63,7 +63,7 @@ class serendipity_plugin_audioscrobbler extends serendipity_plugin {
$propbag->add('description', PLUGIN_AUDIOSCROBBLER_TITLE_BLAHBLAH); $propbag->add('description', PLUGIN_AUDIOSCROBBLER_TITLE_BLAHBLAH);
$propbag->add('stackable', true); $propbag->add('stackable', true);
$propbag->add('author', 'Flo Solcher'); $propbag->add('author', 'Flo Solcher');
$propbag->add('version', '1.25'); $propbag->add('version', '1.25.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -210,7 +210,7 @@ class serendipity_plugin_audioscrobbler extends serendipity_plugin {
//renders the date for output //renders the date for output
function renderScrobblerDate($date) { function renderScrobblerDate($date) {
$stamp = $date + intval($this->utcdifference) * 60 * 60; $stamp = $date + intval($this->utcdifference) * 60 * 60;
return htmlspecialchars(serendipity_formatTime($this->get_config('dateformat'), $stamp, true)); return (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_formatTime($this->get_config('dateformat'), $stamp, true)) : htmlspecialchars(serendipity_formatTime($this->get_config('dateformat'), $stamp, true), ENT_COMPAT, LANG_CHARSET));
} }
//sets the timestamp of the last update try //sets the timestamp of the last update try
@ -475,32 +475,32 @@ class serendipity_plugin_audioscrobbler extends serendipity_plugin {
if ($songlink) { if ($songlink) {
if (is_string(strstr($value['link'], '&mode'))) { if (is_string(strstr($value['link'], '&mode'))) {
//fix ampersand entity //fix ampersand entity
$song = '<a href="'.str_replace('&mode', '&amp;mode', $value['link']). '"'.$onclick.'>'.htmlspecialchars($value['songtitle'], ENT_QUOTES).'</a>'."\n"; $song = '<a href="'.str_replace('&mode', '&amp;mode', $value['link']). '"'.$onclick.'>'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($value['songtitle'], ENT_QUOTES) : htmlspecialchars($value['songtitle'], ENT_QUOTES| ENT_COMPAT, LANG_CHARSET)).'</a>'."\n";
} elseif (is_string(strstr($value['link'], '&amp;mode'))) { } elseif (is_string(strstr($value['link'], '&amp;mode'))) {
//link is ok //link is ok
$song = '<a href="'.$value['link']. '"'.$onclick.'>'.htmlspecialchars($value['songtitle'], ENT_QUOTES).'</a>'."\n"; $song = '<a href="'.$value['link']. '"'.$onclick.'>'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($value['songtitle'], ENT_QUOTES) : htmlspecialchars($value['songtitle'], ENT_QUOTES| ENT_COMPAT, LANG_CHARSET)).'</a>'."\n";
} else { } else {
//encode it //encode it
$song = '<a href="http://www.audioscrobbler.com/music/'.urlencode(utf8_encode($value['artisttitle'])). '/_/'.urlencode(utf8_encode($value['songtitle'])).'"'.$onclick.'>'.htmlspecialchars($value['songtitle'], ENT_QUOTES).'</a>'."\n"; $song = '<a href="http://www.audioscrobbler.com/music/'.urlencode(utf8_encode($value['artisttitle'])). '/_/'.urlencode(utf8_encode($value['songtitle'])).'"'.$onclick.'>'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($value['songtitle'], ENT_QUOTES) : htmlspecialchars($value['songtitle'], ENT_QUOTES| ENT_COMPAT, LANG_CHARSET)).'</a>'."\n";
} }
} else { } else {
$song = htmlspecialchars($value['songtitle'], ENT_QUOTES); $song = (function_exists('serendipity_specialchars') ? serendipity_specialchars($value['songtitle'], ENT_QUOTES) : htmlspecialchars($value['songtitle'], ENT_QUOTES| ENT_COMPAT, LANG_CHARSET));
} }
if ($artistlink == 0) { if ($artistlink == 0) {
$artist = htmlspecialchars($value['artisttitle'], ENT_QUOTES); $artist = (function_exists('serendipity_specialchars') ? serendipity_specialchars($value['artisttitle'], ENT_QUOTES) : htmlspecialchars($value['artisttitle'], ENT_QUOTES| ENT_COMPAT, LANG_CHARSET));
} elseif ($artistlink == 1) { } elseif ($artistlink == 1) {
$artist = '<a href="http://www.audioscrobbler.com/music/'.urlencode(utf8_encode($value['artisttitle'])).'"'.$onclick.'>'.htmlspecialchars($value['artisttitle'], ENT_QUOTES).'</a>'."\n"; $artist = '<a href="http://www.audioscrobbler.com/music/'.urlencode(utf8_encode($value['artisttitle'])).'"'.$onclick.'>'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($value['artisttitle'], ENT_QUOTES) : htmlspecialchars($value['artisttitle'], ENT_QUOTES| ENT_COMPAT, LANG_CHARSET)).'</a>'."\n";
} elseif ($artistlink == 2) { } elseif ($artistlink == 2) {
if ($value['artisttitle'] != '' || $value['artistlink'] != 'http://mm.musicbrainz.org/artist/') { if ($value['artisttitle'] != '' || $value['artistlink'] != 'http://mm.musicbrainz.org/artist/') {
$artist = '<a href="' . $value['artistlink'] . '"'.$onclick.'>'.htmlspecialchars($value['artisttitle'], ENT_QUOTES).'</a>'."\n"; $artist = '<a href="' . $value['artistlink'] . '"'.$onclick.'>'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($value['artisttitle'], ENT_QUOTES) : htmlspecialchars($value['artisttitle'], ENT_QUOTES| ENT_COMPAT, LANG_CHARSET)).'</a>'."\n";
} else { } else {
$artist = htmlspecialchars($value['artisttitle'], ENT_QUOTES); $artist = (function_exists('serendipity_specialchars') ? serendipity_specialchars($value['artisttitle'], ENT_QUOTES) : htmlspecialchars($value['artisttitle'], ENT_QUOTES| ENT_COMPAT, LANG_CHARSET));
} }
} else { } else {
if (trim($value['artistlink']) != 'http://mm.musicbrainz.org/artist/' && trim($value['artistlink']) != '') { if (trim($value['artistlink']) != 'http://mm.musicbrainz.org/artist/' && trim($value['artistlink']) != '') {
$artist = '<a href="' . $value['artistlink'] . '"'.$onclick.'>'.htmlspecialchars($value['artisttitle'], ENT_QUOTES).'</a>'."\n"; $artist = '<a href="' . $value['artistlink'] . '"'.$onclick.'>'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($value['artisttitle'], ENT_QUOTES) : htmlspecialchars($value['artisttitle'], ENT_QUOTES| ENT_COMPAT, LANG_CHARSET)).'</a>'."\n";
} else { } else {
$artist = '<a href="http://www.audioscrobbler.com/music/'.urlencode(utf8_encode($value['artisttitle'])).'"'.$onclick.'>'.htmlspecialchars($value['artisttitle'], ENT_QUOTES).'</a>'."\n"; $artist = '<a href="http://www.audioscrobbler.com/music/'.urlencode(utf8_encode($value['artisttitle'])).'"'.$onclick.'>'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($value['artisttitle'], ENT_QUOTES) : htmlspecialchars($value['artisttitle'], ENT_QUOTES| ENT_COMPAT, LANG_CHARSET)).'</a>'."\n";
} }
} }
$replacements = array('%ARTIST%' => $artist, '%SONG%' => $song, '%DATE%' => $this->renderScrobblerDate($value['date'], $dateformat)); $replacements = array('%ARTIST%' => $artist, '%SONG%' => $song, '%DATE%' => $this->renderScrobblerDate($value['date'], $dateformat));
@ -514,8 +514,8 @@ class serendipity_plugin_audioscrobbler extends serendipity_plugin {
$entries = join($spacer, $content); $entries = join($spacer, $content);
$output = str_replace('%ENTRIES%', $entries, $formatstring_block); $output = str_replace('%ENTRIES%', $entries, $formatstring_block);
$profiletitle = str_replace('%USER%', $this->username, $profiletitle); $profiletitle = str_replace('%USER%', $this->username, $profiletitle);
$output = str_replace('%PROFILE%', '<a href="http://www.audioscrobbler.com/user/'.urlencode(utf8_encode($this->username)).'"'.$onclick.'>'.htmlspecialchars($profiletitle, ENT_QUOTES).'</a>', $output); $output = str_replace('%PROFILE%', '<a href="http://www.audioscrobbler.com/user/'.urlencode(utf8_encode($this->username)).'"'.$onclick.'>'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($profiletitle, ENT_QUOTES) : htmlspecialchars($profiletitle, ENT_QUOTES| ENT_COMPAT, LANG_CHARSET)).'</a>', $output);
$output = str_replace('%LASTUPDATE%', htmlspecialchars(serendipity_formatTime($this->get_config('dateformat'), filemtime($this->scrobblercache), true)), $output); $output = str_replace('%LASTUPDATE%', (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_formatTime($this->get_config('dateformat') : htmlspecialchars(serendipity_formatTime($this->get_config('dateformat', ENT_COMPAT, LANG_CHARSET)), filemtime($this->scrobblercache), true)), $output);
$output = str_replace('audioscrobbler.com', 'last.fm', $output); $output = str_replace('audioscrobbler.com', 'last.fm', $output);
return $output; return $output;
} }

2
serendipity_plugin_delicious/serendipity_plugin_delicious.php
View file

@ -47,7 +47,7 @@ class serendipity_plugin_delicious extends serendipity_plugin {
$propbag->add('name', PLUGIN_DELICIOUS_N); $propbag->add('name', PLUGIN_DELICIOUS_N);
$propbag->add('description', PLUGIN_DELICIOUS_D); $propbag->add('description', PLUGIN_DELICIOUS_D);
$propbag->add('author', 'Riscky'); $propbag->add('author', 'Riscky');
$propbag->add('version', '0.8'); $propbag->add('version', '0.8.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',

8
serendipity_plugin_google_last_query/serendipity_plugin_google_last_query.php
View file

@ -34,7 +34,7 @@ class serendipity_plugin_google_last_query extends serendipity_plugin {
function introspect(&$propbag) { function introspect(&$propbag) {
$propbag->add('name', PLUGIN_GOOGLE_LAST_QUERY_TITLE); $propbag->add('name', PLUGIN_GOOGLE_LAST_QUERY_TITLE);
$propbag->add('description', PLUGIN_GOOGLE_LAST_QUERY_DESC); $propbag->add('description', PLUGIN_GOOGLE_LAST_QUERY_DESC);
$propbag->add('version', '1.18'); $propbag->add('version', '1.18.1');
$propbag->add('stackable', true); $propbag->add('stackable', true);
if ($this->isVisitorsTableFilled()) { if ($this->isVisitorsTableFilled()) {
@ -486,7 +486,7 @@ class serendipity_plugin_google_last_query extends serendipity_plugin {
} else { } else {
$out = urldecode($search_query); $out = urldecode($search_query);
} }
echo "<a rel=\"nofollow\"$time_title href='". $url_prot . "://" . htmlspecialchars($url_host . $url_dir) . "?$url_qpar=" . urlencode(htmlspecialchars($out)) . "'" . $target . ">" . htmlspecialchars($out) ."</a><br />\n"; echo "<a rel=\"nofollow\"$time_title href='". $url_prot . "://" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($url_host . $url_dir) : htmlspecialchars($url_host . $url_dir, ENT_COMPAT, LANG_CHARSET)) . "?$url_qpar=" . urlencode((function_exists('serendipity_specialchars') ? serendipity_specialchars($out) : htmlspecialchars($out, ENT_COMPAT, LANG_CHARSET))) . "'" . $target . ">" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($out) : htmlspecialchars($out, ENT_COMPAT, LANG_CHARSET)) ."</a><br />\n";
} }
function echo_visitors($search_engine, $search_query, $url_path, $url_qpar, $target, $time_title) { function echo_visitors($search_engine, $search_query, $url_path, $url_qpar, $target, $time_title) {
@ -499,8 +499,8 @@ class serendipity_plugin_google_last_query extends serendipity_plugin {
preg_match("/(http:.*?)\?/", $url_path, $hostmatches); preg_match("/(http:.*?)\?/", $url_path, $hostmatches);
$host = $hostmatches[1]; $host = $hostmatches[1];
$url = htmlspecialchars($host . $url_qpar . $search_query); $url = (function_exists('serendipity_specialchars') ? serendipity_specialchars($host . $url_qpar . $search_query) : htmlspecialchars($host . $url_qpar . $search_query, ENT_COMPAT, LANG_CHARSET));
echo "<a rel=\"nofollow\" href='" . $url . "'" . $target . $time_title . ">" . htmlspecialchars($out) . "</a><br />\n"; echo "<a rel=\"nofollow\" href='" . $url . "'" . $target . $time_title . ">" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($out) : htmlspecialchars($out, ENT_COMPAT, LANG_CHARSET)) . "</a><br />\n";
} }
function show_icon($search_engine) { function show_icon($search_engine) {

2
serendipity_plugin_imagesidebar/media_sidebar.php
View file

@ -232,7 +232,7 @@ class media_sidebar extends subplug_sidebar {
} else { } else {
$link = $image_path; $link = $image_path;
} }
$output_str .= '<a href="' . $link . '" title="' . htmlspecialchars($e[0]['title']) . '"><img style="border: 0px; '.$width_str .'" src="'.$thumb_path.'" alt="" /></a>'; $output_str .= '<a href="' . $link . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($e[0]['title']) : htmlspecialchars($e[0]['title'], ENT_COMPAT, LANG_CHARSET)) . '"><img style="border: 0px; '.$width_str .'" src="'.$thumb_path.'" alt="" /></a>';
break; break;
case 'popup': case 'popup':
$output_str .= '<a href="'.$image_path.'" onclick="F1 = window.open(\''.$image_path.'\',\'Zoom\',\'height='.$image['dimensions_height'].',width='.$image['dimensions_width'].',top=298,left=354,toolbar=no,menubar=no,location=no,resize=1,resizable=1,scrollbars=yes\'); return false;"><img style="border: 0px; '.$width_str .'" src="'.$thumb_path.'" alt="" /></a>'; $output_str .= '<a href="'.$image_path.'" onclick="F1 = window.open(\''.$image_path.'\',\'Zoom\',\'height='.$image['dimensions_height'].',width='.$image['dimensions_width'].',top=298,left=354,toolbar=no,menubar=no,location=no,resize=1,resizable=1,scrollbars=yes\'); return false;"><img style="border: 0px; '.$width_str .'" src="'.$thumb_path.'" alt="" /></a>';

2
serendipity_plugin_imagesidebar/serendipity_plugin_imagesidebar.php
View file

@ -75,7 +75,7 @@ class serendipity_plugin_imagesidebar extends serendipity_plugin {
$propbag->add('description', PLUGIN_SIDEBAR_IMAGESIDEBAR_DESC); $propbag->add('description', PLUGIN_SIDEBAR_IMAGESIDEBAR_DESC);
$propbag->add('stackable', true); $propbag->add('stackable', true);
$propbag->add('author', 'Andrew Brown (Menalto code), Matthew Groeninger (Unified/Media Lib. Code), Stefan Lange-Hegermann (Zooomr Code), Matthew Maude (Coppermine code)'); $propbag->add('author', 'Andrew Brown (Menalto code), Matthew Groeninger (Unified/Media Lib. Code), Stefan Lange-Hegermann (Zooomr Code), Matthew Maude (Coppermine code)');
$propbag->add('version', '0.97'); $propbag->add('version', '0.97.1');
$propbag->add('license', 'BSD'); $propbag->add('license', 'BSD');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',

4
serendipity_plugin_photoblog/serendipity_plugin_photoblog.php
View file

@ -25,7 +25,7 @@ class serendipity_plugin_photoblog extends serendipity_plugin {
'php' => '4.1.0' 'php' => '4.1.0'
)); ));
$propbag->add('author', 'Cameron MacFarland'); $propbag->add('author', 'Cameron MacFarland');
$propbag->add('version', '1.2'); $propbag->add('version', '1.2.1');
$propbag->add('groups', array('IMAGES')); $propbag->add('groups', array('IMAGES'));
$this->dependencies = array('serendipity_event_thumbnails' => 'keep'); $this->dependencies = array('serendipity_event_thumbnails' => 'keep');
} }
@ -135,7 +135,7 @@ class serendipity_plugin_photoblog extends serendipity_plugin {
$thumbsize = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename); $thumbsize = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename);
} }
echo '<a href="' . $entryLink . '" title="' . htmlspecialchars($entry['title']) . '">'; echo '<a href="' . $entryLink . '" title="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '">';
if (isset($photo)) { if (isset($photo)) {
echo '<img style="margin:5px;" src="' . $imgsrc . '" width=' . $thumbsize[0] . ' height=' . $thumbsize[1]; echo '<img style="margin:5px;" src="' . $imgsrc . '" width=' . $thumbsize[0] . ' height=' . $thumbsize[1];
if (isset($id) && ($id == $entry['id'])) { if (isset($id) && ($id == $entry['id'])) {

4
serendipity_plugin_pollbox/common.inc.php
View file

@ -66,7 +66,7 @@ class serendipity_common_pollbox {
if (empty($option['title'])) { if (empty($option['title'])) {
continue; continue;
} }
echo '<input class="pollitem" type="radio" style="width: 15px; margin: 0px;" name="serendipity[vote]" value="' . $optid . '" /> ' . htmlspecialchars($option['title']) . '<br />'; echo '<input class="pollitem" type="radio" style="width: 15px; margin: 0px;" name="serendipity[vote]" value="' . $optid . '" /> ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($option['title']) : htmlspecialchars($option['title'], ENT_COMPAT, LANG_CHARSET)) . '<br />';
} }
} }
echo '<input class="pollsubmit" type="submit" name="serendipity[goVote]" value="' . GO . '" />'; echo '<input class="pollsubmit" type="submit" name="serendipity[goVote]" value="' . GO . '" />';
@ -80,7 +80,7 @@ class serendipity_common_pollbox {
asort($sorted); asort($sorted);
foreach($sorted AS $title => $votes) { foreach($sorted AS $title => $votes) {
echo htmlspecialchars($title) . '<br />'; echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($title) : htmlspecialchars($title, ENT_COMPAT, LANG_CHARSET)) . '<br />';
if ($this->poll['votes'] > 0) { if ($this->poll['votes'] > 0) {
$total = ceil(($votes / $this->poll['votes']) * 100); $total = ceil(($votes / $this->poll['votes']) * 100);
} else { } else {

14
serendipity_plugin_pollbox/serendipity_event_pollbox.php
View file

@ -20,7 +20,7 @@ class serendipity_event_pollbox extends serendipity_event {
$propbag->add('configuration', array('permalink', "articleformat", "pagetitle", "articleformattitle")); $propbag->add('configuration', array('permalink', "articleformat", "pagetitle", "articleformattitle"));
$propbag->add('author', 'Garvin Hicking, Matthias Mees'); $propbag->add('author', 'Garvin Hicking, Matthias Mees');
$propbag->add('groups', array('STATISTICS')); $propbag->add('groups', array('STATISTICS'));
$propbag->add('version', '2.14'); $propbag->add('version', '2.14.1');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '0.8', 'serendipity' => '0.8',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -145,7 +145,7 @@ class serendipity_event_pollbox extends serendipity_event {
$polls =& $this->fetchPolls(); $polls =& $this->fetchPolls();
if (is_array($polls)) { if (is_array($polls)) {
foreach($polls AS $poll) { foreach($polls AS $poll) {
echo '<a href="' . $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[subpage]=' . $this->get_config('pagetitle') . '&amp;serendipity[voteId]=' . $poll['id'] . '">' . htmlspecialchars($poll['title']) . '</a>, ' . serendipity_strftime(DATE_FORMAT_ENTRY, $poll['timestamp']) . '<br />'; echo '<a href="' . $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[subpage]=' . $this->get_config('pagetitle') . '&amp;serendipity[voteId]=' . $poll['id'] . '">' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($poll['title']) : htmlspecialchars($poll['title'], ENT_COMPAT, LANG_CHARSET)) . '</a>, ' . serendipity_strftime(DATE_FORMAT_ENTRY, $poll['timestamp']) . '<br />';
} }
} }
echo '</div>'; echo '</div>';
@ -303,7 +303,7 @@ class serendipity_event_pollbox extends serendipity_event {
if (is_array($polls)) { if (is_array($polls)) {
foreach($polls AS $poll) { foreach($polls AS $poll) {
echo ' <option value="' . $poll['id'] . '" ' . ($serendipity['POST']['poll'] == $poll['id'] ? 'selected="selected"' : '') . '>'; echo ' <option value="' . $poll['id'] . '" ' . ($serendipity['POST']['poll'] == $poll['id'] ? 'selected="selected"' : '') . '>';
echo ($poll['active'] == 1 ? '*' : '') . htmlspecialchars($poll['title']) . ' (' . serendipity_strftime('%d.%m.%Y', $poll['timestamp']) . ')</option>'; echo ($poll['active'] == 1 ? '*' : '') . (function_exists('serendipity_specialchars') ? serendipity_specialchars($poll['title']) : htmlspecialchars($poll['title'], ENT_COMPAT, LANG_CHARSET)) . ' (' . serendipity_strftime('%d.%m.%Y', $poll['timestamp']) . ')</option>';
} }
} }
if ($serendipity['version'][0] == '1') { if ($serendipity['version'][0] == '1') {
@ -336,11 +336,11 @@ class serendipity_event_pollbox extends serendipity_event {
if ($serendipity['version'][0] == '1') { if ($serendipity['version'][0] == '1') {
echo '<br /><hr /><br />'; echo '<br /><hr /><br />';
echo TITLE . ' <input class="input_textbox" type="text" name="serendipity[currentPoll][title]" value="' . htmlspecialchars($this->poll['title']) . '" />'; echo TITLE . ' <input class="input_textbox" type="text" name="serendipity[currentPoll][title]" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->poll['title']) : htmlspecialchars($this->poll['title'], ENT_COMPAT, LANG_CHARSET)) . '" />';
} else { } else {
echo '<div class="form_field">'; echo '<div class="form_field">';
echo '<label for="serendipity_current_poll_title" class="block_level">' . TITLE . '</label>'; echo '<label for="serendipity_current_poll_title" class="block_level">' . TITLE . '</label>';
echo '<input id="serendipity_current_poll_title" type="text" name="serendipity[currentPoll][title]" value="' . htmlspecialchars($this->poll['title']) . '">'; echo '<input id="serendipity_current_poll_title" type="text" name="serendipity[currentPoll][title]" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->poll['title']) : htmlspecialchars($this->poll['title'], ENT_COMPAT, LANG_CHARSET)) . '">';
echo '</div>'; echo '</div>';
} }
@ -353,7 +353,7 @@ class serendipity_event_pollbox extends serendipity_event {
foreach((array)$this->poll['options'] AS $optid => $option) { foreach((array)$this->poll['options'] AS $optid => $option) {
echo '<tr>'; echo '<tr>';
echo '<td><input class="input_textbox" type="text" name="serendipity[pollOptions][' . $optid . '][title]" value="' . htmlspecialchars($option['title']) . '" /></td>'; echo '<td><input class="input_textbox" type="text" name="serendipity[pollOptions][' . $optid . '][title]" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($option['title']) : htmlspecialchars($option['title'], ENT_COMPAT, LANG_CHARSET)) . '" /></td>';
echo '<td><input class="serendipityPrettyButton input_button" type="submit" name="serendipity[pollOptionRemove][' . $optid . ']" value="' . DELETE . '" /></td>'; echo '<td><input class="serendipityPrettyButton input_button" type="submit" name="serendipity[pollOptionRemove][' . $optid . ']" value="' . DELETE . '" /></td>';
echo '<td>' . (int)$option['votes'] . ' ' . PLUGIN_POLL_VOTES . '</td>'; echo '<td>' . (int)$option['votes'] . ' ' . PLUGIN_POLL_VOTES . '</td>';
echo '</tr>'; echo '</tr>';
@ -370,7 +370,7 @@ class serendipity_event_pollbox extends serendipity_event {
foreach((array)$this->poll['options'] AS $optid => $option) { foreach((array)$this->poll['options'] AS $optid => $option) {
echo '<li><div class="form_select">'; echo '<li><div class="form_select">';
echo '<label for="serendipity_polloption_' . $optid . '" class="block_level">' . TITLE . '</label>'; echo '<label for="serendipity_polloption_' . $optid . '" class="block_level">' . TITLE . '</label>';
echo ' <input id="serendipity_polloption_' . $optid . '" type="text" name="serendipity[pollOptions][' . $optid . '][title]" value="' . htmlspecialchars($option['title']) . '">'; echo ' <input id="serendipity_polloption_' . $optid . '" type="text" name="serendipity[pollOptions][' . $optid . '][title]" value="' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($option['title']) : htmlspecialchars($option['title'], ENT_COMPAT, LANG_CHARSET)) . '">';
echo ' <input class="state_cancel" type="submit" name="serendipity[pollOptionRemove][' . $optid . ']" value="' . DELETE . '">'; echo ' <input class="state_cancel" type="submit" name="serendipity[pollOptionRemove][' . $optid . ']" value="' . DELETE . '">';
echo ' <span>' . (int)$option['votes'] . ' ' . PLUGIN_POLL_VOTES . '</span>'; echo ' <span>' . (int)$option['votes'] . ' ' . PLUGIN_POLL_VOTES . '</span>';
echo '</div></li>'; echo '</div></li>';

Some files were not shown because too many files have changed in this diff Show more