From 7b69f8cfa582e084dd59c59bfac86335e14b62ac Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Mon, 10 Dec 2018 16:46:49 +0100
Subject: [PATCH] * Api/Filemanager/WebDAV: fix SQL error if login error or
 WebDAV path contains non-ascii chars in that case we transliterate these to
 ascii for storage in egw_access_log table, which only allows ascii chars

---
 api/src/Session.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/api/src/Session.php b/api/src/Session.php
index 663448a5a3..5066024d08 100644
--- a/api/src/Session.php
+++ b/api/src/Session.php
@@ -689,7 +689,7 @@ class Session
 	/**
     * Write or update (for logout) the access_log
 	*
-	* @param string|int $sessionid nummeric or PHP session id or 0 for unsuccessful logins
+	* @param string|int $sessionid nummeric or PHP session id or error-message for unsuccessful logins
 	* @param string $login ='' account_lid (evtl. with domain) or '' for setting the logout-time
 	* @param string $user_ip ='' ip to log
 	* @param int $account_id =0 numerical account_id
@@ -699,6 +699,13 @@ class Session
 	{
 		$now = time();
 
+		// if sessionid contains non-ascii chars (only happens for error-messages)
+		// --> transliterate it to ascii, as session_php only allows ascii chars
+		if (preg_match('/[^\x20-\x7f]/', $sessionid))
+		{
+			$sessionid = Translation::to_ascii($sessionid);
+		}
+
 		if ($login)
 		{
 			$GLOBALS['egw']->db->insert(self::ACCESS_LOG_TABLE,array(
@@ -1421,10 +1428,16 @@ class Session
 	/**
 	 * Set action logged in access-log
 	 *
+	 * Non-ascii chars in $action get transliterate to ascii, as our session_action column allows only ascii.
+	 *
 	 * @param string $action
 	 */
 	public function set_action($action)
 	{
+		if (preg_match('/[^\x20-\x7f]/', $action))
+		{
+			$action = Translation::to_ascii($action);
+		}
 		$this->action = $action;
 	}