From 8d6c82d860e7fc9bb9e16732aeb5637b95fef42a Mon Sep 17 00:00:00 2001
From: marj <marj@e107.org>
Date: Tue, 17 Nov 2009 13:48:46 +0000
Subject: [PATCH] reencode some files to UTF-8

---
 e107_plugins/featurebox/admin_config.php      | 30 ++++++++---------
 e107_plugins/featurebox/featurebox.php        | 29 ++++++++--------
 .../languages/English_admin_featurebox.php    | 30 ++++++++---------
 .../featurebox/templates/centered.php         | 29 ++++++++--------
 e107_plugins/featurebox/templates/default.php | 29 ++++++++--------
 e107_plugins/forum/e_linkgen.php              | 29 ++++++++--------
 e107_plugins/forum/forum_admin.php            | 30 ++++++++---------
 e107_plugins/forum/forum_conf.php             | 30 ++++++++---------
 e107_plugins/forum/forum_mod.php              | 30 ++++++++---------
 e107_plugins/forum/forum_stats.php            | 29 ++++++++--------
 e107_plugins/forum/forum_update_check.php     | 30 ++++++++---------
 e107_plugins/forum/index.php                  | 29 ++++++++--------
 .../English/lan_newforumposts_menu.php        | 31 ++++++++---------
 e107_plugins/forum/newforumposts_menu.php     | 30 ++++++++---------
 .../forum/newforumposts_menu_config.php       | 30 ++++++++---------
 e107_plugins/forum/search/search_advanced.php | 29 ++++++++--------
 e107_plugins/forum/search/search_parser.php   | 29 ++++++++--------
 .../forum/templates/forum_post_template.php   | 29 ++++++++--------
 .../forum/templates/forum_posted_template.php | 25 +++++++-------
 .../templates/forum_preview_template.php      | 29 ++++++++--------
 .../forum/templates/forum_template.php        | 30 ++++++++---------
 .../templates/forum_viewforum_template.php    | 30 ++++++++---------
 .../import/PHPFusion_import_class.php         | 30 ++++++++---------
 e107_plugins/import/PHPNuke_import_class.php  | 30 ++++++++---------
 e107_plugins/import/admin_import.php          | 30 ++++++++---------
 .../import/coppermine_import_class.php        | 30 ++++++++---------
 e107_plugins/import/drupal_import_class.php   | 30 ++++++++---------
 e107_plugins/import/e107_import_class.php     | 30 ++++++++---------
 .../import/ikonboard_import_class.php         | 30 ++++++++---------
 e107_plugins/import/import_classes.php        | 30 ++++++++---------
 e107_plugins/import/import_user_class.php     | 30 ++++++++---------
 e107_plugins/import/mambo_import_class.php    | 30 ++++++++---------
 e107_plugins/import/phpbb2_import_class.php   | 30 ++++++++---------
 e107_plugins/import/smf_import_class.php      | 30 ++++++++---------
 .../import/wordpress_import_class.php         | 30 ++++++++---------
 .../links_page/admin_linkspage_config.php     | 29 ++++++++--------
 e107_plugins/links_page/e_frontpage.php       | 29 ++++++++--------
 e107_plugins/links_page/e_notify.php          | 29 ++++++++--------
 e107_plugins/links_page/link_class.php        | 29 ++++++++--------
 e107_plugins/links_page/link_defines.php      | 29 ++++++++--------
 e107_plugins/links_page/links.php             | 30 ++++++++---------
 e107_plugins/links_page/links_page_sql.php    | 30 ++++++++---------
 e107_plugins/links_page/links_template.php    | 29 ++++++++--------
 .../links_page/search/search_advanced.php     | 29 ++++++++--------
 .../links_page/search/search_parser.php       | 29 ++++++++--------
 e107_plugins/linkwords/admin_config.php       | 33 ++++++++-----------
 e107_plugins/linkwords/e_help.php             | 29 ++++++++--------
 e107_plugins/log/admin_config.php             | 31 ++++++++---------
 e107_plugins/log/consolidate.php              | 29 ++++++++--------
 e107_plugins/log/e_help.php                   | 29 ++++++++--------
 e107_plugins/log/languages/English.php        | 29 ++++++++--------
 .../log/languages/English_admin_log.php       | 31 ++++++++---------
 .../log/languages/English_log_help.php        | 29 ++++++++--------
 e107_plugins/log/stats_csv.php                | 29 ++++++++--------
 e107_plugins/login_menu/languages/English.php | 29 ++++++++--------
 e107_plugins/login_menu/login_menu.php        | 29 ++++++++--------
 e107_plugins/login_menu/login_menu_class.php  | 29 ++++++++--------
 .../newforumposts_main/admin_config.php       | 30 ++++++++---------
 .../newforumposts_main/newforumposts_main.php | 30 ++++++++---------
 e107_plugins/newforumposts_main/plugin.php    | 30 ++++++++---------
 e107_plugins/news/other_news2_menu.php        | 30 ++++++++---------
 e107_plugins/news/other_news_menu.php         | 30 ++++++++---------
 e107_plugins/newsletter/admin_config.php      | 30 ++++++++---------
 e107_plugins/newsletter/languages/English.php | 29 ++++++++--------
 e107_plugins/newsletter/newsletter_menu.php   | 29 ++++++++--------
 e107_plugins/newsletter/plugin.php            | 29 ++++++++--------
 e107_plugins/online/lastseen_menu.php         | 29 ++++++++--------
 e107_plugins/pm/plugin.php                    | 29 ++++++++--------
 e107_plugins/pm/pm.php                        | 29 ++++++++--------
 e107_plugins/pm/pm_class.php                  | 29 ++++++++--------
 e107_plugins/pm/pm_conf.php                   | 30 ++++++++---------
 e107_plugins/pm/pm_func.php                   | 30 ++++++++---------
 e107_plugins/pm/pm_shortcodes.php             | 30 ++++++++---------
 e107_plugins/pm/pm_template.php               | 30 ++++++++---------
 e107_plugins/pm/pm_update.php                 | 29 ++++++++--------
 e107_plugins/pm/pm_update_check.php           | 30 ++++++++---------
 e107_plugins/pm/private_msg_menu.php          | 30 ++++++++---------
 e107_plugins/poll/oldpolls.php                | 28 ++++++++--------
 e107_plugins/poll/poll.php                    | 30 ++++++++---------
 e107_plugins/poll/poll_menu.php               | 29 ++++++++--------
 e107_plugins/poll/templates/poll_template.php | 30 ++++++++---------
 e107_plugins/rss_menu/rss.php                 | 13 ++++----
 e107_plugins/rss_menu/rss_menu.php            | 30 ++++++++---------
 e107_plugins/search_menu/search_menu.php      | 32 +++++++++---------
 e107_plugins/siteinfo/counter_menu.php        | 30 ++++++++---------
 e107_plugins/siteinfo/sitebutton_menu.php     | 31 ++++++++---------
 86 files changed, 1143 insertions(+), 1386 deletions(-)

diff --git a/e107_plugins/featurebox/admin_config.php b/e107_plugins/featurebox/admin_config.php
index ba4e61b53..891a1828a 100644
--- a/e107_plugins/featurebox/admin_config.php
+++ b/e107_plugins/featurebox/admin_config.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/featurebox/admin_config.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2008-12-11 21:13:48 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/featurebox/admin_config.php,v $
+ * $Revision: 1.7 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
+
 require_once("../../class2.php");
 if (!getperms("P") || !plugInstalled('featurebox')) 
 {
diff --git a/e107_plugins/featurebox/featurebox.php b/e107_plugins/featurebox/featurebox.php
index 46cd578b6..51cd05aa2 100644
--- a/e107_plugins/featurebox/featurebox.php
+++ b/e107_plugins/featurebox/featurebox.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/featurebox/featurebox.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2008-12-11 21:13:48 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/featurebox/featurebox.php,v $
+ * $Revision: 1.5 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 if (!plugInstalled('featurebox')) 
diff --git a/e107_plugins/featurebox/languages/English_admin_featurebox.php b/e107_plugins/featurebox/languages/English_admin_featurebox.php
index c96504b64..8376fedfa 100644
--- a/e107_plugins/featurebox/languages/English_admin_featurebox.php
+++ b/e107_plugins/featurebox/languages/English_admin_featurebox.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/featurebox/languages/English_admin_featurebox.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2008-12-10 22:41:39 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
-
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/featurebox/languages/English_admin_featurebox.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 define("FBLAN_01", "Feature Box");
 define("FBLAN_02", "This plugin allows you to display a box above your news items with features / whatever you like in it. The messages can either be revolved randomly or dynamically faded.");
diff --git a/e107_plugins/featurebox/templates/centered.php b/e107_plugins/featurebox/templates/centered.php
index 415e17936..1228cc473 100644
--- a/e107_plugins/featurebox/templates/centered.php
+++ b/e107_plugins/featurebox/templates/centered.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/featurebox/templates/centered.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:10 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/featurebox/templates/centered.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/featurebox/templates/default.php b/e107_plugins/featurebox/templates/default.php
index 32f460e61..566202db1 100644
--- a/e107_plugins/featurebox/templates/default.php
+++ b/e107_plugins/featurebox/templates/default.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/featurebox/templates/default.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:10 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/featurebox/templates/default.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/forum/e_linkgen.php b/e107_plugins/forum/e_linkgen.php
index 2b75730c3..34df86512 100644
--- a/e107_plugins/forum/e_linkgen.php
+++ b/e107_plugins/forum/e_linkgen.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/e_linkgen.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2007-11-05 20:52:29 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/e_linkgen.php,v $
+ * $Revision: 1.5 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/forum/forum_admin.php b/e107_plugins/forum/forum_admin.php
index e87e39251..ea83bef90 100644
--- a/e107_plugins/forum/forum_admin.php
+++ b/e107_plugins/forum/forum_admin.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_admin.php,v $
-|     $Revision: 1.10 $
-|     $Date: 2009-08-15 11:55:30 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_admin.php,v $
+ * $Revision: 1.11 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
+
 $eplug_admin = true;
 require_once("../../class2.php");
 include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_admin.php');
diff --git a/e107_plugins/forum/forum_conf.php b/e107_plugins/forum/forum_conf.php
index 2e089c629..03bc8dfc0 100644
--- a/e107_plugins/forum/forum_conf.php
+++ b/e107_plugins/forum/forum_conf.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-| e107 website system
-|
-| ©Steve Dunstan 2001-2002
-| http://e107.org
-| jalist@e107.org
-|
-| Released under the terms and conditions of the
-| GNU General Public License (http://gnu.org).
-|
-| $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_conf.php,v $
-| $Revision: 1.5 $
-| $Date: 2008-12-17 18:48:02 $
-| $Author: mcfly_e107 $
-+---------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_conf.php,v $
+ * $Revision: 1.6 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
+
 require_once('../../class2.php');
 require_once(e_PLUGIN.'forum/forum_class.php');
 $forum = new e107forum;
diff --git a/e107_plugins/forum/forum_mod.php b/e107_plugins/forum/forum_mod.php
index 73eb65a3c..601bfb667 100644
--- a/e107_plugins/forum/forum_mod.php
+++ b/e107_plugins/forum/forum_mod.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_mod.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2008-12-18 18:32:54 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_mod.php,v $
+ * $Revision: 1.7 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 include_lan(e_PLUGIN.'forum/languages/English/lan_forum_admin.php');
 
diff --git a/e107_plugins/forum/forum_stats.php b/e107_plugins/forum/forum_stats.php
index 32e84ce83..ecb008ce6 100644
--- a/e107_plugins/forum/forum_stats.php
+++ b/e107_plugins/forum/forum_stats.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_stats.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2009-07-30 10:08:05 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_stats.php,v $
+ * $Revision: 1.7 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 require_once('../../class2.php');
 
diff --git a/e107_plugins/forum/forum_update_check.php b/e107_plugins/forum/forum_update_check.php
index e4e116706..354d1a28c 100644
--- a/e107_plugins/forum/forum_update_check.php
+++ b/e107_plugins/forum/forum_update_check.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_update_check.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-12-18 22:03:45 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_update_check.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 $dbupdatep['forum_08'] =  LAN_UPDATE_8.' 0.7.x forums '.LAN_UPDATE_9.' 0.8 forums';
diff --git a/e107_plugins/forum/index.php b/e107_plugins/forum/index.php
index 28e7c1aef..8e29c0c9a 100644
--- a/e107_plugins/forum/index.php
+++ b/e107_plugins/forum/index.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/index.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:15 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/index.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 header("location: forum.php");
 exit;
diff --git a/e107_plugins/forum/languages/English/lan_newforumposts_menu.php b/e107_plugins/forum/languages/English/lan_newforumposts_menu.php
index 1268bbb19..b2641487a 100755
--- a/e107_plugins/forum/languages/English/lan_newforumposts_menu.php
+++ b/e107_plugins/forum/languages/English/lan_newforumposts_menu.php
@@ -1,22 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/languages/English/lan_newforumposts_menu.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2007-07-23 21:13:34 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
-	
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/languages/English/lan_newforumposts_menu.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
+
 define("NFP_1", "All latest posts are outside of your user class, unable to display.");
 define("NFP_2", "No posts yet");
 define("NFP_3", "New Forum Posts menu configuration saved");
diff --git a/e107_plugins/forum/newforumposts_menu.php b/e107_plugins/forum/newforumposts_menu.php
index c9fb7953b..139027089 100755
--- a/e107_plugins/forum/newforumposts_menu.php
+++ b/e107_plugins/forum/newforumposts_menu.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/newforumposts_menu.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2009-08-23 10:57:51 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/newforumposts_menu.php,v $
+ * $Revision: 1.9 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 $e107 = e107::getInstance();
diff --git a/e107_plugins/forum/newforumposts_menu_config.php b/e107_plugins/forum/newforumposts_menu_config.php
index a8cd29e7e..707368b59 100755
--- a/e107_plugins/forum/newforumposts_menu_config.php
+++ b/e107_plugins/forum/newforumposts_menu_config.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/newforumposts_menu_config.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2007-07-23 21:13:34 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/newforumposts_menu_config.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
+
 $eplug_admin = TRUE;
 require_once("../../class2.php");
 if (!getperms("1")) {
diff --git a/e107_plugins/forum/search/search_advanced.php b/e107_plugins/forum/search/search_advanced.php
index 6c43269a0..c2f7f0aad 100644
--- a/e107_plugins/forum/search/search_advanced.php
+++ b/e107_plugins/forum/search/search_advanced.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/search/search_advanced.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:18 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/search/search_advanced.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/forum/search/search_parser.php b/e107_plugins/forum/search/search_parser.php
index 5333305fa..66e283174 100644
--- a/e107_plugins/forum/search/search_parser.php
+++ b/e107_plugins/forum/search/search_parser.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/search/search_parser.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:18 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/search/search_parser.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/forum/templates/forum_post_template.php b/e107_plugins/forum/templates/forum_post_template.php
index 356495606..4d80d3a61 100644
--- a/e107_plugins/forum/templates/forum_post_template.php
+++ b/e107_plugins/forum/templates/forum_post_template.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_post_template.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-12-17 18:48:02 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_post_template.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); }
diff --git a/e107_plugins/forum/templates/forum_posted_template.php b/e107_plugins/forum/templates/forum_posted_template.php
index 83f47ec00..9b9055395 100644
--- a/e107_plugins/forum/templates/forum_posted_template.php
+++ b/e107_plugins/forum/templates/forum_posted_template.php
@@ -1,17 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_posted_template.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 if(!defined('USER_WIDTH')) { define('USER_WIDTH','width:95%'); }
diff --git a/e107_plugins/forum/templates/forum_preview_template.php b/e107_plugins/forum/templates/forum_preview_template.php
index d00bb171e..ca726bb86 100644
--- a/e107_plugins/forum/templates/forum_preview_template.php
+++ b/e107_plugins/forum/templates/forum_preview_template.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_preview_template.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:19 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_preview_template.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%;margin-left:auto;margin-right:auto"); }
diff --git a/e107_plugins/forum/templates/forum_template.php b/e107_plugins/forum/templates/forum_template.php
index 0abf3f172..fc4699bf7 100644
--- a/e107_plugins/forum/templates/forum_template.php
+++ b/e107_plugins/forum/templates/forum_template.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_template.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2008-08-29 19:58:47 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_template.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); }
 
diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php
index fc519c384..f2b1f8bc3 100644
--- a/e107_plugins/forum/templates/forum_viewforum_template.php
+++ b/e107_plugins/forum/templates/forum_viewforum_template.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_viewforum_template.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-07-25 07:10:28 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_viewforum_template.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); }
 
diff --git a/e107_plugins/import/PHPFusion_import_class.php b/e107_plugins/import/PHPFusion_import_class.php
index 2e644767c..1d775b555 100644
--- a/e107_plugins/import/PHPFusion_import_class.php
+++ b/e107_plugins/import/PHPFusion_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/PHPFusion_import_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-07-20 15:24:34 $
-|     $Author: e107coders $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/PHPFusion_import_class.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 // Each import file has an identifier which must be the same for:
 //		a) This file name - add '_class.php' to get the file name
diff --git a/e107_plugins/import/PHPNuke_import_class.php b/e107_plugins/import/PHPNuke_import_class.php
index 50894c6b7..4f0380d91 100644
--- a/e107_plugins/import/PHPNuke_import_class.php
+++ b/e107_plugins/import/PHPNuke_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/PHPNuke_import_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-07-20 15:24:34 $
-|     $Author: e107coders $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/PHPNuke_import_class.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 // Each import file has an identifier which must be the same for:
 //		a) This file name - add '_class.php' to get the file name
diff --git a/e107_plugins/import/admin_import.php b/e107_plugins/import/admin_import.php
index 423836e4d..295ddd975 100644
--- a/e107_plugins/import/admin_import.php
+++ b/e107_plugins/import/admin_import.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/admin_import.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2009-07-20 23:24:41 $
-|     $Author: e107coders $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/admin_import.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 /*
 Routine manages import from other databases
diff --git a/e107_plugins/import/coppermine_import_class.php b/e107_plugins/import/coppermine_import_class.php
index 07d4cc2c9..829f48ce4 100644
--- a/e107_plugins/import/coppermine_import_class.php
+++ b/e107_plugins/import/coppermine_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/coppermine_import_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-07-20 15:24:34 $
-|     $Author: e107coders $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/coppermine_import_class.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 // Each import file has an identifier which must be the same for:
 //		a) This file name - add '_class.php' to get the file name
diff --git a/e107_plugins/import/drupal_import_class.php b/e107_plugins/import/drupal_import_class.php
index a9aced992..301ee5bab 100644
--- a/e107_plugins/import/drupal_import_class.php
+++ b/e107_plugins/import/drupal_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/drupal_import_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-07-20 15:24:34 $
-|     $Author: e107coders $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/drupal_import_class.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 
 // Each import file has an identifier which must be the same for:
diff --git a/e107_plugins/import/e107_import_class.php b/e107_plugins/import/e107_import_class.php
index e69e3a6d3..1ac1e0519 100644
--- a/e107_plugins/import/e107_import_class.php
+++ b/e107_plugins/import/e107_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/e107_import_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-07-20 15:24:34 $
-|     $Author: e107coders $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/e107_import_class.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 // This must be an incredibly pointless file! But it does allow testing of the basic plugin structure.
 
diff --git a/e107_plugins/import/ikonboard_import_class.php b/e107_plugins/import/ikonboard_import_class.php
index e2f8b3db1..46bc0dc12 100644
--- a/e107_plugins/import/ikonboard_import_class.php
+++ b/e107_plugins/import/ikonboard_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/ikonboard_import_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-07-20 15:24:34 $
-|     $Author: e107coders $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/ikonboard_import_class.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 
 // Each import file has an identifier which must be the same for:
diff --git a/e107_plugins/import/import_classes.php b/e107_plugins/import/import_classes.php
index cf1a5509a..e2cabbcd4 100644
--- a/e107_plugins/import/import_classes.php
+++ b/e107_plugins/import/import_classes.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/import_classes.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2009-07-20 21:18:09 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/import_classes.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 /*
 Root classes for import and saving of data. Application-specific classes build on these
diff --git a/e107_plugins/import/import_user_class.php b/e107_plugins/import/import_user_class.php
index 2360fd767..e06fc9152 100644
--- a/e107_plugins/import/import_user_class.php
+++ b/e107_plugins/import/import_user_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/import_user_class.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-08-05 22:18:15 $
-|     $Author: e107coders $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/import_user_class.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 /*
 Class intended to simplify importing of user information from outside.
diff --git a/e107_plugins/import/mambo_import_class.php b/e107_plugins/import/mambo_import_class.php
index 8abac2f16..f325f7dfa 100644
--- a/e107_plugins/import/mambo_import_class.php
+++ b/e107_plugins/import/mambo_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/mambo_import_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-07-20 15:24:34 $
-|     $Author: e107coders $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/mambo_import_class.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 // Each import file has an identifier which must be the same for:
 //		a) This file name - add '_class.php' to get the file name
diff --git a/e107_plugins/import/phpbb2_import_class.php b/e107_plugins/import/phpbb2_import_class.php
index 1849b8207..8e8cada0b 100644
--- a/e107_plugins/import/phpbb2_import_class.php
+++ b/e107_plugins/import/phpbb2_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/phpbb2_import_class.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2009-07-20 21:18:09 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/phpbb2_import_class.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 /*
 To do:
diff --git a/e107_plugins/import/smf_import_class.php b/e107_plugins/import/smf_import_class.php
index e70f9b60f..0b420acac 100644
--- a/e107_plugins/import/smf_import_class.php
+++ b/e107_plugins/import/smf_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/smf_import_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-07-20 15:24:34 $
-|     $Author: e107coders $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/smf_import_class.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 // Each import file has an identifier which must be the same for:
 //		a) This file name - add '_class.php' to get the file name
diff --git a/e107_plugins/import/wordpress_import_class.php b/e107_plugins/import/wordpress_import_class.php
index 7a1d3139d..76edc71e7 100644
--- a/e107_plugins/import/wordpress_import_class.php
+++ b/e107_plugins/import/wordpress_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/wordpress_import_class.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-11-08 21:13:29 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/wordpress_import_class.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 // This must be an incredibly pointless file! But it does allow testing of the basic plugin structure.
 
diff --git a/e107_plugins/links_page/admin_linkspage_config.php b/e107_plugins/links_page/admin_linkspage_config.php
index a20a92eda..33db9f870 100644
--- a/e107_plugins/links_page/admin_linkspage_config.php
+++ b/e107_plugins/links_page/admin_linkspage_config.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|    e107 website system
-|
-|    ©Steve Dunstan 2001-2002
-|    http://e107.org
-|    jalist@e107.org
-|
-|    Released   under the   terms and   conditions of the
-|    GNU    General Public  License (http://gnu.org).
-|
-|    $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/admin_linkspage_config.php,v $
-|    $Revision: 1.4 $
-|    $Date: 2009-08-15 11:55:30 $
-|    $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/admin_linkspage_config.php,v $
+ * $Revision: 1.5 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
 
 require_once("../../class2.php");
 if (!getperms("P") || !plugInstalled('links_page')) 
diff --git a/e107_plugins/links_page/e_frontpage.php b/e107_plugins/links_page/e_frontpage.php
index 3c666e29e..1d98b3889 100644
--- a/e107_plugins/links_page/e_frontpage.php
+++ b/e107_plugins/links_page/e_frontpage.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/e_frontpage.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:20 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/e_frontpage.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/links_page/e_notify.php b/e107_plugins/links_page/e_notify.php
index 692b8122a..bca905e19 100644
--- a/e107_plugins/links_page/e_notify.php
+++ b/e107_plugins/links_page/e_notify.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/e_notify.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-08-15 11:55:30 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/e_notify.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/links_page/link_class.php b/e107_plugins/links_page/link_class.php
index 6fb453dc3..f15669831 100644
--- a/e107_plugins/links_page/link_class.php
+++ b/e107_plugins/links_page/link_class.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|    e107 website system
-|
-|    ©Steve Dunstan 2001-2002
-|    http://e107.org
-|    jalist@e107.org
-|
-|    Released   under the   terms and   conditions of the
-|    GNU    General Public  License (http://gnu.org).
-|
-|    $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_class.php,v $
-|    $Revision: 1.13 $
-|    $Date: 2009-07-25 07:54:35 $
-|    $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_class.php,v $
+ * $Revision: 1.14 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/links_page/link_defines.php b/e107_plugins/links_page/link_defines.php
index 85be3284c..a0deda6ea 100644
--- a/e107_plugins/links_page/link_defines.php
+++ b/e107_plugins/links_page/link_defines.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|    e107 website system
-|
-|    ©Steve Dunstan 2001-2002
-|    http://e107.org
-|    jalist@e107.org
-|
-|    Released   under the   terms and   conditions of the
-|    GNU    General Public  License (http://gnu.org).
-|
-|    $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_defines.php,v $
-|    $Revision: 1.5 $
-|    $Date: 2009-07-25 07:54:35 $
-|    $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_defines.php,v $
+ * $Revision: 1.6 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/links_page/links.php b/e107_plugins/links_page/links.php
index 42aef1e5f..133349633 100644
--- a/e107_plugins/links_page/links.php
+++ b/e107_plugins/links_page/links.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/links.php,v $
-|     $Revision: 1.14 $
-|     $Date: 2009-08-15 11:55:30 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/links.php,v $
+ * $Revision: 1.15 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
+
 require_once('../../class2.php');
 if (!plugInstalled('links_page')) 
 {
diff --git a/e107_plugins/links_page/links_page_sql.php b/e107_plugins/links_page/links_page_sql.php
index 508491e47..1b15b9279 100644
--- a/e107_plugins/links_page/links_page_sql.php
+++ b/e107_plugins/links_page/links_page_sql.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/links_page_sql.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2009-09-19 19:05:16 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/links_page_sql.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
+
 header("location:../index.php");
 exit;
 ?>
diff --git a/e107_plugins/links_page/links_template.php b/e107_plugins/links_page/links_template.php
index 3794da307..c71a876e9 100644
--- a/e107_plugins/links_page/links_template.php
+++ b/e107_plugins/links_page/links_template.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/links_template.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-10-07 19:25:58 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/links_template.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/links_page/search/search_advanced.php b/e107_plugins/links_page/search/search_advanced.php
index b3d7ed7ea..416e60526 100644
--- a/e107_plugins/links_page/search/search_advanced.php
+++ b/e107_plugins/links_page/search/search_advanced.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/search/search_advanced.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:24 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/search/search_advanced.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/links_page/search/search_parser.php b/e107_plugins/links_page/search/search_parser.php
index fa691c170..435acd2a6 100644
--- a/e107_plugins/links_page/search/search_parser.php
+++ b/e107_plugins/links_page/search/search_parser.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/search/search_parser.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:24 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/search/search_parser.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/linkwords/admin_config.php b/e107_plugins/linkwords/admin_config.php
index 942cf71d9..7708523e3 100644
--- a/e107_plugins/linkwords/admin_config.php
+++ b/e107_plugins/linkwords/admin_config.php
@@ -1,24 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/admin_config.php,v $
-|     $Revision: 1.9 $
-|
-| ***** START OF VERSION WHICH ALLOWS TOOLTIPS (also order of forms changed )
-|
-|     $Date: 2009-08-15 11:55:30 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * ***** START OF VERSION WHICH ALLOWS TOOLTIPS (also order of forms changed )
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/admin_config.php,v $
+ * $Revision: 1.10 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 require_once("../../class2.php");
 if (!getperms("P") || !plugInstalled('linkwords')) 
 {
diff --git a/e107_plugins/linkwords/e_help.php b/e107_plugins/linkwords/e_help.php
index 329dcb802..8b12ba95d 100644
--- a/e107_plugins/linkwords/e_help.php
+++ b/e107_plugins/linkwords/e_help.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/e_help.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2008-12-07 21:55:01 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/e_help.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/log/admin_config.php b/e107_plugins/log/admin_config.php
index 15d61b05f..1df67ccab 100644
--- a/e107_plugins/log/admin_config.php
+++ b/e107_plugins/log/admin_config.php
@@ -1,23 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/log/admin_config.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2008-12-11 21:13:48 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-
-*/
-
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/log/admin_config.php,v $
+ * $Revision: 1.8 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 require_once("../../class2.php");
 if (!getperms("P") || !plugInstalled('log')) 
diff --git a/e107_plugins/log/consolidate.php b/e107_plugins/log/consolidate.php
index 24f218d72..64937d30c 100644
--- a/e107_plugins/log/consolidate.php
+++ b/e107_plugins/log/consolidate.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/log/consolidate.php,v $
-|     $Revision: 1.10 $
-|     $Date: 2007-11-01 20:28:21 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/log/consolidate.php,v $
+ * $Revision: 1.11 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 /* first thing to do is check if the log file is out of date ... */
 
diff --git a/e107_plugins/log/e_help.php b/e107_plugins/log/e_help.php
index f376953b7..6e5a45fd7 100644
--- a/e107_plugins/log/e_help.php
+++ b/e107_plugins/log/e_help.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/log/e_help.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2008-12-07 21:41:04 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/log/e_help.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/log/languages/English.php b/e107_plugins/log/languages/English.php
index 35bf3c9eb..7d203cfc2 100644
--- a/e107_plugins/log/languages/English.php
+++ b/e107_plugins/log/languages/English.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/log/languages/English.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2008-02-18 20:52:36 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/log/languages/English.php,v $
+ * $Revision: 1.6 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 define("PAGE_NAME", "Statistics");
 
diff --git a/e107_plugins/log/languages/English_admin_log.php b/e107_plugins/log/languages/English_admin_log.php
index 12a1fbe22..a31e210b5 100644
--- a/e107_plugins/log/languages/English_admin_log.php
+++ b/e107_plugins/log/languages/English_admin_log.php
@@ -1,22 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/log/languages/English_admin_log.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2008-12-07 21:41:04 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
-	
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/log/languages/English_admin_log.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
+
 define("ADSTAT_ON", "On");
 define("ADSTAT_OFF", "Off");
 define("ADSTAT_L1", "This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered.");
diff --git a/e107_plugins/log/languages/English_log_help.php b/e107_plugins/log/languages/English_log_help.php
index d572a0717..c7f75e7cb 100644
--- a/e107_plugins/log/languages/English_log_help.php
+++ b/e107_plugins/log/languages/English_log_help.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/log/languages/English_log_help.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2008-12-07 21:41:04 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/log/languages/English_log_help.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 define('LAN_STAT_HELP_01','Statistics Logging');
 define('LAN_STAT_HELP_02','This option deletes historical data from the database. It does not affect the \'all-time\' figures.<br /><br />
diff --git a/e107_plugins/log/stats_csv.php b/e107_plugins/log/stats_csv.php
index 4d6b9d79a..f63ddecf7 100644
--- a/e107_plugins/log/stats_csv.php
+++ b/e107_plugins/log/stats_csv.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/log/stats_csv.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2007-11-04 09:24:59 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/log/stats_csv.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 //define('CSV_DEBUG', TRUE);
 
diff --git a/e107_plugins/login_menu/languages/English.php b/e107_plugins/login_menu/languages/English.php
index a5f67a484..37bd71661 100644
--- a/e107_plugins/login_menu/languages/English.php
+++ b/e107_plugins/login_menu/languages/English.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/languages/English.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2009-03-06 20:09:08 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/languages/English.php,v $
+ * $Revision: 1.6 $
+ * $Date: 2009-11-17 13:48:44 $
+ * $Author: marj_nl_fr $
+ */
 
 define("LOGIN_MENU_L1", "Username: ");
 define("LOGIN_MENU_L2", "Password: ");
diff --git a/e107_plugins/login_menu/login_menu.php b/e107_plugins/login_menu/login_menu.php
index 89a6f795e..e571fd46b 100644
--- a/e107_plugins/login_menu/login_menu.php
+++ b/e107_plugins/login_menu/login_menu.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu.php,v $
-|     $Revision: 1.12 $
-|     $Date: 2009-09-10 19:15:43 $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu.php,v $
+ * $Revision: 1.13 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/login_menu/login_menu_class.php b/e107_plugins/login_menu/login_menu_class.php
index 02c6da7f3..8b9aab7e8 100644
--- a/e107_plugins/login_menu/login_menu_class.php
+++ b/e107_plugins/login_menu/login_menu_class.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu_class.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2008-08-25 11:11:10 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu_class.php,v $
+ * $Revision: 1.6 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/newforumposts_main/admin_config.php b/e107_plugins/newforumposts_main/admin_config.php
index 8f65faaa9..0dd30338d 100644
--- a/e107_plugins/newforumposts_main/admin_config.php
+++ b/e107_plugins/newforumposts_main/admin_config.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/newforumposts_main/admin_config.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:30 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/newforumposts_main/admin_config.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
+
 require_once("../../class2.php");
 require_once(e_HANDLER."userclass_class.php");
 	
diff --git a/e107_plugins/newforumposts_main/newforumposts_main.php b/e107_plugins/newforumposts_main/newforumposts_main.php
index 9870bf5ab..1ca68c2d7 100644
--- a/e107_plugins/newforumposts_main/newforumposts_main.php
+++ b/e107_plugins/newforumposts_main/newforumposts_main.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/newforumposts_main/newforumposts_main.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-07-28 20:16:13 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/newforumposts_main/newforumposts_main.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 require_once(e_HANDLER."userclass_class.php");
diff --git a/e107_plugins/newforumposts_main/plugin.php b/e107_plugins/newforumposts_main/plugin.php
index f8b382340..f11c1df31 100644
--- a/e107_plugins/newforumposts_main/plugin.php
+++ b/e107_plugins/newforumposts_main/plugin.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/newforumposts_main/plugin.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2009-07-14 03:50:56 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/newforumposts_main/plugin.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 // Plugin info -------------------------------------------------------------------------------------------------------
diff --git a/e107_plugins/news/other_news2_menu.php b/e107_plugins/news/other_news2_menu.php
index 590442231..e918a028c 100644
--- a/e107_plugins/news/other_news2_menu.php
+++ b/e107_plugins/news/other_news2_menu.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/news/other_news2_menu.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-09-19 21:48:52 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/news/other_news2_menu.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 global $e107cache;
diff --git a/e107_plugins/news/other_news_menu.php b/e107_plugins/news/other_news_menu.php
index 82d4ca16c..48c6942f6 100644
--- a/e107_plugins/news/other_news_menu.php
+++ b/e107_plugins/news/other_news_menu.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/news/other_news_menu.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-09-19 21:48:52 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/news/other_news_menu.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 global $e107cache;
diff --git a/e107_plugins/newsletter/admin_config.php b/e107_plugins/newsletter/admin_config.php
index 949cdaaa4..d38b1ee8b 100644
--- a/e107_plugins/newsletter/admin_config.php
+++ b/e107_plugins/newsletter/admin_config.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/admin_config.php,v $
-|     $Revision: 1.9 $
-|     $Date: 2009-07-19 11:44:28 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/admin_config.php,v $
+ * $Revision: 1.10 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 require_once('../../class2.php');
 if (!getperms("P")) 
 {
diff --git a/e107_plugins/newsletter/languages/English.php b/e107_plugins/newsletter/languages/English.php
index dc34a6236..487fa19d9 100644
--- a/e107_plugins/newsletter/languages/English.php
+++ b/e107_plugins/newsletter/languages/English.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/languages/English.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2008-09-22 20:38:26 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/languages/English.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 define("NLLAN_MENU_CAPTION", "Newsletter");
 
diff --git a/e107_plugins/newsletter/newsletter_menu.php b/e107_plugins/newsletter/newsletter_menu.php
index 95ccce00b..8c8b10230 100644
--- a/e107_plugins/newsletter/newsletter_menu.php
+++ b/e107_plugins/newsletter/newsletter_menu.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/newsletter_menu.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:32 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/newsletter_menu.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/newsletter/plugin.php b/e107_plugins/newsletter/plugin.php
index 2b137eaa9..1a6f3bfa6 100644
--- a/e107_plugins/newsletter/plugin.php
+++ b/e107_plugins/newsletter/plugin.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/plugin.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2009-08-15 11:55:30 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/plugin.php,v $
+ * $Revision: 1.5 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/online/lastseen_menu.php b/e107_plugins/online/lastseen_menu.php
index 78daf2a0f..e44132f62 100644
--- a/e107_plugins/online/lastseen_menu.php
+++ b/e107_plugins/online/lastseen_menu.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/online/lastseen_menu.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2007-05-01 19:50:56 $
-|     $Author: lisa_ $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/online/lastseen_menu.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/pm/plugin.php b/e107_plugins/pm/plugin.php
index affcfd2fb..1cb68334a 100755
--- a/e107_plugins/pm/plugin.php
+++ b/e107_plugins/pm/plugin.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/plugin.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-02-16 21:46:38 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/plugin.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/pm/pm.php b/e107_plugins/pm/pm.php
index 365f61506..4b8d30fc9 100755
--- a/e107_plugins/pm/pm.php
+++ b/e107_plugins/pm/pm.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm.php,v $
-|     $Revision: 1.10 $
-|     $Date: 2009-07-21 14:44:11 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm.php,v $
+ * $Revision: 1.11 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 $retrieve_prefs[] = 'pm_prefs';
 require_once("../../class2.php");
diff --git a/e107_plugins/pm/pm_class.php b/e107_plugins/pm/pm_class.php
index 7140c4ccb..2214591c4 100755
--- a/e107_plugins/pm/pm_class.php
+++ b/e107_plugins/pm/pm_class.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_class.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2008-11-29 13:39:09 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_class.php,v $
+ * $Revision: 1.7 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/pm/pm_conf.php b/e107_plugins/pm/pm_conf.php
index 2813f11de..d0411a987 100755
--- a/e107_plugins/pm/pm_conf.php
+++ b/e107_plugins/pm/pm_conf.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_conf.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2009-07-16 08:22:57 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_conf.php,v $
+ * $Revision: 1.5 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 $retrieve_prefs[] = 'pm_prefs';
 $eplug_admin = TRUE;
 require_once("../../class2.php");
diff --git a/e107_plugins/pm/pm_func.php b/e107_plugins/pm/pm_func.php
index 368a6a26b..7bd7f2ab7 100755
--- a/e107_plugins/pm/pm_func.php
+++ b/e107_plugins/pm/pm_func.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_func.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2008-10-21 19:06:06 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_func.php,v $
+ * $Revision: 1.6 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 function pm_getInfo($which = "inbox")
diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index 97aed0d0f..3e7a81791 100755
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_shortcodes.php,v $
-|     $Revision: 1.11 $
-|     $Date: 2009-07-25 07:54:36 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_shortcodes.php,v $
+ * $Revision: 1.12 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 include_once(e_HANDLER.'shortcode_handler.php');
 include_once(e_PLUGIN.'pm/pm_func.php');
diff --git a/e107_plugins/pm/pm_template.php b/e107_plugins/pm/pm_template.php
index c59293448..eba62d343 100755
--- a/e107_plugins/pm/pm_template.php
+++ b/e107_plugins/pm/pm_template.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_template.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-07-25 07:54:36 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_template.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 global $sc_style;
diff --git a/e107_plugins/pm/pm_update.php b/e107_plugins/pm/pm_update.php
index 229c41253..0798fd6d7 100644
--- a/e107_plugins/pm/pm_update.php
+++ b/e107_plugins/pm/pm_update.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_update.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-08-15 11:55:30 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_update.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/pm/pm_update_check.php b/e107_plugins/pm/pm_update_check.php
index 70b8eb183..3176a2ce0 100644
--- a/e107_plugins/pm/pm_update_check.php
+++ b/e107_plugins/pm/pm_update_check.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_update_check.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:39 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_update_check.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 include_lan(e_PLUGIN."pm/languages/admin/".e_LANGUAGE.".php");
diff --git a/e107_plugins/pm/private_msg_menu.php b/e107_plugins/pm/private_msg_menu.php
index f79b20243..522e40205 100755
--- a/e107_plugins/pm/private_msg_menu.php
+++ b/e107_plugins/pm/private_msg_menu.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/private_msg_menu.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2009-07-25 07:54:36 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/private_msg_menu.php,v $
+ * $Revision: 1.8 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 global $sysprefs, $pref, $pm_prefs;
 if(!isset($pm_prefs['perpage']))
diff --git a/e107_plugins/poll/oldpolls.php b/e107_plugins/poll/oldpolls.php
index cc3269faf..fdf7fb779 100644
--- a/e107_plugins/poll/oldpolls.php
+++ b/e107_plugins/poll/oldpolls.php
@@ -1,21 +1,19 @@
 <?php
 /*
- + ----------------------------------------------------------------------------+
- |     e107 website system
- |
- |     ©Steve Dunstan 2001-2002
- |     http://e107.org
- |     jalist@e107.org
- |
- |     Released under the terms and conditions of the
- |     GNU General Public License (http://gnu.org).
- |
- |     $Source: /cvs_backup/e107_0.8/e107_plugins/poll/oldpolls.php,v $
- |     $Revision: 1.6 $
- |     $Date: 2009-08-20 10:16:04 $
- |     $Author: marj_nl_fr $
- +----------------------------------------------------------------------------+
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/poll/oldpolls.php,v $
+ * $Revision: 1.7 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
  */
+
 require_once("../../class2.php");
 if (!plugInstalled('poll'))
 {
diff --git a/e107_plugins/poll/poll.php b/e107_plugins/poll/poll.php
index 24b9315e5..d32f6bac0 100644
--- a/e107_plugins/poll/poll.php
+++ b/e107_plugins/poll/poll.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2008-12-11 21:13:48 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
+
 require_once("../../class2.php");
 if (!plugInstalled('poll')) 
 {
diff --git a/e107_plugins/poll/poll_menu.php b/e107_plugins/poll/poll_menu.php
index a19f0a5c0..de27f5d1d 100644
--- a/e107_plugins/poll/poll_menu.php
+++ b/e107_plugins/poll/poll_menu.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll_menu.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2009-08-15 11:55:30 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll_menu.php,v $
+ * $Revision: 1.5 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/poll/templates/poll_template.php b/e107_plugins/poll/templates/poll_template.php
index 612b801c9..269246761 100644
--- a/e107_plugins/poll/templates/poll_template.php
+++ b/e107_plugins/poll/templates/poll_template.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/poll/templates/poll_template.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:41 $
-|     $Author: mcfly_e107 $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/poll/templates/poll_template.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!defined('e107_INIT')) { exit; }
 
diff --git a/e107_plugins/rss_menu/rss.php b/e107_plugins/rss_menu/rss.php
index 1cd9a88f8..e5ebdc58a 100644
--- a/e107_plugins/rss_menu/rss.php
+++ b/e107_plugins/rss_menu/rss.php
@@ -9,8 +9,8 @@
  *
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/rss.php,v $
- * $Revision: 1.16 $
- * $Date: 2009-11-17 10:46:34 $
+ * $Revision: 1.17 $
+ * $Date: 2009-11-17 13:48:46 $
  * $Author: marj_nl_fr $
  */
 
@@ -410,7 +410,7 @@ class rssCreate
 		switch ($this -> rssType) 
 		{
 			case 1:		// RSS 1.0
-				echo "<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+				echo "<?xml version=\"1.0\" encoding=\"utf-8\" ?".">
 						<!-- generator=\"e107\" -->
 						<!-- content type=\"".$this -> contentType."\" -->
 						<rss version=\"0.92\">
@@ -447,7 +447,7 @@ class rssCreate
 
 			case 2:	// RSS 2.0
 				$sitebutton = (strstr(SITEBUTTON, "http:") ? SITEBUTTON : SITEURL.str_replace("../", "", SITEBUTTON));
-				echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>
+				echo "<?xml version=\"1.0\" encoding=\"utf-8\"?".">
 				<!-- generator=\"e107\" -->
 				<!-- content type=\"".$this -> contentType."\" -->
 				<rss {$rss_namespace} version=\"2.0\">
@@ -552,7 +552,7 @@ class rssCreate
 			break;
 
 			case 3: 	// RDF
-				echo "<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+				echo "<?xml version=\"1.0\" encoding=\"utf-8\" ?".">
 				<!-- generator=\"e107\" -->
 				<!-- content type=\"".$this -> contentType."\" -->
 				<rdf:RDF xmlns=\"http://purl.org/rss/1.0/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:sy=\"http://purl.org/rss/1.0/modules/syndication/\" xmlns:admin=\"http://webns.net/mvcb/\" xmlns:content=\"http://purl.org/rss/1.0/modules/content/\">
@@ -613,7 +613,7 @@ class rssCreate
 
 			// Atom
 			case 4:
-				echo "<?xml version='1.0' encoding='utf-8'?>\n
+				echo "<?xml version='1.0' encoding='utf-8'?".">\n
 				<feed xmlns='http://www.w3.org/2005/Atom'>\n";
 				/*
 				<feed version='0.3'
@@ -730,4 +730,3 @@ class rssCreate
 		return ($tmp[0] != "") ? $tmp[0].RSS_LAN_2 : RSS_LAN_3;
 	}
 } // End class rssCreate
-?>
\ No newline at end of file
diff --git a/e107_plugins/rss_menu/rss_menu.php b/e107_plugins/rss_menu/rss_menu.php
index 61fc4cfc1..3c335e132 100644
--- a/e107_plugins/rss_menu/rss_menu.php
+++ b/e107_plugins/rss_menu/rss_menu.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/rss_menu.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2009-09-18 19:05:50 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/rss_menu.php,v $
+ * $Revision: 1.6 $
+ * $Date: 2009-11-17 13:48:46 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 if (!plugInstalled('rss_menu')) 
 {
diff --git a/e107_plugins/search_menu/search_menu.php b/e107_plugins/search_menu/search_menu.php
index 4d54e2d02..ac2af98e2 100644
--- a/e107_plugins/search_menu/search_menu.php
+++ b/e107_plugins/search_menu/search_menu.php
@@ -1,24 +1,22 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/search_menu/search_menu.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:43 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/search_menu/search_menu.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:45 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
-@include(e_PLUGIN."search_menu/languages/".e_LANGUAGE.".php");
+include_lan(e_PLUGIN."search_menu/languages/".e_LANGUAGE.".php");
 if (strstr(e_PAGE, "news.php")) {
 	 $page = 0;
 } elseif(strstr(e_PAGE, "comment.php")) {
diff --git a/e107_plugins/siteinfo/counter_menu.php b/e107_plugins/siteinfo/counter_menu.php
index abe0e2893..fd9178ff1 100644
--- a/e107_plugins/siteinfo/counter_menu.php
+++ b/e107_plugins/siteinfo/counter_menu.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/siteinfo/counter_menu.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-09-19 17:36:35 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/siteinfo/counter_menu.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 $text = "";
diff --git a/e107_plugins/siteinfo/sitebutton_menu.php b/e107_plugins/siteinfo/sitebutton_menu.php
index ed5e80b68..939de119b 100644
--- a/e107_plugins/siteinfo/sitebutton_menu.php
+++ b/e107_plugins/siteinfo/sitebutton_menu.php
@@ -1,22 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/siteinfo/sitebutton_menu.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-09-19 17:36:36 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/siteinfo/sitebutton_menu.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 13:48:43 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 echo "parm=".$parm; //FIXME - just for testing only.
 $ns->tablerender(SITEBUTTON_MENU_L1, "<div style='text-align:center'>\n<a href='".SITEURL."'><img src='".(strstr(SITEBUTTON, "http:") ? SITEBUTTON : e_IMAGE_ABS.SITEBUTTON)."' alt='".SITEBUTTON_MENU_L1."' style='border: 0px; width: 88px; height: 31px' /></a>\n</div>", 'sitebutton');
-?>
\ No newline at end of file