* Implemented suggestion of removing boilerplate code in plugin API:

Change hack protection, introduce unified language loading, see
      http://board.s9y.org/viewtopic.php?f=11&t=16921
      Thanks to mt2!

docs/NEWS

@@ -3,6 +3,11 @@
 Version 1.6 ()
 ------------------------------------------------------------------------
 
+    * Implemented suggestion of removing boilerplate code in plugin API:
+      Change hack protection, introduce unified language loading, see
+      http://board.s9y.org/viewtopic.php?f=11&t=16921
+      Thanks to mt2!
+
     * Fix PHP 5.3.2 parse error in a file, thanks to fyremoon
     
     * Include license output in plugin listing (onli)

include/plugin_api.inc.php

@@ -1099,6 +1099,24 @@ class serendipity_plugin_api
 
         return $instance;
     }
+
+    /**
+     * Probe for a language include with constants. Still include defines later on, if some constants were missing
+     *
+     * @access public
+     * @param current plugin's path
+     * @return  object      Returns the plugin object or false, if failure
+     */
+    function load_language($path) {
+        global $serendipity;
+
+        $probelang = $path . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
+        if (file_exists($probelang)) {
+            include $probelang;
+        }
+        
+        include $path . '/lang_en.inc.php';
+    }
 }
 
 /** 

plugins/serendipity_event_bbcode/serendipity_event_bbcode.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_bbcode extends serendipity_event
 {

plugins/serendipity_event_browsercompatibility/serendipity_event_browsercompatibility.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_browsercompatibility extends serendipity_event
 {

plugins/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_contentrewrite extends serendipity_event
 {

plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_creativecommons extends serendipity_event {
     var $title = PLUGIN_CREATIVECOMMONS_NAME;

plugins/serendipity_event_emoticate/serendipity_event_emoticate.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-if (IN_serendipity !== true) {
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-    die ("Don't hack!");
-}
-
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_emoticate extends serendipity_event
 {

plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_entryproperties extends serendipity_event
 {

plugins/serendipity_event_karma/serendipity_event_karma.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 @define('PLUGIN_KARMA_DB_VERSION', '2.0');
 

plugins/serendipity_event_livesearch/serendipity_event_livesearch.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-if (IN_serendipity !== true) {
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-    die ("Don't hack!");
-}
-
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_livesearch extends serendipity_event
 {

plugins/serendipity_event_mailer/serendipity_event_mailer.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-if (IN_serendipity !== true) {
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-    die ("Don't hack!");
-}
-
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_mailer extends serendipity_event
 {

plugins/serendipity_event_nl2br/serendipity_event_nl2br.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-if (IN_serendipity !== true) {
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-    die ("Don't hack!");
-}
-
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_nl2br extends serendipity_event
 {

plugins/serendipity_event_s9ymarkup/serendipity_event_s9ymarkup.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-if (IN_serendipity !== true) {
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-    die ("Don't hack!");
-}
-
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_s9ymarkup extends serendipity_event
 {

plugins/serendipity_event_searchhighlight/serendipity_event_searchhighlight.php

@@ -4,18 +4,7 @@
 /*  Authored by Tom Sommer, 2004  */
 /**********************************/
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_searchhighlight extends serendipity_event
 {

plugins/serendipity_event_spamblock/serendipity_event_spamblock.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 /* BC - TODO: Remove for 0.8 final */
 if (!function_exists('serendipity_serverOffsetHour')) {

plugins/serendipity_event_spartacus/serendipity_event_spartacus.php

@@ -8,18 +8,7 @@
 
  ***********/
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_spartacus extends serendipity_event
 {

plugins/serendipity_event_statistics/serendipity_event_statistics.php

@@ -1,16 +1,6 @@
 <?php # $Id$
 
-if (IN_serendipity !== true) {
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
    
 class serendipity_event_statistics extends serendipity_event
 {

plugins/serendipity_event_statistics/serendipity_plugin_statistics.php

@@ -1,17 +1,6 @@
 <?php # $Id: serendipity_plugin_comments.php 691 2005-11-13 06:58:40Z elf2000 $
 
-if (IN_serendipity !== true) {
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-    die ("Don't hack!");
-}
-
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_plugin_statistics extends serendipity_plugin
 {

plugins/serendipity_event_templatechooser/serendipity_event_templatechooser.php

@@ -1,18 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
-
 
 class serendipity_event_templatechooser extends serendipity_event
 {

plugins/serendipity_event_textile/serendipity_event_textile.php

@@ -1,18 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_textile extends serendipity_event
 {

plugins/serendipity_event_textwiki/serendipity_event_textwiki.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 // Currently only english available
 

plugins/serendipity_event_trackexits/serendipity_event_trackexits.php

@@ -1,17 +1,6 @@
 <?php # $Id$
 
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-if (IN_serendipity !== true) {
-    die ("Don't hack!");
-}
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_trackexits extends serendipity_event
 {

plugins/serendipity_event_weblogping/serendipity_event_weblogping.php

@@ -1,14 +1,7 @@
 <?php # $Id$
 
 require_once S9Y_PEAR_PATH . 'HTTP/Request.php';
-
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_event_weblogping extends serendipity_event
 {

plugins/serendipity_event_xhtmlcleanup/serendipity_event_xhtmlcleanup.php

@@ -1,12 +1,6 @@
 <?php # $Id$
 
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 if (!function_exists('html_entity_decode')) {
     function html_entity_decode($given_html, $quote_style = ENT_QUOTES) {

plugins/serendipity_plugin_comments/serendipity_plugin_comments.php

@@ -1,12 +1,6 @@
 <?php # $Id$
 
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_plugin_comments extends serendipity_plugin
 {

plugins/serendipity_plugin_creativecommons/serendipity_plugin_creativecommons.php

@@ -1,12 +1,6 @@
 <?php # $Id$
 
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_plugin_creativecommons extends serendipity_plugin {
     var $title = PLUGIN_SIDEBAR_CREATIVECOMMONS_NAME;

plugins/serendipity_plugin_entrylinks/serendipity_plugin_entrylinks.php

@@ -1,12 +1,6 @@
 <?php # $Id$
 
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_plugin_entrylinks extends serendipity_plugin
 {

plugins/serendipity_plugin_eventwrapper/serendipity_plugin_eventwrapper.php

@@ -1,12 +1,6 @@
 <?php # $Id$
 
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_plugin_eventwrapper extends serendipity_plugin
 {

plugins/serendipity_plugin_history/serendipity_plugin_history.php

@@ -1,12 +1,6 @@
 <?php # $Id$
 
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_plugin_history extends serendipity_plugin
 {

plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php

@@ -3,13 +3,7 @@
 // Contributed by Christian Machmeier <cm@redsplash.de>
 // Randomizing contributed by Christian Brabandt <cb@256bit.org>
 
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_plugin_recententries extends serendipity_plugin {
     var $title = PLUGIN_RECENTENTRIES_TITLE;

plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php

@@ -3,13 +3,7 @@
 // Contributed by Udo Gerhards <udo@babyblaue-seiten.de>
 // OPML Contributed by Richard Thomas Harrison <rich@mibnet.plus.com>
 
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class s9y_remoterss_XMLTree {
     function GetChildren($vals, &$i) {

plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php

@@ -2,13 +2,7 @@
 
 /* Contributed by Matthias Lange (http://blog.dinnri.de/ml/) */
 
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_plugin_shoutbox extends serendipity_plugin
 {

plugins/serendipity_plugin_templatedropdown/serendipity_plugin_templatedropdown.php

@@ -1,12 +1,6 @@
 <?php # $Id$
 
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
+@serendipity_plugin_api::load_language(dirname(__FILE__));
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
 
 class serendipity_plugin_templatedropdown extends serendipity_plugin {
     var $title = PLUGIN_TEMPLATEDROPDOWN_NAME;