diff --git a/src/messenger/webim/locales/en/properties b/src/messenger/webim/locales/en/properties index b0c4a54f..98a92734 100644 --- a/src/messenger/webim/locales/en/properties +++ b/src/messenger/webim/locales/en/properties @@ -115,6 +115,7 @@ content.logoff=Log out of the system. data.saved=Changes saved demo.chat.question=There are so many browsers to choose from. Which ones do you recommend? demo.chat.welcome=Hello. How may I help you? +edit.item=edit errors.captcha=The letters you typed don't match the letters that were shown in the picture. errors.failed.uploading.file=Error uploading file "{0}": {1}. errors.file.move.error=Error moving file @@ -360,6 +361,7 @@ page_ban.thread=You opened this window for "{0}" thread. Address field is page_ban.title=Block address page_bans.add=Add address page_bans.confirm=Are you sure that you want to delete address {0} from the blocked list? +page_bans.edit=Edit page_bans.list=List of banned IPs: page_bans.title=Ban List page_bans.to=Till diff --git a/src/messenger/webim/locales/ru/properties b/src/messenger/webim/locales/ru/properties index 92853960..c5cc4cf2 100644 --- a/src/messenger/webim/locales/ru/properties +++ b/src/messenger/webim/locales/ru/properties @@ -115,6 +115,7 @@ content.logoff= data.saved=Изменения сохранены demo.chat.question=Посоветуйте мне, пожалуйста, хороший браузер? demo.chat.welcome=Здравствуйте! Чем я могу Вам помочь? +edit.item=редактировать errors.captcha=Введенные символы не соответствуют изображению. errors.failed.uploading.file=Ошибка выгрузки файла "{0}": {1}. errors.file.move.error=Ошибка копирования файла @@ -358,6 +359,7 @@ page_ban.thread= page_ban.title=Запрет адреса page_bans.add=Добавить адрес page_bans.confirm=Вы уверены что хотите убрать адрес {0} из списка заблокированных? +page_bans.edit=Изменить page_bans.list=Список запрещенных адресов: page_bans.title=Запреты page_bans.to=До diff --git a/src/messenger/webim/operator/history.php b/src/messenger/webim/operator/history.php index 113f6fa7..c661625c 100644 --- a/src/messenger/webim/operator/history.php +++ b/src/messenger/webim/operator/history.php @@ -62,6 +62,7 @@ if ($query !== false) { } if ($searchType == 'visitor' || $searchType == 'all') { $searchConditions[] = "(${mysqlprefix}chatthread.userName LIKE '%%$escapedQuery%%')"; + $searchConditions[] = "(${mysqlprefix}chatthread.remote LIKE '%%$escapedQuery%%')"; } select_with_pagintation("DISTINCT unix_timestamp(${mysqlprefix}chatthread.dtmcreated) as created, " . "unix_timestamp(${mysqlprefix}chatthread.dtmmodified) as modified, ${mysqlprefix}chatthread.threadid, " . diff --git a/src/messenger/webim/view/blocked_visitors.php b/src/messenger/webim/view/blocked_visitors.php index beb4abe5..f3ea1025 100644 --- a/src/messenger/webim/view/blocked_visitors.php +++ b/src/messenger/webim/view/blocked_visitors.php @@ -59,6 +59,7 @@ require_once('inc_errors.php');