From 9e8eb943e82c97caa86551704288d463d0b8266a Mon Sep 17 00:00:00 2001
From: Mafoo <mafoo@users.noreply.github.com>
Date: Fri, 9 Jun 2017 20:31:50 +0100
Subject: [PATCH] BugFix - database class app_uuid (#2663)

if $database->app_uuid is not set it would use '' in some conditions
which isset would test true.
This fix uses strlen instead, but also fixes number_transations app that
highlighted the flaw
---
 .../resources/classes/number_translation.php           |  1 +
 resources/classes/database.php                         | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/number_translation/resources/classes/number_translation.php b/app/number_translation/resources/classes/number_translation.php
index 4c1cc43704..aff51ed655 100644
--- a/app/number_translation/resources/classes/number_translation.php
+++ b/app/number_translation/resources/classes/number_translation.php
@@ -106,6 +106,7 @@ include "root.php";
 							}
 							$database = new database;
 							$database->app_name = 'number_translations';
+							$database->app_uuid = '6ad54de6-4909-11e7-a919-92ebcb67fe33';
 							$database->save($array);
 							if ($this->display_type == "text") {
 								if ($database->message['code'] != '200') { 
diff --git a/resources/classes/database.php b/resources/classes/database.php
index bafdb45600..a07da6c48f 100644
--- a/resources/classes/database.php
+++ b/resources/classes/database.php
@@ -48,6 +48,8 @@ include "root.php";
 			public $count;
 			public $sql;
 			public $result;
+			public $app_name;
+			public $app_uuid;
 
 			public function connect() {
 
@@ -881,7 +883,7 @@ include "root.php";
 						$sql .= "database_transaction_uuid, ";
 						$sql .= "domain_uuid, ";
 						$sql .= "user_uuid, ";
-						if (isset($this->app_uuid)) {
+						if (strlen($this->app_uuid) > 0) {
 							$sql .= "app_uuid, ";
 						}
 						$sql .= "app_name, ";
@@ -898,7 +900,7 @@ include "root.php";
 						$sql .= "'".uuid()."', ";
 						$sql .= "'".$domain_uuid."', ";
 						$sql .= "'".$_SESSION['user_uuid']."', ";
-						if (isset($this->app_uuid)) {
+						if (strlen($this->app_uuid) > 0) {
 							$sql .= "'".$this->app_uuid."', ";
 						}
 						$sql .= "'".$this->app_name."', ";
@@ -1608,7 +1610,7 @@ include "root.php";
 						$sql .= "database_transaction_uuid, ";
 						$sql .= "domain_uuid, ";
 						$sql .= "user_uuid, ";
-						if (isset($this->app_uuid)) {
+						if (strlen($this->app_uuid) > 0) {
 							$sql .= "app_uuid, ";
 						}
 						$sql .= "app_name, ";
@@ -1625,7 +1627,7 @@ include "root.php";
 						$sql .= "'".uuid()."', ";
 						$sql .= "'".$domain_uuid."', ";
 						$sql .= "'".$_SESSION['user_uuid']."', ";
-						if (isset($this->app_uuid)) {
+						if (strlen($this->app_uuid) > 0) {
 							$sql .= "'".$this->app_uuid."', ";
 						}
 						$sql .= "'".$this->app_name."', ";