From 2fdacdc9e901e4adaa6784738e6f083f57f8094d Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Mon, 25 Apr 2016 12:48:57 +0200
Subject: [PATCH] remove $Id$ and set correct requirement version

The en lang does not need to live in utf8 (if not in need), since it is always included at last from plugins directory root.
This is different in core lang files though.
---
 serendipity_plugin_piwik/ChangeLog            |  3 +
 .../UTF-8/lang_de.inc.php                     | 66 ++++++++---------
 .../UTF-8/lang_en.inc.php                     | 37 ----------
 serendipity_plugin_piwik/lang_de.inc.php      | 70 +++++++++---------
 serendipity_plugin_piwik/lang_en.inc.php      | 71 ++++++++++---------
 .../serendipity_plugin_piwik.php              | 32 +++++----
 6 files changed, 125 insertions(+), 154 deletions(-)
 delete mode 100755 serendipity_plugin_piwik/UTF-8/lang_en.inc.php

diff --git a/serendipity_plugin_piwik/ChangeLog b/serendipity_plugin_piwik/ChangeLog
index c8438cb3..36b8ed3a 100644
--- a/serendipity_plugin_piwik/ChangeLog
+++ b/serendipity_plugin_piwik/ChangeLog
@@ -1,3 +1,6 @@
+0.4.1
+   * set correct requirement version
+
 0.4.0
    * with Piwik v2 it is possible to use lsat x days for most
      read entries instead of current week
diff --git a/serendipity_plugin_piwik/UTF-8/lang_de.inc.php b/serendipity_plugin_piwik/UTF-8/lang_de.inc.php
index e1fc31a1..2318c1f2 100755
--- a/serendipity_plugin_piwik/UTF-8/lang_de.inc.php
+++ b/serendipity_plugin_piwik/UTF-8/lang_de.inc.php
@@ -1,38 +1,38 @@
-<?php # $Id$
+<?php
 
-	@define('PLUGIN_SIDEBAR_PIWIK_NAME', 'Piwik');
-	@define('PLUGIN_SIDEBAR_PIWIK_DESC', 'zeigt Piwik-Statistiken an');
-	@define('PLUGIN_SIDEBAR_PIWIK_TITLE_NAME', 'Ãœberschrift');
-	@define('PLUGIN_SIDEBAR_PIWIK_TITLE_DESC', 'die Ãœberschrift des Abschnitts');
-	@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_NAME','Token');
-	@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_DESC','der geheime Token des Piwik-Nutzers');
-	@define('PLUGIN_SIDEBAR_PIWIK_SITEID_NAME','Seiten-ID');
-	@define('PLUGIN_SIDEBAR_PIWIK_SITEID_DESC','ID der Seite in Piwik');
-	@define('PLUGIN_SIDEBAR_PIWIK_URL_NAME','URL');
-	@define('PLUGIN_SIDEBAR_PIWIK_URL_DESC','die URL zur Piwik-Installation');
+@define('PLUGIN_SIDEBAR_PIWIK_NAME', 'Piwik');
+@define('PLUGIN_SIDEBAR_PIWIK_DESC', 'zeigt Piwik-Statistiken an');
+@define('PLUGIN_SIDEBAR_PIWIK_TITLE_NAME', 'Ãœberschrift');
+@define('PLUGIN_SIDEBAR_PIWIK_TITLE_DESC', 'die Ãœberschrift des Abschnitts');
+@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_NAME','Token');
+@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_DESC','der geheime Token des Piwik-Nutzers');
+@define('PLUGIN_SIDEBAR_PIWIK_SITEID_NAME','Seiten-ID');
+@define('PLUGIN_SIDEBAR_PIWIK_SITEID_DESC','ID der Seite in Piwik');
+@define('PLUGIN_SIDEBAR_PIWIK_URL_NAME','URL');
+@define('PLUGIN_SIDEBAR_PIWIK_URL_DESC','die URL zur Piwik-Installation');
 
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_NAME','Live-Statistiken: Anzeige');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_DESC','Statistiken zu den Besuchern der letzten xx Minuten anzeigen');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_NAME','Live-Statistiken: Ãœberschrift');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_DESC','Überschrift für die Live-Statistiken, leer lassen zum verstecken');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_NAME','Live-Statistiken: Zeitraum');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_DESC','Zeitraum in Minuten, der für die Live-Statistiken verwendet werden soll');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITORS','eindeutige Besucher');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITS','Besuche');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_ACTIONS','Seitenansichten');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_NAME','Live-Statistiken: Anzeige');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_DESC','Statistiken zu den Besuchern der letzten xx Minuten anzeigen');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_NAME','Live-Statistiken: Ãœberschrift');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_DESC','Überschrift für die Live-Statistiken, leer lassen zum verstecken');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_NAME','Live-Statistiken: Zeitraum');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_DESC','Zeitraum in Minuten, der für die Live-Statistiken verwendet werden soll');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITORS','eindeutige Besucher');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITS','Besuche');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_ACTIONS','Seitenansichten');
 
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_NAME','meistgelesene Beiträge: Anzeige');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_DESC','die meistgelesenen Beiträge der aktuellen Woche anzeigen');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_NAME','meistgelesene Beiträge: Überschrift');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_DESC','Überschrift für die meistgelesenen Beiträge der Woche, leer lassen zum verstecken');
-        @define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_NAME','meistgelesene Beiträge: Zeitraum');
-        @define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_DESC','letzte X Tage, die berücksichtigt werden sollen (0 für aktuelle Woche)');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_NAME','meistgelesene Beiträge: Anzahl');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_DESC','maximale Anzahl der anzuzeigenden Einträge');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_NAME','meistgelesene Beiträge: zu entfernender Text');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_DESC','Text, der aus dem Seitennamen entfernt werden soll');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_VIEWS','Aufrufe');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_NAME','meistgelesene Beiträge: Anzeige');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_DESC','die meistgelesenen Beiträge der aktuellen Woche anzeigen');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_NAME','meistgelesene Beiträge: Überschrift');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_DESC','Überschrift für die meistgelesenen Beiträge der Woche, leer lassen zum verstecken');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_NAME','meistgelesene Beiträge: Zeitraum');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_DESC','letzte X Tage, die berücksichtigt werden sollen (0 für aktuelle Woche)');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_NAME','meistgelesene Beiträge: Anzahl');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_DESC','maximale Anzahl der anzuzeigenden Einträge');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_NAME','meistgelesene Beiträge: zu entfernender Text');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_DESC','Text, der aus dem Seitennamen entfernt werden soll');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_VIEWS','Aufrufe');
 
-	@define('PLUGIN_SIDEBAR_PIWIK_DEBUG_NAME','Debug-Logging aktivieren:');
-        @define('PLUGIN_SIDEBAR_PIWIK_DEBUG_DESC','wenn das Logging aktiviert ist, werden einige Ausgaben (z. B. die Piwik-Abfrage-URL nach ./templates_c/piwik_debug.log geschrieben');
+@define('PLUGIN_SIDEBAR_PIWIK_DEBUG_NAME','Debug-Logging aktivieren:');
+@define('PLUGIN_SIDEBAR_PIWIK_DEBUG_DESC','wenn das Logging aktiviert ist, werden einige Ausgaben (z. B. die Piwik-Abfrage-URL nach ./templates_c/piwik_debug.log geschrieben');
 
diff --git a/serendipity_plugin_piwik/UTF-8/lang_en.inc.php b/serendipity_plugin_piwik/UTF-8/lang_en.inc.php
deleted file mode 100755
index 8f8fd041..00000000
--- a/serendipity_plugin_piwik/UTF-8/lang_en.inc.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php # $Id$
-
-	@define('PLUGIN_SIDEBAR_PIWIK_NAME', 'Piwik');
-	@define('PLUGIN_SIDEBAR_PIWIK_DESC', 'show statistics of Piwik in sidebar');
-	@define('PLUGIN_SIDEBAR_PIWIK_TITLE_NAME', 'Header');
-	@define('PLUGIN_SIDEBAR_PIWIK_TITLE_DESC', 'the header for this sidebar-plugin');
-	@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_NAME','Token');
-	@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_DESC','the token of Piwik-user who can read statistics');
-	@define('PLUGIN_SIDEBAR_PIWIK_SITEID_NAME','Site-ID');
-	@define('PLUGIN_SIDEBAR_PIWIK_SITEID_DESC','ID of your webpage within Piwik');
-	@define('PLUGIN_SIDEBAR_PIWIK_URL_NAME','URL');
-	@define('PLUGIN_SIDEBAR_PIWIK_URL_DESC','URL of your Piwik-installation');
-	
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_NAME','Live: Display');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_DESC','show statistics of your visitors from the last xx minutes');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_NAME','Live: Header');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_DESC','header for live-section, leave empty for hiding');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_NAME','Live: Period');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_DESC','period in minutes which will be used for live-statistics');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITORS','unique visitors');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITS','visits');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_ACTIONS','page views');
-		
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_NAME','Entries: Display');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_DESC','show most read entries of current week');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_NAME','Entries: Header');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_DESC','header for most read entries, leave empty for hiding');
-        @define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_NAME','Entries: Period');
-        @define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_DESC','last X days that should be considered (0 for current week)');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_NAME','Entries: Number');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_DESC','how many entries should be shown');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_NAME','Entries: String to remove');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_DESC','string that should be removed from page-title');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_VIEWS','views');
-
-	@define('PLUGIN_SIDEBAR_PIWIK_DEBUG_NAME','activate debug-logging:');
-        @define('PLUGIN_SIDEBAR_PIWIK_DEBUG_DESC','if logging is enabled, some things will be written into ./templates_c/piwik_debug.log (for example the piwik-fetch-url');
diff --git a/serendipity_plugin_piwik/lang_de.inc.php b/serendipity_plugin_piwik/lang_de.inc.php
index 55188d39..9909934f 100755
--- a/serendipity_plugin_piwik/lang_de.inc.php
+++ b/serendipity_plugin_piwik/lang_de.inc.php
@@ -1,38 +1,38 @@
-<?php # $Id$
+<?php
 
-	@define('PLUGIN_SIDEBAR_PIWIK_NAME', 'Piwik');
-	@define('PLUGIN_SIDEBAR_PIWIK_DESC', 'zeigt Piwik-Statistiken an');
-	@define('PLUGIN_SIDEBAR_PIWIK_TITLE_NAME', 'Überschrift');
-	@define('PLUGIN_SIDEBAR_PIWIK_TITLE_DESC', 'die Überschrift des Abschnitts');
-	@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_NAME','Token');
-	@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_DESC','der geheime Token des Piwik-Nutzers');
-	@define('PLUGIN_SIDEBAR_PIWIK_SITEID_NAME','Seiten-ID');
-	@define('PLUGIN_SIDEBAR_PIWIK_SITEID_DESC','ID der Seite in Piwik');
-	@define('PLUGIN_SIDEBAR_PIWIK_URL_NAME','URL');
-	@define('PLUGIN_SIDEBAR_PIWIK_URL_DESC','die URL zur Piwik-Installation');
-	
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_NAME','Live-Statistiken: Anzeige');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_DESC','Statistiken zu den Besuchern der letzten xx Minuten anzeigen');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_NAME','Live-Statistiken: Überschrift');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_DESC','Überschrift für die Live-Statistiken, leer lassen zum verstecken');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_NAME','Live-Statistiken: Zeitraum');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_DESC','Zeitraum in Minuten, der für die Live-Statistiken verwendet werden soll');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITORS','eindeutige Besucher');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITS','Besuche');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_ACTIONS','Seitenansichten');
-	
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_NAME','meistgelesene Beiträge: Anzeige');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_DESC','die meistgelesenen Beiträge der aktuellen Woche anzeigen');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_NAME','meistgelesene Beiträge: Überschrift');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_DESC','Überschrift für die meistgelesenen Beiträge der Woche, leer lassen zum verstecken');
-        @define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_NAME','meistgelesene Beiträge: Zeitraum');
-        @define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_DESC','letzte X Tage, die berücksichtigt werden sollen (0 für aktuelle Woche)');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_NAME','meistgelesene Beiträge: Anzahl');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_DESC','maximale Anzahl der anzuzeigenden Einträge');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_NAME','meistgelesene Beiträge: zu entfernender Text');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_DESC','Text, der aus dem Seitennamen entfernt werden soll');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_VIEWS','Aufrufe');
+@define('PLUGIN_SIDEBAR_PIWIK_NAME', 'Piwik');
+@define('PLUGIN_SIDEBAR_PIWIK_DESC', 'zeigt Piwik-Statistiken an');
+@define('PLUGIN_SIDEBAR_PIWIK_TITLE_NAME', 'Überschrift');
+@define('PLUGIN_SIDEBAR_PIWIK_TITLE_DESC', 'die Überschrift des Abschnitts');
+@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_NAME','Token');
+@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_DESC','der geheime Token des Piwik-Nutzers');
+@define('PLUGIN_SIDEBAR_PIWIK_SITEID_NAME','Seiten-ID');
+@define('PLUGIN_SIDEBAR_PIWIK_SITEID_DESC','ID der Seite in Piwik');
+@define('PLUGIN_SIDEBAR_PIWIK_URL_NAME','URL');
+@define('PLUGIN_SIDEBAR_PIWIK_URL_DESC','die URL zur Piwik-Installation');
 
-	@define('PLUGIN_SIDEBAR_PIWIK_DEBUG_NAME','Debug-Logging aktivieren:');
-        @define('PLUGIN_SIDEBAR_PIWIK_DEBUG_DESC','wenn das Logging aktiviert ist, werden einige Ausgaben (z. B. die Piwik-Abfrage-URL nach ./templates_c/piwik_debug.log geschrieben');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_NAME','Live-Statistiken: Anzeige');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_DESC','Statistiken zu den Besuchern der letzten xx Minuten anzeigen');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_NAME','Live-Statistiken: Überschrift');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_DESC','Überschrift für die Live-Statistiken, leer lassen zum verstecken');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_NAME','Live-Statistiken: Zeitraum');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_DESC','Zeitraum in Minuten, der für die Live-Statistiken verwendet werden soll');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITORS','eindeutige Besucher');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITS','Besuche');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_ACTIONS','Seitenansichten');
+
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_NAME','meistgelesene Beiträge: Anzeige');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_DESC','die meistgelesenen Beiträge der aktuellen Woche anzeigen');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_NAME','meistgelesene Beiträge: Überschrift');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_DESC','Überschrift für die meistgelesenen Beiträge der Woche, leer lassen zum verstecken');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_NAME','meistgelesene Beiträge: Zeitraum');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_DESC','letzte X Tage, die berücksichtigt werden sollen (0 für aktuelle Woche)');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_NAME','meistgelesene Beiträge: Anzahl');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_DESC','maximale Anzahl der anzuzeigenden Einträge');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_NAME','meistgelesene Beiträge: zu entfernender Text');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_DESC','Text, der aus dem Seitennamen entfernt werden soll');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_VIEWS','Aufrufe');
+
+@define('PLUGIN_SIDEBAR_PIWIK_DEBUG_NAME','Debug-Logging aktivieren:');
+@define('PLUGIN_SIDEBAR_PIWIK_DEBUG_DESC','wenn das Logging aktiviert ist, werden einige Ausgaben (z. B. die Piwik-Abfrage-URL nach ./templates_c/piwik_debug.log geschrieben');
 
diff --git a/serendipity_plugin_piwik/lang_en.inc.php b/serendipity_plugin_piwik/lang_en.inc.php
index e188bc40..ab8bcbdf 100755
--- a/serendipity_plugin_piwik/lang_en.inc.php
+++ b/serendipity_plugin_piwik/lang_en.inc.php
@@ -1,37 +1,38 @@
-<?php # $Id$
+<?php
 
-	@define('PLUGIN_SIDEBAR_PIWIK_NAME', 'Piwik');
-	@define('PLUGIN_SIDEBAR_PIWIK_DESC', 'show statistics of Piwik in sidebar');
-	@define('PLUGIN_SIDEBAR_PIWIK_TITLE_NAME', 'Header');
-	@define('PLUGIN_SIDEBAR_PIWIK_TITLE_DESC', 'the header for this sidebar-plugin');
-	@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_NAME','Token');
-	@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_DESC','the token of Piwik-user who can read statistics');
-	@define('PLUGIN_SIDEBAR_PIWIK_SITEID_NAME','Site-ID');
-	@define('PLUGIN_SIDEBAR_PIWIK_SITEID_DESC','ID of your webpage within Piwik');
-	@define('PLUGIN_SIDEBAR_PIWIK_URL_NAME','URL');
-	@define('PLUGIN_SIDEBAR_PIWIK_URL_DESC','URL of your Piwik-installation');
-	
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_NAME','Live: Display');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_DESC','show statistics of your visitors from the last xx minutes');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_NAME','Live: Header');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_DESC','header for live-section, leave empty for hiding');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_NAME','Live: Period');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_DESC','period in minutes which will be used for live-statistics');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITORS','unique visitors');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITS','visits');
-	@define('PLUGIN_SIDEBAR_PIWIK_LIVE_ACTIONS','page views');
-		
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_NAME','Entries: Display');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_DESC','show most read entries of current week');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_NAME','Entries: Header');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_DESC','header for most read entries, leave empty for hiding');
-        @define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_NAME','Entries: Period');
-        @define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_DESC','last X days that should be considered (0 for current week)');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_NAME','Entries: Number');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_DESC','how many entries should be shown');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_NAME','Entries: String to remove');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_DESC','string that should be removed from page-title');
-	@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_VIEWS','views');
+@define('PLUGIN_SIDEBAR_PIWIK_NAME', 'Piwik');
+@define('PLUGIN_SIDEBAR_PIWIK_DESC', 'show statistics of Piwik in sidebar');
+@define('PLUGIN_SIDEBAR_PIWIK_TITLE_NAME', 'Header');
+@define('PLUGIN_SIDEBAR_PIWIK_TITLE_DESC', 'the header for this sidebar-plugin');
+@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_NAME','Token');
+@define('PLUGIN_SIDEBAR_PIWIK_TOKEN_DESC','the token of Piwik-user who can read statistics');
+@define('PLUGIN_SIDEBAR_PIWIK_SITEID_NAME','Site-ID');
+@define('PLUGIN_SIDEBAR_PIWIK_SITEID_DESC','ID of your webpage within Piwik');
+@define('PLUGIN_SIDEBAR_PIWIK_URL_NAME','URL');
+@define('PLUGIN_SIDEBAR_PIWIK_URL_DESC','URL of your Piwik-installation');
+
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_NAME','Live: Display');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_SHOW_DESC','show statistics of your visitors from the last xx minutes');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_NAME','Live: Header');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_TITLE_DESC','header for live-section, leave empty for hiding');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_NAME','Live: Period');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_MINUTES_DESC','period in minutes which will be used for live-statistics');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITORS','unique visitors');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_VISITS','visits');
+@define('PLUGIN_SIDEBAR_PIWIK_LIVE_ACTIONS','page views');
+
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_NAME','Entries: Display');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_SHOW_DESC','show most read entries of current week');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_NAME','Entries: Header');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_TITLE_DESC','header for most read entries, leave empty for hiding');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_NAME','Entries: Period');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_DAYS_DESC','last X days that should be considered (0 for current week)');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_NAME','Entries: Number');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_MAX_DESC','how many entries should be shown');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_NAME','Entries: String to remove');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_REMOVE_DESC','string that should be removed from page-title');
+@define('PLUGIN_SIDEBAR_PIWIK_ENTRIES_VIEWS','views');
+
+@define('PLUGIN_SIDEBAR_PIWIK_DEBUG_NAME','activate debug-logging:');
+@define('PLUGIN_SIDEBAR_PIWIK_DEBUG_DESC','if logging is enabled, some things will be written into ./templates_c/piwik_debug.log (for example the piwik-fetch-url');
 
-	@define('PLUGIN_SIDEBAR_PIWIK_DEBUG_NAME','activate debug-logging:');
-        @define('PLUGIN_SIDEBAR_PIWIK_DEBUG_DESC','if logging is enabled, some things will be written into ./templates_c/piwik_debug.log (for example the piwik-fetch-url');
diff --git a/serendipity_plugin_piwik/serendipity_plugin_piwik.php b/serendipity_plugin_piwik/serendipity_plugin_piwik.php
index 2585152f..b6ddff60 100755
--- a/serendipity_plugin_piwik/serendipity_plugin_piwik.php
+++ b/serendipity_plugin_piwik/serendipity_plugin_piwik.php
@@ -1,10 +1,11 @@
-<?php # $Id$
- 
+<?php
+
 require_once S9Y_PEAR_PATH . 'HTTP/Request.php';
- 
+
 @serendipity_plugin_api::load_language(dirname(__FILE__));
- 
-class serendipity_plugin_piwik extends serendipity_plugin {
+
+class serendipity_plugin_piwik extends serendipity_plugin
+{
     public $title = PLUGIN_SIDEBAR_PIWIK_NAME;
     protected $token;
     protected $url;
@@ -18,7 +19,7 @@ class serendipity_plugin_piwik extends serendipity_plugin {
     protected $entries_remove;
     protected $debug;
     protected $dependencies;
- 
+
     /**
      * @param serendipity_property_bag $propbag
      * @return void
@@ -30,9 +31,9 @@ class serendipity_plugin_piwik extends serendipity_plugin {
         $propbag->add('description',   PLUGIN_SIDEBAR_PIWIK_DESC);
         $propbag->add('stackable',     true);
         $propbag->add('author',        'Bernd Distler');
-        $propbag->add('version',       '0.4.0');
+        $propbag->add('version',       '0.4.1');
         $propbag->add('requirements',  array(
-            'serendipity' => '1.3.1', // don't know about that
+            'serendipity' => '1.6',
             'smarty'      => '2.6.7',
             'php'         => '5.1.0'
         ));
@@ -40,7 +41,7 @@ class serendipity_plugin_piwik extends serendipity_plugin {
         $propbag->add('groups', array('FRONTEND_EXTERNAL_SERVICES'));
         $this->dependencies = array('serendipity_event_piwik' => 'remove');
     }
- 
+
     /**
      * @param string $name
      * @param serendipity_property_bag $propbag
@@ -131,12 +132,13 @@ class serendipity_plugin_piwik extends serendipity_plugin {
         }
         return true;
     }
- 
+
     /**
      * @param string $title
      * @return void
      */
-    public function generate_content(&$title) {
+    public function generate_content(&$title)
+    {
         $title = $this->get_config('title', $title ? $title : $this->title);
         $token = $this->get_config('token', $this->token);
         $site_id = $this->get_config('site_id', $this->site_id);
@@ -245,7 +247,7 @@ class serendipity_plugin_piwik extends serendipity_plugin {
             if ($error) {
                 return;
             }
- 
+
             // take pagetitles from seconed array and write it into first one
             for ($i = 0; $i < count($piwik_array_pagesurls); $i++) {
                 $piwik_array_pagesurls[$i]['label'] = $piwik_array_pagestitles[$i]['label'];
@@ -269,7 +271,7 @@ class serendipity_plugin_piwik extends serendipity_plugin {
             echo "\n</ol>\n";
         }
     }
- 
+
     /**
      * @param $api_url
      * @return bool|mixed|string
@@ -295,6 +297,8 @@ class serendipity_plugin_piwik extends serendipity_plugin {
         fwrite($fp, "\n".date('Y-m-d H:i:s', serendipity_serverOffsetHour()).' '.$debug_message);
         fclose($fp);
     }
+
 }
- 
+
 /* vim: set sts=4 ts=4 expandtab : */
+?>
\ No newline at end of file