From 8b0ba10a5aec38dd60a2974683d4e7c3cbe41f8e Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Fri, 3 Jan 2014 23:45:28 +0200
Subject: [PATCH] Site Url without trailing slashes

---
 plugins/box/menu/views/frontend/index.view.php       |  2 +-
 plugins/box/users/views/frontend/index.view.php      |  2 +-
 plugins/box/users/views/frontend/profile.view.php    |  6 +++---
 plugins/box/users/views/frontend/userspanel.view.php | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/box/menu/views/frontend/index.view.php b/plugins/box/menu/views/frontend/index.view.php
index 5644908..eafd4f1 100644
--- a/plugins/box/menu/views/frontend/index.view.php
+++ b/plugins/box/menu/views/frontend/index.view.php
@@ -12,7 +12,7 @@
 
             $pos = strpos($item['link'], 'http://');
             if ($pos === false) {
-                $link = Option::get('siteurl').$item['link'];
+                $link = Option::get('siteurl').'/'.$item['link'];
             } else {
                 $link = $item['link'];
             }
diff --git a/plugins/box/users/views/frontend/index.view.php b/plugins/box/users/views/frontend/index.view.php
index 9173f3a..136bd2a 100644
--- a/plugins/box/users/views/frontend/index.view.php
+++ b/plugins/box/users/views/frontend/index.view.php
@@ -7,7 +7,7 @@
     <?php foreach ($users as $user) { ?>
     <tr>
         <td>
-            <a href="<?php echo Site::url(); ?>users/<?php echo $user['id']; ?>"><?php echo $user['login']; ?></a>
+            <a href="<?php echo Site::url(); ?>/users/<?php echo $user['id']; ?>"><?php echo $user['login']; ?></a>
         </td>
     </tr>
     <?php } ?>
diff --git a/plugins/box/users/views/frontend/profile.view.php b/plugins/box/users/views/frontend/profile.view.php
index 057affe..f92e19c 100644
--- a/plugins/box/users/views/frontend/profile.view.php
+++ b/plugins/box/users/views/frontend/profile.view.php
@@ -13,8 +13,8 @@
 </table>
 <br>
 <?php if (Users::isLoged()) { ?>
-<a href="<?php echo Site::url(); ?>users/<?php echo $user['id']; ?>/edit"><?php echo __('Edit profile', 'users'); ?></a> /
-<?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?> <a href="<?php echo Site::url(); ?>admin"><?php echo __('Administration', 'system'); ?></a> / <?php } ?>
-<a href="<?php echo Site::url(); ?>users/logout"><?php echo __('Log Out', 'users'); ?></a>
+<a href="<?php echo Site::url(); ?>/users/<?php echo $user['id']; ?>/edit"><?php echo __('Edit profile', 'users'); ?></a> /
+<?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?> <a href="<?php echo Site::url(); ?>/admin"><?php echo __('Administration', 'system'); ?></a> / <?php } ?>
+<a href="<?php echo Site::url(); ?>/users/logout"><?php echo __('Log Out', 'users'); ?></a>
 <?php } ?>
 <?php } else { echo __('This users doesnt exists', 'users'); } ?>
diff --git a/plugins/box/users/views/frontend/userspanel.view.php b/plugins/box/users/views/frontend/userspanel.view.php
index fe7b0d4..6758f10 100644
--- a/plugins/box/users/views/frontend/userspanel.view.php
+++ b/plugins/box/users/views/frontend/userspanel.view.php
@@ -1,13 +1,13 @@
 <div style="float:right">
     <?php if (Session::get('user_id')) { ?>
         <?php echo __('Welcome', 'users'); ?>,
-        <a href="<?php echo Site::url(); ?>users/<?php echo Session::get('user_id'); ?>"><?php echo Session::get('user_login'); ?></a> /
+        <a href="<?php echo Site::url(); ?>/users/<?php echo Session::get('user_id'); ?>"><?php echo Session::get('user_login'); ?></a> /
         <?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?>
-            <a href="<?php echo Site::url(); ?>admin"><?php echo __('Administration', 'system'); ?></a> /
+            <a href="<?php echo Site::url(); ?>/admin"><?php echo __('Administration', 'system'); ?></a> /
         <?php } ?>
-        <a href="<?php echo Site::url(); ?>users/logout"><?php echo __('Log Out', 'users'); ?></a>
+        <a href="<?php echo Site::url(); ?>/users/logout"><?php echo __('Log Out', 'users'); ?></a>
         <?php } else { ?>
-        <a href="<?php echo Site::url(); ?>users/login"><?php echo __('Log In', 'users'); ?></a> /
-        <a href="<?php echo Site::url(); ?>users/registration"><?php echo __('Registration', 'users'); ?></a>
+        <a href="<?php echo Site::url(); ?>/users/login"><?php echo __('Log In', 'users'); ?></a> /
+        <a href="<?php echo Site::url(); ?>/users/registration"><?php echo __('Registration', 'users'); ?></a>
     <?php } ?>
 </div>