From 29d506a86275a56c28431ebd0c6b0ac5004e3754 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 00:39:31 +0600
Subject: [PATCH 1/3] W3

---
 admin/themes/default/login.template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/themes/default/login.template.php b/admin/themes/default/login.template.php
index 8f27beb..f6b5aa1 100644
--- a/admin/themes/default/login.template.php
+++ b/admin/themes/default/login.template.php
@@ -66,7 +66,7 @@
             <div class="administration-area">
                 <hr>
                 <div>
-                    <h2 style="text-align:center;"><?php echo __('Administration', 'system'); ?></h2><br />
+                    <h2 style="text-align:center;"><?php echo __('Administration', 'system'); ?></h2><br>
                     <form method="post">
                         <div class="form-group">
                             <label><?php echo __('Username', 'users'); ?></label>

From 432942abf85f855ab4a343c037d39d15ce42f915 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 00:44:58 +0600
Subject: [PATCH 2/3] W3 Fixes <br/> > <br>

---
 admin/themes/default/login.template.php                    | 2 +-
 libraries/Gelato/Html/Html.php                             | 2 +-
 plugins/codemirror/codemirror/mode/gas/index.html          | 2 +-
 plugins/codemirror/codemirror/mode/htmlembedded/index.html | 2 +-
 plugins/codemirror/codemirror/mode/smarty/index.html       | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/themes/default/login.template.php b/admin/themes/default/login.template.php
index f6b5aa1..7c3ed8a 100644
--- a/admin/themes/default/login.template.php
+++ b/admin/themes/default/login.template.php
@@ -87,7 +87,7 @@
             <div class="reset-password-area">
                 <hr>
                 <div>
-                    <h2 style="text-align:center;"><?php echo __('Reset Password', 'users'); ?></h2><br />
+                    <h2 style="text-align:center;"><?php echo __('Reset Password', 'users'); ?></h2><br>
                     <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
                     <form method="post">
                         <div class="form-group">
diff --git a/libraries/Gelato/Html/Html.php b/libraries/Gelato/Html/Html.php
index c757e52..26a8ca7 100644
--- a/libraries/Gelato/Html/Html.php
+++ b/libraries/Gelato/Html/Html.php
@@ -157,7 +157,7 @@ class Html
      */
     public static function br($num = 1)
     {
-        return str_repeat("<br />",(int) $num);
+        return str_repeat("<br>",(int) $num);
     }
 
     /**
diff --git a/plugins/codemirror/codemirror/mode/gas/index.html b/plugins/codemirror/codemirror/mode/gas/index.html
index cd8a2ff..77f24de 100644
--- a/plugins/codemirror/codemirror/mode/gas/index.html
+++ b/plugins/codemirror/codemirror/mode/gas/index.html
@@ -45,7 +45,7 @@ main:
         pop     {sp, pc}
 
 message:
-        .asciz "Hello world!<br />"
+        .asciz "Hello world!<br>"
 </textarea>
         </form>
 
diff --git a/plugins/codemirror/codemirror/mode/htmlembedded/index.html b/plugins/codemirror/codemirror/mode/htmlembedded/index.html
index 4ab90f7..37e9289 100644
--- a/plugins/codemirror/codemirror/mode/htmlembedded/index.html
+++ b/plugins/codemirror/codemirror/mode/htmlembedded/index.html
@@ -53,7 +53,7 @@ This is an example of EJS (embedded javascript)
     </script>
 
     <p>Mode for html embedded scripts like JSP and ASP.NET. Depends on HtmlMixed which in turn depends on
-    JavaScript, CSS and XML.<br />Other dependancies include those of the scriping language chosen.</p>
+    JavaScript, CSS and XML.<br>Other dependancies include those of the scriping language chosen.</p>
 
     <p><strong>MIME types defined:</strong> <code>application/x-aspx</code> (ASP.NET), 
     <code>application/x-ejs</code> (Embedded Javascript), <code>application/x-jsp</code> (JavaServer Pages)</p>
diff --git a/plugins/codemirror/codemirror/mode/smarty/index.html b/plugins/codemirror/codemirror/mode/smarty/index.html
index d458aef..d36e745 100644
--- a/plugins/codemirror/codemirror/mode/smarty/index.html
+++ b/plugins/codemirror/codemirror/mode/smarty/index.html
@@ -53,7 +53,7 @@
       });
     </script>
 
-    <br />
+    <br>
 
 	<h3>Smarty 2, custom delimiters</h3>
     <form><textarea id="code2" name="code2">
@@ -89,7 +89,7 @@
       });
     </script>
 
-	<br />
+	<br>
 
 	<h3>Smarty 3</h3>
 

From 3d83dc775f9d3bfb7189b2f4cf26e14e931d412e 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:02:23 +0600
Subject: [PATCH 3/3] Site Url without trailing slashes

---
 admin/themes/default/login.template.php            |  2 +-
 plugins/blog/rss.php                               |  8 ++++----
 plugins/blog/views/frontend/block.view.php         |  2 +-
 plugins/blog/views/frontend/index.view.php         |  2 +-
 plugins/blog/views/frontend/related_posts.view.php |  2 +-
 plugins/blog/views/frontend/tags.view.php          |  2 +-
 plugins/box/filesmanager/filesmanager.admin.php    | 14 +++++++-------
 plugins/box/pages/pages.plugin.php                 |  2 +-
 plugins/box/sitemap/sitemap.plugin.php             |  4 ++--
 plugins/box/sitemap/views/frontend/index.view.php  |  4 ++--
 plugins/box/users/users.plugin.php                 |  2 +-
 .../users/views/emails/new_password_email.view.php |  2 +-
 .../views/emails/reset_password_email.view.php     |  4 ++--
 plugins/box/users/views/frontend/login.view.php    |  2 +-
 plugins/captcha/captcha.plugin.php                 |  2 +-
 15 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/admin/themes/default/login.template.php b/admin/themes/default/login.template.php
index 7c3ed8a..d088a24 100644
--- a/admin/themes/default/login.template.php
+++ b/admin/themes/default/login.template.php
@@ -62,7 +62,7 @@
 
         <div class="container form-signin">
 
-            <div style="text-align:center;"><a class="brand" href="<?php echo Option::get('siteurl'); ?>admin"><img src="<?php echo Option::get('siteurl'); ?>public/assets/img/monstra-logo.png" height="27" width="171" alt="monstra" /></a></div>
+            <div style="text-align:center;"><a class="brand" href="<?php echo Option::get('siteurl'); ?>/admin"><img src="<?php echo Option::get('siteurl'); ?>/public/assets/img/monstra-logo.png" height="27" width="171" alt="monstra" /></a></div>
             <div class="administration-area">
                 <hr>
                 <div>
diff --git a/plugins/blog/rss.php b/plugins/blog/rss.php
index fca27b1..12acba9 100644
--- a/plugins/blog/rss.php
+++ b/plugins/blog/rss.php
@@ -19,18 +19,18 @@ ob_end_clean();
 <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
 <title>MonstraCMS::BLOG::RSS</title>
-<link><?php echo Option::get('siteurl'); ?>blog</link>
+<link><?php echo Option::get('siteurl'); ?>/blog</link>
 <description>The latest updates for <?php echo Option::get('sitename'); ?>.</description>
 <language>en-us</language>
 <pubDate><?php echo $now; ?></pubDate>
 <lastBuildDate><?php echo $now; ?></lastBuildDate>
-<atom:link href="<?php echo Option::get('siteurl'); ?>rss.php" rel="self" type="application/rss+xml" />
+<atom:link href="<?php echo Option::get('siteurl'); ?>/rss.php" rel="self" type="application/rss+xml" />
 <generator>Monstra</generator>
 <?php foreach ($posts as $post) { ?>
 <item>
 <title><?php echo $post['title']; ?></title>
-<link><?php echo Option::get('siteurl').'blog/'.$post['slug']; ?></link>
-<guid><?php echo Option::get('siteurl').'blog/'.$post['slug']; ?></guid>
+<link><?php echo Option::get('siteurl').'/blog/'.$post['slug']; ?></link>
+<guid><?php echo Option::get('siteurl').'/blog/'.$post['slug']; ?></guid>
 <pubDate><?php echo Date::format($post['date'], 'd M Y'); ?></pubDate>
 <description><![CDATA[<?php echo Text::toHtml(Text::cut(File::getContent(STORAGE . DS . 'pages' . DS . $post['id'] . '.page.txt'), 300)); ?>]]></description>
 <author><?php echo $post['author']; ?></author>
diff --git a/plugins/blog/views/frontend/block.view.php b/plugins/blog/views/frontend/block.view.php
index 8fb8bc2..978365e 100644
--- a/plugins/blog/views/frontend/block.view.php
+++ b/plugins/blog/views/frontend/block.view.php
@@ -1,5 +1,5 @@
 <?php foreach($posts as $post) { ?>
-    <a href="<?php echo Option::get('siteurl'); ?><?php echo Blog::$parent_page_name; ?>/<?php echo $post['slug']; ?>"><?php echo $post['title']; ?></a> <small  class="monstra-blog-date"><?php echo Date::format($post['date'], 'd M Y'); ?></small><br>
+    <a href="<?php echo Option::get('siteurl'); ?>/<?php echo Blog::$parent_page_name; ?>/<?php echo $post['slug']; ?>"><?php echo $post['title']; ?></a> <small  class="monstra-blog-date"><?php echo Date::format($post['date'], 'd M Y'); ?></small><br>
     <?php echo $post['content']; ?>
     <br><br>
 <?php } ?>
diff --git a/plugins/blog/views/frontend/index.view.php b/plugins/blog/views/frontend/index.view.php
index 6bfe180..7db4812 100644
--- a/plugins/blog/views/frontend/index.view.php
+++ b/plugins/blog/views/frontend/index.view.php
@@ -1,5 +1,5 @@
 <?php foreach($posts as $post) { ?>
-    <a href="<?php echo Option::get('siteurl'); ?><?php echo Blog::$parent_page_name; ?>/<?php echo $post['slug'] ?>"><?php echo $post['title']; ?></a> <small  class="monstra-blog-date"><?php echo Date::format($post['date'], 'd M Y'); ?></small><br>
+    <a href="<?php echo Option::get('siteurl'); ?>/<?php echo Blog::$parent_page_name; ?>/<?php echo $post['slug'] ?>"><?php echo $post['title']; ?></a> <small  class="monstra-blog-date"><?php echo Date::format($post['date'], 'd M Y'); ?></small><br>
     <?php echo $post['content']; ?>
     <br><br>
 <?php } ?>
diff --git a/plugins/blog/views/frontend/related_posts.view.php b/plugins/blog/views/frontend/related_posts.view.php
index 8f89431..37066d9 100644
--- a/plugins/blog/views/frontend/related_posts.view.php
+++ b/plugins/blog/views/frontend/related_posts.view.php
@@ -2,6 +2,6 @@
 <b><?php echo __('Related posts', 'blog'); ?>:</b>
 <div>
 <?php foreach($related_posts as $related_post) { ?>
-<a href="<?php echo Option::get('siteurl'); ?><?php echo Blog::$parent_page_name; ?>/<?php echo $related_post['slug']; ?>"><?php echo $related_post['title']; ?></a><br>
+<a href="<?php echo Option::get('siteurl'); ?>/<?php echo Blog::$parent_page_name; ?>/<?php echo $related_post['slug']; ?>"><?php echo $related_post['title']; ?></a><br>
 <?php } ?>
 </div>
\ No newline at end of file
diff --git a/plugins/blog/views/frontend/tags.view.php b/plugins/blog/views/frontend/tags.view.php
index bffb830..343b484 100644
--- a/plugins/blog/views/frontend/tags.view.php
+++ b/plugins/blog/views/frontend/tags.view.php
@@ -1,3 +1,3 @@
 <?php foreach($tags as $tag) { ?>
-    <a href="<?php echo Option::get('siteurl'); ?><?php echo Blog::$parent_page_name; ?>?tag=<?php echo $tag; ?>"><span class="label label-important" data-original-title=""><?php echo $tag; ?></span></a>
+    <a href="<?php echo Option::get('siteurl'); ?>/<?php echo Blog::$parent_page_name; ?>?tag=<?php echo $tag; ?>"><span class="label label-important" data-original-title=""><?php echo $tag; ?></span></a>
 <?php } ?>
\ No newline at end of file
diff --git a/plugins/box/filesmanager/filesmanager.admin.php b/plugins/box/filesmanager/filesmanager.admin.php
index ea3e657..ebfcaec 100755
--- a/plugins/box/filesmanager/filesmanager.admin.php
+++ b/plugins/box/filesmanager/filesmanager.admin.php
@@ -31,25 +31,25 @@ class FilesmanagerAdmin extends Backend
         // Add slash if not exists
         if (substr($path, -1, 1) != '/') {
             $path .= '/';
-            Request::redirect($site_url.'admin/index.php?id=filesmanager&path='.$path);
+            Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
         }
 
         // Upload corectly!
         if ($path == 'uploads' || $path == 'uploads//') {
             $path = 'uploads/';
-            Request::redirect($site_url.'admin/index.php?id=filesmanager&path='.$path);
+            Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
         }
 
         // Only 'uploads' folder!
         if (strpos($path, 'uploads') === false) {
             $path = 'uploads/';
-            Request::redirect($site_url.'admin/index.php?id=filesmanager&path='.$path);
+            Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
         }
 
         // Set default path value if path is empty
         if ($path == '') {
             $path = 'uploads/';
-            Request::redirect($site_url.'admin/index.php?id=filesmanager&path='.$path);
+            Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
         }
 
         $files_path = ROOT . DS . 'public' . DS . $path;
@@ -85,7 +85,7 @@ class FilesmanagerAdmin extends Backend
             if (Security::check(Request::get('token'))) {
 
                 File::delete($files_path.Request::get('delete_file'));
-                Request::redirect($site_url.'admin/index.php?id=filesmanager&path='.$path);
+                Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
 
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
@@ -97,7 +97,7 @@ class FilesmanagerAdmin extends Backend
             if (Security::check(Request::get('token'))) {
 
                 Dir::delete($files_path.Request::get('delete_dir'));
-                Request::redirect($site_url.'admin/index.php?id=filesmanager&path='.$path);
+                Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
 
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
@@ -111,7 +111,7 @@ class FilesmanagerAdmin extends Backend
                 if ($_FILES['file']) {
                     if ( ! in_array(File::ext($_FILES['file']['name']), $forbidden_types)) {
                         move_uploaded_file($_FILES['file']['tmp_name'], $files_path.Security::safeName(basename($_FILES['file']['name'], File::ext($_FILES['file']['name'])), '-', true).'.'.File::ext($_FILES['file']['name']));
-                        Request::redirect($site_url.'admin/index.php?id=filesmanager&path='.$path);
+                        Request::redirect($site_url.'/admin/index.php?id=filesmanager&path='.$path);
                     }
                 }
 
diff --git a/plugins/box/pages/pages.plugin.php b/plugins/box/pages/pages.plugin.php
index 2cc8862..f43394f 100644
--- a/plugins/box/pages/pages.plugin.php
+++ b/plugins/box/pages/pages.plugin.php
@@ -486,7 +486,7 @@ class Page extends Pages
      */
     public static function url()
     {
-        return Option::get('siteurl').Pages::$page['slug'];
+        return Option::get('siteurl').'/'.Pages::$page['slug'];
     }
 
     /**
diff --git a/plugins/box/sitemap/sitemap.plugin.php b/plugins/box/sitemap/sitemap.plugin.php
index 6d48834..8ea39a5 100644
--- a/plugins/box/sitemap/sitemap.plugin.php
+++ b/plugins/box/sitemap/sitemap.plugin.php
@@ -82,7 +82,7 @@ class Sitemap extends Frontend
         $map .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'."\n";
         foreach ($pages_list as $page) {
             if ($page['parent'] != '') { $parent = $page['parent'].'/'; $priority = '0.5'; } else { $parent = ''; $priority = '1.0'; }
-            $map .= "\t".'<url>'."\n\t\t".'<loc>'.Option::get('siteurl').$parent.$page['slug'].'</loc>'."\n\t\t".'<lastmod>'.date("Y-m-d", (int) $page['date']).'</lastmod>'."\n\t\t".'<changefreq>weekly</changefreq>'."\n\t\t".'<priority>'.$priority.'</priority>'."\n\t".'</url>'."\n";
+            $map .= "\t".'<url>'."\n\t\t".'<loc>'.Option::get('siteurl').'/'.$parent.$page['slug'].'</loc>'."\n\t\t".'<lastmod>'.date("Y-m-d", (int) $page['date']).'</lastmod>'."\n\t\t".'<changefreq>weekly</changefreq>'."\n\t\t".'<priority>'.$priority.'</priority>'."\n\t".'</url>'."\n";
         }
 
         // Get list of components
@@ -91,7 +91,7 @@ class Sitemap extends Frontend
         // Add components to sitemap
         if (count($components) > 0) {
             foreach ($components as $component) {
-                $map .= "\t".'<url>'."\n\t\t".'<loc>'.Option::get('siteurl').Text::lowercase($component).'</loc>'."\n\t\t".'<lastmod>'.date("Y-m-d", time()).'</lastmod>'."\n\t\t".'<changefreq>weekly</changefreq>'."\n\t\t".'<priority>1.0</priority>'."\n\t".'</url>'."\n";
+                $map .= "\t".'<url>'."\n\t\t".'<loc>'.Option::get('siteurl').'/'.Text::lowercase($component).'</loc>'."\n\t\t".'<lastmod>'.date("Y-m-d", time()).'</lastmod>'."\n\t\t".'<changefreq>weekly</changefreq>'."\n\t\t".'<priority>1.0</priority>'."\n\t".'</url>'."\n";
             }
         }
 
diff --git a/plugins/box/sitemap/views/frontend/index.view.php b/plugins/box/sitemap/views/frontend/index.view.php
index ca60022..b4e6eab 100644
--- a/plugins/box/sitemap/views/frontend/index.view.php
+++ b/plugins/box/sitemap/views/frontend/index.view.php
@@ -9,7 +9,7 @@
         foreach ($pages_list as $page) {
             if (trim($page['parent']) !== '') $parent = $page['parent'].'/'; else $parent = '';
             if (trim($page['parent']) !== '') { echo '<ul>'."\n"; }
-            echo '<li><a href="'.Option::get('siteurl').$parent.$page['slug'].'">'.$page['title'].'</a></li>'."\n";
+            echo '<li><a href="'.Option::get('siteurl').'/'.$parent.$page['slug'].'">'.$page['title'].'</a></li>'."\n";
             if (trim($page['parent']) !== '') { echo '</ul>'."\n"; }
         }
         if (count($components) == 0) { echo '<ul>'."\n"; }
@@ -21,7 +21,7 @@
     if (count($components) > 0) {
         if (count($pages_list) == 0) { echo '<ul>'."\n"; }
         foreach ($components as $component) {
-            echo '<li><a href="'.Option::get('siteurl').$component.'">'.__(ucfirst($component), $component).'</a></li>'."\n";
+            echo '<li><a href="'.Option::get('siteurl').'/'.$component.'">'.__(ucfirst($component), $component).'</a></li>'."\n";
         }
         if (count($pages_list) == 0) { echo '</ul>'."\n"; }
     }
diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php
index 00e10ca..6581b1f 100644
--- a/plugins/box/users/users.plugin.php
+++ b/plugins/box/users/users.plugin.php
@@ -155,7 +155,7 @@ class Users extends Frontend
                             $mail->Send();
 
                             // Redirect to user profile
-                            Request::redirect(Option::get('siteurl').'users/'.Users::$users->lastId());
+                            Request::redirect(Option::get('siteurl').'/users/'.Users::$users->lastId());
                         }
 
                     } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
diff --git a/plugins/box/users/views/emails/new_password_email.view.php b/plugins/box/users/views/emails/new_password_email.view.php
index 7533642..90cf182 100644
--- a/plugins/box/users/views/emails/new_password_email.view.php
+++ b/plugins/box/users/views/emails/new_password_email.view.php
@@ -6,7 +6,7 @@ Your new details are as follows:
 Username: <?php echo $user_login; ?><br>
 Password: <?php echo $new_password; ?>
 <br><br>
-To change your password, please visit this page: <a href="<?php echo $site_url; ?>users/<?php echo $user_id; ?>" style="color:#333; text-decoration:underline;"><?php echo $site_url; ?>users/<?php echo $user_id; ?></a>
+To change your password, please visit this page: <a href="<?php echo $site_url; ?>/users/<?php echo $user_id; ?>" style="color:#333; text-decoration:underline;"><?php echo $site_url; ?>/users/<?php echo $user_id; ?></a>
 <br><br>
 All the best,<br>
 <?php echo $site_name; ?>
diff --git a/plugins/box/users/views/emails/reset_password_email.view.php b/plugins/box/users/views/emails/reset_password_email.view.php
index 1f67930..f7e5df9 100644
--- a/plugins/box/users/views/emails/reset_password_email.view.php
+++ b/plugins/box/users/views/emails/reset_password_email.view.php
@@ -4,14 +4,14 @@ You have requested to reset your password on <?php echo $site_name; ?> because y
 If you did not request this, please ignore it.
 <br><br>
 To reset your password, please visit the following page:<br>
-<a href="<?php echo $site_url; ?>users/password-reset?hash=<?php echo $new_hash; ?>" style="color:#333; text-decoration:underline;"><?php echo $site_url; ?>users/password-reset?hash=<?php echo $new_hash; ?></a>
+<a href="<?php echo $site_url; ?>/users/password-reset?hash=<?php echo $new_hash; ?>" style="color:#333; text-decoration:underline;"><?php echo $site_url; ?>/users/password-reset?hash=<?php echo $new_hash; ?></a>
 <br><br>
 When you visit that page, your password will be reset, and the new password will be emailed to you.
 <br><br>
 Your username is: <?php echo $user_login; ?>
 <br><br>
 To edit your profile, go to this page:<br>
-<a href="<?php echo $site_url ?>users/<?php echo $user_id; ?>" style="color:#333; text-decoration:underline;"><?php echo $site_url ?>users/<?php echo $user_id; ?></a>
+<a href="<?php echo $site_url ?>/users/<?php echo $user_id; ?>" style="color:#333; text-decoration:underline;"><?php echo $site_url ?>/users/<?php echo $user_id; ?></a>
 <br><br>
 All the best,<br>
 <?php echo $site_name; ?>
diff --git a/plugins/box/users/views/frontend/login.view.php b/plugins/box/users/views/frontend/login.view.php
index b877e96..651ef2d 100644
--- a/plugins/box/users/views/frontend/login.view.php
+++ b/plugins/box/users/views/frontend/login.view.php
@@ -5,5 +5,5 @@
     <?php echo Form::hidden('csrf', Security::token()); ?>
     <label><?php echo __('Username', 'users'); ?></label><input name="username" type="text" class="input-large" />
     <label><?php echo __('Password', 'users'); ?></label><input name="password" type="password" class="input-large" />
-    <br><input name="login_submit" class="btn" type="submit" value="<?php echo __('Log In', 'users'); ?>" /> <a class="small-grey-text reset-password-btn" href="<?php echo Option::get('siteurl').'users/password-reset'; ?>"><?php echo __('Forgot your password?', 'users');?></a>
+    <br><input name="login_submit" class="btn" type="submit" value="<?php echo __('Log In', 'users'); ?>" /> <a class="small-grey-text reset-password-btn" href="<?php echo Option::get('siteurl').'/users/password-reset'; ?>"><?php echo __('Forgot your password?', 'users');?></a>
 </form>
\ No newline at end of file
diff --git a/plugins/captcha/captcha.plugin.php b/plugins/captcha/captcha.plugin.php
index 4c6741c..f81cac7 100644
--- a/plugins/captcha/captcha.plugin.php
+++ b/plugins/captcha/captcha.plugin.php
@@ -20,7 +20,7 @@ Plugin::register( __FILE__,
                 'http://monstra.org/');
 
 // Set crypt captcha path to images
-$cryptinstall = Option::get('siteurl').'plugins/captcha/crypt/images/';
+$cryptinstall = Option::get('siteurl').'/plugins/captcha/crypt/images/';
 
 // Include Crypt Captcha
 include PLUGINS . DS . 'captcha/crypt/cryptographp.fct.php';