diff --git a/README.md b/README.md index 89ab5af..e598a96 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,10 @@ # Monstra CMS -Fast and small content management system written in PHP! +Monstra is a modern and lightweight Content Management System. ## System Requirements -- UNIX/Linux host -- PHP 5.2.3 or higher -- SimpleXML Module -- Apache Mod Rewrite -- Multibyte String +Operation system: Unix, Linux, Windows, Mac OS +Middleware: PHP 5.2.3 or higher with PHP's SimpleXML module and Multibyte String module +Webserver: Apache with Mod Rewrite or Ngnix with Rewrite Module ## Steps to Install 1. [Download the latest version.](http://monstra.org/download) @@ -30,4 +28,4 @@ Fast and small content management system written in PHP! - [Documentation](http://monstra.org/documentation) - [Github Repository](https://github.com/Awilum/monstra-cms) -Copyright (C) 2012-2014 Romanenko Sergey / Awilum [awilum@msn.com] \ No newline at end of file +Copyright (C) 2012-2014 Romanenko Sergey / Awilum [awilum@msn.com] diff --git a/admin/themes/default/login.template.php b/admin/themes/default/login.template.php index 8b30602..5f8f15d 100644 --- a/admin/themes/default/login.template.php +++ b/admin/themes/default/login.template.php @@ -111,7 +111,7 @@
- © 2012 Monstra + © 2012 - 2014 Monstra
diff --git a/engine/Plugin/Javascript.php b/engine/Plugin/Javascript.php index dd01dc5..086c40c 100644 --- a/engine/Plugin/Javascript.php +++ b/engine/Plugin/Javascript.php @@ -128,7 +128,7 @@ class Javascript if (BACKEND) { echo ''; } else { - echo ''; + echo ''."\n"; } } } diff --git a/engine/boot/actions.php b/engine/boot/actions.php index 563ee9c..d3c09e2 100644 --- a/engine/boot/actions.php +++ b/engine/boot/actions.php @@ -4,4 +4,4 @@ * Set meta generator */ Action::add('theme_meta', 'setMetaGenerator'); -function setMetaGenerator() { echo ''; } +function setMetaGenerator() { echo ''."\n"; } diff --git a/install.php b/install.php index 3feb3db..44da50d 100644 --- a/install.php +++ b/install.php @@ -16,8 +16,11 @@ // Get array with the names of all modules compiled and loaded $php_modules = get_loaded_extensions(); + // Get server port + if ($_SERVER["SERVER_PORT"] == "80") $port = ""; else $port = ':'.$_SERVER["SERVER_PORT"]; + // Get site URL - $site_url = 'http://'.$_SERVER["SERVER_NAME"].str_replace(array("index.php", "install.php"), "", $_SERVER['PHP_SELF']); + $site_url = 'http://'.$_SERVER["SERVER_NAME"].$port.str_replace(array("index.php", "install.php"), "", $_SERVER['PHP_SELF']); // Rewrite base $rewrite_base = str_replace(array("index.php", "install.php"), "", $_SERVER['PHP_SELF']); diff --git a/libraries/Gelato/Image/Image.php b/libraries/Gelato/Image/Image.php index 51e016b..a92fcc2 100644 --- a/libraries/Gelato/Image/Image.php +++ b/libraries/Gelato/Image/Image.php @@ -659,4 +659,3 @@ class Image } } -code diff --git a/public/themes/default/index.template.php b/public/themes/default/index.template.php index 4f4d51a..e836717 100644 --- a/public/themes/default/index.template.php +++ b/public/themes/default/index.template.php @@ -20,4 +20,4 @@
-