From 4996dd014aea928dea54f66b07c9bae0fed0456d Mon Sep 17 00:00:00 2001
From: alextselegidis <alextselegidis@gmail.com>
Date: Thu, 6 Oct 2016 21:00:58 +0200
Subject: [PATCH] Improved global variables definition in php files.

---
 src/application/views/backend/customers.php | 8 ++++----
 src/application/views/backend/services.php  | 6 +++---
 src/application/views/backend/settings.php  | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/application/views/backend/customers.php b/src/application/views/backend/customers.php
index 9d72c371..27236e7c 100644
--- a/src/application/views/backend/customers.php
+++ b/src/application/views/backend/customers.php
@@ -9,16 +9,16 @@
 
 <script type="text/javascript">
     var GlobalVariables = {
-        'csrfToken': <?php echo json_encode($this->security->get_csrf_hash()); ?>,
+        'csrfToken'         : <?php echo json_encode($this->security->get_csrf_hash()); ?>,
         'availableProviders': <?php echo json_encode($available_providers); ?>,
         'availableServices' : <?php echo json_encode($available_services); ?>,
         'dateFormat'        : <?php echo json_encode($date_format); ?>,
-        'baseUrl'           : <?php echo '"' . $base_url . '"'; ?>,
+        'baseUrl'           : <?php echo json_encode($base_url); ?>,
         'customers'         : <?php echo json_encode($customers); ?>,
         'user'              : {
             'id'        : <?php echo $user_id; ?>,
-            'email'     : <?php echo '"' . $user_email . '"'; ?>,
-            'role_slug' : <?php echo '"' . $role_slug . '"'; ?>,
+            'email'     : <?php echo json_encode($user_email); ?>,
+            'role_slug' : <?php echo json_encode($role_slug); ?>,
             'privileges': <?php echo json_encode($privileges); ?>
         }
     };
diff --git a/src/application/views/backend/services.php b/src/application/views/backend/services.php
index 0ff9c315..3198cb26 100644
--- a/src/application/views/backend/services.php
+++ b/src/application/views/backend/services.php
@@ -10,14 +10,14 @@
 <script type="text/javascript">
     var GlobalVariables = {
         'csrfToken'     : <?php echo json_encode($this->security->get_csrf_hash()); ?>,
-        'baseUrl'       : <?php echo '"' . $base_url . '"'; ?>,
+        'baseUrl'       : <?php echo json_encode($base_url); ?>,
         'dateFormat'    : <?php echo json_encode($date_format); ?>,
         'services'      : <?php echo json_encode($services); ?>,
         'categories'    : <?php echo json_encode($categories); ?>,
         'user'          : {
             'id'        : <?php echo $user_id; ?>,
-            'email'     : <?php echo '"' . $user_email . '"'; ?>,
-            'role_slug' : <?php echo '"' . $role_slug . '"'; ?>,
+            'email'     : <?php echo json_encode($user_email); ?>,
+            'role_slug' : <?php echo json_encode($role_slug); ?>,
             'privileges': <?php echo json_encode($privileges); ?>
         }
     };
diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index 72c5bc58..a65ea034 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -14,17 +14,17 @@
 <script type="text/javascript">
     var GlobalVariables = {
         'csrfToken'     : <?php echo json_encode($this->security->get_csrf_hash()); ?>,
-        'baseUrl'       : <?php echo '"' . $base_url . '"'; ?>,
+        'baseUrl'       : <?php echo json_encode($base_url); ?>,
         'dateFormat'    : <?php echo json_encode($date_format); ?>,
-        'userSlug'      : <?php echo '"' . $role_slug . '"'; ?>,
+        'userSlug'      : <?php echo json_encode($role_slug); ?>,
         'settings'      : {
             'system'    : <?php echo json_encode($system_settings); ?>,
             'user'      : <?php echo json_encode($user_settings); ?>
         },
         'user'          : {
             'id'        : <?php echo $user_id; ?>,
-            'email'     : <?php echo '"' . $user_email . '"'; ?>,
-            'role_slug' : <?php echo '"' . $role_slug . '"'; ?>,
+            'email'     : <?php echo json_encode($user_email); ?>,
+            'role_slug' : <?php echo json_encode($role_slug); ?>,
             'privileges': <?php echo json_encode($privileges); ?>
         }
     };