From 9b4781f8bebcc2157564d298bbfbf3cd0fe5fad8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 23 Nov 2012 12:49:04 +0200 Subject: [PATCH 1/8] Update plugins/box/system/system.admin.php --- plugins/box/system/system.admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/system/system.admin.php b/plugins/box/system/system.admin.php index b96774c..42f809c 100755 --- a/plugins/box/system/system.admin.php +++ b/plugins/box/system/system.admin.php @@ -58,7 +58,7 @@ // Get all pages $pages_array = array(); - $pages_list = $pages->select('[slug!="error404" and parent="" and status="published" and access="public"]'); + $pages_list = $pages->select('[slug!="error404" and parent="" and status="published"]'); foreach ($pages_list as $page) { $pages_array[$page['slug']] = Html::toText($page['title']); } From c73abd0a728437f85352ffeb0dd03a6ebc4dbbef Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 23 Nov 2012 13:57:57 +0200 Subject: [PATCH 2/8] Shortcodes API: Check if this shortcode realy exists then call user function else return empty string --- monstra/engine/shortcodes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monstra/engine/shortcodes.php b/monstra/engine/shortcodes.php index 2454489..74ab6d0 100644 --- a/monstra/engine/shortcodes.php +++ b/monstra/engine/shortcodes.php @@ -180,7 +180,8 @@ } } - return $prefix . call_user_func(Shortcode::$shortcode_tags[$shortcode], $attributes, $matches[5], $shortcode) . $suffix; + // Check if this shortcode realy exists then call user function else return empty string + return (isset(Shortcode::$shortcode_tags[$shortcode])) ? $prefix . call_user_func(Shortcode::$shortcode_tags[$shortcode], $attributes, $matches[5], $shortcode) . $suffix : ''; } } \ No newline at end of file From 48c7ace92a8a35fbd29d2a6de72aee53fef615cd Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 23 Nov 2012 14:25:51 +0200 Subject: [PATCH 3/8] Update monstra/helpers/text.php --- monstra/helpers/text.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/monstra/helpers/text.php b/monstra/helpers/text.php index 7ffcbbe..4fad4b8 100644 --- a/monstra/helpers/text.php +++ b/monstra/helpers/text.php @@ -230,6 +230,10 @@ /** * Add's _1 to a string or increment the ending number to allow _2, _3, etc * + * + * $str = Text::increment($str); + * + * * @param string $str String to increment * @param integer $first Start with * @param string $separator Separator From 975877e471eef432baae64da57486031411ea024 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 23 Nov 2012 16:08:05 +0200 Subject: [PATCH 4/8] Update plugins/box/users/languages/ru.lang.php --- plugins/box/users/languages/ru.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/languages/ru.lang.php b/plugins/box/users/languages/ru.lang.php index 839b539..d5261ff 100644 --- a/plugins/box/users/languages/ru.lang.php +++ b/plugins/box/users/languages/ru.lang.php @@ -33,7 +33,7 @@ 'Old password' => 'Старый пароль', 'New password' => 'Новый пароль', 'Welcome' => 'Добро пожаловать', - 'Wrong login or password' => 'Неправильный логин или пароль', + 'Wrong username or password' => 'Неправильный логин или пароль', 'Your changes have been saved.' => 'Ваши изменения были сохранены.', 'New user have been registered.' => 'Новый пользователь был зарегистрирован.', 'Captcha' => 'Каптча', From 4583b1377ae1e61c35f74f87b5dfbccd79014925 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 23 Nov 2012 16:10:35 +0200 Subject: [PATCH 5/8] Update plugins/box/users/users.plugin.php --- plugins/box/users/users.plugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php index 83f45a1..daf9f9e 100644 --- a/plugins/box/users/users.plugin.php +++ b/plugins/box/users/users.plugin.php @@ -393,11 +393,11 @@ Session::set('user_role', (string)$user['role']); Request::redirect(Site::url().'users/'.Session::get('user_id')); } else { - Notification::setNow('error', __('Wrong login or password', 'users')); + Notification::setNow('error', __('Wrong username or password', 'users')); } } } else { - Notification::setNow('error', __('Wrong login or password', 'users')); + Notification::setNow('error', __('Wrong username or password', 'users')); } } else { die('csrf detected!'); } From 32f9b2d3a3352911362ef2ee0e13a1a4aee152cc Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 23 Nov 2012 16:11:31 +0200 Subject: [PATCH 6/8] Update plugins/box/users/languages/it.lang.php --- plugins/box/users/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php index 743cee0..a351b56 100644 --- a/plugins/box/users/languages/it.lang.php +++ b/plugins/box/users/languages/it.lang.php @@ -33,7 +33,7 @@ 'Old password' => 'Vecchia password', 'New password' => 'Nuova password', 'Welcome' => 'Benvenuto', - 'Wrong login or password' => 'Login o password errata', + 'Wrong username or password' => 'username o password errata', 'Your changes have been saved.' => 'Le modifiche sono state salvate.', 'New user have been registered.' => 'Nuovo utente è stato registrato.', 'Captcha' => 'Codice captcha', From 834f8690ec3cd0dee8cbe9f3fb455425f676dd6c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 23 Nov 2012 16:12:08 +0200 Subject: [PATCH 7/8] Update plugins/box/users/languages/uk.lang.php --- plugins/box/users/languages/uk.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/languages/uk.lang.php b/plugins/box/users/languages/uk.lang.php index 6a0d24b..2fae7c5 100644 --- a/plugins/box/users/languages/uk.lang.php +++ b/plugins/box/users/languages/uk.lang.php @@ -33,7 +33,7 @@ 'Old password' => 'Старий пароль', 'New password' => 'Новий пароль', 'Welcome' => 'Ласкаво просимо', - 'Wrong login or password' => 'Неправильний логін або пароль', + 'Wrong username or password' => 'Неправильний логін або пароль', 'Your changes have been saved.' => 'Ваші зміни були збережені.', 'New user have been registered.' => 'Новий користувач був зареєстрований.', 'Captcha' => 'Каптча', From cc968ed072244f1b35411d3698a772ad148846b7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 26 Nov 2012 16:38:07 +0200 Subject: [PATCH 8/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31578cc..d9a1478 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Fast and small content management system written in PHP! ## Links -- [Site](http://punbb.informer.com/wiki/) +- [Site](http://monstra.org) - [Forum](http://forum.monstra.org) - [Documentation](http://monstra.org/documentation) - [Github Repository](https://github.com/Awilum/monstra-cms)