Merge remote-tracking branch 'upstream/master'

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
	lib/installer.php
	plugins/Meteor/MeteorPlugin.php
	plugins/TwitterBridge/daemons/synctwitterfriends.php
	scripts/getvaliddaemons.php

diff --cc lib/framework.php
Simple merge

diff --cc plugins/TwitterBridge/daemons/synctwitterfriends.php
index d56e5abb648eb6ce747c37a4f02d738470619037,8b8ffbfd496bdbaaa0382f71c4bf12db2469a4a7..913cbbd4daf3c9ad08cabcbb151a6590539b613a
--- 1/plugins/TwitterBridge/daemons/synctwitterfriends.php
--- 2/plugins/TwitterBridge/daemons/synctwitterfriends.php
+++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php
@@@ -30,8 -30,8 +30,8 @@@ Batch script for synching local friend
  
  END_OF_TRIM_HELP;
  
 -require_once INSTALLDIR . '/scripts/commandline.inc';
 +require_once INSTALLDIR . '/scripts/commandline.inc.php';
- require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+ require_once dirname(__DIR__) . '/twitter.php';
  
  /**
   * Daemon to sync local friends with Twitter friends

diff --cc plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 0f03a385a752064d8b950f8f8a93d5d6b7d2c782,74fc77cd79a00b6a2e494c24e8cdff59a906b51f..47ba57f7ba2bd2633f3345e1a42d330b3de18a02
--- 1/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
--- 2/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@@ -36,10 -36,10 +36,10 @@@ Batch script for retrieving Twitter mes
  
  END_OF_TRIM_HELP;
  
 -require_once INSTALLDIR . '/scripts/commandline.inc';
 +require_once INSTALLDIR . '/scripts/commandline.inc.php';
  require_once INSTALLDIR . '/lib/common.php';
  require_once INSTALLDIR . '/lib/daemon.php';
- require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+ require_once dirname(__DIR__) . '/twitter.php';
  
  /**
   * Fetch statuses from Twitter

diff --cc scripts/getvaliddaemons.php
index 7d000bad034018a9be5dcc1dff269194a49269fe,448fbb6d32cceb9282804fa6a162a66893a23aa2..f7aa0f60f88088cf06857042cf424b3650263ccc
--- 1/scripts/getvaliddaemons.php
--- 2/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@@ -33,10 -33,10 +33,10 @@@ by the startdaemons scrip
  
  ENDOFHELP;
  
- // No error reporting to avoid invalid daemon names
- error_reporting(0);
+ // No unnecessary error reporting to avoid invalid daemon names
+ error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE);
  
 -require_once INSTALLDIR.'/scripts/commandline.inc';
 +require_once INSTALLDIR.'/scripts/commandline.inc.php';
  
  $daemons = array();