From e60fb9921e381d11b31c7b0193e2fa437124ebb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?=
 <info@promo360.ru>
Date: Tue, 7 Jan 2014 01:32:50 +0600
Subject: [PATCH] Site Url without trailing slashes

---
 admin/index.php                                    |  2 +-
 .../box/pages/views/frontend/breadcrumbs.view.php  |  4 ++--
 plugins/box/users/users.plugin.php                 | 14 +++++++-------
 public/themes/default/footer-links.chunk.php       |  2 +-
 public/themes/default/header.chunk.php             |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 25d8d80..d09b112 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -131,7 +131,7 @@ if (Request::post('reset_password_submit')) {
         Notification::set('reset_password', 'reset_password');
 
         // Redirect to password-reset page
-        Request::redirect(Site::url().'admin');
+        Request::redirect(Site::url().'/admin');
 
     }
 
diff --git a/plugins/box/pages/views/frontend/breadcrumbs.view.php b/plugins/box/pages/views/frontend/breadcrumbs.view.php
index 4889b76..12a5320 100644
--- a/plugins/box/pages/views/frontend/breadcrumbs.view.php
+++ b/plugins/box/pages/views/frontend/breadcrumbs.view.php
@@ -1,5 +1,5 @@
 <?php if ($parent) { ?>
-    <a href="<?php echo Site::url().$page['parent']; ?>"><?php echo $parent_page['title']; ?></a>&nbsp;<span>&rarr;</span>&nbsp;<a href="<?php echo Site::url().$page['parent'].'/'.$page['slug']; ?>"><?php echo $page['title']; ?></a>
+    <a href="<?php echo Site::url().'/'.$page['parent']; ?>"><?php echo $parent_page['title']; ?></a>&nbsp;<span>&rarr;</span>&nbsp;<a href="<?php echo Site::url().'/'.$page['parent'].'/'.$page['slug']; ?>"><?php echo $page['title']; ?></a>
 <?php } else { ?>
-    <a href="<?php echo Site::url().$page['slug']; ?>"><?php echo $page['title']; ?></a>
+    <a href="<?php echo Site::url().'/'.$page['slug']; ?>"><?php echo $page['title']; ?></a>
 <?php }
diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php
index 6581b1f..349c1d8 100644
--- a/plugins/box/users/users.plugin.php
+++ b/plugins/box/users/users.plugin.php
@@ -170,7 +170,7 @@ class Users extends Frontend
                         ->display();
 
             } else {
-                Request::redirect(Site::url().'users/'.Session::get('user_id'));
+                Request::redirect(Site::url().'/users/'.Session::get('user_id'));
             }
 
         } else {
@@ -240,7 +240,7 @@ class Users extends Frontend
                             }
 
                             Notification::set('success', __('Your changes have been saved.', 'users'));
-                            Request::redirect(Site::url().'users/'.$user['id']);
+                            Request::redirect(Site::url().'/users/'.$user['id']);
                         }
                     } else { }
 
@@ -253,7 +253,7 @@ class Users extends Frontend
                 ->display();
 
         } else {
-            Request::redirect(Site::url().'users/login');
+            Request::redirect(Site::url().'/users/login');
         }
     }
 
@@ -307,7 +307,7 @@ class Users extends Frontend
                     Notification::set('success', __('New password has been sent', 'users'));
 
                     // Redirect to password-reset page
-                    Request::redirect(Site::url().'users/password-reset');
+                    Request::redirect(Site::url().'/users/password-reset');
 
                 }
             }
@@ -356,7 +356,7 @@ class Users extends Frontend
                         Notification::set('success', __('Your login details for :site_name has been sent', 'users', array(':site_name' => $site_name)));
 
                         // Redirect to password-reset page
-                        Request::redirect(Site::url().'users/password-reset');
+                        Request::redirect(Site::url().'/users/password-reset');
 
                     }
 
@@ -403,7 +403,7 @@ class Users extends Frontend
                                     Session::set('user_id', (int) $user['id']);
                                     Session::set('user_login', (string) $user['login']);
                                     Session::set('user_role', (string) $user['role']);
-                                    Request::redirect(Site::url().'users/'.Session::get('user_id'));
+                                    Request::redirect(Site::url().'/users/'.Session::get('user_id'));
                                 } else {
                                     Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users'));
 
@@ -440,7 +440,7 @@ class Users extends Frontend
 
             View::factory('box/users/views/frontend/login')->display();
         } else {
-            Request::redirect(Site::url().'users/'.Session::get('user_id'));
+            Request::redirect(Site::url().'/users/'.Session::get('user_id'));
         }
     }
 
diff --git a/public/themes/default/footer-links.chunk.php b/public/themes/default/footer-links.chunk.php
index 187c6bb..17ec4c8 100644
--- a/public/themes/default/footer-links.chunk.php
+++ b/public/themes/default/footer-links.chunk.php
@@ -1 +1 @@
-<a href="<?php echo Site::url(); ?>sitemap"><?php echo __('Sitemap', 'sitemap'); ?></a>
+<a href="<?php echo Site::url(); ?>/sitemap"><?php echo __('Sitemap', 'sitemap'); ?></a>
diff --git a/public/themes/default/header.chunk.php b/public/themes/default/header.chunk.php
index 0459926..e74bda3 100644
--- a/public/themes/default/header.chunk.php
+++ b/public/themes/default/header.chunk.php
@@ -32,8 +32,8 @@
     <![endif]-->
 
     <!-- Fav icons -->
-    <link rel="icon" href="<?php echo Site::url(); ?>favicon.ico" type="image/x-icon">
-    <link rel="shortcut icon" href="<?php echo Site::url(); ?>favicon.ico" type="image/x-icon">
+    <link rel="icon" href="<?php echo Site::url(); ?>/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="<?php echo Site::url(); ?>/favicon.ico" type="image/x-icon">
   </head>
 
   <body>