diff --git a/src/messenger/pack.pl b/src/messenger/pack.pl index 876c3957..a6b0704d 100755 --- a/src/messenger/pack.pl +++ b/src/messenger/pack.pl @@ -5,7 +5,7 @@ ################################################################## $targetFolder = "deploy"; -$suffix = "160"; +$suffix = "161"; ################################################################## # Copies tree into target folder, preprocess .phps diff --git a/src/messenger/webim/libs/operator.php b/src/messenger/webim/libs/operator.php index ac0bbfcc..0cbb2a05 100644 --- a/src/messenger/webim/libs/operator.php +++ b/src/messenger/webim/libs/operator.php @@ -105,13 +105,13 @@ function has_online_operators($groupid="") { global $settings; loadsettings(); $link = connect(); - $query = "select min(unix_timestamp(CURRENT_TIMESTAMP)-unix_timestamp(dtmlastvisited)) as time from chatoperator"; + $query = "select count(*) as total, min(unix_timestamp(CURRENT_TIMESTAMP)-unix_timestamp(dtmlastvisited)) as time from chatoperator"; if($groupid) { $query .= ", chatgroupoperator where groupid = $groupid and chatoperator.operatorid = chatgroupoperator.operatorid"; } $row = select_one_row($query,$link); mysql_close($link); - return $row['time'] < $settings['online_timeout']; + return $row['time'] < $settings['online_timeout'] && $row['total'] > 0; } function get_operator_name($operator) { diff --git a/src/messenger/webim/locales/en/properties b/src/messenger/webim/locales/en/properties index 44eef03f..f798c4f9 100644 --- a/src/messenger/webim/locales/en/properties +++ b/src/messenger/webim/locales/en/properties @@ -258,6 +258,7 @@ page.preview.agentrochat=View Chat window (operator in readonly mode) page.preview.chatsimple=Simple chat window, refresh to post messages (IE 5, Opera 7) page.preview.choose=Choose style page.preview.choosetpl=Choose template +page.preview.error=Error window page.preview.intro=From here, you can view the list of themes you currently have installed. page.preview.leavemessage=Leave message window page.preview.leavemessagesent="Message is delivered" window diff --git a/src/messenger/webim/styles/default/templates/chat.tpl b/src/messenger/webim/styles/default/templates/chat.tpl index 0733fed7..27ed1e1c 100644 --- a/src/messenger/webim/styles/default/templates/chat.tpl +++ b/src/messenger/webim/styles/default/templates/chat.tpl @@ -2,17 +2,16 @@ ${msg:chat.window.title.agent} - - + + - +//--> + - - - + + - - - +
- +
- +
@@ -161,16 +160,16 @@ ${endif:user} ${if:agent} + ${msg:chat.window.close_title} ${endif:agent} ${if:user} - + ${endif:user} ${if:agent} ${if:canpost} - ${endif:canpost} ${if:historyParams} @@ -183,7 +182,7 @@ ${endif:agent} ${if:sslLink} - ${endif:sslLink} @@ -203,7 +202,7 @@ ${endif:sslLink}
@@ -80,18 +79,18 @@ var threadParams = { servl:"${webimroot}/thread.php",wroot:"${webimroot}",freque ${if:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${else:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${endif:ct.company.chatLogoURL} - |Mail Mail  + Redirect  Refresh  + SSL 
 ${msg:chat.window.close_title}
@@ -218,11 +217,11 @@ ${endif:sslLink} - +
- +
@@ -253,11 +252,11 @@ ${if:canpost} ${else:isOpera95}
${endif:isOpera95} - - + ${endif:canpost}
+
diff --git a/src/messenger/webim/styles/default/templates/chatsimple.tpl b/src/messenger/webim/styles/default/templates/chatsimple.tpl index 25ddb985..82f61084 100644 --- a/src/messenger/webim/styles/default/templates/chatsimple.tpl +++ b/src/messenger/webim/styles/default/templates/chatsimple.tpl @@ -2,13 +2,12 @@ ${msg:chat.window.title.user} - - - + + - + @@ -110,7 +109,7 @@ @@ -137,7 +136,7 @@ - diff --git a/src/messenger/webim/styles/default/templates/error.tpl b/src/messenger/webim/styles/default/templates/error.tpl index 360e2a13..fd59f3a9 100644 --- a/src/messenger/webim/styles/default/templates/error.tpl +++ b/src/messenger/webim/styles/default/templates/error.tpl @@ -1,11 +1,10 @@ - - + +${msg:chat.error_page.title} - - + -
-
-
+ @@ -176,9 +175,9 @@
-
- ${msg:chat.window.send_message_short,send_shortcut}
+ 		+
+ ${msg:chat.window.send_message_short,send_shortcut}
+
@@ -27,20 +27,22 @@ ${if:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${else:ct.company.chatLogoURL} ${if:webimHost} - ${page:ct.company.name} + + + ${else:webimHost} - ${page:ct.company.name} + ${endif:webimHost} ${endif:ct.company.chatLogoURL} - +
${msg:chat.error_page.head}${msg:leavemessage.title}
@@ -59,9 +61,8 @@ -

- ${harderrors} -

+ + ${harderrors}
diff --git a/src/messenger/webim/styles/default/templates/leavemessage.tpl b/src/messenger/webim/styles/default/templates/leavemessage.tpl index f6b0d44a..5a710905 100644 --- a/src/messenger/webim/styles/default/templates/leavemessage.tpl +++ b/src/messenger/webim/styles/default/templates/leavemessage.tpl @@ -1,12 +1,10 @@ - - + + ${msg:leavemessage.title} - - - + @@ -54,22 +53,22 @@ ${if:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${else:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${endif:ct.company.chatLogoURL} - +
${msg:leavemessage.title}${msg:leavemessage.title}
diff --git a/src/messenger/webim/styles/default/templates/leavemessagesent.tpl b/src/messenger/webim/styles/default/templates/leavemessagesent.tpl index 11883b8a..d41e6149 100644 --- a/src/messenger/webim/styles/default/templates/leavemessagesent.tpl +++ b/src/messenger/webim/styles/default/templates/leavemessagesent.tpl @@ -1,11 +1,10 @@ - - + +${msg:leavemessage.sent.title} - - + - +
@@ -27,22 +27,22 @@ ${if:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${else:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${endif:ct.company.chatLogoURL} - +
${msg:leavemessage.sent.title}${msg:leavemessage.sent.title}
diff --git a/src/messenger/webim/styles/default/templates/mail.tpl b/src/messenger/webim/styles/default/templates/mail.tpl index 2f736bd1..a8c22166 100644 --- a/src/messenger/webim/styles/default/templates/mail.tpl +++ b/src/messenger/webim/styles/default/templates/mail.tpl @@ -1,11 +1,10 @@ - - + +${msg:chat.window.title.user} - - + - +
- +
@@ -41,22 +41,22 @@ ${if:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${else:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${endif:ct.company.chatLogoURL} ${msg:mailthread.title}${msg:mailthread.title}
${if:errors} @@ -75,7 +75,7 @@ ${endif:errors} 		- + @@ -105,7 +105,7 @@ ${endif:errors}
${msg:mailthread.enter_email}${msg:mailthread.enter_email}
- diff --git a/src/messenger/webim/styles/default/templates/mailsent.tpl b/src/messenger/webim/styles/default/templates/mailsent.tpl index 28e3a4ec..f7f1b30f 100644 --- a/src/messenger/webim/styles/default/templates/mailsent.tpl +++ b/src/messenger/webim/styles/default/templates/mailsent.tpl @@ -1,11 +1,10 @@ - - + +${msg:chat.window.title.user} - - + -
+
@@ -27,22 +27,22 @@ ${if:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${else:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${endif:ct.company.chatLogoURL} - +
${msg:chat.mailthread.sent.title}${msg:chat.mailthread.sent.title}
diff --git a/src/messenger/webim/styles/default/templates/nochat.tpl b/src/messenger/webim/styles/default/templates/nochat.tpl index 2f17c77a..fb90fc66 100644 --- a/src/messenger/webim/styles/default/templates/nochat.tpl +++ b/src/messenger/webim/styles/default/templates/nochat.tpl @@ -1,11 +1,10 @@ - - + +${msg:chat.window.title.user} - - - + - +
@@ -27,22 +27,22 @@ ${if:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${else:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${endif:ct.company.chatLogoURL} - +
${msg:page.chat.old_browser.title}${msg:page.chat.old_browser.title}
@@ -61,9 +61,9 @@ -

- ${msg:page.chat.old_browser.list} -

+ + ${msg:page.chat.old_browser.list} +
diff --git a/src/messenger/webim/styles/default/templates/redirect.tpl b/src/messenger/webim/styles/default/templates/redirect.tpl index 648fcff8..0b0e07cc 100644 --- a/src/messenger/webim/styles/default/templates/redirect.tpl +++ b/src/messenger/webim/styles/default/templates/redirect.tpl @@ -1,12 +1,10 @@ - - + + ${msg:chat.window.title.agent} - - - - + @@ -51,22 +49,22 @@ ${if:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${else:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${endif:ct.company.chatLogoURL} - +
${msg:chat.redirect.title}${msg:chat.redirect.title}
diff --git a/src/messenger/webim/styles/default/templates/redirected.tpl b/src/messenger/webim/styles/default/templates/redirected.tpl index 99631c23..49bfb6b4 100644 --- a/src/messenger/webim/styles/default/templates/redirected.tpl +++ b/src/messenger/webim/styles/default/templates/redirected.tpl @@ -1,11 +1,10 @@ - - + +${msg:chat.window.title.user} - - + - +
@@ -27,22 +27,22 @@ ${if:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${else:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${endif:ct.company.chatLogoURL} - +
${msg:chat.redirected.title}${msg:chat.redirected.title}
diff --git a/src/messenger/webim/styles/default/templates/survey.tpl b/src/messenger/webim/styles/default/templates/survey.tpl index 966f0386..9e5fee2f 100644 --- a/src/messenger/webim/styles/default/templates/survey.tpl +++ b/src/messenger/webim/styles/default/templates/survey.tpl @@ -1,12 +1,10 @@ - - + +${msg:presurvey.title} - - - + @@ -60,22 +59,22 @@ ${ifnot:showmessage} - + ${else:webimHost} - + ${endif:webimHost} ${else:ct.company.chatLogoURL} ${if:webimHost} - + ${else:webimHost} - + ${endif:webimHost} ${endif:ct.company.chatLogoURL} - +
${msg:presurvey.title}${msg:presurvey.title}
diff --git a/src/messenger/webim/styles/original/templates/chat.tpl b/src/messenger/webim/styles/original/templates/chat.tpl index cfa4f606..4619bf18 100644 --- a/src/messenger/webim/styles/original/templates/chat.tpl +++ b/src/messenger/webim/styles/original/templates/chat.tpl @@ -2,17 +2,16 @@ ${msg:chat.window.title.agent} - - - + + - +//--> + - - - + + - +
+ ${msg:chat.window.close_title} ${endif:agent} ${if:user} - + ${endif:user} ${if:agent} ${if:canpost} - ${endif:canpost} ${if:historyParams} @@ -179,7 +179,7 @@ ${endif:agent} ${if:sslLink} - ${endif:sslLink} @@ -210,11 +210,11 @@ ${endif:sslLink}
- +
- - +
+
@@ -105,7 +105,7 @@ var threadParams = { servl:"${webimroot}/thread.php",wroot:"${webimroot}",freque
${msg:chat.window.close_title}
@@ -157,16 +157,16 @@ ${endif:user} ${if:agent} 		- Mail Mail  + Redirect  Refresh  + SSL  - +
- +
@@ -245,11 +245,11 @@ ${if:canpost} ${else:isOpera95} - diff --git a/src/messenger/webim/styles/original/templates/chatsimple.tpl b/src/messenger/webim/styles/original/templates/chatsimple.tpl index 8a8f1909..291574e8 100644 --- a/src/messenger/webim/styles/original/templates/chatsimple.tpl +++ b/src/messenger/webim/styles/original/templates/chatsimple.tpl @@ -2,13 +2,12 @@ ${msg:chat.window.title.user} - - - + + - +
${endif:isOpera95} - - + ${endif:canpost}
+
@@ -288,9 +288,9 @@ ${if:canpost}
-
- ${msg:chat.window.send_message_short,send_shortcut}
+ 		+
+ ${msg:chat.window.send_message_short,send_shortcut}
@@ -17,7 +16,7 @@
-
+ @@ -137,7 +136,7 @@ - diff --git a/src/messenger/webim/styles/original/templates/error.tpl b/src/messenger/webim/styles/original/templates/error.tpl index fc50c35a..b6500a29 100644 --- a/src/messenger/webim/styles/original/templates/error.tpl +++ b/src/messenger/webim/styles/original/templates/error.tpl @@ -1,11 +1,10 @@ - - + +${msg:chat.error_page.title} - - - -
@@ -110,7 +109,7 @@
-
- + @@ -176,9 +175,9 @@
-
- ${msg:chat.window.send_message_short,send_shortcut}
+ 		+
+ ${msg:chat.window.send_message_short,send_shortcut}
+ + +
- +
@@ -36,19 +36,19 @@ - +
- + - - +
+ ${harderrors}
diff --git a/src/messenger/webim/styles/original/templates/leavemessage.tpl b/src/messenger/webim/styles/original/templates/leavemessage.tpl index 35ff8ad3..371439e9 100644 --- a/src/messenger/webim/styles/original/templates/leavemessage.tpl +++ b/src/messenger/webim/styles/original/templates/leavemessage.tpl @@ -1,11 +1,10 @@ - - + + ${msg:leavemessage.title} - - - - + + +
- +
@@ -58,7 +58,7 @@ ${endif:errors} @@ -98,9 +98,9 @@ ${endif:errors}
-
+
@@ -78,11 +78,11 @@ ${endif:errors} -
${msg:leavemessage.descr}
${msg:form.field.message}: -
- +
+
+
- diff --git a/src/messenger/webim/styles/original/templates/leavemessagesent.tpl b/src/messenger/webim/styles/original/templates/leavemessagesent.tpl index 7ff606f1..6d1e4ca2 100644 --- a/src/messenger/webim/styles/original/templates/leavemessagesent.tpl +++ b/src/messenger/webim/styles/original/templates/leavemessagesent.tpl @@ -1,11 +1,10 @@ - - + +${msg:leavemessage.sent.title} - - - -
-
- ${msg:leavemessage.perform}
+ 		+
+ ${msg:leavemessage.perform}
+ + +
- +
@@ -36,16 +36,16 @@ - +
- + - @@ -54,7 +54,7 @@ - +
+ ${msg:leavemessage.sent.message}
diff --git a/src/messenger/webim/styles/original/templates/mail.tpl b/src/messenger/webim/styles/original/templates/mail.tpl index 2e7f3ca0..a3a78825 100644 --- a/src/messenger/webim/styles/original/templates/mail.tpl +++ b/src/messenger/webim/styles/original/templates/mail.tpl @@ -1,11 +1,10 @@ - - + + ${msg:chat.window.title.user} - - - - + + +
@@ -79,9 +79,9 @@ ${endif:errors}
- +
@@ -57,13 +57,13 @@ ${endif:errors} -
+
-
${msg:mailthread.enter_email}
+
- diff --git a/src/messenger/webim/styles/original/templates/mailsent.tpl b/src/messenger/webim/styles/original/templates/mailsent.tpl index d41dc006..15601663 100644 --- a/src/messenger/webim/styles/original/templates/mailsent.tpl +++ b/src/messenger/webim/styles/original/templates/mailsent.tpl @@ -1,11 +1,10 @@ - - + +${msg:chat.window.title.user} - - - -
-
- ${msg:mailthread.perform}
+ 		+
+ ${msg:mailthread.perform}
+ + +
- +
@@ -36,16 +36,16 @@ - +
- + - - +
+ ${msg:chat.mailthread.sent.content,email}
${msg:chat.mailthread.sent.closewindow} @@ -56,7 +56,7 @@
diff --git a/src/messenger/webim/styles/original/templates/nochat.tpl b/src/messenger/webim/styles/original/templates/nochat.tpl index 40fe19d8..aff91f94 100644 --- a/src/messenger/webim/styles/original/templates/nochat.tpl +++ b/src/messenger/webim/styles/original/templates/nochat.tpl @@ -1,11 +1,10 @@ - - + + ${msg:page.chat.old_browser.title} - - - - + + +
- +
@@ -35,19 +35,19 @@ - +
- + - - +
+ ${msg:page.chat.old_browser.problem} ${msg:page.chat.old_browser.list}
diff --git a/src/messenger/webim/styles/original/templates/redirect.tpl b/src/messenger/webim/styles/original/templates/redirect.tpl index 1ba5ce97..9a59f949 100644 --- a/src/messenger/webim/styles/original/templates/redirect.tpl +++ b/src/messenger/webim/styles/original/templates/redirect.tpl @@ -1,11 +1,10 @@ - - + + ${msg:chat.window.title.agent} - - - - + + +
- +
@@ -33,7 +33,7 @@

${msg:chat.redirect.title}

${msg:chat.redirect.choose}

-
+
@@ -45,18 +45,18 @@ 		- +
- + -
+ - +
- +
@@ -90,7 +90,7 @@ ${endif:redirectToGroup}
diff --git a/src/messenger/webim/styles/original/templates/redirected.tpl b/src/messenger/webim/styles/original/templates/redirected.tpl index a72615c0..0d1c1e20 100644 --- a/src/messenger/webim/styles/original/templates/redirected.tpl +++ b/src/messenger/webim/styles/original/templates/redirected.tpl @@ -1,11 +1,10 @@ - - + + ${msg:chat.window.title.agent} - - - - + + +
@@ -71,7 +71,7 @@
- +
- +
@@ -36,16 +36,16 @@ - +
- + - - +
+ ${page:message}
${msg:chat.redirected.closewindow} @@ -56,7 +56,7 @@
diff --git a/src/messenger/webim/styles/original/templates/survey.tpl b/src/messenger/webim/styles/original/templates/survey.tpl index 665bfbc6..6df2760d 100644 --- a/src/messenger/webim/styles/original/templates/survey.tpl +++ b/src/messenger/webim/styles/original/templates/survey.tpl @@ -1,11 +1,10 @@ - - + + ${msg:presurvey.title} - - - - + + +
@@ -147,7 +145,7 @@ var threadParams = { servl:"${webimroot}/thread.php",wroot:"${webimroot}",freque ${endif:canpost}
@@ -34,7 +34,7 @@ ${ifnot:showemail}${endif:showemail} ${ifnot:groups}${if:formgroupid}${endif:formgroupid}${endif:groups} ${ifnot:showmessage}${endif:showmessage} - +
@@ -63,7 +63,7 @@ ${endif:errors} @@ -124,9 +124,9 @@ ${endif:showmessage}
-
+
@@ -101,14 +101,14 @@ ${if:showmessage} -
${msg:presurvey.intro}
${msg:presurvey.question}: ${endif:showmessage} -
- +
+
+
- diff --git a/src/messenger/webim/styles/simplicity/chat.css b/src/messenger/webim/styles/simplicity/chat.css index c3d80257..8399cf40 100644 --- a/src/messenger/webim/styles/simplicity/chat.css +++ b/src/messenger/webim/styles/simplicity/chat.css @@ -173,6 +173,12 @@ TEXTAREA.message { padding-left: 3px; } +textarea.field { + margin: 0px; + padding: 0px 3px; + overflow: auto; +} + .dropdown { font-family: Arial, Helvetica, sans-serif; font-size: 11px; diff --git a/src/messenger/webim/styles/simplicity/templates/chat.tpl b/src/messenger/webim/styles/simplicity/templates/chat.tpl index 02247e3b..fbd6e474 100644 --- a/src/messenger/webim/styles/simplicity/templates/chat.tpl +++ b/src/messenger/webim/styles/simplicity/templates/chat.tpl @@ -2,23 +2,21 @@ ${msg:chat.window.title.agent} - - - - - - - - - - + +
-
- ${msg:presurvey.submit}
+ 		+
+ ${msg:presurvey.submit}
@@ -34,7 +32,7 @@ var threadParams = { servl:"${webimroot}/thread.php",wroot:"${webimroot}",freque ${endif:historyParams}
- ${msg:chat.window.close_title} + ${msg:chat.window.close_title}
${endif:agent} @@ -68,13 +66,13 @@ var threadParams = { servl:"${webimroot}/thread.php",wroot:"${webimroot}",freque ${if:user} ${endif:user} ${if:agent} ${if:canpost} ${endif:canpost} ${if:historyParams} @@ -91,11 +89,11 @@ var threadParams = { servl:"${webimroot}/thread.php",wroot:"${webimroot}",freque ${if:sslLink} ${endif:sslLink}
- ${msg:chat.window.toolbar.mail_history} + ${msg:chat.window.toolbar.mail_history} - ${msg:chat.window.toolbar.redirect_user} + ${msg:chat.window.toolbar.redirect_user} - SSL + SSL - ${msg:chat.window.close_title} + ${msg:chat.window.close_title}
- + @@ -44,7 +43,7 @@ @@ -52,10 +51,10 @@
-
- + - + @@ -69,7 +68,7 @@
- + - + + diff --git a/src/messenger/webim/styles/simplicity/templates/leavemessage.tpl b/src/messenger/webim/styles/simplicity/templates/leavemessage.tpl index aa866dde..b79a6b31 100644 --- a/src/messenger/webim/styles/simplicity/templates/leavemessage.tpl +++ b/src/messenger/webim/styles/simplicity/templates/leavemessage.tpl @@ -1,5 +1,5 @@ - - + + ${msg:leavemessage.title} @@ -46,7 +46,7 @@
${msg:form.field.message}:
- + - + - + - + - + - + - + - - + + ${endif:showmessage} @@ -86,7 +86,7 @@
- +