From 3f6a95f7a61e9962d0c49a3866999691d62f5909 Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Wed, 14 Jan 2015 14:37:30 +0000
Subject: [PATCH] Use human-readable way to define visitor track window params

---
 src/mibew/js/source/users/model_views/visitor.js          | 2 +-
 .../libs/classes/Mibew/Controller/UsersController.php     | 2 +-
 src/mibew/libs/classes/Mibew/Style/PageStyle.php          | 2 +-
 src/mibew/styles/pages/default/config.yml                 | 8 +++++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/mibew/js/source/users/model_views/visitor.js b/src/mibew/js/source/users/model_views/visitor.js
index c17d82a8..081c93cf 100644
--- a/src/mibew/js/source/users/model_views/visitor.js
+++ b/src/mibew/js/source/users/model_views/visitor.js
@@ -101,7 +101,7 @@
                         + '?visitor='
                         + visitorId,
                     'ImTracked' + visitorId,
-                    page.get('trackedVisitorWindowParams')
+                    Mibew.Utils.buildWindowParams(page.get('trackedVisitorWindowParams'))
                 );
             },
 
diff --git a/src/mibew/libs/classes/Mibew/Controller/UsersController.php b/src/mibew/libs/classes/Mibew/Controller/UsersController.php
index 408defd1..493c1094 100644
--- a/src/mibew/libs/classes/Mibew/Controller/UsersController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/UsersController.php
@@ -127,7 +127,7 @@ class UsersController extends AbstractController
                     'chatWindowParams' => $chat_style_config['chat']['window'],
                     'geoWindowParams' => Settings::get('geolinkparams'),
                     'trackedUserWindowParams' => $page_style_config['tracked']['user_window'],
-                    'trackedVisitorWindowParams' => $page_style_config['tracked']['visitor_window_params'],
+                    'trackedVisitorWindowParams' => $page_style_config['tracked']['visitor_window'],
                     'banWindowParams' => $page_style_config['ban']['window'],
                     'inviteWindowParams' => $chat_style_config['chat']['window'],
                 ),
diff --git a/src/mibew/libs/classes/Mibew/Style/PageStyle.php b/src/mibew/libs/classes/Mibew/Style/PageStyle.php
index b552f7a8..4ecbf8ce 100644
--- a/src/mibew/libs/classes/Mibew/Style/PageStyle.php
+++ b/src/mibew/libs/classes/Mibew/Style/PageStyle.php
@@ -127,7 +127,7 @@ class PageStyle extends AbstractHandlebarsPoweredStyle implements StyleInterface
             ),
             'tracked' => array(
                 'user_window' => array(),
-                'visitor_window_params' => '',
+                'visitor_window' => array(),
             ),
             'ban' => array(
                 'window' => array(),
diff --git a/src/mibew/styles/pages/default/config.yml b/src/mibew/styles/pages/default/config.yml
index d3ecc2dc..22fa23fe 100644
--- a/src/mibew/styles/pages/default/config.yml
+++ b/src/mibew/styles/pages/default/config.yml
@@ -20,7 +20,13 @@ tracked:
         width: 640
         height: 480
         resizable: true
-    visitor_window_params: "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1"
+    # These params are used for visitor's track windows opened via JavaScript's
+    # window.open method.
+    visitor_window:
+        width: 640
+        height: 480
+        scrollbars: true
+        resizable: true
 
 ban:
     # These params are used for history windows opened via JavaScript's