diff --git a/serendipity_event_adminnotes/serendipity_event_adminnotes.php b/serendipity_event_adminnotes/serendipity_event_adminnotes.php index 962e8a01..61c78f9a 100644 --- a/serendipity_event_adminnotes/serendipity_event_adminnotes.php +++ b/serendipity_event_adminnotes/serendipity_event_adminnotes.php @@ -27,7 +27,7 @@ class serendipity_event_adminnotes extends serendipity_event { 'php' => '4.1.0' )); - $propbag->add('version', '0.11'); + $propbag->add('version', '0.11.1'); $propbag->add('author', 'Garvin Hicking, Matthias Mees'); $propbag->add('stackable', false); $propbag->add('configuration', array('feedback', 'limit', 'html', 'markup', 'cutoff')); @@ -242,17 +242,17 @@ class serendipity_event_adminnotes extends serendipity_event { echo serendipity_setFormToken(); echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; if ($serendipity['version'][0] == '1') { echo TITLE . '
'; - echo '

'; + echo '

'; } else { echo '
'; echo ''; - echo ''; + echo ''; echo '
'; } @@ -281,7 +281,7 @@ class serendipity_event_adminnotes extends serendipity_event { } else { $is_selected = ''; } - echo '' . "\n"; + echo '' . "\n"; } if ($serendipity['version'][0] == '1') { echo '

'; @@ -295,7 +295,7 @@ class serendipity_event_adminnotes extends serendipity_event { echo '
'; echo ''; } - echo ''; + echo ''; if ($serendipity['version'][0] == '1') { echo '

'; echo ''; @@ -316,7 +316,7 @@ class serendipity_event_adminnotes extends serendipity_event { if ($serendipity['version'][0] == '2') { echo ' '; } - 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') { echo ''; } @@ -326,7 +326,7 @@ class serendipity_event_adminnotes extends serendipity_event {

- " class="serendipityPrettyButton"> + " class="serendipityPrettyButton">
@@ -335,7 +335,7 @@ class serendipity_event_adminnotes extends serendipity_event { ?>
- "> + ">
'; } - 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') { echo ''; } @@ -410,7 +410,7 @@ class serendipity_event_adminnotes extends serendipity_event { if ($allow_html) { $body = $string; } else { - $body = htmlspecialchars($string); + $body = (function_exists('serendipity_specialchars') ? serendipity_specialchars($string) : htmlspecialchars($string, ENT_COMPAT, LANG_CHARSET)); } if ($do_markup) { @@ -477,7 +477,7 @@ function fulltext_toggle(id) { if (is_array($notes)) { foreach($notes AS $id => $note) { echo '
' . "\n"; - echo '
' . $this->output($note['subject']) . ' ' . POSTED_BY . ' ' . htmlspecialchars($note['realname']) . ' ' . ON . ' ' . serendipity_strftime(DATE_FORMAT_SHORT, $note['notetime']) . '
' . "\n"; + echo '
' . $this->output($note['subject']) . ' ' . 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']) . '
' . "\n"; if (strlen($note['body']) > $cutoff) { $output = $this->output($note['body']); diff --git a/serendipity_event_aggregator/serendipity_event_aggregator.php b/serendipity_event_aggregator/serendipity_event_aggregator.php index 1c274b02..24dc0658 100644 --- a/serendipity_event_aggregator/serendipity_event_aggregator.php +++ b/serendipity_event_aggregator/serendipity_event_aggregator.php @@ -72,7 +72,7 @@ class serendipity_event_aggregator extends serendipity_event { '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('stackable', false); $propbag->add('event_hooks', array( @@ -135,7 +135,7 @@ class serendipity_event_aggregator extends serendipity_event { if (!is_array($plugin_data['p']->markup_elements)) { 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 { ' . $idx . ' - ' . htmlspecialchars($feed['charset']) . ' + ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['charset']) : htmlspecialchars($feed['charset'], ENT_COMPAT, LANG_CHARSET)) . ' - - + + ' . $cat . ' -
- +
+ @@ -1394,7 +1394,7 @@ class serendipity_event_aggregator extends serendipity_event { // error handling if ($simplefeed->error()) { - if (!$opt['store_seperate']) printf('

ERROR: ' . htmlspecialchars($simplefeed->error()) . "

\r\n") ; + if (!$opt['store_seperate']) printf('

ERROR: ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($simplefeed->error()) : htmlspecialchars($simplefeed->error(), ENT_COMPAT, LANG_CHARSET)) . "

\r\n") ; } if ($success) { @@ -1610,10 +1610,10 @@ class serendipity_event_aggregator extends serendipity_event { } printf(' ' . "\n", - serendipity_utf8_encode(htmlspecialchars($feed['feedname'])), - serendipity_utf8_encode(htmlspecialchars($feed['feedurl'])), - serendipity_utf8_encode(htmlspecialchars($feed['htmlurl'])), - 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((function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['feedurl']) : htmlspecialchars($feed['feedurl'], ENT_COMPAT, LANG_CHARSET))), + serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['htmlurl']) : htmlspecialchars($feed['htmlurl'], ENT_COMPAT, LANG_CHARSET))), + serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($feed['feedname']) : htmlspecialchars($feed['feedname'], ENT_COMPAT, LANG_CHARSET))) ); } } diff --git a/serendipity_event_amazonchooser/Amazon_s9y_lib.php b/serendipity_event_amazonchooser/Amazon_s9y_lib.php index 07bae6d5..3ed8ca66 100644 --- a/serendipity_event_amazonchooser/Amazon_s9y_lib.php +++ b/serendipity_event_amazonchooser/Amazon_s9y_lib.php @@ -388,70 +388,70 @@ function Amazon_AttributesText ($SearchIndex,$items,$country_url) { $item['strings']['largeurl'] = rawurldecode($item['LARGEIMAGE']['LARGEIMAGE_URL']); } 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 ($SearchIndex == "" || !isset($SearchIndex)) { $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'])) { - $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'])) { - $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'])) { - $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'])) { - $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'])) { - $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'])) { - $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) { - $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'])) { - $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'])) { - $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'])) { - $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'])) { - $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'])) { - $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'])) { - $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'])) { - $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']))) { - $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']))) { - $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']))) { - $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']))) { - $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']))) { - $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) { case 'Books': @@ -460,20 +460,20 @@ function Amazon_AttributesText ($SearchIndex,$items,$country_url) { case 'KindleStore': if (isset($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 { - $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'])) { - $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'])) { - $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']); } 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; case 'VHS': @@ -481,19 +481,19 @@ function Amazon_AttributesText ($SearchIndex,$items,$country_url) { case 'DVD': if (isset($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 { - $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'])) { - $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'])) { - $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'])) { - $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; case 'Music': @@ -504,33 +504,33 @@ function Amazon_AttributesText ($SearchIndex,$items,$country_url) { case 'MusicTracks': if (isset($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 { - $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'])) { - $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; case 'Software': case 'VideoGames': case 'SoftwareVideoGames': 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; case 'Apparel': 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; default: 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'])) { - $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; } diff --git a/serendipity_event_amazonchooser/serendipity_event_amazonchooser.php b/serendipity_event_amazonchooser/serendipity_event_amazonchooser.php index 05f1c81e..bb06e287 100644 --- a/serendipity_event_amazonchooser/serendipity_event_amazonchooser.php +++ b/serendipity_event_amazonchooser/serendipity_event_amazonchooser.php @@ -29,7 +29,7 @@ class serendipity_event_amazonchooser extends serendipity_event $propbag->add('description', PLUGIN_EVENT_AMAZONCHOOSER_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Matthew Groeninger, Ian'); - $propbag->add('version', '0.74'); + $propbag->add('version', '0.74.1'); $propbag->add('requirements', array( 'serendipity' => '1.3', 'smarty' => '2.6.7', @@ -278,13 +278,13 @@ class serendipity_event_amazonchooser extends serendipity_event } else { $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)) { - $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 { $results['return_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) { $previous_page = $page - 1; @@ -306,16 +306,16 @@ class serendipity_event_amazonchooser extends serendipity_event 'plugin_amazonchooser_error_result' => $results['error_result'], 'plugin_amazonchooser_cache_time' => $results['return_date'], 'plugin_amazonchooser_items' => $results['items'], - 'plugin_amazonchooser_search_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&') . 'txtarea=' . htmlspecialchars($_REQUEST['txtarea']).$simple.'&keyword='.trim(htmlspecialchars(rawurlencode($_REQUEST['keyword']))).'&mode='.$request_mode, - 'plugin_amazonchooser_this_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&') . '&mode='.trim(htmlspecialchars(rawurlencode($_REQUEST['mode']))).'&txtarea=' . htmlspecialchars($_REQUEST['txtarea']) .$simple. '&step=1&keyword='.trim(htmlspecialchars(rawurlencode($_REQUEST['keyword']))).'&page=', - 'plugin_amazonchooser_select_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&') . '&mode='.trim(htmlspecialchars(rawurlencode($_REQUEST['mode']))).$simple.'&txtarea=' . htmlspecialchars($_REQUEST['txtarea']) . '&step=2&asin=' + 'plugin_amazonchooser_search_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&') . 'txtarea=' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($_REQUEST['txtarea']) : htmlspecialchars($_REQUEST['txtarea'], ENT_COMPAT, LANG_CHARSET)).$simple.'&keyword='.trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['keyword'])) : htmlspecialchars(rawurlencode($_REQUEST['keyword']), ENT_COMPAT, LANG_CHARSET))).'&mode='.$request_mode, + 'plugin_amazonchooser_this_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&') . '&mode='.trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['mode'])) : htmlspecialchars(rawurlencode($_REQUEST['mode']), ENT_COMPAT, LANG_CHARSET))).'&txtarea=' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($_REQUEST['txtarea']) : htmlspecialchars($_REQUEST['txtarea'], ENT_COMPAT, LANG_CHARSET)) .$simple. '&step=1&keyword='.trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['keyword'])) : htmlspecialchars(rawurlencode($_REQUEST['keyword']), ENT_COMPAT, LANG_CHARSET))).'&page=', + 'plugin_amazonchooser_select_url' => serendipity_rewriteURL('plugin/amazonch') . ($serendipity['rewrite'] != 'none' ? '?' : '&') . '&mode='.trim((function_exists('serendipity_specialchars') ? serendipity_specialchars(rawurlencode($_REQUEST['mode'])) : htmlspecialchars(rawurlencode($_REQUEST['mode']), ENT_COMPAT, LANG_CHARSET))).$simple.'&txtarea=' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($_REQUEST['txtarea']) : htmlspecialchars($_REQUEST['txtarea'], ENT_COMPAT, LANG_CHARSET)) . '&step=2&asin=' ) ); break; case '2': 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 { $result['count'] = 0; $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_item_count' => $result['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_error_message' => $result['error_message'], 'plugin_amazonchooser_cache_time' => $result['return_date'], @@ -359,7 +359,7 @@ class serendipity_event_amazonchooser extends serendipity_event 'plugin_amazonchooser_page' => "default", 'plugin_amazonchooser_keyword' => rawurldecode($_REQUEST['keyword']), '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_mode' => $mode_out, 'plugin_amazonchooser_defaultmode' => $defaultmode diff --git a/serendipity_event_assigncategories/serendipity_event_assigncategories.php b/serendipity_event_assigncategories/serendipity_event_assigncategories.php index b12d2bc0..073e8e0d 100644 --- a/serendipity_event_assigncategories/serendipity_event_assigncategories.php +++ b/serendipity_event_assigncategories/serendipity_event_assigncategories.php @@ -23,7 +23,7 @@ class serendipity_event_assigncategories extends serendipity_event $propbag->add('description', PLUGIN_ASSIGNCATEGORIES_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Matthias Mees'); - $propbag->add('version', '1.4'); + $propbag->add('version', '1.4.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'php' => '4.1.0' @@ -151,11 +151,11 @@ class serendipity_event_assigncategories extends serendipity_event echo ''; foreach ($cats as $cat_data) { echo '' . "\n"; - echo '' . "\n"; + echo '' . "\n"; echo '' . "\n"; @@ -168,11 +168,11 @@ class serendipity_event_assigncategories extends serendipity_event } else { foreach ($cats as $cat_data) { echo '
'; - echo ''; + echo ''; echo '
'; diff --git a/serendipity_event_autoupdate/serendipity_event_autoupdate.php b/serendipity_event_autoupdate/serendipity_event_autoupdate.php index f116657e..be873e06 100644 --- a/serendipity_event_autoupdate/serendipity_event_autoupdate.php +++ b/serendipity_event_autoupdate/serendipity_event_autoupdate.php @@ -22,7 +22,7 @@ class serendipity_event_autoupdate extends serendipity_event { $propbag->add('description', PLUGIN_EVENT_AUTOUPDATE_DESC); $propbag->add('stackable', false); $propbag->add('author', 'onli, Ian'); - $propbag->add('version', '1.1'); + $propbag->add('version', '1.1.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', '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. 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; $ad_suite = SERENDIPITY_ADMIN_SUITE; $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 = ''; echo << diff --git a/serendipity_event_backend/serendipity_event_backend.php b/serendipity_event_backend/serendipity_event_backend.php index dede1609..67c358f7 100644 --- a/serendipity_event_backend/serendipity_event_backend.php +++ b/serendipity_event_backend/serendipity_event_backend.php @@ -34,7 +34,7 @@ class serendipity_event_backend extends serendipity_event { '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('stackable', false); $propbag->add('event_hooks', array( @@ -169,9 +169,9 @@ class serendipity_event_backend extends serendipity_event { if ($details <= 0) { if ($date != "") { - $date = "[".addslashes(htmlspecialchars($date))."] "; + $date = "[".addslashes((function_exists('serendipity_specialchars') ? serendipity_specialchars($date) : htmlspecialchars($date, ENT_COMPAT, LANG_CHARSET)))."] "; } - echo " document.write('".(trim($point) !="" ? addslashes(htmlspecialchars(trim($point)))." " : "") . "" . $date . "" . addslashes($entries[$a]['title']) . "
');\n"; + echo " document.write('".(trim($point) !="" ? addslashes((function_exists('serendipity_specialchars') ? serendipity_specialchars(trim($point) : htmlspecialchars(trim($point, ENT_COMPAT, LANG_CHARSET))))." " : "") . "" . $date . "" . addslashes($entries[$a]['title']) . "
');\n"; } else { echo " document.write('".addslashes($entries[$a]['title'])."');\n"; echo " document.write('
');\n"; @@ -187,7 +187,7 @@ class serendipity_event_backend extends serendipity_event { } 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); diff --git a/serendipity_event_blogpdf/serendipity_event_blogpdf.php b/serendipity_event_blogpdf/serendipity_event_blogpdf.php index 8fea48b8..ecd2a538 100644 --- a/serendipity_event_blogpdf/serendipity_event_blogpdf.php +++ b/serendipity_event_blogpdf/serendipity_event_blogpdf.php @@ -46,7 +46,7 @@ class serendipity_event_blogpdf extends serendipity_event $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Olivier PLATHEY, Steven Wittens'); $propbag->add('license', 'GPL (Uses LGPL FPDF, HTML2PDF, UFPDF'); - $propbag->add('version', '1.82'); + $propbag->add('version', '1.82.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', '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'])); 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) { $posted_by .= ' ' . IN . ' '; $cats = array(); @@ -309,7 +309,7 @@ class serendipity_event_blogpdf extends serendipity_event } 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://') { $comment['url'] = 'http://' . $comment['url']; } diff --git a/serendipity_event_cachesimple/serendipity_event_cachesimple.php b/serendipity_event_cachesimple/serendipity_event_cachesimple.php index 06433522..18b3cfab 100644 --- a/serendipity_event_cachesimple/serendipity_event_cachesimple.php +++ b/serendipity_event_cachesimple/serendipity_event_cachesimple.php @@ -75,7 +75,7 @@ class serendipity_event_cachesimple extends serendipity_event $propbag->add('description', PLUGIN_EVENT_CACHESIMPLE_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '1.2'); + $propbag->add('version', '1.2.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -271,7 +271,7 @@ document.getElementById('serendipity_commentform_url').value = getCommentCooki $post_import = array('name', 'email', 'url'); foreach($post_import AS $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"; } } ?> diff --git a/serendipity_event_cal/serendipity_event_cal.php b/serendipity_event_cal/serendipity_event_cal.php index 0ff302ff..b7ddc6c9 100644 --- a/serendipity_event_cal/serendipity_event_cal.php +++ b/serendipity_event_cal/serendipity_event_cal.php @@ -76,7 +76,7 @@ class serendipity_event_cal extends serendipity_event { ) ); $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('requirements', array( 'serendipity' => '1.4', @@ -262,15 +262,15 @@ class serendipity_event_cal extends serendipity_event { if (is_array($val)) { foreach($val as $akey => $aval) { 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 - $$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 { 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 - $$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 } } } diff --git a/serendipity_event_categorytemplates/serendipity_event_categorytemplates.php b/serendipity_event_categorytemplates/serendipity_event_categorytemplates.php index abd3d41c..d4d0e0e6 100644 --- a/serendipity_event_categorytemplates/serendipity_event_categorytemplates.php +++ b/serendipity_event_categorytemplates/serendipity_event_categorytemplates.php @@ -29,7 +29,7 @@ class serendipity_event_categorytemplates extends serendipity_event $propbag->add('description', PLUGIN_CATEGORYTEMPLATES_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Judebert'); - $propbag->add('version', '0.35'); + $propbag->add('version', '0.35.1'); $propbag->add('requirements', array( 'serendipity' => '0.9', 'php' => '4.1.0' @@ -515,7 +515,7 @@ class serendipity_event_categorytemplates extends serendipity_event foreach ($styles AS $style => $path) { $templateInfo = serendipity_fetchTemplateInfo($style); ?> - + @@ -536,7 +536,7 @@ class serendipity_event_categorytemplates extends serendipity_event diff --git a/serendipity_event_ckeditor/serendipity_event_ckeditor.php b/serendipity_event_ckeditor/serendipity_event_ckeditor.php index 0d16f6d1..9125b1ad 100644 --- a/serendipity_event_ckeditor/serendipity_event_ckeditor.php +++ b/serendipity_event_ckeditor/serendipity_event_ckeditor.php @@ -157,7 +157,7 @@ class serendipity_event_ckeditor extends serendipity_event $propbag->add('description', PLUGIN_EVENT_CKEDITOR_DESC); $propbag->add('stackable', false); $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('requirements', array( 'serendipity' => '1.7', @@ -351,7 +351,7 @@ class serendipity_event_ckeditor extends serendipity_event 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!) 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)); ?> @@ -368,8 +368,8 @@ class serendipity_event_ckeditor extends serendipity_event case 'backend_header': if (isset($serendipity['wysiwyg']) && $serendipity['wysiwyg'] && isset($eventData)) { - $relpath = htmlspecialchars($this->get_config('path')); - $plgpath = htmlspecialchars($this->get_config('plugpath')); + $relpath = (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_config('path')) : htmlspecialchars($this->get_config('path'), ENT_COMPAT, LANG_CHARSET)); + $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 $pbck_on = serendipity_db_bool($this->get_config('codebutton')) ? 'true' : 'false'; // same here for cke_plugins.js /* set some global vars */ diff --git a/serendipity_event_comics/serendipity_event_comics.php b/serendipity_event_comics/serendipity_event_comics.php index 251fbd18..231e712a 100644 --- a/serendipity_event_comics/serendipity_event_comics.php +++ b/serendipity_event_comics/serendipity_event_comics.php @@ -26,7 +26,7 @@ class serendipity_event_comics extends serendipity_event { $propbag->add('description', PLUGIN_COMICS_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Wesley Hwang-Chung'); - $propbag->add('version', '1.4'); + $propbag->add('version', '1.4.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -189,7 +189,7 @@ class serendipity_event_comics extends serendipity_event { if ($event == 'entries_header' && $serendipity['GET']['page'] == '1') { if ($show_t == 'true') { echo '

'; - echo PLUGIN_COMICS_LATEST . htmlspecialchars(serendipity_strftime(DATE_FORMAT_ENTRY, $comic['0']['timestamp'])) . '

'; + 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)) . ''; } if ($show_raw == 'true') { echo $comic['0']['body']; diff --git a/serendipity_event_communityrating/serendipity_event_communityrating.php b/serendipity_event_communityrating/serendipity_event_communityrating.php index 328aecec..f0d404d0 100644 --- a/serendipity_event_communityrating/serendipity_event_communityrating.php +++ b/serendipity_event_communityrating/serendipity_event_communityrating.php @@ -26,7 +26,7 @@ class serendipity_event_communityrating extends serendipity_event $propbag->add('description', PLUGIN_EVENT_COMMUNITYRATING_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Lewe Zipfel'); - $propbag->add('version', '1.11'); + $propbag->add('version', '1.11.1'); $propbag->add('requirements', array( 'serendipity' => '0.9', 'smarty' => '2.6.7', @@ -148,8 +148,8 @@ class serendipity_event_communityrating extends serendipity_event } ?> :
- : - : + : + :
add('description', PLUGIN_EVENT_COMMUNITYRATING_AVGRATING_DESC); $propbag->add('stackable', true); $propbag->add('author', 'Lewe Zipfel, Garvin Hicking'); - $propbag->add('version', '1.2'); + $propbag->add('version', '1.2.1'); $propbag->add('requirements', array( 'serendipity' => '0.9', 'smarty' => '2.6.7', @@ -99,7 +99,7 @@ class serendipity_plugin_communityrating extends serendipity_plugin 'serendipityHTTPPath', true, array('timestamp' => $row['timestamp'])); - echo '
  • ' . htmlspecialchars($row['title']) . ' (' . ($row['rating']) . ')
    • '; + echo '
  • ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['title']) : htmlspecialchars($row['title'], ENT_COMPAT, LANG_CHARSET)) . ' (' . ($row['rating']) . ')
    • '; } echo ''; diff --git a/serendipity_event_communityrating/smarty.inc.php b/serendipity_event_communityrating/smarty.inc.php index 7a44cf91..b2438200 100644 --- a/serendipity_event_communityrating/smarty.inc.php +++ b/serendipity_event_communityrating/smarty.inc.php @@ -126,7 +126,7 @@ function communityrating_serendipity_show($params, &$smarty) { $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; 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 { echo $content; } diff --git a/serendipity_event_contactform/serendipity_event_contactform.php b/serendipity_event_contactform/serendipity_event_contactform.php index 9e0dde1e..9eeddf2d 100644 --- a/serendipity_event_contactform/serendipity_event_contactform.php +++ b/serendipity_event_contactform/serendipity_event_contactform.php @@ -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('configuration', array('permalink', 'pagetitle', 'backend_title', 'email', 'subject', 'counter', 'intro', 'sent', 'articleformat','dynamic_tpl','dynamic_fields','dynamic_fields_tpl','dynamic_fields_desc')); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '1.16'); + $propbag->add('version', '1.16.1'); $propbag->add('requirements', array( 'serendipity' => '0.7', 'smarty' => '2.6.7', @@ -222,10 +222,10 @@ class serendipity_event_contactform extends serendipity_event { $commentInfo = array( 'type' => 'NORMAL', 'source' => 'commentform', - 'name' => htmlspecialchars(strip_tags($serendipity['POST']['name'])), - 'url' => htmlspecialchars(strip_tags($serendipity['POST']['url'])), - 'comment' => htmlspecialchars(strip_tags($serendipity['POST']['comment'])), - 'email' => htmlspecialchars(strip_tags($serendipity['POST']['email'])), + 'name' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['name'])) : htmlspecialchars(strip_tags($serendipity['POST']['name']), ENT_COMPAT, LANG_CHARSET)), + 'url' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)), + 'comment' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['comment'])) : htmlspecialchars(strip_tags($serendipity['POST']['comment']), ENT_COMPAT, LANG_CHARSET)), + '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 ); @@ -245,10 +245,10 @@ class serendipity_event_contactform extends serendipity_event { if ($this->sendComment( $this->get_config('email'), - htmlspecialchars(strip_tags($serendipity['POST']['name'])), - htmlspecialchars(strip_tags($serendipity['POST']['email'])), - htmlspecialchars(strip_tags($serendipity['POST']['url'])), - htmlspecialchars(strip_tags($serendipity['POST']['comment'])))) { + (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['name'])) : htmlspecialchars(strip_tags($serendipity['POST']['name']), ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['email'])) : htmlspecialchars(strip_tags($serendipity['POST']['email']), ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)), + (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); return true; @@ -318,10 +318,10 @@ class serendipity_event_contactform extends serendipity_event { $commentInfo = array( 'type' => 'NORMAL', 'source' => 'commentform', - 'name' => htmlspecialchars(strip_tags($serendipity['POST']['name'])), - 'url' => htmlspecialchars(strip_tags($serendipity['POST']['url'])), - 'comment' => htmlspecialchars(strip_tags($comment)), - 'email' => htmlspecialchars(strip_tags($serendipity['POST']['email'])), + 'name' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['name'])) : htmlspecialchars(strip_tags($serendipity['POST']['name']), ENT_COMPAT, LANG_CHARSET)), + 'url' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)), + 'comment' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($comment)) : htmlspecialchars(strip_tags($comment), ENT_COMPAT, LANG_CHARSET)), + '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 ); serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo); @@ -340,10 +340,10 @@ class serendipity_event_contactform extends serendipity_event { if ($this->sendComment( $this->get_config('email'), - htmlspecialchars(strip_tags($serendipity['POST']['name'])), - htmlspecialchars(strip_tags($serendipity['POST']['email'])), - htmlspecialchars(strip_tags($serendipity['POST']['url'])), - htmlspecialchars(strip_tags($comment)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['name'])) : htmlspecialchars(strip_tags($serendipity['POST']['name']), ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['email'])) : htmlspecialchars(strip_tags($serendipity['POST']['email']), ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($comment)) : htmlspecialchars(strip_tags($comment), ENT_COMPAT, LANG_CHARSET)), 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"'; break; 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; } } @@ -415,11 +415,11 @@ class serendipity_event_contactform extends serendipity_event { 'plugin_contactform_sent' => $this->get_config('sent', PLUGIN_CONTACTFORM_SENT_HTML), 'plugin_contactform_message' => PLUGIN_CONTACTFORM_MESSAGE, 'commentform_action' => $serendipity['baseURL'] . $serendipity['indexFile'], - 'commentform_sname' => htmlspecialchars($serendipity['GET']['subpage']), - 'commentform_name' => htmlspecialchars(strip_tags($serendipity['POST']['name'])), - 'commentform_url' => htmlspecialchars(strip_tags($serendipity['POST']['url'])), - 'commentform_email' => htmlspecialchars(strip_tags($serendipity['POST']['email'])), - 'commentform_data' => htmlspecialchars(strip_tags($serendipity['POST']['comment'])), + 'commentform_sname' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['subpage']) : htmlspecialchars($serendipity['GET']['subpage'], ENT_COMPAT, LANG_CHARSET)), + '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' => (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($serendipity['POST']['url'])) : htmlspecialchars(strip_tags($serendipity['POST']['url']), ENT_COMPAT, LANG_CHARSET)), + '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' => (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'], 'commentform_entry' => array( 'timestamp' => 1, // force captchas! @@ -497,7 +497,7 @@ class serendipity_event_contactform extends serendipity_event { } if ($this->selected()) { $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 { // Put subpage back so static page plugin will work $serendipity['GET']['subpage'] = $oldsubpage; diff --git a/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php b/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php index f197b597..ac015c06 100644 --- a/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php +++ b/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php @@ -24,7 +24,7 @@ class serendipity_event_contentrewrite extends serendipity_event $propbag->add('description', PLUGIN_EVENT_CONTENTREWRITE_DESCRIPTION); $propbag->add('stackable', true); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '1.4'); + $propbag->add('version', '1.4.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -218,8 +218,8 @@ class serendipity_event_contentrewrite extends serendipity_event foreach($this->rewrite_from AS $key => $val) { ?> - - + + $g_val) { if ( !is_array($g_val) && $g_key != 'page' ) { - echo ''; + echo ''; } } ?> @@ -628,10 +628,10 @@ function cpg_imageSelector_done(textarea) - + - + : @@ -679,14 +679,14 @@ function cpg_imageSelector_done(textarea) if (!empty($CPG['filename_only'])) { ?> ', $id, - htmlspecialchars($props['title']), - htmlspecialchars(implode(', ', $newtags)) + (function_exists('serendipity_specialchars') ? serendipity_specialchars($props['title']) : htmlspecialchars($props['title'], ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars(implode(', ', $newtags)) : htmlspecialchars(implode(', ', $newtags), ENT_COMPAT, LANG_CHARSET)) ); } else { echo '
  • '; printf( PLUGIN_EVENT_FREETAG_GLOBALCAT2TAG_ENTRY, $id, - htmlspecialchars($props['title']), - htmlspecialchars(implode(', ', $newtags)) + (function_exists('serendipity_specialchars') ? serendipity_specialchars($props['title']) : htmlspecialchars($props['title'], ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars(implode(', ', $newtags)) : htmlspecialchars(implode(', ', $newtags), ENT_COMPAT, LANG_CHARSET)) ); echo '
    • '; } @@ -2069,7 +2069,7 @@ addLoadEvent(enableAutocomplete); $keys[$key['tag']] = $key['keywords']; } } - $url = FREETAG_MANAGE_URL . "&serendipity[tagview]=".htmlspecialchars($this->eventData['GET']['tagview']); + $url = FREETAG_MANAGE_URL . "&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) { echo '
    ' . PLUGIN_EVENT_FREETAG_KEYWORDS_DESC . '

    '; @@ -2097,7 +2097,7 @@ addLoadEvent(enableAutocomplete); if (urldecode($serendipity['GET']['tag']) == $tag) { ?> - + eventData['GET']['tagview']); + $url = FREETAG_MANAGE_URL . "&serendipity[tagview]=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($this->eventData['GET']['tagview']) : htmlspecialchars($this->eventData['GET']['tagview'], ENT_COMPAT, LANG_CHARSET)); ?>
    ' . htmlspecialchars($cat_data['category_name']) . '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($cat_data['category_name']) : htmlspecialchars($cat_data['category_name'], ENT_COMPAT, LANG_CHARSET)) . '
    rewrite_to[$key]); ?>rewrite_to[$key]) : htmlspecialchars($this->rewrite_to[$key], ENT_COMPAT, LANG_CHARSET)); ?>
    @@ -2228,11 +2228,11 @@ addLoadEvent(enableAutocomplete); ?> getManageUrlAsHidden($this->eventData) ?> - + - - => + + => eventData['GET']['tagview']); - $yes = FREETAG_MANAGE_URL . "&serendipity[tagview]=".htmlspecialchars($this->eventData['GET']['tagview']). + $no = FREETAG_MANAGE_URL . "&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 . "&serendipity[tagview]=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($this->eventData['GET']['tagview']) : htmlspecialchars($this->eventData['GET']['tagview'], ENT_COMPAT, LANG_CHARSET)). "&serendipity[tagaction]=delete". "&serendipity[tag]=".urlencode($tag)."&serendipity[commit]=true"; ?> -

    +

       

    getManageUrlAsHidden($this->eventData) ?> - + - +


    foobarbaz => foo,bar,baz

    - => + => '; echo $this->getManageUrlAsHidden($this->eventData); - echo ''; + echo ''; echo ''; if ($serendipity['version'][0] < 2) { echo ''; diff --git a/serendipity_event_geotag/plugin_version.inc.php b/serendipity_event_geotag/plugin_version.inc.php index d7bc713e..86827ffd 100644 --- a/serendipity_event_geotag/plugin_version.inc.php +++ b/serendipity_event_geotag/plugin_version.inc.php @@ -1,5 +1,5 @@ ' . "\n"; echo '' . "\n"; echo '' . "\n"; diff --git a/serendipity_event_geourl/serendipity_event_geourl.php b/serendipity_event_geourl/serendipity_event_geourl.php index dc528423..53185c94 100644 --- a/serendipity_event_geourl/serendipity_event_geourl.php +++ b/serendipity_event_geourl/serendipity_event_geourl.php @@ -32,7 +32,7 @@ class serendipity_event_geourl extends serendipity_event { $propbag->add('event_hooks', array('frontend_header' => true)); $propbag->add('configuration', array('lat', 'long')); $propbag->add('description', PLUGIN_EVENT_GEOURL_DESC); - $propbag->add('version', '1.4'); + $propbag->add('version', '1.4.1'); $propbag->add('groups', array('BACKEND_METAINFORMATION')); } @@ -71,7 +71,7 @@ class serendipity_event_geourl extends serendipity_event { $long = $this->get_config('long'); print "\n" . ' ' . "\n"; print ' ' . "\n"; - print ' ' . "\n"; + print ' ' . "\n"; return true; break; diff --git a/serendipity_event_glossary/serendipity_event_glossary.php b/serendipity_event_glossary/serendipity_event_glossary.php index 8a8bb851..ad0534ce 100644 --- a/serendipity_event_glossary/serendipity_event_glossary.php +++ b/serendipity_event_glossary/serendipity_event_glossary.php @@ -36,7 +36,7 @@ class serendipity_event_glossary extends serendipity_event $propbag->add('description', PLUGIN_EVENT_GLOSSARY_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Rob Antonishen'); - $propbag->add('version', '1.7'); + $propbag->add('version', '1.7.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -157,7 +157,7 @@ class serendipity_event_glossary extends serendipity_event $s = trim($temp[0]); $r = trim($temp[1]); 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))); } } diff --git a/serendipity_event_google_analytics/serendipity_event_google_analytics.php b/serendipity_event_google_analytics/serendipity_event_google_analytics.php index defd18d5..e7e1ae20 100644 --- a/serendipity_event_google_analytics/serendipity_event_google_analytics.php +++ b/serendipity_event_google_analytics/serendipity_event_google_analytics.php @@ -21,7 +21,7 @@ class serendipity_event_google_analytics extends serendipity_event { $propbag->add ('description', PLUGIN_EVENT_GOOGLE_ANALYTICS_DESC); $propbag->add ('stackable', false); $propbag->add ('author', 'kleinerChemiker'); - $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 ('groups', array ('STATISTICS' )); $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]); preg_match ('/\.([a-z0-9]+)$/i', $host['path'], $extension); if (!in_array ($host['host'], $internal_hosts) && $analytics_track_external) { - return 'add('name', PLUGIN_EVENT_SITEMAP_TITLE); $propbag->add('description', PLUGIN_EVENT_SITEMAP_DESC); $propbag->add('author', 'Boris'); - $propbag->add('version', '0.58'); + $propbag->add('version', '0.58.1'); $propbag->add('event_hooks', array( 'backend_publish' => 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) { /* Sitemap requires this. * 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\n"; $str .= "\t\t$url\n"; @@ -170,8 +170,8 @@ class serendipity_event_google_sitemap extends serendipity_event { $str .= "\t\t\n"; $str .= "\t\t\t\n"; - $str .= "\t\t\t\t" . htmlspecialchars($this->get_config('gnews_name')) . '' . "\n"; - $str .= "\t\t\t\t" . htmlspecialchars($GLOBALS['serendipity']['lang']) . '' . "\n"; + $str .= "\t\t\t\t" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_config('gnews_name')) : htmlspecialchars($this->get_config('gnews_name'), ENT_COMPAT, LANG_CHARSET)) . '' . "\n"; + $str .= "\t\t\t\t" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($GLOBALS['serendipity']['lang']) : htmlspecialchars($GLOBALS['serendipity']['lang'], ENT_COMPAT, LANG_CHARSET)) . '' . "\n"; $str .= "\t\t\t\n"; $sub = $this->get_config('gnews_subscription'); @@ -194,11 +194,11 @@ class serendipity_event_google_sitemap extends serendipity_event { if (!empty($genre) && $genre != 'none') { $str .= "\t\t\t" . $genre . "\n"; } - $str .= "\t\t\t" . htmlspecialchars($props['title']) . "\n"; + $str .= "\t\t\t" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($props['title']) : htmlspecialchars($props['title'], ENT_COMPAT, LANG_CHARSET)) . "\n"; $str .= "\t\t\t$str_lastmod\n"; if (is_array($props) && isset($props['meta_keywords'])) { - $str .= "\t\t\t" . htmlspecialchars($props['meta_keywords']) . "\n"; + $str .= "\t\t\t" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($props['meta_keywords']) : htmlspecialchars($props['meta_keywords'], ENT_COMPAT, LANG_CHARSET)) . "\n"; } $str .= "\t\t\n"; } diff --git a/serendipity_event_gravatar/serendipity_event_gravatar.php b/serendipity_event_gravatar/serendipity_event_gravatar.php index 74905bbe..7d963875 100755 --- a/serendipity_event_gravatar/serendipity_event_gravatar.php +++ b/serendipity_event_gravatar/serendipity_event_gravatar.php @@ -14,7 +14,7 @@ if (file_exists($probelang)) { include dirname(__FILE__) . '/lang_en.inc.php'; // 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. @define('PLUGIN_EVENT_GRAVATAR_METHOD_MAX', 6); @@ -438,7 +438,7 @@ class serendipity_event_gravatar extends serendipity_event $title = ''; $author = 'unknown'; 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; } diff --git a/serendipity_event_guestbook/serendipity_event_guestbook.php b/serendipity_event_guestbook/serendipity_event_guestbook.php index fc54dd0d..21f37fd1 100644 --- a/serendipity_event_guestbook/serendipity_event_guestbook.php +++ b/serendipity_event_guestbook/serendipity_event_guestbook.php @@ -67,7 +67,7 @@ class serendipity_event_guestbook extends serendipity_event { 'dateformat' )); $propbag->add('author', 'Ian'); - $propbag->add('version', '3.51'); + $propbag->add('version', '3.51.1'); $propbag->add('requirements', array( 'serendipity' => '1.7.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) { $authenticated_user = serendipity_userLoggedIn() ? true : false; 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 { foreach ($parr AS $k => $v) { if (in_array($k, $keys)) { $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]))) { $parrsec['stripped'] = true; $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 (!$this->is_valid_email($serendipity['POST']['email'])) { - array_push($messages, ERROR_NOVALIDEMAIL . ' ' . htmlspecialchars($serendipity['POST']['email']) . ''); + array_push($messages, ERROR_NOVALIDEMAIL . ' ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['email']) : htmlspecialchars($serendipity['POST']['email'], ENT_COMPAT, LANG_CHARSET)) . ''); } else { $valid['data_email'] = TRUE; } @@ -1101,12 +1101,12 @@ class serendipity_event_guestbook extends serendipity_event { 'plugin_guestbook_intro' => $this->get_config('intro'), 'plugin_guestbook_sent' => $this->get_config('sent', PLUGIN_GUESTBOOK_SENT_HTML), 'plugin_guestbook_action' => $serendipity['baseURL'] . $serendipity['indexFile'], - 'plugin_guestbook_sname' => htmlspecialchars($serendipity['GET']['subpage']), - 'plugin_guestbook_name' => htmlspecialchars(strip_tags($serendipity['POST']['name'])), - 'plugin_guestbook_email' => htmlspecialchars(strip_tags($serendipity['POST']['email'])), + 'plugin_guestbook_sname' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['subpage']) : htmlspecialchars($serendipity['GET']['subpage'], ENT_COMPAT, LANG_CHARSET)), + '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' => (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_url' => htmlspecialchars(strip_tags($serendipity['POST']['url'])), - 'plugin_guestbook_comment' => htmlspecialchars(strip_tags($serendipity['POST']['comment'])), + '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' => (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_entry' => array('timestamp' => 1) ) @@ -1285,7 +1285,7 @@ class serendipity_event_guestbook extends serendipity_event { if ($this->selected()) { $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; diff --git a/serendipity_event_guestbook/serendipity_plugin_guestbook.php b/serendipity_event_guestbook/serendipity_plugin_guestbook.php index b4ba72df..e54d9108 100644 --- a/serendipity_event_guestbook/serendipity_plugin_guestbook.php +++ b/serendipity_event_guestbook/serendipity_plugin_guestbook.php @@ -28,7 +28,7 @@ class serendipity_plugin_guestbook extends serendipity_plugin { $propbag->add('description', PLUGIN_GUESTSIDE_BLAHBLAH); $propbag->add('stackable', false); $propbag->add('author', 'Jaap Boerma ( j@webbict.com ), Tadashi Jokagi , Ian (Timbalu)'); - $propbag->add('version', '1.22'); + $propbag->add('version', '1.22.1'); $propbag->add('requirements', array( 'serendipity' => '0.7', 'smarty' => '2.6.7', @@ -182,8 +182,8 @@ class serendipity_plugin_guestbook extends serendipity_plugin { $entries = serendipity_db_query($sql); if($entries && is_array($entries)) { foreach($entries as $e => $row) { - echo "" . htmlspecialchars(serendipity_strftime($dateformat, $row['timestamp'])) . '
    ' . "\n"; - $row['body'] = htmlspecialchars($row['body']); + echo "" . (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_strftime($dateformat, $row['timestamp'])) : htmlspecialchars(serendipity_strftime($dateformat, $row['timestamp']), ENT_COMPAT, LANG_CHARSET)) . '
    ' . "\n"; + $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']); if (strlen($row['body'])>$max_chars) { if (function_exists('mb_strimwidth')) { @@ -196,17 +196,17 @@ class serendipity_plugin_guestbook extends serendipity_plugin { serendipity_plugin_api::hook_event('frontend_display', $entry); echo $entry['comment'] . "
    "; - echo "" . htmlspecialchars($row['name']) . "
    "; + echo "" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['name']) : htmlspecialchars($row['name'], ENT_COMPAT, LANG_CHARSET)) . "
    "; if ($showemail){ - echo "    " . htmlspecialchars($row['email']) . ""; + echo "" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['email']) : htmlspecialchars($row['email'], ENT_COMPAT, LANG_CHARSET)) . ""; } if ($showhomepage) { if ($showemail) { echo "
    "; } - echo "" . htmlspecialchars($row['homepage']) . ""; + echo "" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['homepage']) : htmlspecialchars($row['homepage'], ENT_COMPAT, LANG_CHARSET)) . ""; } echo "
    \n\n"; diff --git a/serendipity_event_imageselectorplus/serendipity_event_imageselectorplus.php b/serendipity_event_imageselectorplus/serendipity_event_imageselectorplus.php index b6ad4e01..fd170104 100644 --- a/serendipity_event_imageselectorplus/serendipity_event_imageselectorplus.php +++ b/serendipity_event_imageselectorplus/serendipity_event_imageselectorplus.php @@ -26,7 +26,7 @@ class serendipity_event_imageselectorplus extends serendipity_event $propbag->add('description', PLUGIN_EVENT_IMAGESELECTORPLUS_DESC); $propbag->add('stackable', false); $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( 'serendipity' => '1.3', 'smarty' => '2.6.7', @@ -548,7 +548,7 @@ class serendipity_event_imageselectorplus extends serendipity_event // New draft post $entry = array(); $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)) { $entry['body'] = '' . $filename . ' (-'.$obj_mime.'-)

    ' . $serendipity['POST']['quickblog']['body'] . '

    '; } else { @@ -556,7 +556,7 @@ class serendipity_event_imageselectorplus extends serendipity_event } $entry['authorid'] = $serendipity['authorid']; $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['moderate_comments'] = 'false'; // to take default values $serendipity['POST']['properties']['fake'] = 'fake'; @@ -668,7 +668,7 @@ class serendipity_event_imageselectorplus extends serendipity_event echo '

    ' . serendipity_formatTime(DATE_FORMAT_ENTRY, $entry['timestamp']) . '

    '; - echo '

    ' . htmlspecialchars($entry['title']) . '

    '; + echo '

    ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '

    '; echo '
    '; echo '
    ' . $link . '
    '; @@ -749,9 +749,9 @@ class serendipity_event_imageselectorplus extends serendipity_event case 'frontend_image_selector': 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 { - $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; break; diff --git a/serendipity_event_includeentry/form.inc.php b/serendipity_event_includeentry/form.inc.php index 83e58628..77dd85ed 100644 --- a/serendipity_event_includeentry/form.inc.php +++ b/serendipity_event_includeentry/form.inc.php @@ -9,10 +9,10 @@ $cbag = new serendipity_property_bag; $this->introspect_item($config_item, $cbag); - $cname = htmlspecialchars($cbag->get('name')); - $cdesc = htmlspecialchars($cbag->get('description')); + $cname = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET)); + $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'); - $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'); if (!empty($only_type) && $type != $only_type) { $elcount--; @@ -28,7 +28,7 @@ /* Try and the default value for the config item */ $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(); $select = array(); $per_row = null; @@ -58,10 +58,10 @@ title="" /> - + title="" /> + add('description', PLUGIN_EVENT_INCLUDEENTRY_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '2.14'); + $propbag->add('version', '2.14.1'); $propbag->add('scrambles_true_content', true); $propbag->add('requirements', array( 'serendipity' => '0.8', @@ -471,7 +471,7 @@ class serendipity_event_includeentry extends serendipity_event continue; } $html .= ' '; + $html .= (function_exists('serendipity_specialchars') ? serendipity_specialchars($block['title']) : htmlspecialchars($block['title'], ENT_COMPAT, LANG_CHARSET)) . ''; } return $html; @@ -522,8 +522,8 @@ class serendipity_event_includeentry extends serendipity_event $serendipity['POST']['staticSubmit'] = true; $bag = new serendipity_property_bag; $this->introspect($bag); - $name = htmlspecialchars($bag->get('name')); - $desc = htmlspecialchars($bag->get('description')); + $name = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('name')) : htmlspecialchars($bag->get('name'), ENT_COMPAT, LANG_CHARSET)); + $desc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('description')) : htmlspecialchars($bag->get('description'), ENT_COMPAT, LANG_CHARSET)); $config_names = $bag->get('page_configuration'); foreach ($config_names as $config_item) { diff --git a/serendipity_event_karma/serendipity_event_karma.php b/serendipity_event_karma/serendipity_event_karma.php index edaaa20a..9036642e 100644 --- a/serendipity_event_karma/serendipity_event_karma.php +++ b/serendipity_event_karma/serendipity_event_karma.php @@ -1115,7 +1115,7 @@ END_IMG_CSS; if (is_array($sql_rows)) { foreach($sql_rows AS $id => $row) { ?> -
    +
    - +
    - +
    - +
    - +
    @@ -1586,22 +1586,22 @@ END_IMG_CSS; if (!empty($serendipity['GET']['filter']['entryid'])) { $val = $serendipity['GET']['filter']['entryid']; $and .= "AND l.entryid = '" . serendipity_db_escape_string($val) . "'"; - $searchString .= "&serendipity['filter']['entryid']=".htmlspecialchars($val); + $searchString .= "&serendipity['filter']['entryid']=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET)); } if (!empty($serendipity['GET']['filter']['ip'])) { $val = $serendipity['GET']['filter']['ip']; $and .= "AND l.ip = '" . serendipity_db_escape_string($val) . "'"; - $searchString .= "&serendipity['filter']['ip']=".htmlspecialchars($val); + $searchString .= "&serendipity['filter']['ip']=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET)); } if (!empty($serendipity['GET']['filter']['user_agent'])) { $val = $serendipity['GET']['filter']['user_agent']; $and .= "AND l.user_agent LIKE '%" . serendipity_db_escape_string($val) . "%'"; - $searchString .= "&serendipity['filter']['user_agent']=".htmlspecialchars($val); + $searchString .= "&serendipity['filter']['user_agent']=".(function_exists('serendipity_specialchars') ? serendipity_specialchars($val) : htmlspecialchars($val, ENT_COMPAT, LANG_CHARSET)); } if (!empty($serendipity['GET']['filter']['title'])) { $val = $serendipity['GET']['filter']['title']; $and .= "AND e.title LIKE '%" . serendipity_db_escape_string($val) . "%'"; - $searchString .= "&serendipity['filter']['title']=".htmlspecialchars($val); + $searchString .= "&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) diff --git a/serendipity_event_linklist/serendipity_event_linklist.php b/serendipity_event_linklist/serendipity_event_linklist.php index 4499e848..ce2dfac1 100644 --- a/serendipity_event_linklist/serendipity_event_linklist.php +++ b/serendipity_event_linklist/serendipity_event_linklist.php @@ -30,7 +30,7 @@ class serendipity_event_linklist extends serendipity_event { 'external_plugin' => true )); $propbag->add('author', 'Matthew Groeninger, Omid Mottaghi Rad'); - $propbag->add('version', '1.99'); + $propbag->add('version', '1.99.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -291,7 +291,7 @@ class serendipity_event_linklist extends serendipity_event { $link = $row['link']; $id = $row['id']; $descrip = $row['descrip']; - $output .= ''."\n"; + $output .= ''."\n"; } } } @@ -333,7 +333,7 @@ class serendipity_event_linklist extends serendipity_event { $cat_name = $sql[0]['category_name']; $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; } else { $cat_open = false; @@ -368,9 +368,9 @@ class serendipity_event_linklist extends serendipity_event { $replace_link = "_link_"; $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_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; } } @@ -739,7 +739,7 @@ class serendipity_event_linklist extends serendipity_event {
    - + add('description', PLUGIN_LINKTOOLBAR_TITLE_DESC); $propbag->add('event_hooks', array('frontend_header' => true)); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '1.5'); + $propbag->add('version', '1.5.1'); $propbag->add('requirements', array( 'serendipity' => '0.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'])) { return array( '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( '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( '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_title = $serendipity['blogTitle']; - echo '' . "\n"; + echo '' . "\n"; if ($serendipity['GET']['action'] == 'read' && !empty($serendipity['GET']['id'])) { // Article detail view - echo '' . "\n"; + echo '' . "\n"; $this->backAndForth( $this->showPaging($serendipity['GET']['id']) ); @@ -348,7 +348,7 @@ class serendipity_event_linktoolbar extends serendipity_event { ), 'serendipityHTTPPath'); } - echo '' . "\n"; + echo '' . "\n"; echo '' . "\n"; $categories = serendipity_fetchCategories('all'); diff --git a/serendipity_event_livesearch/serendipity_event_livesearch.php b/serendipity_event_livesearch/serendipity_event_livesearch.php index d6f54c86..2473e19d 100644 --- a/serendipity_event_livesearch/serendipity_event_livesearch.php +++ b/serendipity_event_livesearch/serendipity_event_livesearch.php @@ -14,7 +14,7 @@ class serendipity_event_livesearch extends serendipity_event $propbag->add('description', PLUGIN_EVENT_LIVESEARCH_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Christian Stocker, Garvin Hicking'); - $propbag->add('version', '1.4'); + $propbag->add('version', '1.4.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -133,7 +133,7 @@ class serendipity_event_livesearch extends serendipity_event if (is_array($res) && count($res) > 0) { foreach($res AS $id => $entry) { - echo '
    ' . htmlspecialchars($entry['title']) . '
    '; + echo '
    ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . '
    '; } } else { echo '
    ' . print_r($res, true) . '
    '; diff --git a/serendipity_event_ljupdate/serendipity_event_ljupdate.php b/serendipity_event_ljupdate/serendipity_event_ljupdate.php index 19c17c66..3b724e94 100644 --- a/serendipity_event_ljupdate/serendipity_event_ljupdate.php +++ b/serendipity_event_ljupdate/serendipity_event_ljupdate.php @@ -26,7 +26,7 @@ class serendipity_event_ljupdate extends serendipity_event 'php' => '4.1.0' )); $propbag->add('author', 'Kaustubh Srikanth, Ivan Makhonin'); - $propbag->add('version', '1.13'); + $propbag->add('version', '1.13.1'); $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_params = "email=$ms_userid&password=$ms_passwd&Remember=0"; - echo "Opening URL $login_url with data " . htmlspecialchars($login_params) . "
    \n"; + echo "Opening URL $login_url with data " . (function_exists('serendipity_specialchars') ? serendipity_specialchars($login_params) : htmlspecialchars($login_params, ENT_COMPAT, LANG_CHARSET)) . "
    \n"; $ch = curl_init(); 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_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) . "
    \n"; + echo "Opening URL $post_url with data " . (function_exists('serendipity_specialchars') ? serendipity_specialchars($post_params) : htmlspecialchars($post_params, ENT_COMPAT, LANG_CHARSET)) . "
    \n"; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $post_url); diff --git a/serendipity_event_metadesc/serendipity_event_metadesc.php b/serendipity_event_metadesc/serendipity_event_metadesc.php index 135f5840..42f6a222 100644 --- a/serendipity_event_metadesc/serendipity_event_metadesc.php +++ b/serendipity_event_metadesc/serendipity_event_metadesc.php @@ -25,7 +25,7 @@ class serendipity_event_metadesc extends serendipity_event { $propbag->add('description', PLUGIN_METADESC_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Judebert, Don Chambers'); - $propbag->add('version', '0.15'); + $propbag->add('version', '0.15.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'php' => '4.1.0' @@ -143,7 +143,7 @@ class serendipity_event_metadesc extends serendipity_event { $this->meta_title = $property['meta_head_title']; $this->save_title = $serendipity['head_title']; $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) $serendipity['head_subtitle'] = ''; } @@ -192,8 +192,8 @@ class serendipity_event_metadesc extends serendipity_event { if (serendipity_db_bool($this->get_config('escape'))) { - $md = htmlspecialchars($meta_description); - $mk = htmlspecialchars($meta_keywords); + $md = (function_exists('serendipity_specialchars') ? serendipity_specialchars($meta_description) : htmlspecialchars($meta_description, ENT_COMPAT, LANG_CHARSET)); + $mk = (function_exists('serendipity_specialchars') ? serendipity_specialchars($meta_keywords) : htmlspecialchars($meta_keywords, ENT_COMPAT, LANG_CHARSET)); } else { $md = $meta_description; $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 if (serendipity_db_bool($this->get_config('escape'))) { - $md = htmlspecialchars($default_description); - $mk = htmlspecialchars($default_keywords); + $md = (function_exists('serendipity_specialchars') ? serendipity_specialchars($default_description) : htmlspecialchars($default_description, ENT_COMPAT, LANG_CHARSET)); + $mk = (function_exists('serendipity_specialchars') ? serendipity_specialchars($default_keywords) : htmlspecialchars($default_keywords, ENT_COMPAT, LANG_CHARSET)); } else { $md = $default_description; $mk = $default_keywords; @@ -281,18 +281,18 @@ class serendipity_event_metadesc extends serendipity_event {


    - +


    - +


    - +

    * ' . PLUGIN_METADESC_STRINGLENGTH_DISCLAIMER; ?>

    diff --git a/serendipity_event_microformats/serendipity_event_microformats.php b/serendipity_event_microformats/serendipity_event_microformats.php index efbcd101..ad0635d1 100644 --- a/serendipity_event_microformats/serendipity_event_microformats.php +++ b/serendipity_event_microformats/serendipity_event_microformats.php @@ -59,7 +59,7 @@ class serendipity_event_microformats extends serendipity_event $propbag->add('description', PLUGIN_EVENT_MICROFORMATS_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Matthias Gutjahr'); - $propbag->add('version', '0.46'); + $propbag->add('version', '0.46.1'); $propbag->add('requirements', array( 'serendipity' => '0.9', 'smarty' => '2.6.7', diff --git a/serendipity_event_microformats/smarty.inc.php b/serendipity_event_microformats/smarty.inc.php index 0f0a192c..678334fe 100644 --- a/serendipity_event_microformats/smarty.inc.php +++ b/serendipity_event_microformats/smarty.inc.php @@ -161,7 +161,7 @@ echo '';*/ $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; 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 { echo $content; } diff --git a/serendipity_event_mobile_output/serendipity_event_mobile_output.php b/serendipity_event_mobile_output/serendipity_event_mobile_output.php index cbd3aec5..b95b6c6f 100644 --- a/serendipity_event_mobile_output/serendipity_event_mobile_output.php +++ b/serendipity_event_mobile_output/serendipity_event_mobile_output.php @@ -14,7 +14,7 @@ TODO: if (IN_serendipity !== true) { 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_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) { /* Sitemap requires this. * 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\n"; $str .= "\t\t$url\n"; diff --git a/serendipity_event_multilingual/serendipity_event_multilingual.php b/serendipity_event_multilingual/serendipity_event_multilingual.php index 4c05f7eb..a4f66b86 100755 --- a/serendipity_event_multilingual/serendipity_event_multilingual.php +++ b/serendipity_event_multilingual/serendipity_event_multilingual.php @@ -34,7 +34,7 @@ class serendipity_event_multilingual extends serendipity_event 'php' => '4.1.0' )); $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('event_hooks', array( 'frontend_fetchentries' => true, @@ -521,7 +521,7 @@ class serendipity_event_multilingual extends serendipity_event $langs = ''; foreach($use_lang AS $code => $desc) { - $langs .= '' . "\n"; + $langs .= '' . "\n"; } ?>
    diff --git a/serendipity_event_multilingual/serendipity_plugin_multilingual.php b/serendipity_event_multilingual/serendipity_plugin_multilingual.php index ba5d409f..ff441e6d 100644 --- a/serendipity_event_multilingual/serendipity_plugin_multilingual.php +++ b/serendipity_event_multilingual/serendipity_plugin_multilingual.php @@ -37,7 +37,7 @@ class serendipity_plugin_multilingual extends serendipity_event $conf[] = $lkey; } $propbag->add('configuration', $conf); - $propbag->add('version', '1.11'); + $propbag->add('version', '1.11.1'); $propbag->add('groups', array('FRONTEND_VIEWS')); $this->dependencies = array('serendipity_event_multilingual' => 'remove'); } @@ -91,7 +91,7 @@ class serendipity_plugin_multilingual extends serendipity_event echo ''; diff --git a/serendipity_event_mycalendar/serendipity_event_mycalendar.php b/serendipity_event_mycalendar/serendipity_event_mycalendar.php index aed5bb8d..0c44edf1 100644 --- a/serendipity_event_mycalendar/serendipity_event_mycalendar.php +++ b/serendipity_event_mycalendar/serendipity_event_mycalendar.php @@ -28,7 +28,7 @@ class serendipity_event_mycalendar extends serendipity_event { '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('stackable', false); $propbag->add('event_hooks', array( @@ -229,12 +229,12 @@ class serendipity_event_mycalendar extends serendipity_event { if ($i == $selected) { $found = true; } - $html .= '' . "\n"; + $html .= '' . "\n"; } if (!$found) { $html .= '' . "\n"; - $html .= '' . "\n"; + $html .= '' . "\n"; } $html .= ''; @@ -314,8 +314,8 @@ class serendipity_event_mycalendar extends serendipity_event { echo "
    \n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo "\n"; } @@ -415,14 +415,14 @@ class serendipity_event_mycalendar extends serendipity_event { foreach($items AS $item) { ?> - <?php echo serendipity_utf8_encode(htmlspecialchars($item['title'])); ?> - + <?php echo serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($item['title']) : htmlspecialchars($item['title'], ENT_COMPAT, LANG_CHARSET))); ?> + - + - + add('description', PLUGIN_MYCALENDAR_SIDE_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Markus Gerstel'); - $propbag->add('version', '0.13'); + $propbag->add('version', '0.13.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -135,14 +135,14 @@ class serendipity_plugin_mycalendar extends serendipity_plugin { $olddays = 0; 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['eventurltitle'])) { $ltitle = $item['eventurltitle']; } else { $ltitle = $item['eventname']; } - $cont = '' . $cont . ''; + $cont = '' . $cont . ''; } $daystostart = ceil(($item['eventdate'] - $ts) / 86400); diff --git a/serendipity_event_mymood/serendipity_event_mymood.php b/serendipity_event_mymood/serendipity_event_mymood.php index 662cb7e5..c7f5547f 100644 --- a/serendipity_event_mymood/serendipity_event_mymood.php +++ b/serendipity_event_mymood/serendipity_event_mymood.php @@ -56,7 +56,7 @@ class serendipity_event_mymood extends serendipity_event { 'php' => '4.1.0' )); - $propbag->add('version', '0.11'); + $propbag->add('version', '0.11.1'); $propbag->add('author', 'Brett Profitt'); $propbag->add('stackable', false); $propbag->add('event_hooks', array( @@ -348,9 +348,9 @@ class serendipity_event_mymood extends serendipity_event { echo "\n"; echo " \n"; echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo "\n"; $count++; diff --git a/serendipity_event_openid/common.inc.php b/serendipity_event_openid/common.inc.php index 31fcea49..2024b968 100644 --- a/serendipity_event_openid/common.inc.php +++ b/serendipity_event_openid/common.inc.php @@ -8,7 +8,7 @@ if (file_exists($probelang)) { include_once dirname(__FILE__) . '/lang_en.inc.php'; 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 { @@ -255,7 +255,7 @@ class serendipity_common_openid { $form .= ''; $form .=''; foreach($hidden AS $key => $val) { - $form .= ''; + $form .= ''; } $form .= 'OpenID '; @@ -271,7 +271,7 @@ class serendipity_common_openid { $form .= ''; $form .=''; foreach($hidden AS $key => $val) { - $form .= ''; + $form .= ''; } $form .= ' '; $form .= ' '; diff --git a/serendipity_event_openid/serendipity_event_openid.php b/serendipity_event_openid/serendipity_event_openid.php index cdcc27d2..41a25135 100644 --- a/serendipity_event_openid/serendipity_event_openid.php +++ b/serendipity_event_openid/serendipity_event_openid.php @@ -13,7 +13,7 @@ class serendipity_event_openid extends serendipity_event $propbag->add('description', PLUGIN_OPENID_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Grischa Brockhaus, Rob Richards'); - $propbag->add('version', '1.2'); + $propbag->add('version', '1.2.1'); $propbag->add('requirements', array( 'serendipity' => '1.2', '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 ($checkRet = serendipity_common_openid::authenticate_openid($_GET, $this->get_consumertest_path(), true)) { if (serendipity_common_openid::updateOpenID($checkRet['openID'], $serendipity['authorid'])) { - echo '' . htmlspecialchars(PLUGIN_OPENID_UPDATE_SUCCESS) . '

    '; + echo '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_OPENID_UPDATE_SUCCESS) : htmlspecialchars(PLUGIN_OPENID_UPDATE_SUCCESS, ENT_COMPAT, LANG_CHARSET)) . '

    '; } else { - echo '' . htmlspecialchars(PLUGIN_OPENID_UPDATE_FAIL) . '

    '; + echo '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_OPENID_UPDATE_FAIL) : htmlspecialchars(PLUGIN_OPENID_UPDATE_FAIL, ENT_COMPAT, LANG_CHARSET)) . '

    '; } } else { - echo '' . htmlspecialchars(PLUGIN_OPENID_INVALID_RESPONSE) . '

    '; + echo '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_OPENID_INVALID_RESPONSE) : htmlspecialchars(PLUGIN_OPENID_INVALID_RESPONSE, ENT_COMPAT, LANG_CHARSET)) . '

    '; } // Job done. unset($serendipity['GET']['openidflag']); } elseif (! empty($serendipity['POST']['openidflag']) && ($serendipity['POST']['openidflag']==3)) { - echo '' . htmlspecialchars(PLUGIN_OPENID_INVALID_RESPONSE) . '

    '; + echo '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_OPENID_INVALID_RESPONSE) : htmlspecialchars(PLUGIN_OPENID_INVALID_RESPONSE, ENT_COMPAT, LANG_CHARSET)) . '

    '; } } $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'; echo '
    '; - echo '' . htmlspecialchars(PLUGIN_EVENT_OPENID_SELECT) . '

    '; + echo '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_EVENT_OPENID_SELECT) : htmlspecialchars(PLUGIN_EVENT_OPENID_SELECT, ENT_COMPAT, LANG_CHARSET)) . '

    '; // To allow ENTER in the input line we have to create two forms: diff --git a/serendipity_event_picasa/serendipity_event_picasa.php b/serendipity_event_picasa/serendipity_event_picasa.php index a31ff096..b2f6442c 100644 --- a/serendipity_event_picasa/serendipity_event_picasa.php +++ b/serendipity_event_picasa/serendipity_event_picasa.php @@ -256,7 +256,7 @@ class serendipity_event_picasa extends serendipity_event { )); $propbag->add('stackable', false); $propbag->add('author', 'Thomas Nesges, Greg Greenway'); - $propbag->add('version', '1.14'); + $propbag->add('version', '1.14.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -467,7 +467,7 @@ class serendipity_event_picasa extends serendipity_event { $albumItemCount = $xmlData['albumItemCount']; 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') { diff --git a/serendipity_event_podcast/serendipity_event_podcast.php b/serendipity_event_podcast/serendipity_event_podcast.php index a8444edb..c736a523 100644 --- a/serendipity_event_podcast/serendipity_event_podcast.php +++ b/serendipity_event_podcast/serendipity_event_podcast.php @@ -14,7 +14,7 @@ if (file_exists($probelang)) { include_once dirname(__FILE__) . '/lang_en.inc.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 { /** @@ -134,7 +134,7 @@ class serendipity_event_podcast extends serendipity_event{ switch($name) { case 'info': $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; case 'easy': @@ -393,9 +393,9 @@ class serendipity_event_podcast extends serendipity_event{ $propbag->add('description', PLUGIN_PODCAST_ITUNES_DESC); $propbag->add('default', " -" . htmlspecialchars($serendipity['blogTitle']) . " -" . htmlspecialchars($serendipity['blogTitle']) . " -" . htmlspecialchars($serendipity['blogDescription']) . " +" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogTitle']) : htmlspecialchars($serendipity['blogTitle'], ENT_COMPAT, LANG_CHARSET)) . " +" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogTitle']) : htmlspecialchars($serendipity['blogTitle'], ENT_COMPAT, LANG_CHARSET)) . " +" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogDescription']) : htmlspecialchars($serendipity['blogDescription'], ENT_COMPAT, LANG_CHARSET)) . " "); @@ -414,9 +414,9 @@ class serendipity_event_podcast extends serendipity_event{ } function iTunify(&$eventData) { - $eventData['per_entry_display_dat'] .= '' . htmlspecialchars($eventData['author']) . '' . "\n"; - $eventData['per_entry_display_dat'] .= '' . htmlspecialchars($eventData['title']) . '' . "\n"; - $eventData['per_entry_display_dat'] .= '' . htmlspecialchars(strip_tags($eventData['feed_body'])) . '' . "\n"; + $eventData['per_entry_display_dat'] .= '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($eventData['author']) : htmlspecialchars($eventData['author'], ENT_COMPAT, LANG_CHARSET)) . '' . "\n"; + $eventData['per_entry_display_dat'] .= '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($eventData['title']) : htmlspecialchars($eventData['title'], ENT_COMPAT, LANG_CHARSET)) . '' . "\n"; + $eventData['per_entry_display_dat'] .= '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(strip_tags($eventData['feed_body']) : htmlspecialchars(strip_tags($eventData['feed_body'], ENT_COMPAT, LANG_CHARSET))) . '' . "\n"; } /** @@ -592,7 +592,7 @@ class serendipity_event_podcast extends serendipity_event{ $fileInfo = $this->GetFileInfo($eventData['properties'][$eattr]); $type = $fileInfo['mime']; $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)) { $this->iTunify($eventData, $enclosure); diff --git a/serendipity_event_popfetcher/serendipity_event_popfetcher.php b/serendipity_event_popfetcher/serendipity_event_popfetcher.php index 929055e7..ad5f4467 100644 --- a/serendipity_event_popfetcher/serendipity_event_popfetcher.php +++ b/serendipity_event_popfetcher/serendipity_event_popfetcher.php @@ -12,7 +12,7 @@ require_once('tmobile.php'); require_once('o2.php'); // 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_HIDENAME', 'popfetcher'); // User should set this to something unguessable define('DEFAULT_MAILSERVER', ''); @@ -793,7 +793,7 @@ class serendipity_event_popfetcher extends serendipity_event $displayed_class = "popfetcherimage"; } $attfile = $serendipity['serendipityHTTPPath'].$serendipity['uploadHTTPPath'].$maildir.$filename; - $attlink = ''.htmlspecialchars($this->stripsubject($subject)).''; + $attlink = ''.(function_exists('serendipity_specialchars') ? serendipity_specialchars($this->stripsubject($subject)) : htmlspecialchars($this->stripsubject($subject), ENT_COMPAT, LANG_CHARSET)).''; if ($this->inline_picture($p->headers['content-id'], $postbody, $postex, $attfile, $attlink)) { return true; @@ -1107,7 +1107,7 @@ class serendipity_event_popfetcher extends serendipity_event $date = (isset($s->headers['date'])) ? $s->headers['date'] : MF_MSG3; $from = (isset($s->headers['from'])) ? $s->headers['from'] : MF_MSG4; if (!empty($onlyfrom) && trim($from) != trim($onlyfrom)) { - $this->out('
    '.sprintf(MF_ERROR_ONLYFROM, '"' . htmlspecialchars($from) . '"', '"' . htmlspecialchars($onlyfrom) . '"')); + $this->out('
    '.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; } @@ -1120,7 +1120,7 @@ class serendipity_event_popfetcher extends serendipity_event $this->out( '
    '); $this->out( MF_MSG5 . $date . '
    '); - $this->out( MF_MSG6 . htmlspecialchars($from) . '
    '); + $this->out( MF_MSG6 . (function_exists('serendipity_specialchars') ? serendipity_specialchars($from) : htmlspecialchars($from, ENT_COMPAT, LANG_CHARSET)) . '
    '); $this->out( MF_MSG16 . $subject . '
    '); // Find the author associated with the from address and @@ -1144,7 +1144,7 @@ class serendipity_event_popfetcher extends serendipity_event } if (is_null($useAuthor)) { - $this->out( '
    '.sprintf(MF_ERROR_NOAUTHOR, '"' . htmlspecialchars($clean) . '"')); + $this->out( '
    '.sprintf(MF_ERROR_NOAUTHOR, '"' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($clean) : htmlspecialchars($clean, ENT_COMPAT, LANG_CHARSET)) . '"')); continue; } } else { diff --git a/serendipity_event_relatedlinks/serendipity_event_relatedlinks.php b/serendipity_event_relatedlinks/serendipity_event_relatedlinks.php index 62dc5b7c..b18140ea 100644 --- a/serendipity_event_relatedlinks/serendipity_event_relatedlinks.php +++ b/serendipity_event_relatedlinks/serendipity_event_relatedlinks.php @@ -30,7 +30,7 @@ class serendipity_event_relatedlinks extends serendipity_event 'smarty' => '2.6.7', 'php' => '4.1.0' )); - $propbag->add('version', '1.8'); + $propbag->add('version', '1.8.1'); $propbag->add('event_hooks', array( 'frontend_display:html:per_entry' => true, 'backend_publish' => true, @@ -159,7 +159,7 @@ class serendipity_event_relatedlinks extends serendipity_event $html_links[] = array( '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
    - + add('description', PLUGIN_EVENT_SEARCHHIGHLIGHT_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Tom Sommer'); - $propbag->add('version', '1.8'); + $propbag->add('version', '1.8.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -156,7 +156,7 @@ class serendipity_event_searchhighlight extends serendipity_event : parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY) ); 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 $query = $path[(array_search('search', $path)+1)]; } diff --git a/serendipity_event_sidebarhider/serendipity_event_sidebarhider.php b/serendipity_event_sidebarhider/serendipity_event_sidebarhider.php index ab266985..97907675 100644 --- a/serendipity_event_sidebarhider/serendipity_event_sidebarhider.php +++ b/serendipity_event_sidebarhider/serendipity_event_sidebarhider.php @@ -26,7 +26,7 @@ class serendipity_event_sidebarhider extends serendipity_event $propbag->add('description', PLUGIN_SIDEBAR_HIDER_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Tys von Gaza, Garvin Hicking'); - $propbag->add('version', '1.25'); + $propbag->add('version', '1.25.1'); $propbag->add('requirements', array( 'serendipity' => '0.9', 'php' => '4.1.0' @@ -468,7 +468,7 @@ class serendipity_event_sidebarhider extends serendipity_event $group['name'] = constant($group['confvalue']); } ?> - + \n"; @@ -480,14 +480,14 @@ class serendipity_event_sidebarhider extends serendipity_event $selected = explode(',', $category_viewlist[$plugin->instance]); echo " -' . WORD_OR . '- '; @@ -1952,8 +1952,8 @@ class serendipity_event_staticpage extends serendipity_event $serendipity['POST']['staticSubmit'] = true; $bag = new serendipity_property_bag; $this->introspect($bag); - $name = htmlspecialchars($bag->get('name')); - $desc = htmlspecialchars($bag->get('description')); + $name = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('name')) : htmlspecialchars($bag->get('name'), ENT_COMPAT, LANG_CHARSET)); + $desc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('description')) : htmlspecialchars($bag->get('description'), ENT_COMPAT, LANG_CHARSET)); $config_names = $bag->get('page_configuration'); foreach ($config_names as $config_item) { @@ -2004,7 +2004,7 @@ class serendipity_event_staticpage extends serendipity_event if ($dh) { while ($file = readdir($dh)) { if ($file != 'default_staticpage_backend.tpl' && preg_match('@^(.*).tpl$@i', $file, $m)) { - echo '' . "\n"; + echo '' . "\n"; } } } @@ -2012,7 +2012,7 @@ class serendipity_event_staticpage extends serendipity_event if ($dh) { while ($file = readdir($dh)) { if ($file != 'default_staticpage_backend.tpl' && preg_match('@^(.*).tpl$@i', $file, $m)) { - echo '' . "\n"; + echo '' . "\n"; } } } @@ -2030,7 +2030,7 @@ class serendipity_event_staticpage extends serendipity_event foreach ($pages as $page) { if ($this->checkPageUser($page['authorid'])) { echo ' '; + echo str_repeat('  ', $page['depth']) . (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['pagetitle']) : htmlspecialchars($page['pagetitle'], ENT_COMPAT, LANG_CHARSET)) . ''; } } } @@ -2189,9 +2189,9 @@ class serendipity_event_staticpage extends serendipity_event @@ -2243,7 +2243,7 @@ foreach($select AS $select_value => $select_desc) { } $counter = 0; 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++; $checked = ""; @@ -2261,8 +2261,8 @@ foreach($select AS $select_value => $select_desc) { - title="" /> - + title="" /> + $select_desc) { $cbag = new serendipity_property_bag; $this->introspect_item($config_item, $cbag); - $cname = htmlspecialchars($cbag->get('name')); - $cdesc = htmlspecialchars($cbag->get('description')); + $cname = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET)); + $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'); - $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)) { $lang_direction = LANG_DIRECTION; @@ -2470,7 +2470,7 @@ foreach($select AS $select_value => $select_desc) { /* Try and the default value for the config item */ $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(); $select = array(); $per_row = null; @@ -2587,11 +2587,11 @@ foreach($select AS $select_value => $select_desc) { $cbag = new serendipity_property_bag; $this->$introspec_func($config_item, $cbag); - $cname = htmlspecialchars($cbag->get('name')); - $cdesc = htmlspecialchars($cbag->get('description')); + $cname = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET)); + $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'); - $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)) { $lang_direction = LANG_DIRECTION; @@ -2602,7 +2602,7 @@ foreach($select AS $select_value => $select_desc) { /* Try and the default value for the config item */ $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(); $select = array(); $per_row = null; @@ -2696,7 +2696,7 @@ foreach($select AS $select_value => $select_desc) {
    $idx"; 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'] .')') . "."; @@ -343,7 +343,7 @@ class serendipity_event_mycalendar extends serendipity_event { echo "
     " . PLUGIN_MYCALENDAR_EVENTURI_TITLE . ":
    $count
    - + '; echo ''; @@ -627,14 +627,14 @@ class serendipity_event_userprofiles extends serendipity_event { . '&gravatar_id=' . md5($eventData['email']) . '&size=' . $this->get_config('gravatar_size','80') . '&border=&rating=' . $this->get_config('gravatar_rating','R'); - $this->found_images[$author] = '
    ' . AUTHOR . '
    ' . htmlspecialchars($authorname) . '
    '; + $this->found_images[$author] = '
    ' . AUTHOR . '
    ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($authorname) : htmlspecialchars($authorname, ENT_COMPAT, LANG_CHARSET)) . '
    '; $eventData['body'] = $this->found_images[$author] . $eventData['body']; } elseif (isset($this->found_images[$author])) { // Author image was already found previously. Display it. $eventData['body'] = $this->found_images[$author] . $eventData['body']; } 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. - $this->found_images[$author] = '
    ' . AUTHOR . '
    ' .htmlspecialchars($authorname) . '
    '; + $this->found_images[$author] = '
    ' . AUTHOR . '
    ' .(function_exists('serendipity_specialchars') ? serendipity_specialchars($authorname) : htmlspecialchars($authorname, ENT_COMPAT, LANG_CHARSET)) . '
    '; $eventData['body'] = $this->found_images[$author] . $eventData['body']; } else { // No image found, do not try again in next article. diff --git a/serendipity_event_userprofiles/serendipity_plugin_userprofiles.php b/serendipity_event_userprofiles/serendipity_plugin_userprofiles.php index 18df9e69..5a2ee0fb 100644 --- a/serendipity_event_userprofiles/serendipity_plugin_userprofiles.php +++ b/serendipity_event_userprofiles/serendipity_plugin_userprofiles.php @@ -22,7 +22,7 @@ class serendipity_plugin_userprofiles extends serendipity_plugin { $propbag->add('description', PLUGIN_USERPROFILES_NAME_DESC); $propbag->add('author', "Falk Döring"); $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('requirements', array( 'serendipity' => '0.8', @@ -101,8 +101,8 @@ class serendipity_plugin_userprofiles extends serendipity_plugin { $content .= sprintf("%s
    \n", $entryLink, - htmlspecialchars($user['realname']), - htmlspecialchars($user['realname'])); + (function_exists('serendipity_specialchars') ? serendipity_specialchars($user['realname']) : htmlspecialchars($user['realname'], ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars($user['realname']) : htmlspecialchars($user['realname'], ENT_COMPAT, LANG_CHARSET))); } return $content; diff --git a/serendipity_event_versioning/serendipity_event_versioning.php b/serendipity_event_versioning/serendipity_event_versioning.php index 0bc9c06c..70740ebc 100644 --- a/serendipity_event_versioning/serendipity_event_versioning.php +++ b/serendipity_event_versioning/serendipity_event_versioning.php @@ -34,7 +34,7 @@ class serendipity_event_versioning extends serendipity_event { )); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '0.11'); + $propbag->add('version', '0.11.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -261,10 +261,7 @@ class serendipity_event_versioning extends serendipity_event { $msg = '
    ' . VERSIONING_TITLE . ':
    %s
    '; $html = ''; @@ -314,7 +311,8 @@ class serendipity_event_versioning extends serendipity_event { } ?> - ');" /> + ');" /> add('description', PLUGIN_EVENT_WEBLOGPING_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Serendipity Team'); - $propbag->add('version', '1.08'); + $propbag->add('version', '1.08.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -221,7 +221,7 @@ class serendipity_event_weblogping extends serendipity_event $http_response = $req->getResponseBody(); $xmlrpc_result = $message->parseResponse($http_response); if ($xmlrpc_result->faultCode()) { - $out = sprintf(PLUGIN_EVENT_WEBLOGPING_SEND_FAILURE . "
    ", htmlspecialchars($xmlrpc_result->faultString())); + $out = sprintf(PLUGIN_EVENT_WEBLOGPING_SEND_FAILURE . "
    ", (function_exists('serendipity_specialchars') ? serendipity_specialchars($xmlrpc_result->faultString()) : htmlspecialchars($xmlrpc_result->faultString(), ENT_COMPAT, LANG_CHARSET)); } else { $out = PLUGIN_EVENT_WEBLOGPING_SEND_SUCCESS . "
    "; } diff --git a/serendipity_event_wikilinks/serendipity_event_wikilinks.php b/serendipity_event_wikilinks/serendipity_event_wikilinks.php index 7a0dfbe2..943846fa 100644 --- a/serendipity_event_wikilinks/serendipity_event_wikilinks.php +++ b/serendipity_event_wikilinks/serendipity_event_wikilinks.php @@ -30,7 +30,7 @@ class serendipity_event_wikilinks extends serendipity_event $propbag->add('description', PLUGIN_EVENT_WIKILINKS_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Grischa Brockhaus'); - $propbag->add('version', '0.25'); + $propbag->add('version', '0.25.1'); $propbag->add('requirements', array( 'serendipity' => '1.0', 'smarty' => '2.6.7', @@ -198,13 +198,13 @@ class serendipity_event_wikilinks extends serendipity_event echo '
    '; echo '
    '; - echo ''; + echo ''; echo ''; echo '
    '; echo '
    '; echo '
    '; - echo ''; + echo ''; echo '
    '; echo '
    '; @@ -307,9 +307,9 @@ class serendipity_event_wikilinks extends serendipity_event if (is_array($e)) { foreach($e AS $entry) { $link = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath', true, array('timestamp' => $entry['timestamp'])); - $jslink = "'" . htmlspecialchars($entry['title']) . "<' + '/a>'"; + $jslink = "'" . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . "<' + '/a>'"; echo '
  • ' - . '' . htmlspecialchars($entry['title']) . ' (#' . $entry['id'] . ')
    ' + . '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)) . ' (#' . $entry['id'] . ')
    ' . POSTED_BY . ' ' . $entry['author'] . ' ' . ON . ' ' . serendipity_formatTime(DATE_FORMAT_SHORT, $entry['timestamp']) . ($entry['isdraft'] != 'false' ? ' (' . DRAFT . ')' : '') . '
    • ' . "\n"; @@ -505,8 +505,8 @@ function use_link_(txt) { array( $refix, - htmlspecialchars($buffer['ref']), - htmlspecialchars($buffer['refname']), + (function_exists('serendipity_specialchars') ? serendipity_specialchars($buffer['ref']) : htmlspecialchars($buffer['ref'], ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars($buffer['refname']) : htmlspecialchars($buffer['refname'], ENT_COMPAT, LANG_CHARSET)), ), $result ); @@ -539,7 +539,7 @@ function use_link_(txt) { array( $count2, - htmlspecialchars($buffer), + (function_exists('serendipity_specialchars') ? serendipity_specialchars($buffer) : htmlspecialchars($buffer, ENT_COMPAT, LANG_CHARSET)), $key ), $format @@ -627,7 +627,7 @@ function use_link_(txt) { if (serendipity_userLoggedIn()) { $mode = 'create'; $title = urlencode($ltitle); - $body = '

    ' . htmlspecialchars($ltitle) . '

    '; + $body = '

    ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($ltitle) : htmlspecialchars($ltitle, ENT_COMPAT, LANG_CHARSET)) . '

    '; $admin_url2 = $serendipity['baseURL'] . 'serendipity_admin.php?serendipity[adminModule]=event_display&serendipity[adminAction]=staticpages&serendipity[pre][headline]=' . $title . '&serendipity[pre][content]=' . $body . '&serendipity[pre][pagetitle]=' . $title; if ($otype == 'staticpage') { diff --git a/serendipity_event_wrapurl/serendipity_event_wrapurl.php b/serendipity_event_wrapurl/serendipity_event_wrapurl.php index 89015d85..0578712d 100644 --- a/serendipity_event_wrapurl/serendipity_event_wrapurl.php +++ b/serendipity_event_wrapurl/serendipity_event_wrapurl.php @@ -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('configuration', array('headline', 'permalink', 'pagetitle', 'wrapurl', 'height', 'wrapurl_append', 'hide_sidebar')); $propbag->add('author', 'Rob Antonishen, Ian (Timbalu)'); - $propbag->add('version', '0.10'); + $propbag->add('version', '0.10.1'); $propbag->add('requirements', array( 'serendipity' => '0.7', 'smarty' => '2.6.7', @@ -126,7 +126,7 @@ class serendipity_event_wrapURL extends serendipity_event { continue; } - $url .= htmlspecialchars($key) . '=' . htmlspecialchars($value) . '&'; + $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)) . '&'; } } diff --git a/serendipity_event_xsstrust/serendipity_event_xsstrust.php b/serendipity_event_xsstrust/serendipity_event_xsstrust.php index 739b1b95..eec2276b 100644 --- a/serendipity_event_xsstrust/serendipity_event_xsstrust.php +++ b/serendipity_event_xsstrust/serendipity_event_xsstrust.php @@ -31,7 +31,7 @@ class serendipity_event_xsstrust extends serendipity_event 'smarty' => '2.6.7', 'php' => '4.1.0' )); - $propbag->add('version', '0.5'); + $propbag->add('version', '0.5.1'); $propbag->add('event_hooks', array( 'frontend_display' => true, 'backend_media_check' => true)); @@ -61,7 +61,7 @@ class serendipity_event_xsstrust extends serendipity_event $users = (array)serendipity_fetchUsers(); $valid =& $this->trusted_authors; foreach($users as $user) { - $html .= '' . "\n"; + $html .= '' . "\n"; } $html .= ''; @@ -137,8 +137,8 @@ class serendipity_event_xsstrust extends serendipity_event if (!isset($this->trusted_authors[$eventData['authorid']])) { // Not trusted. #$eventData['title'] = htmlspecialchars($eventData['title']); - $eventData['body'] = htmlspecialchars($eventData['body']); - $eventData['extended'] = htmlspecialchars($eventData['extended']); + $eventData['body'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($eventData['body']) : htmlspecialchars($eventData['body'], ENT_COMPAT, LANG_CHARSET)); + $eventData['extended'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($eventData['extended']) : htmlspecialchars($eventData['extended'], ENT_COMPAT, LANG_CHARSET)); } else { // Trusted. } diff --git a/serendipity_event_xsstrust/serendipity_plugin_xsstrust.php b/serendipity_event_xsstrust/serendipity_plugin_xsstrust.php index 8bb209b9..069ee164 100644 --- a/serendipity_event_xsstrust/serendipity_plugin_xsstrust.php +++ b/serendipity_event_xsstrust/serendipity_plugin_xsstrust.php @@ -28,7 +28,7 @@ class serendipity_plugin_xsstrust extends serendipity_plugin $propbag->add('description', PLUGIN_ETHICS_BLAHBLAH); $propbag->add('stackable', false); $propbag->add('author', 'Loris Zena'); - $propbag->add('version', '1.1'); + $propbag->add('version', '1.1.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -218,7 +218,7 @@ class serendipity_plugin_xsstrust extends serendipity_plugin if ($sql && is_array($sql)) { foreach($sql AS $key => $row) { echo "
    '; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -370,7 +370,7 @@ class serendipity_event_pollbox extends serendipity_event { foreach((array)$this->poll['options'] AS $optid => $option) { echo '
  • '; echo ''; - echo ' '; + echo ' '; echo ' '; echo ' ' . (int)$option['votes'] . ' ' . PLUGIN_POLL_VOTES . ''; echo '
    • '; diff --git a/serendipity_plugin_pollbox/serendipity_plugin_pollbox.php b/serendipity_plugin_pollbox/serendipity_plugin_pollbox.php index 7f2b0069..42fb7de9 100755 --- a/serendipity_plugin_pollbox/serendipity_plugin_pollbox.php +++ b/serendipity_plugin_pollbox/serendipity_plugin_pollbox.php @@ -14,7 +14,7 @@ class serendipity_plugin_pollbox extends serendipity_plugin { $propbag->add('configuration', array('title')); $propbag->add('author', 'Garvin Hicking, Evan Nemerson'); $propbag->add('stackable', false); - $propbag->add('version', '2.08'); + $propbag->add('version', '2.08.1'); $propbag->add('groups', array('STATISTICS')); $this->dependencies = array('serendipity_event_pollbox' => 'keep'); } diff --git a/serendipity_plugin_popularentries/serendipity_plugin_popularentries.php b/serendipity_plugin_popularentries/serendipity_plugin_popularentries.php index d36db674..f2a911d5 100644 --- a/serendipity_plugin_popularentries/serendipity_plugin_popularentries.php +++ b/serendipity_plugin_popularentries/serendipity_plugin_popularentries.php @@ -27,7 +27,7 @@ class serendipity_plugin_POPULARENTRIES extends serendipity_plugin { 'smarty' => '2.6.7', 'php' => '4.1.0' )); - $propbag->add('version', '1.10'); + $propbag->add('version', '1.10.1'); $propbag->add('configuration', array('title', 'sortby', 'number', 'number_from', 'category', 'commentors_hide')); $propbag->add('groups', array('STATISTICS')); } @@ -262,8 +262,8 @@ class serendipity_plugin_POPULARENTRIES extends serendipity_plugin { continue; } $entryLink = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_COMMENTS . '/' . urlencode($entry['author']); - echo '
  • ' . htmlspecialchars($entry['author']) . ''; - echo ' (' . (!empty($entry['points']) ? htmlspecialchars($entry['points']) : 0) . ')
    • '; + echo '
  • ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['author']) : htmlspecialchars($entry['author'], ENT_COMPAT, LANG_CHARSET)) . ''; + echo ' (' . (!empty($entry['points']) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['points']) : htmlspecialchars($entry['points'], ENT_COMPAT, LANG_CHARSET)) : 0) . ')
    • '; } else { $entryLink = serendipity_archiveURL( $entry['id'], @@ -273,8 +273,8 @@ class serendipity_plugin_POPULARENTRIES extends serendipity_plugin { array('timestamp' => $entry['timestamp']) ); - echo '
  • ' . $entry['title'] . ''; - echo ' (' . (!empty($entry['points']) ? htmlspecialchars($entry['points']) : 0) . ')
    • '; + echo '
  • ' . $entry['title'] . ''; + echo ' (' . (!empty($entry['points']) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['points']) : htmlspecialchars($entry['points'], ENT_COMPAT, LANG_CHARSET)) : 0) . ')
    • '; } } } diff --git a/serendipity_plugin_quicklink/serendipity_plugin_quicklink.php b/serendipity_plugin_quicklink/serendipity_plugin_quicklink.php index 805cf879..453d5a11 100644 --- a/serendipity_plugin_quicklink/serendipity_plugin_quicklink.php +++ b/serendipity_plugin_quicklink/serendipity_plugin_quicklink.php @@ -27,7 +27,7 @@ class serendipity_plugin_quicklink extends serendipity_plugin $propbag->add('description', PLUGIN_QUICKLINK_BLAHBLAH); $propbag->add('stackable', false); $propbag->add('author', 'Omid Mottaghi Rad'); - $propbag->add('version', '0.7'); + $propbag->add('version', '0.7.1'); $propbag->add('requirements', array( 'serendipity' => '0.9', 'smarty' => '2.6.7', @@ -271,9 +271,9 @@ initToolTips(); // create tool tip string $tip = ''; if($show_tip == 'true'){ - $tip = htmlspecialchars(serendipity_strftime($timestamp, $row['stamp'])); + $tip = (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_strftime($timestamp, $row['stamp'])) : htmlspecialchars(serendipity_strftime($timestamp, $row['stamp']), ENT_COMPAT, LANG_CHARSET)); if( trim($row['description']) != ''){ - $tip .= '
    ' . nl2br(htmlspecialchars($row['description'])); + $tip .= '
    ' . nl2br((function_exists('serendipity_specialchars') ? serendipity_specialchars($row['description']) : htmlspecialchars($row['description'], ENT_COMPAT, LANG_CHARSET))); } $tip = ' onMouseOver="toolTip(\'' . $tip . '\')" onMouseOut="toolTip()"'; } @@ -286,7 +286,7 @@ initToolTips(); } // create link string - $link = '' . htmlspecialchars($label) . ''; + $link = '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($label) : htmlspecialchars($label, ENT_COMPAT, LANG_CHARSET)) . ''; // create telete link string $deleteLink = ''; diff --git a/serendipity_plugin_randomquotes/serendipity_plugin_randomquotes.php b/serendipity_plugin_randomquotes/serendipity_plugin_randomquotes.php index bc06a2c4..fc11428f 100644 --- a/serendipity_plugin_randomquotes/serendipity_plugin_randomquotes.php +++ b/serendipity_plugin_randomquotes/serendipity_plugin_randomquotes.php @@ -21,7 +21,7 @@ class serendipity_plugin_randomquotes extends serendipity_plugin { $propbag->add('configuration', array('title', 'searchenginelink', 'formatstring', 'quotes', 'newwindow', 'numquotes')); $propbag->add('author', 'Florian Solcher'); $propbag->add('stackable', true); - $propbag->add('version', '1.05'); + $propbag->add('version', '1.05.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -106,7 +106,7 @@ class serendipity_plugin_randomquotes extends serendipity_plugin { if (trim($quote) != '') { $exp = explode('|', $quote); if (count($exp) > 0 && trim($exp[0]) != '') { - $quotes_array[$i]['quote'] = htmlspecialchars(trim($exp[0])); + $quotes_array[$i]['quote'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars(trim($exp[0]) : htmlspecialchars(trim($exp[0], ENT_COMPAT, LANG_CHARSET))); $quotes_array[$i]['author'] = trim($exp[1]); if(count($exp) > 2) { $quotes_array[$i]['link'] = trim($exp[2]); @@ -130,12 +130,12 @@ class serendipity_plugin_randomquotes extends serendipity_plugin { $item = $quotes_array[$key]; if (trim($item['link']) == '') { if (trim($url) != '') { - $item['author'] = ''. htmlspecialchars($item['author']).''."\n"; + $item['author'] = ''. (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['author']) : htmlspecialchars($item['author'], ENT_COMPAT, LANG_CHARSET)).''."\n"; } } elseif (trim($item['link']) != 'none') { - $item['author'] = ''. htmlspecialchars($item['author']) .''."\n"; + $item['author'] = ''. (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['author']) : htmlspecialchars($item['author'], ENT_COMPAT, LANG_CHARSET)) .''."\n"; } else { - $item['author'] = htmlspecialchars($item['author']); + $item['author'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($item['author']) : htmlspecialchars($item['author'], ENT_COMPAT, LANG_CHARSET)); } echo str_replace(array('%QUOTE%', '%AUTHOR%'), array($item['quote'], $item['author']), $formatstring); } diff --git a/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php b/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php index 04a2cdfd..cd81c41c 100644 --- a/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php +++ b/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php @@ -16,7 +16,7 @@ class serendipity_plugin_shoutbox extends serendipity_plugin $propbag->add('description', PLUGIN_SHOUTBOX_BLAHBLAH); $propbag->add('stackable', false); $propbag->add('author', 'Matthias Lange'); - $propbag->add('version', '1.02'); + $propbag->add('version', '1.02.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -206,7 +206,7 @@ class serendipity_plugin_shoutbox extends serendipity_plugin serendipity_plugin_api::hook_event('frontend_display', $entry); $entry['comment'] = wordwrap($entry['comment'], $wordwrap, "\n", 1); - echo '
    ' . htmlspecialchars(serendipity_strftime($dateformat, $row['stamp'])) . '
    ' . "\n" + echo '
    ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(serendipity_strftime($dateformat, $row['stamp'])) : htmlspecialchars(serendipity_strftime($dateformat, $row['stamp']), ENT_COMPAT, LANG_CHARSET)) . '
    ' . "\n" . '
    ' . $entry['comment'] . '
    ' . "\n" . '
    ' . $deleteLink . '
    ' . "\n\n"; } diff --git a/serendipity_plugin_showentries/serendipity_plugin_showentries.php b/serendipity_plugin_showentries/serendipity_plugin_showentries.php index 1b4f7160..85ee4d03 100644 --- a/serendipity_plugin_showentries/serendipity_plugin_showentries.php +++ b/serendipity_plugin_showentries/serendipity_plugin_showentries.php @@ -28,7 +28,7 @@ class serendipity_plugin_showentries extends serendipity_plugin { 'php' => '4.1.0' )); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '1.8'); + $propbag->add('version', '1.8.1'); $propbag->add('stackable', true); $propbag->add('groups', array('FRONTEND_VIEWS')); } @@ -119,7 +119,7 @@ class serendipity_plugin_showentries extends serendipity_plugin { $entry['link'] = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath', true, array('timestamp' => $entry['timestamp'])); $entry['commURL'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false, array('timestamp' => $entry['timestamp'])); $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', true, array('timestamp' => $entry['timestamp'])); - $entry['title'] = htmlspecialchars($entry['title']); + $entry['title'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($entry['title']) : htmlspecialchars($entry['title'], ENT_COMPAT, LANG_CHARSET)); $entry['link_allow_comments'] = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=enable&serendipity[entry]=' . $entry['id']; $entry['link_deny_comments'] = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=disable&serendipity[entry]=' . $entry['id']; diff --git a/serendipity_plugin_socialbookmarks/serendipity_plugin_socialbookmarks.php b/serendipity_plugin_socialbookmarks/serendipity_plugin_socialbookmarks.php index ff62b485..6ad516d8 100644 --- a/serendipity_plugin_socialbookmarks/serendipity_plugin_socialbookmarks.php +++ b/serendipity_plugin_socialbookmarks/serendipity_plugin_socialbookmarks.php @@ -117,7 +117,7 @@ class serendipity_plugin_socialbookmarks extends serendipity_plugin { $propbag->add('name', PLUGIN_SOCIALBOOKMARKS_N); $propbag->add('description', PLUGIN_SOCIALBOOKMARKS_D); $propbag->add('author', 'Matthias Gutjahr'); - $propbag->add('version', '0.46'); + $propbag->add('version', '0.46.1'); $propbag->add('requirements', array( 'serendipity' => '0.9alpha5', 'smarty' => '2.6.7', @@ -276,7 +276,7 @@ class serendipity_plugin_socialbookmarks extends serendipity_plugin { for ($x = 0; $x < $max; $x++) { $item = $socialbookmarksFeed->get_item($x); $socialbookmarksContent .= '
  • '; - $socialbookmarksContent .= ''; + $socialbookmarksContent .= ''; if ($this->get_config('displayThumbnails')) { $socialbookmarksContent .= $this->socialbookmarks_get_thumbnail($item->get_description()); } else { diff --git a/serendipity_plugin_topreferers/serendipity_plugin_topreferers.php b/serendipity_plugin_topreferers/serendipity_plugin_topreferers.php index 5b36453a..a0d2db23 100644 --- a/serendipity_plugin_topreferers/serendipity_plugin_topreferers.php +++ b/serendipity_plugin_topreferers/serendipity_plugin_topreferers.php @@ -25,7 +25,7 @@ class serendipity_plugin_topreferers extends serendipity_plugin { 'php' => '4.1.0' )); $propbag->add('groups', array('STATISTICS')); - $propbag->add('version', '1.3'); + $propbag->add('version', '1.3.1'); } function introspect_config_item($name, &$propbag) { @@ -141,15 +141,15 @@ function displayTopUrlList($list, $limit, $use_links = true, $filter_out = "", $ if ($use_links) { printf( '%2$s (%3$s)
    ', - htmlspecialchars($row['scheme']), - htmlspecialchars($row['host']), - htmlspecialchars($row['total']) + (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['scheme']) : htmlspecialchars($row['scheme'], ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['host']) : htmlspecialchars($row['host'], ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['total']) : htmlspecialchars($row['total'], ENT_COMPAT, LANG_CHARSET)) ); } else { printf( '%1$s (%2$s)
    ', - htmlspecialchars($row['host']), - htmlspecialchars($row['total']) + (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['host']) : htmlspecialchars($row['host'], ENT_COMPAT, LANG_CHARSET)), + (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['total']) : htmlspecialchars($row['total'], ENT_COMPAT, LANG_CHARSET)) ); } } diff --git a/serendipity_plugin_twitter/plugin_version.inc.php b/serendipity_plugin_twitter/plugin_version.inc.php index bc5563ed..7600ab00 100644 --- a/serendipity_plugin_twitter/plugin_version.inc.php +++ b/serendipity_plugin_twitter/plugin_version.inc.php @@ -1,4 +1,4 @@
    - + - + default_shorturl($entryurl); - $onclick = htmlspecialchars(PLUGIN_EVENT_TWITTER_SHORTURL_ON_CLICK); + $onclick = (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_EVENT_TWITTER_SHORTURL_ON_CLICK) : htmlspecialchars(PLUGIN_EVENT_TWITTER_SHORTURL_ON_CLICK, ENT_COMPAT, LANG_CHARSET)); if ($do_smartify) { // emit smarty tag only $eventData[$event_index]['url_shorturl'] = $shorturl; }
    • - + @@ -2704,7 +2704,7 @@ foreach($select AS $select_value => $select_desc) {
    - selectAuthor($entry['authorid'])); ?> + selectAuthor($entry['authorid'])) : htmlspecialchars($this->selectAuthor($entry['authorid']), ENT_COMPAT, LANG_CHARSET)); ?> $select_desc) { foreach ($pages as $page) { if ($this->checkPageUser($page['authorid'])) { echo ' '; + echo str_repeat('  ', $page['depth']) . (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['pagetitle']) : htmlspecialchars($page['pagetitle'], ENT_COMPAT, LANG_CHARSET)) . ''; } } } @@ -3098,7 +3098,7 @@ foreach($select AS $select_value => $select_desc) { if ($this->selected()) { $te = $this->get_static('title_element'); 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'] =''; } else { $serendipity['head_title'] = $this->get_static('headline'); @@ -3108,8 +3108,8 @@ foreach($select AS $select_value => $select_desc) { break; case 'frontend_header': - $md = htmlspecialchars($this->get_static('meta_description')); - $mk = htmlspecialchars($this->get_static('meta_keywords')); + $md = (function_exists('serendipity_specialchars') ? serendipity_specialchars($this->get_static('meta_description')) : htmlspecialchars($this->get_static('meta_description'), ENT_COMPAT, LANG_CHARSET)); + $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)) { echo ' ' . "\n"; diff --git a/serendipity_event_staticpage/serendipity_plugin_staticpage.php b/serendipity_event_staticpage/serendipity_plugin_staticpage.php index bf70dc5f..acb7f762 100644 --- a/serendipity_event_staticpage/serendipity_plugin_staticpage.php +++ b/serendipity_event_staticpage/serendipity_plugin_staticpage.php @@ -24,7 +24,7 @@ class serendipity_plugin_staticpage extends serendipity_plugin { $propbag->add('description', PLUGIN_STATICPAGELIST_NAME_DESC); $propbag->add('author', "Rob Antonishen, Falk Doering, Ian (Timbalu)"); $propbag->add('stackable', true); - $propbag->add('version', '1.19'); + $propbag->add('version', '1.19.1'); $propbag->add('configuration', array( 'title', 'limit', @@ -187,9 +187,9 @@ class serendipity_plugin_staticpage extends serendipity_plugin { $str .= 'fd_' . $fdid . '.add(' . $value['id'] . ',' . $value['parent_id'] . ',' - . '"' . htmlspecialchars((empty($value['headline']) ? $value['pagetitle'] : $value['headline'])) . '",' - . '"' . htmlspecialchars($value['permalink']) . '",' - . '"' . htmlspecialchars($value['pagetitle']) .'",' + . '"' . (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)) . '",' + . '"' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($value['permalink']) : htmlspecialchars($value['permalink'], ENT_COMPAT, LANG_CHARSET)) . '",' + . '"' . (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 */ $content[] = array( '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'], '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'], 'depth' => $page['depth']*10 ); @@ -307,13 +307,13 @@ class serendipity_plugin_staticpage extends serendipity_plugin { ? sprintf( "%s
    \n", $page['permalink'], - htmlspecialchars($page['pagetitle']), + (function_exists('serendipity_specialchars') ? serendipity_specialchars($page['pagetitle']) : htmlspecialchars($page['pagetitle'], ENT_COMPAT, LANG_CHARSET)), $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( "
    %s
    ", $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))))); } } } diff --git a/serendipity_event_suggest/serendipity_event_suggest.php b/serendipity_event_suggest/serendipity_event_suggest.php index 6aeb7220..d53138cf 100644 --- a/serendipity_event_suggest/serendipity_event_suggest.php +++ b/serendipity_event_suggest/serendipity_event_suggest.php @@ -31,7 +31,7 @@ class serendipity_event_suggest extends serendipity_event { )); $propbag->add('configuration', array('permalink', 'pagetitle', 'authorid', 'email')); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '0.11'); + $propbag->add('version', '0.11.1'); $propbag->add('groups', array('FRONTEND_FEATURES')); $propbag->add('requirements', array( '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'); if (!is_array($res) || $res['validation'] != $_REQUEST['suggestkey']) { $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 { $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']); $entry = array( @@ -272,11 +272,11 @@ class serendipity_event_suggest extends serendipity_event { 'suggest_backend' => $metaout, 'suggest_action' => $serendipity['baseURL'] . $serendipity['indexFile'], 'suggest_sname' => $serendipity['GET']['subpage'], - 'suggest_name' => htmlspecialchars($serendipity['POST']['name']), - 'suggest_url' => htmlspecialchars($serendipity['POST']['url']), - 'suggest_email' => htmlspecialchars($serendipity['POST']['email']), - 'suggest_entry_title' => htmlspecialchars($serendipity['POST']['entry_title']), - 'suggest_data' => htmlspecialchars($serendipity['POST']['comment']), + 'suggest_name' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['name']) : htmlspecialchars($serendipity['POST']['name'], ENT_COMPAT, LANG_CHARSET)), + 'suggest_url' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['url']) : htmlspecialchars($serendipity['POST']['url'], ENT_COMPAT, LANG_CHARSET)), + 'suggest_email' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['email']) : htmlspecialchars($serendipity['POST']['email'], ENT_COMPAT, LANG_CHARSET)), + 'suggest_entry_title' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['entry_title']) : htmlspecialchars($serendipity['POST']['entry_title'], ENT_COMPAT, LANG_CHARSET)), + 'suggest_data' => (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['comment']) : htmlspecialchars($serendipity['POST']['comment'], ENT_COMPAT, LANG_CHARSET)), 'comments_messagestack' => $serendipity['messagestack']['comments'], 'suggest_validation_error' => $validation_error, 'suggest_validation_success' => $validation_success, @@ -407,7 +407,7 @@ class serendipity_event_suggest extends serendipity_event {
    - +
    add('stackable', false); $propbag->add('author', 'Malte Paskuda'); $propbag->add('license', 'GPL'); - $propbag->add('version', '0.7'); + $propbag->add('version', '0.7.1'); $propbag->add('requirements', array( 'serendipity' => '0.8' )); @@ -190,13 +190,13 @@ class serendipity_event_template_editor extends serendipity_event { } if (isset($serendipity['GET']['message'])) { - echo '

    '.htmlspecialchars($serendipity['GET']['message']).'

    '; + echo '

    '.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['message']) : htmlspecialchars($serendipity['GET']['message'], ENT_COMPAT, LANG_CHARSET)).'

    '; } if (isset($serendipity['GET']['success'])) { - echo '

    '.htmlspecialchars($serendipity['GET']['success']).'

    '; + echo '

    '.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['success']) : htmlspecialchars($serendipity['GET']['success'], ENT_COMPAT, LANG_CHARSET)).'

    '; } if (isset($serendipity['GET']['error'])) { - echo '

    '.htmlspecialchars($serendipity['GET']['error']).'

    '; + echo '

    '.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['error']) : htmlspecialchars($serendipity['GET']['error'], ENT_COMPAT, LANG_CHARSET)).'

    '; } @@ -316,7 +316,7 @@ class serendipity_event_template_editor extends serendipity_event { echo '

    '.$heading.'

    - + '; @@ -471,8 +471,8 @@ class serendipity_event_template_editor extends serendipity_event { //Now that the fork is created we need to set it instantly //but only if copying succeeded if (is_dir($template_path . $fork_template)) { - $themeInfo = serendipity_fetchTemplateInfo(htmlspecialchars($fork_template)); - serendipity_set_config_var('template', 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', (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'); } } else { diff --git a/serendipity_event_textlinkads/serendipity_event_textlinkads.php b/serendipity_event_textlinkads/serendipity_event_textlinkads.php index a94445eb..384a490d 100644 --- a/serendipity_event_textlinkads/serendipity_event_textlinkads.php +++ b/serendipity_event_textlinkads/serendipity_event_textlinkads.php @@ -30,7 +30,7 @@ class serendipity_event_textlinkads extends serendipity_event 'php' => '4.1.0' )); $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('event_hooks', array( 'css' => true, @@ -211,7 +211,7 @@ class serendipity_event_textlinkads extends serendipity_event $basedir = dirname(__FILE__) . '/'; 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; } diff --git a/serendipity_event_thumbnails/serendipity_event_thumbnails.php b/serendipity_event_thumbnails/serendipity_event_thumbnails.php index bf24f6c9..c8a7efe0 100644 --- a/serendipity_event_thumbnails/serendipity_event_thumbnails.php +++ b/serendipity_event_thumbnails/serendipity_event_thumbnails.php @@ -25,7 +25,7 @@ class serendipity_event_thumbnails extends serendipity_event { $propbag->add('configuration', array('number')); $propbag->add('stackable', false); $propbag->add('author', 'Cameron MacFarland'); - $propbag->add('version', '1.4'); + $propbag->add('version', '1.4.1'); $propbag->add('requirements', array( 'serendipity' => '0.7', 'smarty' => '2.6.7', @@ -119,7 +119,7 @@ class serendipity_event_thumbnails extends serendipity_event { $thumbsize = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename); } - echo ''; + echo ''; if (isset($photo)) { echo ' true )); $propbag->add('author', 'Steven Tonnesen'); - $propbag->add('version', '1.24'); + $propbag->add('version', '1.24.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -1302,9 +1302,9 @@ class serendipity_event_todolist extends serendipity_event { } if ($entry['id'] == $default) { - $entrytext.= '\n"; + $entrytext.= '\n"; } else { - $entrytext .= '\n"; + $entrytext .= '\n"; } } } @@ -1884,7 +1884,7 @@ class serendipity_event_todolist extends serendipity_event {     		diff --git a/serendipity_event_trackback/serendipity_event_trackback.php b/serendipity_event_trackback/serendipity_event_trackback.php index a61b976b..45e80f1f 100644 --- a/serendipity_event_trackback/serendipity_event_trackback.php +++ b/serendipity_event_trackback/serendipity_event_trackback.php @@ -26,7 +26,7 @@ class serendipity_event_trackback extends serendipity_event $propbag->add('description', PLUGIN_EVENT_MTRACKBACK_TITLEDESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Malte Paskuda'); - $propbag->add('version', '1.16'); + $propbag->add('version', '1.16.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', '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'] ."'"); if (is_array($urls)) { 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) { $additional_url = trim($additional_url); 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)); } } } diff --git a/serendipity_event_trackexits/serendipity_event_trackexits.php b/serendipity_event_trackexits/serendipity_event_trackexits.php index 530a2e4d..35c7b2e1 100644 --- a/serendipity_event_trackexits/serendipity_event_trackexits.php +++ b/serendipity_event_trackexits/serendipity_event_trackexits.php @@ -15,7 +15,7 @@ class serendipity_event_trackexits extends serendipity_event $propbag->add('description', PLUGIN_EVENT_TRACKBACK_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Serendipity Team'); - $propbag->add('version', '1.9'); + $propbag->add('version', '1.9.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -208,8 +208,8 @@ class serendipity_event_trackexits extends serendipity_event $buffer[1], 'http://bmi.pifo.biz/?' . $url, - (!$is_title ? htmlspecialchars($url) : ''), - (!$is_over ? htmlspecialchars($url) : ''), + (!$is_title ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''), + (!$is_over ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''), $buffer[6]); } @@ -221,8 +221,8 @@ class serendipity_event_trackexits extends serendipity_event '_id', $this->links[$url], ($entry_id != 0) ? '&entry_id=' . $entry_id : '', - (!$is_title ? htmlspecialchars($url) : ''), - (!$is_over ? htmlspecialchars($url) : ''), + (!$is_title ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''), + (!$is_over ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''), $buffer[6] ); } else { @@ -233,8 +233,8 @@ class serendipity_event_trackexits extends serendipity_event '', base64_encode($url), ($entry_id != 0) ? '&entry_id=' . $entry_id : '', - (!$is_title ? htmlspecialchars($url) : ''), - (!$is_over ? htmlspecialchars($url) : ''), + (!$is_title ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''), + (!$is_over ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($url) : htmlspecialchars($url, ENT_COMPAT, LANG_CHARSET)) : ''), $buffer[6] ); } diff --git a/serendipity_event_typesetbuttons/serendipity_event_typesetbuttons.php b/serendipity_event_typesetbuttons/serendipity_event_typesetbuttons.php index 6b3d674e..5564af03 100644 --- a/serendipity_event_typesetbuttons/serendipity_event_typesetbuttons.php +++ b/serendipity_event_typesetbuttons/serendipity_event_typesetbuttons.php @@ -36,7 +36,7 @@ class serendipity_event_typesetbuttons extends serendipity_event $propbag->add('description', PLUGIN_EVENT_TYPESETBUTTONS_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Matthew Groeninger, Malte Diers, Matthias Gutjahr'); - $propbag->add('version', '0.22'); + $propbag->add('version', '0.22.1'); $propbag->add('requirements', array( 'serendipity' => '1.7', 'smarty' => '2.6.7', @@ -454,7 +454,7 @@ class serendipity_event_typesetbuttons extends serendipity_event private function getCustomButton($txtarea, $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_open = str_replace(array('"', "'"), array('"', "\\'"), $buttons[1]); $b_close = str_replace(array('"', "'"), array('"', "\\'"), $buttons[2]); diff --git a/serendipity_event_unstrip_tags/serendipity_event_unstrip_tags.php b/serendipity_event_unstrip_tags/serendipity_event_unstrip_tags.php index 09bb15a2..b509c844 100644 --- a/serendipity_event_unstrip_tags/serendipity_event_unstrip_tags.php +++ b/serendipity_event_unstrip_tags/serendipity_event_unstrip_tags.php @@ -24,7 +24,7 @@ class serendipity_event_unstrip_tags extends serendipity_event $propbag->add('description', PLUGIN_EVENT_UNSTRIP_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '1.03'); + $propbag->add('version', '1.03.1'); $propbag->add('requirements', array( 'serendipity' => '0.7', 'smarty' => '2.6.7', @@ -47,7 +47,7 @@ class serendipity_event_unstrip_tags extends serendipity_event case 'frontend_display': 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; break; diff --git a/serendipity_event_userprofiles/serendipity_event_userprofiles.php b/serendipity_event_userprofiles/serendipity_event_userprofiles.php index 9b86b38f..224061b9 100755 --- a/serendipity_event_userprofiles/serendipity_event_userprofiles.php +++ b/serendipity_event_userprofiles/serendipity_event_userprofiles.php @@ -96,7 +96,7 @@ class serendipity_event_userprofiles extends serendipity_event { 'genpage' => true )); $propbag->add('author', 'Garvin Hicking, Falk Doering'); - $propbag->add('version', '0.28'); + $propbag->add('version', '0.28.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -223,11 +223,11 @@ class serendipity_event_userprofiles extends serendipity_event { echo ''; echo ''; echo '
    '; - echo '' . htmlspecialchars(PLUGIN_EVENT_USERPROFILES_SELECT) . '

    '; + echo '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars(PLUGIN_EVENT_USERPROFILES_SELECT) : htmlspecialchars(PLUGIN_EVENT_USERPROFILES_SELECT, ENT_COMPAT, LANG_CHARSET)) . '

    '; echo USER . ' '; echo ' '; @@ -350,7 +350,7 @@ class serendipity_event_userprofiles extends serendipity_event { echo '
    		'; switch($info['type']) { case 'html': - echo '\n"; + echo '\n"; break; case 'boolean': @@ -370,7 +370,7 @@ class serendipity_event_userprofiles extends serendipity_event { case 'string': default: - echo ''; + echo ''; } echo '
    "; - echo htmlspecialchars($row['villan']).""; + echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($row['villan']) : htmlspecialchars($row['villan'], ENT_COMPAT, LANG_CHARSET)).""; if ($row['ethics'] == 3) { ?> diff --git a/serendipity_plugin_adduser/common.inc.php b/serendipity_plugin_adduser/common.inc.php index 10d612f3..484d5c66 100644 --- a/serendipity_plugin_adduser/common.inc.php +++ b/serendipity_plugin_adduser/common.inc.php @@ -66,7 +66,7 @@ class serendipity_common_adduser { } $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; return true; @@ -92,7 +92,7 @@ class serendipity_common_adduser { if (is_array($author)) { $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'])) { - printf(PLUGIN_ADDUSER_EXISTS . '
    ', htmlspecialchars($author['username'])); + printf(PLUGIN_ADDUSER_EXISTS . '
    ', (function_exists('serendipity_specialchars') ? serendipity_specialchars($author['username']) : htmlspecialchars($author['username'], ENT_COMPAT, LANG_CHARSET))); 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); if (is_array($user) && !empty($user['authorid'])) { - printf(PLUGIN_ADDUSER_EXISTS . '
    ', htmlspecialchars($username)); + printf(PLUGIN_ADDUSER_EXISTS . '
    ', (function_exists('serendipity_specialchars') ? serendipity_specialchars($username) : htmlspecialchars($username, ENT_COMPAT, LANG_CHARSET))); return false; } diff --git a/serendipity_plugin_adduser/serendipity_event_adduser.php b/serendipity_plugin_adduser/serendipity_event_adduser.php index b41a5867..7f0c8fdc 100644 --- a/serendipity_plugin_adduser/serendipity_event_adduser.php +++ b/serendipity_plugin_adduser/serendipity_event_adduser.php @@ -12,7 +12,7 @@ class serendipity_event_adduser extends serendipity_event $propbag->add('description', PLUGIN_ADDUSER_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '2.37'); + $propbag->add('version', '2.37.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', diff --git a/serendipity_plugin_adduser/serendipity_plugin_adduser.php b/serendipity_plugin_adduser/serendipity_plugin_adduser.php index dec26f03..2ffc3c24 100644 --- a/serendipity_plugin_adduser/serendipity_plugin_adduser.php +++ b/serendipity_plugin_adduser/serendipity_plugin_adduser.php @@ -12,7 +12,7 @@ class serendipity_plugin_adduser extends serendipity_plugin { $propbag->add('description', PLUGIN_ADDUSER_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '2.34'); + $propbag->add('version', '2.34.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -158,7 +158,7 @@ class serendipity_plugin_adduser extends serendipity_plugin { $html .= ' ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($option['title']) : htmlspecialchars($option['title'], ENT_COMPAT, LANG_CHARSET)) . '
    '; } } echo ''; @@ -80,7 +80,7 @@ class serendipity_common_pollbox { asort($sorted); foreach($sorted AS $title => $votes) { - echo htmlspecialchars($title) . '
    '; + echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($title) : htmlspecialchars($title, ENT_COMPAT, LANG_CHARSET)) . '
    '; if ($this->poll['votes'] > 0) { $total = ceil(($votes / $this->poll['votes']) * 100); } else { diff --git a/serendipity_plugin_pollbox/serendipity_event_pollbox.php b/serendipity_plugin_pollbox/serendipity_event_pollbox.php index 45bd77f6..72acc841 100644 --- a/serendipity_plugin_pollbox/serendipity_event_pollbox.php +++ b/serendipity_plugin_pollbox/serendipity_event_pollbox.php @@ -20,7 +20,7 @@ class serendipity_event_pollbox extends serendipity_event { $propbag->add('configuration', array('permalink', "articleformat", "pagetitle", "articleformattitle")); $propbag->add('author', 'Garvin Hicking, Matthias Mees'); $propbag->add('groups', array('STATISTICS')); - $propbag->add('version', '2.14'); + $propbag->add('version', '2.14.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -145,7 +145,7 @@ class serendipity_event_pollbox extends serendipity_event { $polls =& $this->fetchPolls(); if (is_array($polls)) { foreach($polls AS $poll) { - echo '' . htmlspecialchars($poll['title']) . ', ' . serendipity_strftime(DATE_FORMAT_ENTRY, $poll['timestamp']) . '
    '; + echo '' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($poll['title']) : htmlspecialchars($poll['title'], ENT_COMPAT, LANG_CHARSET)) . ', ' . serendipity_strftime(DATE_FORMAT_ENTRY, $poll['timestamp']) . '
    '; } } echo ''; @@ -303,7 +303,7 @@ class serendipity_event_pollbox extends serendipity_event { if (is_array($polls)) { foreach($polls AS $poll) { echo ' '; + 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']) . ')'; } } if ($serendipity['version'][0] == '1') { @@ -336,11 +336,11 @@ class serendipity_event_pollbox extends serendipity_event { if ($serendipity['version'][0] == '1') { echo '

    '; - echo TITLE . ' '; + echo TITLE . ' '; } else { echo '
    '; echo ''; - echo ''; + echo ''; echo '
    '; } @@ -353,7 +353,7 @@ class serendipity_event_pollbox extends serendipity_event { foreach((array)$this->poll['options'] AS $optid => $option) { echo '
    ' . (int)$option['votes'] . ' ' . PLUGIN_POLL_VOTES . '