X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fthird_party%2Fapi%2Fwernisportal%2Fclass_WernisApi.php;h=f217f103c6665dc03860bf76380dd3550619cfdc;hp=c64fba3e7b7260a405c5c5d99187a2cc144f61aa;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=78a010fef84895720e796842208f01dfb619c332

diff --git a/framework/main/third_party/api/wernisportal/class_WernisApi.php b/framework/main/third_party/api/wernisportal/class_WernisApi.php
index c64fba3e..f217f103 100644
--- a/framework/main/third_party/api/wernisportal/class_WernisApi.php
+++ b/framework/main/third_party/api/wernisportal/class_WernisApi.php
@@ -3,14 +3,18 @@
 namespace Wds66\Api;
 
 // Import framework stuff
-use CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * Class for connecting to the Wernis-Portal at http://www.wds66.com
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/third_party/api/wernisportal/class_WernisApi.php
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/third_party/api/wernisportal/class_WernisApi.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @todo		Out-dated since 0.6-BETA
@@ -32,7 +36,7 @@ class WernisApi extends BaseFrameworkSystem {
 	/**
 	 * Static base API URL
 	 */
-	private static $apiUrl = 'http://www.wds66.com/api/';
+	private static $apiUrl = 'https://www.wds66.com/api/';
 
 	/**
 	 * API Wernis amount
@@ -216,7 +220,7 @@ class WernisApi extends BaseFrameworkSystem {
 		$response = $this->sendRawRequest($requestString);
 
 		// Check the response header if all is fine
-		if (strpos($response[0], '200') === FALSE) {
+		if (strpos($response[0], '200') === false) {
 			// Something bad happend... :(
 			return array(
 				'status'  => 'request_error',
@@ -309,7 +313,7 @@ class WernisApi extends BaseFrameworkSystem {
 	// Widthdraw this amount
 	private function executeWithdraw ($amount) {
 		// First all fails...
-		$result = FALSE;
+		$result = false;
 
 		// Prepare the purpose
 		$purpose = "\"Bube oder Dame\"-Einsatz gesetzt.";
@@ -329,7 +333,7 @@ class WernisApi extends BaseFrameworkSystem {
 
 		if ($return['status'] == $this->statusOkay) {
 			// All fine!
-			$result = TRUE;
+			$result = true;
 		} else {
 			// Status failture text
 			$this->setStatusMessage($return['message'], $return['status']);
@@ -342,7 +346,7 @@ class WernisApi extends BaseFrameworkSystem {
 	// Payout this amount
 	private function executePayout ($amount) {
 		// First all fails...
-		$result = FALSE;
+		$result = false;
 
 		// Prepare the purpose
 		$purpose = "\"Bube oder Dame\"-Gewinn erhalten.";
@@ -362,7 +366,7 @@ class WernisApi extends BaseFrameworkSystem {
 
 		if ($return['status'] == $this->statusOkay) {
 			// All fine!
-			$result = TRUE;
+			$result = true;
 		} else {
 			// Status failture text
 			$this->setStatusMessage($return['message'], $return['status']);