From 68a178d445d0cdf4aff3f292e620ca209bbd3002 Mon Sep 17 00:00:00 2001
From: Franzz <francois@lutran.fr>
Date: Mon, 15 Nov 2021 19:43:49 +0100
Subject: [PATCH] Fix color customization

---
 inc/databap.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/inc/databap.php b/inc/databap.php
index e40f161..743ad5f 100755
--- a/inc/databap.php
+++ b/inc/databap.php
@@ -313,8 +313,7 @@ class Databap extends PhpObject
 	{
 		if($sType!='')
 		{
-			if($sType!='' && !array_key_exists($sType, self::$TYPES)) self::addError('Type "'.$sType.'" inconnu');
-			else $asResult = array($sType=>self::$TYPES[$sType]);
+			if(array_key_exists($sType, self::$TYPES)) $asResult = array($sType=>self::$TYPES[$sType]);
 		}
 		else $asResult = self::$TYPES;
 
@@ -328,8 +327,7 @@ class Databap extends PhpObject
 				$asResult[$sType] = array();
 				foreach($oInfo as $sInfo)
 				{
-					if(!array_key_exists($sInfo, $asTypeInfo)) self::addError('Info "'.$sInfo.'" inconnue');
-					else $asResult[$sType][$sInfo] = $asTypeInfo[$sInfo];
+					if(array_key_exists($sInfo, $asTypeInfo)) $asResult[$sType][$sInfo] = $asTypeInfo[$sInfo];
 				}
 				if($bUnique) $asResult[$sType] = $asResult[$sType][$sInfo];
 			}
@@ -808,7 +806,7 @@ class Databap extends PhpObject
 		return $asPost;
 	}
 
-	private function getRemotePageDom($sUrl)
+	private function getRemotePageDom($sUrl): DOMDocument
 	{
 		$oDom = new DOMDocument();
 		if(mb_substr($sUrl, 0, 4)!='http') $sUrl = 'http://'.$sUrl;
@@ -1769,7 +1767,7 @@ class Databap extends PhpObject
 		}
 		else $sDesc = 'Nom de chan non autorisé (nom de personne / nom de société interdit)';
 
-		return self::getJsonPostResult($bSuccess, $sDesc, $asVars);
+		return $this->getJsonPostResult($bSuccess, $sDesc, $asVars);
 	}
 
 	private function isUserConnected($iChanId=0, $iUserId=0)
@@ -2844,7 +2842,7 @@ class Databap extends PhpObject
 	public function getUrlAvailability($sLink)
 	{
 		$bAvailable = !$this->checkValue(self::URL_TABLE, array('phrase'=>$sLink));
-		return self::getJsonPostResult($bAvailable, '');
+		return $this->getJsonPostResult($bAvailable, '');
 	}
 
 	public function resetChanSafeNames()
@@ -2911,8 +2909,8 @@ class Databap extends PhpObject
 
 		//Inserting Color Anchors
 		$asDefaultValues = $this->getDefaultOptionValues($asStyleParams, false);
-		foreach($asDefaultValues as $iOptionNameId=>$sDefaultValue) $asColorAnchors[$iOptionNameId] = '[OPT#'.$iOptionNameId.']';
-		$sStyle = str_replace($asDefaultValues, $asColorAnchors, $sStyle);
+        foreach($asDefaultValues as $iOptionNameId=>$sDefaultValue) $asColorAnchors[$iOptionNameId] = '[OPT#'.$iOptionNameId.']';
+		$sStyle = str_ireplace($asDefaultValues, $asColorAnchors, $sStyle);
 
 		//Switching color Anchors with user colors
 		$asOptionvalues = $this->getUserOptions($asStyleParams);