From ce1bed563c5e35c7144b6d52b02a1f360f1aaccd Mon Sep 17 00:00:00 2001
From: Mario Hommel <mario@hommel-net.de>
Date: Fri, 10 Mar 2017 19:01:33 +0100
Subject: [PATCH] Fix PHP7 compatibility problems. (#53)

---
 serendipity_event_popfetcher/ChangeLog                        | 4 ++++
 serendipity_event_popfetcher/class.mimedecode.php             | 2 +-
 serendipity_event_popfetcher/class.pop3.php                   | 2 +-
 serendipity_event_popfetcher/serendipity_event_popfetcher.php | 4 ++--
 serendipity_plugin_twitter/ChangeLog                          | 4 ++++
 serendipity_plugin_twitter/classes/Twitter.php                | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/serendipity_event_popfetcher/ChangeLog b/serendipity_event_popfetcher/ChangeLog
index 852f71f6..5bd77838 100644
--- a/serendipity_event_popfetcher/ChangeLog
+++ b/serendipity_event_popfetcher/ChangeLog
@@ -1,3 +1,7 @@
+1.47
+----
+* Fix PHP7 incompatibility
+
 1.46:
 -----
 * Updated translation (german), fixed some english descriptions
diff --git a/serendipity_event_popfetcher/class.mimedecode.php b/serendipity_event_popfetcher/class.mimedecode.php
index 9ad72294..42acabd1 100644
--- a/serendipity_event_popfetcher/class.mimedecode.php
+++ b/serendipity_event_popfetcher/class.mimedecode.php
@@ -121,7 +121,7 @@ class mimeDecode
     * @param string The input to decode
     * @access public
     */
-    function mimeDecode($input)
+    function __construct($input)
     {
         list($header, $body)   = $this->_splitBodyHeader($input);
 
diff --git a/serendipity_event_popfetcher/class.pop3.php b/serendipity_event_popfetcher/class.pop3.php
index 1191ab29..7f4fcd19 100644
--- a/serendipity_event_popfetcher/class.pop3.php
+++ b/serendipity_event_popfetcher/class.pop3.php
@@ -41,7 +41,7 @@ class POP3 {
     //  This must be set to true
     //  manually
 
-    function POP3 ( $server = '', $timeout = '' ) {
+    function __construct ( $server = '', $timeout = '' ) {
         settype($this->BUFFER,"integer");
         if( !empty($server) ) {
             // Do not allow programs to alter MAILSERVER
diff --git a/serendipity_event_popfetcher/serendipity_event_popfetcher.php b/serendipity_event_popfetcher/serendipity_event_popfetcher.php
index 2cfc6360..a7861815 100644
--- a/serendipity_event_popfetcher/serendipity_event_popfetcher.php
+++ b/serendipity_event_popfetcher/serendipity_event_popfetcher.php
@@ -12,7 +12,7 @@ require_once('tmobile.php');
 require_once('o2.php');
 
 // Default values
-define('POPFETCHER_VERSION',  '1.46');       // This version of Popfetcher
+define('POPFETCHER_VERSION',  '1.47');       // This version of Popfetcher
 define('DEFAULT_ADMINMENU',   'true');       // True if run as sidebar plugin. False if external plugin.
 define('DEFAULT_HIDENAME',    'popfetcher'); // User should set this to something unguessable
 define('DEFAULT_MAILSERVER',  '');
@@ -1598,4 +1598,4 @@ class serendipity_event_popfetcher extends serendipity_event
 
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/serendipity_plugin_twitter/ChangeLog b/serendipity_plugin_twitter/ChangeLog
index 3bfb85d7..8fbc060d 100644
--- a/serendipity_plugin_twitter/ChangeLog
+++ b/serendipity_plugin_twitter/ChangeLog
@@ -9,6 +9,10 @@ TODO:
 * Twitter announcements/credentials etc. per author instead of
   only per central blog
 
+1.68:
+-----
+    * Fix PHP7 incompatibility
+  
 1.67:
 -----
     * Added serendipity_request_url API method
diff --git a/serendipity_plugin_twitter/classes/Twitter.php b/serendipity_plugin_twitter/classes/Twitter.php
index d5faafd8..00a92529 100644
--- a/serendipity_plugin_twitter/classes/Twitter.php
+++ b/serendipity_plugin_twitter/classes/Twitter.php
@@ -34,7 +34,7 @@ class Twitter {
      * The constructor of this class.
      * @param boolean use_identi_ca default=false (use twitter mode)
      */
-    function Twitter($use_identi_ca = false) {
+    function __construct($use_identi_ca = false) {
         $this->use_identica = $use_identi_ca;
     }