From 2efff484fc8c3eb88975f8cf3ada3b4cb39a3385 Mon Sep 17 00:00:00 2001 From: bernte Date: Sun, 22 Dec 2013 23:16:49 +0100 Subject: [PATCH 01/10] Update actions.php adding a linebreak for sourcecode after ` ` --- engine/boot/actions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; } From 524052b4bfbb3ac66633f5ea7116c99c5c5708e0 Mon Sep 17 00:00:00 2001 From: bernte Date: Sun, 22 Dec 2013 23:23:32 +0100 Subject: [PATCH 02/10] Update Javascript.php adding a linebreak for sourcecode after --- engine/Plugin/Javascript.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; } } } From 10a6b56b340b85a6cafe4759db0c3a12c902c143 Mon Sep 17 00:00:00 2001 From: bernte Date: Sun, 22 Dec 2013 23:49:47 +0100 Subject: [PATCH 03/10] Update login.template.php added year --- 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 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 –
From 099b206e6633b3ca77b4deaa587f2e07db775ec0 Mon Sep 17 00:00:00 2001 From: bernte Date: Mon, 23 Dec 2013 03:47:11 +0100 Subject: [PATCH 04/10] Update index.template.php --- public/themes/default/index.template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@
- From 7696d90752024fc2a6d5cb6f0158c9e6ca05dc8a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 23 Dec 2013 16:44:08 +0200 Subject: [PATCH 05/10] Installer: SERVER_PORT issue - fixed by KANekT --- install.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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']); From 339413581dc27ece70a7dca926fd123b0532b293 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 24 Dec 2013 10:21:45 +0200 Subject: [PATCH 06/10] Update README.md --- README.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 89ab5af..2eb63c9 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ # 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 +Unix/Linux Operation system +PHP 5.2.3 or higher +PHP's SimpleXML module and Multibyte String module +Apache or Ngnix webserver with Mod Rewrite ## Steps to Install 1. [Download the latest version.](http://monstra.org/download) @@ -30,4 +29,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] From cbaa84f50e1c92291d5d0b50eff32947fe58de67 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 24 Dec 2013 10:22:14 +0200 Subject: [PATCH 07/10] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2eb63c9..7a2dae6 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ Monstra is a modern and lightweight Content Management System. ## System Requirements -Unix/Linux Operation system -PHP 5.2.3 or higher +Unix/Linux Operation system +PHP 5.2.3 or higher PHP's SimpleXML module and Multibyte String module Apache or Ngnix webserver with Mod Rewrite From a33d1a39d9be09123d8eec7fe0ef14d9c1cbc6c8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 24 Dec 2013 10:24:04 +0200 Subject: [PATCH 08/10] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7a2dae6..fe9fee7 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ Monstra is a modern and lightweight Content Management System. ## System Requirements -Unix/Linux Operation system -PHP 5.2.3 or higher -PHP's SimpleXML module and Multibyte String module -Apache or Ngnix webserver with Mod Rewrite +Unix/Linux Operation system +PHP 5.2.3 or higher +PHP's SimpleXML module and Multibyte String module +Apache or Ngnix webserver with Mod Rewrite ## Steps to Install 1. [Download the latest version.](http://monstra.org/download) From c7935e6636917515d7ec25986f4ed0468fda0469 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 24 Dec 2013 14:19:42 +0200 Subject: [PATCH 09/10] Update README.md --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fe9fee7..e598a96 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,9 @@ Monstra is a modern and lightweight Content Management System. ## System Requirements -Unix/Linux Operation system -PHP 5.2.3 or higher -PHP's SimpleXML module and Multibyte String module -Apache or Ngnix webserver with Mod Rewrite +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) From 6531d3ee8705d9add4acd648c9b7cee23b261cd7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 24 Dec 2013 21:01:55 +0200 Subject: [PATCH 10/10] Update Image.php --- libraries/Gelato/Image/Image.php | 1 - 1 file changed, 1 deletion(-) 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