From 2c9e65b518a2b6251ce86eb4970392cdaedd162a Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Mon, 18 Feb 2013 12:59:50 +0000
Subject: [PATCH] Use 'company.*' vars instead of 'ct.company.*' in tempates

---
 src/messenger/webim/libs/chat.php                  | 14 ++++++++------
 .../styles/dialogs/default/templates/chat.tpl      | 10 +++++-----
 .../styles/dialogs/default/templates/error.tpl     | 10 +++++-----
 .../dialogs/default/templates/leavemessage.tpl     | 10 +++++-----
 .../dialogs/default/templates/leavemessagesent.tpl | 10 +++++-----
 .../styles/dialogs/default/templates/mail.tpl      | 10 +++++-----
 .../styles/dialogs/default/templates/mailsent.tpl  | 10 +++++-----
 .../styles/dialogs/default/templates/nochat.tpl    | 10 +++++-----
 .../styles/dialogs/default/templates/redirect.tpl  | 10 +++++-----
 .../dialogs/default/templates/redirected.tpl       | 10 +++++-----
 .../styles/dialogs/default/templates/survey.tpl    | 10 +++++-----
 11 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/src/messenger/webim/libs/chat.php b/src/messenger/webim/libs/chat.php
index 36aaa232..0f586e0e 100644
--- a/src/messenger/webim/libs/chat.php
+++ b/src/messenger/webim/libs/chat.php
@@ -139,13 +139,15 @@ function setup_logo($group = NULL) {
 
 	$toplevelgroup = (!$group)?array():get_top_level_group($group);
 
-	$data['ct.company.name'] = topage(empty($toplevelgroup['vctitle'])
-		? Settings::get('title')
-		: $toplevelgroup['vctitle']);
+	$data['company'] = array(
+		'name' => topage(empty($toplevelgroup['vctitle'])
+			? Settings::get('title')
+			: $toplevelgroup['vctitle']),
 
-	$data['ct.company.chatLogoURL'] = topage(empty($toplevelgroup['vclogo'])
-		? Settings::get('logo')
-		: $toplevelgroup['vclogo']);
+		'chatLogoURL' => topage(empty($toplevelgroup['vclogo'])
+			? Settings::get('logo')
+			: $toplevelgroup['vclogo'])
+	);
 
 	$data['webimHost'] = topage(empty($toplevelgroup['vchosturl'])
 		? Settings::get('hosturl')
diff --git a/src/messenger/webim/styles/dialogs/default/templates/chat.tpl b/src/messenger/webim/styles/dialogs/default/templates/chat.tpl
index eb323056..913f8313 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/chat.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/chat.tpl
@@ -108,15 +108,15 @@
         <!-- Chat window top. Includes logo and some info about company -->
         <div id="top">
             <div id="logo">
-                ${if:ct.company.chatLogoURL}
+                ${if:company.chatLogoURL}
                     ${if:webimHost}
                         <a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
-                            <img src="${page:ct.company.chatLogoURL}" alt=""/>
+                            <img src="${page:company.chatLogoURL}" alt=""/>
                         </a>
                     ${else:webimHost}
-                        <img src="${page:ct.company.chatLogoURL}" alt=""/>
+                        <img src="${page:company.chatLogoURL}" alt=""/>
                     ${endif:webimHost}
-                ${else:ct.company.chatLogoURL}
+                ${else:company.chatLogoURL}
                     ${if:webimHost}
                         <a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
                             <img src="${tplroot}/images/default-logo.gif" alt=""/>
@@ -124,7 +124,7 @@
                     ${else:webimHost}
                         <img src="${tplroot}/images/default-logo.gif" alt=""/>
                     ${endif:webimHost}
-                ${endif:ct.company.chatLogoURL}
+                ${endif:company.chatLogoURL}
                 &nbsp;
                 <div id="page-title">${page:chat.title}</div>
                 <div class="clear">&nbsp;</div>
diff --git a/src/messenger/webim/styles/dialogs/default/templates/error.tpl b/src/messenger/webim/styles/dialogs/default/templates/error.tpl
index bde431ce..98e06ebd 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/error.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/error.tpl
@@ -8,15 +8,15 @@
 <body class="bgbody">
 	<div id="top2">
 		<div id="logo">
-			${if:ct.company.chatLogoURL}
+			${if:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
-						<img src="${page:ct.company.chatLogoURL}" alt=""/>
+						<img src="${page:company.chatLogoURL}" alt=""/>
 					</a>
 				${else:webimHost}
-					<img src="${page:ct.company.chatLogoURL}" alt=""/>
+					<img src="${page:company.chatLogoURL}" alt=""/>
 				${endif:webimHost}
-			${else:ct.company.chatLogoURL}
+			${else:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
 						<img src="${tplroot}/images/default-logo.gif" alt=""/>
@@ -24,7 +24,7 @@
 				${else:webimHost}
 					<img src="${tplroot}/images/default-logo.gif" alt=""/>
 				${endif:webimHost}
-			${endif:ct.company.chatLogoURL}
+			${endif:company.chatLogoURL}
 			&nbsp;
 			<div id="page-title">${msg:leavemessage.title}</div>
 			<div class="clear">&nbsp;</div>
diff --git a/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl b/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl
index 7d798f57..8520dbd1 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl
@@ -22,15 +22,15 @@ ${endif:groups}
 
 	<div id="top2">
 		<div id="logo">
-			${if:ct.company.chatLogoURL}
+			${if:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
-						<img src="${page:ct.company.chatLogoURL}" alt=""/>
+						<img src="${page:company.chatLogoURL}" alt=""/>
 					</a>
 				${else:webimHost}
-					<img src="${page:ct.company.chatLogoURL}" alt=""/>
+					<img src="${page:company.chatLogoURL}" alt=""/>
 				${endif:webimHost}
-			${else:ct.company.chatLogoURL}
+			${else:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
 						<img src="${tplroot}/images/default-logo.gif" alt=""/>
@@ -38,7 +38,7 @@ ${endif:groups}
 				${else:webimHost}
 					<img src="${tplroot}/images/default-logo.gif" alt=""/>
 				${endif:webimHost}
-			${endif:ct.company.chatLogoURL}
+			${endif:company.chatLogoURL}
 			&nbsp;
 			<div id="page-title">${if:formgroupname}${form:groupname}: ${endif:formgroupname}${msg:leavemessage.title}</div>
 			<div class="clear">&nbsp;</div>
diff --git a/src/messenger/webim/styles/dialogs/default/templates/leavemessagesent.tpl b/src/messenger/webim/styles/dialogs/default/templates/leavemessagesent.tpl
index f165fb84..c2d87b4f 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/leavemessagesent.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/leavemessagesent.tpl
@@ -8,15 +8,15 @@
 <body class="bgbody">
 	<div id="top2">
 		<div id="logo">
-			${if:ct.company.chatLogoURL}
+			${if:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
-						<img src="${page:ct.company.chatLogoURL}" alt=""/>
+						<img src="${page:company.chatLogoURL}" alt=""/>
 					</a>
 				${else:webimHost}
-					<img src="${page:ct.company.chatLogoURL}" alt=""/>
+					<img src="${page:company.chatLogoURL}" alt=""/>
 				${endif:webimHost}
-			${else:ct.company.chatLogoURL}
+			${else:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
 						<img src="${tplroot}/images/default-logo.gif" alt=""/>
@@ -24,7 +24,7 @@
 				${else:webimHost}
 					<img src="${tplroot}/images/default-logo.gif" alt=""/>
 				${endif:webimHost}
-			${endif:ct.company.chatLogoURL}
+			${endif:company.chatLogoURL}
 			&nbsp;
 			<div id="page-title">${msg:leavemessage.sent.title}</div>
 			<div class="clear">&nbsp;</div>
diff --git a/src/messenger/webim/styles/dialogs/default/templates/mail.tpl b/src/messenger/webim/styles/dialogs/default/templates/mail.tpl
index ebde799e..b7196821 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/mail.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/mail.tpl
@@ -12,15 +12,15 @@
 
 	<div id="top2">
 		<div id="logo">
-			${if:ct.company.chatLogoURL}
+			${if:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
-						<img src="${page:ct.company.chatLogoURL}" alt=""/>
+						<img src="${page:company.chatLogoURL}" alt=""/>
 					</a>
 				${else:webimHost}
-					<img src="${page:ct.company.chatLogoURL}" alt=""/>
+					<img src="${page:company.chatLogoURL}" alt=""/>
 				${endif:webimHost}
-			${else:ct.company.chatLogoURL}
+			${else:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
 						<img src="${tplroot}/images/default-logo.gif" alt=""/>
@@ -28,7 +28,7 @@
 				${else:webimHost}
 					<img src="${tplroot}/images/default-logo.gif" alt=""/>
 				${endif:webimHost}
-			${endif:ct.company.chatLogoURL}
+			${endif:company.chatLogoURL}
 			&nbsp;<br />&nbsp;
 			<div id="page-title">${msg:mailthread.title}</div>
 			<div class="clear">&nbsp;</div>
diff --git a/src/messenger/webim/styles/dialogs/default/templates/mailsent.tpl b/src/messenger/webim/styles/dialogs/default/templates/mailsent.tpl
index 48ac7483..6132f292 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/mailsent.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/mailsent.tpl
@@ -8,15 +8,15 @@
 <body class="bgbody">
 	<div id="top2">
 		<div id="logo">
-			${if:ct.company.chatLogoURL}
+			${if:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
-						<img src="${page:ct.company.chatLogoURL}" alt=""/>
+						<img src="${page:company.chatLogoURL}" alt=""/>
 					</a>
 				${else:webimHost}
-					<img src="${page:ct.company.chatLogoURL}" alt=""/>
+					<img src="${page:company.chatLogoURL}" alt=""/>
 				${endif:webimHost}
-			${else:ct.company.chatLogoURL}
+			${else:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
 						<img src="${tplroot}/images/default-logo.gif" alt=""/>
@@ -24,7 +24,7 @@
 				${else:webimHost}
 					<img src="${tplroot}/images/default-logo.gif" alt=""/>
 				${endif:webimHost}
-			${endif:ct.company.chatLogoURL}
+			${endif:company.chatLogoURL}
 			&nbsp;
 			<div id="page-title">${msg:chat.mailthread.sent.title}</div>
 			<div class="clear">&nbsp;</div>
diff --git a/src/messenger/webim/styles/dialogs/default/templates/nochat.tpl b/src/messenger/webim/styles/dialogs/default/templates/nochat.tpl
index 24467ee1..044622dd 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/nochat.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/nochat.tpl
@@ -8,15 +8,15 @@
 <body class="bgbody">
 	<div id="top2">
 		<div id="logo">
-			${if:ct.company.chatLogoURL}
+			${if:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
-						<img src="${page:ct.company.chatLogoURL}" alt=""/>
+						<img src="${page:company.chatLogoURL}" alt=""/>
 					</a>
 				${else:webimHost}
-					<img src="${page:ct.company.chatLogoURL}" alt=""/>
+					<img src="${page:company.chatLogoURL}" alt=""/>
 				${endif:webimHost}
-			${else:ct.company.chatLogoURL}
+			${else:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
 						<img src="${tplroot}/images/default-logo.gif" alt=""/>
@@ -24,7 +24,7 @@
 				${else:webimHost}
 					<img src="${tplroot}/images/default-logo.gif" alt=""/>
 				${endif:webimHost}
-			${endif:ct.company.chatLogoURL}
+			${endif:company.chatLogoURL}
 			&nbsp;
 			<div id="page-title">${msg:page.chat.old_browser.title}</div>
 			<div class="clear">&nbsp;</div>
diff --git a/src/messenger/webim/styles/dialogs/default/templates/redirect.tpl b/src/messenger/webim/styles/dialogs/default/templates/redirect.tpl
index 703e4cce..2c2cedc2 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/redirect.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/redirect.tpl
@@ -8,15 +8,15 @@
 <body class="bgbody">
 	<div id="top2">
 		<div id="logo">
-			${if:ct.company.chatLogoURL}
+			${if:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
-						<img src="${page:ct.company.chatLogoURL}" alt=""/>
+						<img src="${page:company.chatLogoURL}" alt=""/>
 					</a>
 				${else:webimHost}
-					<img src="${page:ct.company.chatLogoURL}" alt=""/>
+					<img src="${page:company.chatLogoURL}" alt=""/>
 				${endif:webimHost}
-			${else:ct.company.chatLogoURL}
+			${else:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
 						<img src="${tplroot}/images/default-logo.gif" alt=""/>
@@ -24,7 +24,7 @@
 				${else:webimHost}
 					<img src="${tplroot}/images/default-logo.gif" alt=""/>
 				${endif:webimHost}
-			${endif:ct.company.chatLogoURL}
+			${endif:company.chatLogoURL}
 			&nbsp;<br />&nbsp;
 			<div id="page-title">${msg:chat.redirect.title}</div>
 			<div class="clear">&nbsp;</div>
diff --git a/src/messenger/webim/styles/dialogs/default/templates/redirected.tpl b/src/messenger/webim/styles/dialogs/default/templates/redirected.tpl
index 400c42b7..079422eb 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/redirected.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/redirected.tpl
@@ -8,15 +8,15 @@
 <body class="bgbody">
 	<div id="top2">
 		<div id="logo">
-			${if:ct.company.chatLogoURL}
+			${if:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
-						<img src="${page:ct.company.chatLogoURL}" alt=""/>
+						<img src="${page:company.chatLogoURL}" alt=""/>
 					</a>
 				${else:webimHost}
-					<img src="${page:ct.company.chatLogoURL}" alt=""/>
+					<img src="${page:company.chatLogoURL}" alt=""/>
 				${endif:webimHost}
-			${else:ct.company.chatLogoURL}
+			${else:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
 						<img src="${tplroot}/images/default-logo.gif" alt=""/>
@@ -24,7 +24,7 @@
 				${else:webimHost}
 					<img src="${tplroot}/images/default-logo.gif" alt=""/>
 				${endif:webimHost}
-			${endif:ct.company.chatLogoURL}
+			${endif:company.chatLogoURL}
 			&nbsp;
 			<div id="page-title">${msg:chat.redirected.title}</div>
 			<div class="clear">&nbsp;</div>
diff --git a/src/messenger/webim/styles/dialogs/default/templates/survey.tpl b/src/messenger/webim/styles/dialogs/default/templates/survey.tpl
index 2cae2ecf..bb80aa86 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/survey.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/survey.tpl
@@ -20,15 +20,15 @@
 <body class="bgbody">
 	<div id="top2">
 		<div id="logo">
-			${if:ct.company.chatLogoURL}
+			${if:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
-						<img src="${page:ct.company.chatLogoURL}" alt=""/>
+						<img src="${page:company.chatLogoURL}" alt=""/>
 					</a>
 				${else:webimHost}
-					<img src="${page:ct.company.chatLogoURL}" alt=""/>
+					<img src="${page:company.chatLogoURL}" alt=""/>
 				${endif:webimHost}
-			${else:ct.company.chatLogoURL}
+			${else:company.chatLogoURL}
 				${if:webimHost}
 					<a onclick="window.open('${page:webimHost}');return false;" href="${page:webimHost}">
 						<img src="${tplroot}/images/default-logo.gif" alt=""/>
@@ -36,7 +36,7 @@
 				${else:webimHost}
 					<img src="${tplroot}/images/default-logo.gif" alt=""/>
 				${endif:webimHost}
-			${endif:ct.company.chatLogoURL}
+			${endif:company.chatLogoURL}
 			&nbsp;
 			<div id="page-title">${msg:presurvey.title}</div>
 			<div class="clear">&nbsp;</div>