Mibew/java
1
0
Fork 0
mirror of https://github.com/Mibew/java.git synced 2025-01-22 17:40:35 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added to blocked visitors page links to blocked visitors chat history

Browse Source
This commit is contained in:
Dmitriy Simushev 2012-02-14 17:37:55 +00:00
parent 35e6787a1e
commit ee756d06b9
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/messenger/webim/locales/en/properties
View File

@ -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. <i>Address</i> 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

2
src/messenger/webim/locales/ru/properties
View File

@ -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=До

1
src/messenger/webim/operator/history.php
View File

@ -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, " .

8
src/messenger/webim/view/blocked_visitors.php
View File

@ -59,6 +59,7 @@ require_once('inc_errors.php');
</th><th>
<?php echo getlocal("form.field.ban_comment") ?>
</th><th>
<?php echo getlocal("page_bans.edit") ?>
</th>
</tr>
</thead>
@ -68,7 +69,7 @@ if( $page['pagination.items'] ) {
foreach( $page['pagination.items'] as $b ) { ?>
<tr>
<td class="notlast">
<a href="ban.php?id=<?php echo $b['banid'] ?>" class="man" id="ti<?php echo $b['banid'] ?>">
<a href="<?php echo $webimroot ?>/operator/history.php?q=<?php echo $b['address']?>&type=visitor" class="man" id="ti<?php echo $b['banid'] ?>">
<?php echo htmlspecialchars($b['address']) ?>
</a>
</td>
@ -86,8 +87,9 @@ if( $page['pagination.items'] ) {
</td>
<td>
<a class="removelink" id="i<?php echo $b['banid'] ?>" href="<?php echo $webimroot ?>/operator/blocked.php?act=del&amp;id=<?php echo $b['banid'] ?>">
remove
</a>
<?php echo getlocal("remove.item") ?></a>,
<a href="<?php echo $webimroot ?>/operator/ban.php?id=<?php echo $b['banid'] ?>">
<?php echo getlocal("edit.item") ?></a>
</td>
</tr>
<?php