From: Stricted <info@stricted.net>
Date: Sun, 5 Feb 2017 12:26:05 +0000 (+0100)
Subject: Merge branch 'master' into test
X-Git-Url: https://git.stricted.de/?p=GitHub%2FStricted%2Fspeedport-hybrid-php-api.git;a=commitdiff_plain;h=629170c702be2be196a9e63653356a137cf8ad9a

Merge branch 'master' into test

# Conflicts:
#	README.md
#	SpeedportHybrid.class.php
#	Speedportw724v.class.php
#	lib/trait/CryptLib.class.php
---

629170c702be2be196a9e63653356a137cf8ad9a
diff --cc README.md
index 1a6a0fc,f046add..57fadb0
--- a/README.md
+++ b/README.md
@@@ -1,10 -1,10 +1,10 @@@
 -### speedport hybrid php api
 +### speedport php api
  
- [![Build Status](https://travis-ci.org/Stricted/speedport-hybrid-php-api.svg?branch=test)](https://travis-ci.org/Stricted/speedport-hybrid-php-api) [![Release](https://img.shields.io/github/release/Stricted/speedport-hybrid-php-api.svg)](https://github.com/Stricted/speedport-hybrid-php-api/releases/latest) [![License](https://img.shields.io/badge/license-LGPLv3-brightgreen.svg)](https://github.com/Stricted/speedport-hybrid-php-api/blob/master/LICENSE)
+ [![Build Status](https://travis-ci.org/Stricted/speedport-hybrid-php-api.svg?branch=master)](https://travis-ci.org/Stricted/speedport-hybrid-php-api) [![Release](https://img.shields.io/github/release/Stricted/speedport-hybrid-php-api.svg)](https://github.com/Stricted/speedport-hybrid-php-api/releases/latest) [![License](https://img.shields.io/badge/license-LGPLv3-brightgreen.svg)](https://github.com/Stricted/speedport-hybrid-php-api/blob/master/LICENSE)
  
 -Access Speedport Hybrid Router through PHP
 +Access Speedport Router through PHP
  
 -**THIS CLASS IS ONLY FOR SPEEDPORT HYBRID**
 +This is an **EXPERIMENTAL** branch to support other speedport router, i dont have them so feel free to test it and report any error
  
  ### License
  ---
diff --cc SpeedportHybrid.class.php
index e5f03a6,c135643..dda8316
--- a/SpeedportHybrid.class.php
+++ b/SpeedportHybrid.class.php
@@@ -1,9 -1,8 +1,10 @@@
  <?php
  require_once('lib/exception/RebootException.class.php');
  require_once('lib/exception/RouterException.class.php');
+ require_once('lib/exception/NotImplementedException.class.php');
  require_once('CryptLib/CryptLib.php');
 +require_once('Speedport.class.php');
 +require_once('ISpeedport.class.php');
  require_once('lib/trait/Connection.class.php');
  require_once('lib/trait/CryptLib.class.php');
  require_once('lib/trait/Login.class.php');
@@@ -15,9 -14,9 +16,9 @@@ require_once('lib/trait/System.class.ph
  /**
   * @author      Jan Altensen (Stricted)
   * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
-  * @copyright   2015 Jan Altensen (Stricted)
+  * @copyright   2015-2016 Jan Altensen (Stricted)
   */
 -class SpeedportHybrid {
 +class SpeedportHybrid extends Speedport implements ISpeedport {
  	use Connection;
  	use CryptLib;
  	use Firewall;
@@@ -30,8 -29,24 +31,8 @@@
  	 * class version
  	 * @const	string
  	 */
- 	const VERSION = '1.0.4';
+ 	const VERSION = '1.0.5';
  	
 -	/**
 -	 * router url
 -	 * @var	string
 -	 */
 -	private $url = '';
 -	
 -	/**
 -	 * inititalize this class
 -	 *
 -	 * @param	string	$url
 -	 */
 -	public function __construct ($url = 'http://speedport.ip/') {
 -		$this->url = $url;
 -		$this->checkRequirements();
 -	}
 -	
  	/**
  	 * check php requirements
  	 */