Mibew/tray
1
0
Fork 0
mirror of https://github.com/Mibew/tray.git synced 2025-01-22 18:10:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OSSG/mibew into ossg_master

Browse Source
This commit is contained in:
Dmitriy Simushev 2012-01-24 22:06:34 +00:00
commit 1ca18622c6
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/messenger/webim/libs/chat.php
View File

@ -576,7 +576,7 @@ function close_old_threads($link)
}
$next_revision = next_revision($link);
$query = "update ${mysqlprefix}chatthread set lrevision = $next_revision, dtmmodified = CURRENT_TIMESTAMP, istate = $state_closed " .
"where istate <> $state_closed and istate <> $state_left and " .
"where istate <> $state_closed and istate <> $state_left and lastpingagent <> 0 and lastpinguser <> 0 and " .
"(ABS(UNIX_TIMESTAMP(CURRENT_TIMESTAMP) - UNIX_TIMESTAMP(lastpinguser)) > " . $settings['thread_lifetime'] . " and " .
"ABS(UNIX_TIMESTAMP(CURRENT_TIMESTAMP) - UNIX_TIMESTAMP(lastpingagent)) > " . $settings['thread_lifetime'] . ")";

2
src/messenger/webim/libs/common.php
View File

@ -672,7 +672,7 @@ $settings = array(
'geolinkparams' => 'width=440,height=100,toolbar=0,scrollbars=0,location=0,status=1,menubar=0,resizable=1',
'max_uploaded_file_size' => 100000,
'max_connections_from_one_host' => 10,
'thread_lifetime' => 60,
'thread_lifetime' => 600,
'email' => '', /* inbox for left messages */
'left_messages_locale' => $home_locale,

2
src/messenger/webim/libs/getcode.php
View File

@ -39,7 +39,7 @@ function generate_button($title, $locale, $style, $invitationstyle, $group, $inn
$temp .= '<div id="mibewinvitation"></div><script type="text/javascript">var mibewInviteStyle = \'@import url(';
$temp .= get_app_location($showhost, $forcesecure);
$temp .= '/styles/invitations/';
$temp .= ($invitationstyle?$invitationstyle:$settings['invitationstyle']);
$temp .= ($invitationstyle?$invitationstyle:(array_key_exists('invitationstyle', $settings)?$settings['invitationstyle']:'default'));
$temp .= '/invite.css);\'; var mibewRequestTimeout = ';
$temp .= $settings['updatefrequency_tracking'];
$temp .= '*1000; var mibewRequestUrl = \'';

4
src/messenger/webim/libs/track.php
View File

@ -50,8 +50,8 @@ function track_visitor_start($entry, $referer, $link)
db_escape_string($entry),
db_escape_string(track_build_details())), $link);
if ($id) {
track_visit_page($id, $referer, $link);
if ($SESSION['visitorid']) {
track_visit_page($SESSION['visitorid'], $referer, $link);
}
$id = db_insert_id($link);

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

@ -504,7 +504,7 @@ settings.survey.askmessage=Show initial question field
settings.title=Messenger settings
settings.trackinglifetime.description=Specify the lifetime of old visitor's tracks in seconds. Default is 600 seconds.
settings.trackinglifetime=Track lifetime
settings.threadlifetime.description=Specify the lifetime of the thread after closing the dialog box in seconds. Default is 60 seconds. Set 0 for unlimited thread lifetime.
settings.threadlifetime.description=Specify the lifetime of the thread after closing the dialog box in seconds. Default is 600 seconds. Set 0 for unlimited thread lifetime.
settings.threadlifetime=Thread lifetime
settings.usercanchangename.description=Turn off to hide edit box from chat window
settings.usercanchangename=Allows users to change their names

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

@ -494,7 +494,7 @@ settings.survey.askmessage=
settings.title=Настройки мессенджера
settings.trackinglifetime.description=Укажите срок хранения старых отслеженных путей в секундах. По умолчанию, 600 секунд.
settings.trackinglifetime=Срок хранения отслеженных путей
settings.threadlifetime.description=Укажите время жизни диалога после закрытия диалогового окна в секундах. По умолчанию, 60 секунд. Укажите 0 для снятия ограничения.
settings.threadlifetime.description=Укажите время жизни диалога после закрытия диалогового окна в секундах. По умолчанию, 600 секунд. Укажите 0 для снятия ограничения.
settings.threadlifetime=Время жизни диалога
settings.usercanchangename.description=Возможность убрать поле смены имени из чат окна
settings.usercanchangename=Разрешать посетителям менять имена

2
src/messenger/webim/operator/update.php
View File

@ -235,7 +235,7 @@ function print_visitors()
$output = array();
$query = "SELECT visitorid, userid, username, unix_timestamp(firsttime), unix_timestamp(lasttime), " .
"entry, path, details, invited, unix_timestamp(invitationtime), invitedby, invitations, chats " .
"entry, details, invited, unix_timestamp(invitationtime), invitedby, invitations, chats " .
"FROM ${mysqlprefix}chatsitevisitor " .
"WHERE threadid IS NULL " .
"ORDER BY invited, lasttime DESC, invitations";