diff --git a/admin/themes/default/login.template.php b/admin/themes/default/login.template.php index 8f27beb..d088a24 100644 --- a/admin/themes/default/login.template.php +++ b/admin/themes/default/login.template.php @@ -62,11 +62,11 @@
-
monstra
+
monstra
-


+


@@ -87,7 +87,7 @@
-


+


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("
",(int) $num); + return str_repeat("
",(int) $num); } /** 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(); MonstraCMS::BLOG::RSS -blog +/blog The latest updates for . en-us - + Monstra <?php echo $post['title']; ?> - - + + ]]> diff --git a/plugins/box/filesmanager/filesmanager.admin.php b/plugins/box/filesmanager/filesmanager.admin.php index eb000b8..5dfc910 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 .= ''."\n"; foreach ($pages_list as $page) { if ($page['parent'] != '') { $parent = $page['parent'].'/'; $priority = '0.5'; } else { $parent = ''; $priority = '1.0'; } - $map .= "\t".''."\n\t\t".''.Option::get('siteurl').$parent.$page['slug'].''."\n\t\t".''.date("Y-m-d", (int) $page['date']).''."\n\t\t".'weekly'."\n\t\t".''.$priority.''."\n\t".''."\n"; + $map .= "\t".''."\n\t\t".''.Option::get('siteurl').'/'.$parent.$page['slug'].''."\n\t\t".''.date("Y-m-d", (int) $page['date']).''."\n\t\t".'weekly'."\n\t\t".''.$priority.''."\n\t".''."\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".''."\n\t\t".''.Option::get('siteurl').Text::lowercase($component).''."\n\t\t".''.date("Y-m-d", time()).''."\n\t\t".'weekly'."\n\t\t".'1.0'."\n\t".''."\n"; + $map .= "\t".''."\n\t\t".''.Option::get('siteurl').'/'.Text::lowercase($component).''."\n\t\t".''.date("Y-m-d", time()).''."\n\t\t".'weekly'."\n\t\t".'1.0'."\n\t".''."\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 ''."\n"; } } if (count($components) == 0) { echo '
    '."\n"; } @@ -21,7 +21,7 @@ if (count($components) > 0) { if (count($pages_list) == 0) { echo ''."\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:
    Password:

    -To change your password, please visit this page: users/ +To change your password, please visit this page: /users/

    All the best,
    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 because y If you did not request this, please ignore it.

    To reset your password, please visit the following page:
    -users/password-reset?hash= +/users/password-reset?hash=

    When you visit that page, your password will be reset, and the new password will be emailed to you.

    Your username is:

    To edit your profile, go to this page:
    -users/ +/users/

    All the best,
    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 @@ -
    +
    \ 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'; 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!
    " + .asciz "Hello world!
    " 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)

    Mode for html embedded scripts like JSP and ASP.NET. Depends on HtmlMixed which in turn depends on - JavaScript, CSS and XML.
    Other dependancies include those of the scriping language chosen.

    + JavaScript, CSS and XML.
    Other dependancies include those of the scriping language chosen.

    MIME types defined: application/x-aspx (ASP.NET), application/x-ejs (Embedded Javascript), application/x-jsp (JavaServer Pages)

    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 @@ }); -
    +

    Smarty 2, custom delimiters