From 917c8df22535b75e0a6fbe3e6ca1bf7f3f3ff874 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 Nov 2019 12:24:18 +0100
Subject: [PATCH] Add type of db driver in stats

---
 htdocs/core/ajax/pingresult.php                 |  3 ++-
 htdocs/main.inc.php                             | 17 ++++++++++++-----
 .../template/class/myobject.class.php           | 11 +++++++----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index eec1c9f0aca..0dbb5167f9e 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -54,6 +54,7 @@ print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"])
 if ($action == 'firstpingok')
 {
 	// Note: pings are by installation, done on entity 1.
+	// Once this constant are set, no more ping will be tried (except if we add parameter &forceping=1 on URL). So we can say this are 'first' ping.
 	dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_DATE', dol_print_date($now, 'dayhourlog', 'gmt'));
 	dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_ID', $hash_unique_id);
 
@@ -63,7 +64,7 @@ if ($action == 'firstpingok')
 elseif ($action == 'firstpingko')
 {
 	// Note: pings are by installation, done on entity 1.
-	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt');
+	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt');	// erase last value
 	print 'First ping KO saved for entity '.$conf->entity;
 }
 else {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 858f73afa05..34d3d7a9768 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2567,7 +2567,7 @@ if (! function_exists("llxFooter"))
 					print "\n".'<!-- Includes JS for Ping of Dolibarr MAIN_FIRST_PING_OK_DATE = '.$conf->global->MAIN_FIRST_PING_OK_DATE.' MAIN_FIRST_PING_OK_ID = '.$conf->global->MAIN_FIRST_PING_OK_ID.' -->'."\n";
 					print "\n<!-- JS CODE TO ENABLE the anonymous Ontime Ping -->\n";
 					$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);
-					$url_for_ping = "https://ping.dolibarr.org/";
+					$url_for_ping = (empty($conf->global->MAIN_URL_FOR_PING) ? "https://ping.dolibarr.org/" : $conf->global->MAIN_URL_FOR_PING);
 					?>
 		    			<script>
 		    			jQuery(document).ready(function (tmp) {
@@ -2576,7 +2576,14 @@ if (! function_exists("llxFooter"))
 		    					  url: "<?php echo $url_for_ping ?>",
 		    					  timeout: 500,     // timeout milliseconds
 		    					  cache: false,
-		    					  data: { hash_algo: "md5", hash_unique_id: "<?php echo $hash_unique_id; ?>", action: "dolibarrping", version: "<?php echo (float) DOL_VERSION; ?>", entity: <?php echo (int) $conf->entity; ?> },
+		    					  data: {
+			    					  hash_algo: "md5",
+			    					  hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>",
+			    					  action: "dolibarrping",
+			    					  version: "<?php echo (float) DOL_VERSION; ?>",
+			    					  entity: "<?php echo (int) $conf->entity; ?>",
+			    					  dbtype: "<?php echo dol_escape_js($db->type); ?>"
+			    				  },
 		    					  success: function (data, status, xhr) {   // success callback function (data contains body of response)
 		      					    	console.log("Ping ok");
 		        	    				$.ajax({
@@ -2584,17 +2591,17 @@ if (! function_exists("llxFooter"))
 		      	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
 		      	    					  timeout: 500,     // timeout milliseconds
 		      	    					  cache: false,
-		      	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo $hash_unique_id; ?>", action: "firstpingok" },
+		      	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", action: "firstpingok" },	// to update
 		    					  		});
 		    					  },
-		    					  error: function (data,status,xhr) {   // success callback function
+		    					  error: function (data,status,xhr) {   // error callback function
 		        					    console.log("Ping ko: " + data);
 		        	    				$.ajax({
 		        	    					  method: "GET",
 		        	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
 		        	    					  timeout: 500,     // timeout milliseconds
 		        	    					  cache: false,
-		        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo $hash_unique_id; ?>", action: "firstpingko", version: "<?php echo (float) DOL_VERSION; ?>" },
+		        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", action: "firstpingko" },
 		      					  		});
 		    					  }
 		    				});
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 3c3858a7a84..49574ede476 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -227,13 +227,16 @@ class MyObject extends CommonObject
 		}
 
 		// Translate some data of arrayofkeyval
-		foreach($this->fields as $key => $val)
+		if (is_object($langs))
 		{
-			if (is_array($val['arrayofkeyval']))
+			foreach($this->fields as $key => $val)
 			{
-				foreach($val['arrayofkeyval'] as $key2 => $val2)
+				if (is_array($val['arrayofkeyval']))
 				{
-					$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
+					foreach($val['arrayofkeyval'] as $key2 => $val2)
+					{
+						$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
+					}
 				}
 			}
 		}