Merge branch 'dev'

Update login.template.php

.htaccess

@@ -19,8 +19,16 @@ Options -Indexes
 # Setting rewrite rules.
 <IfModule mod_rewrite.c>
 	RewriteEngine on
+	
+	# Update code bellow for SEO improvements 
+	# RewriteCond %{HTTP_HOST} ^www.example.org [NC]
+ 	# RewriteRule ^(.*)$ http://example.org/$1 [R=301,L]
+	
 	RewriteBase /%siteurlhere%/
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
-</IfModule>
+	
+	# Update code bellow for SEO improvements 
+	# Redirect 301 /home http://example.org/
+</IfModule>

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](http://php.net/simplexml) and [Multibyte String module](http://php.net/mbstring)   
+Webserver: Apache with [Mod Rewrite](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) or Ngnix with [Rewrite Module](http://wiki.nginx.org/HttpRewriteModule)   
 
 ## Steps to Install
 1. [Download the latest version.](http://monstra.org/download)
@@ -21,13 +19,13 @@ Fast and small content management system written in PHP!
 2. Donate to keep Monstra free. We will add you to Monstra [Sponsors Page.](http://monstra.org/contribute/sponsors)
 3. Develop a new plugin.
 4. Create a new theme.
-5. Find and [report issues.](https://github.com/MonstraLab/monstra-cms/issues)
+5. Find and [report issues.](https://github.com/Awilum/monstra-cms/issues)
 6. Link back to [Monstra](http://monstra.org).
 
 ## Links
 - [Site](http://monstra.org)
 - [Forum](http://forum.monstra.org)
 - [Documentation](http://monstra.org/documentation)
-- [Github Repository](https://github.com/MonstraLab/monstra-cms)
+- [Github Repository](https://github.com/Awilum/monstra-cms)
 
-Copyright (C) 2012-2013 Romanenko Sergey / Awilum [awilum@msn.com]
+Copyright (C) 2012-2014 Romanenko Sergey / Awilum [awilum@msn.com]

admin/index.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -33,23 +33,53 @@ $users = new Table('users');
 // Admin login
 if (Request::post('login_submit')) {
 
-    $user = $users->select("[login='" . trim(Request::post('login')) . "']", null);
-    if (count($user) !== 0) {
-        if ($user['login'] == Request::post('login')) {
-            if (trim($user['password']) == Security::encryptPassword(Request::post('password'))) {
-                if ($user['role'] == 'admin' || $user['role'] == 'editor') {
-                    Session::set('admin', true);
-                    Session::set('user_id', (int) $user['id']);
-                    Session::set('user_login', (string) $user['login']);
-                    Session::set('user_role', (string) $user['role']);
-                    Request::redirect('index.php');
+    if (Cookie::get('login_attempts') && Cookie::get('login_attempts') >= 5) {
+        
+        $login_error = __('You are banned for 10 minutes. Try again later', 'users');
+    
+    } else {
+
+        $user = $users->select("[login='" . trim(Request::post('login')) . "']", null);
+        if (count($user) !== 0) {
+            if ($user['login'] == Request::post('login')) {
+                if (trim($user['password']) == Security::encryptPassword(Request::post('password'))) {
+                    if ($user['role'] == 'admin' || $user['role'] == 'editor') {
+                        Session::set('admin', true);
+                        Session::set('user_id', (int) $user['id']);
+                        Session::set('user_login', (string) $user['login']);
+                        Session::set('user_role', (string) $user['role']);
+                        Request::redirect('index.php');
+                    }
+                } else {
+                    $login_error = __('Wrong <b>username</b> or <b>password</b>', 'users');
+
+                    if (Cookie::get('login_attempts')) {
+                        if (Cookie::get('login_attempts') < 5) {
+                            $attempts = Cookie::get('login_attempts') + 1;
+                            Cookie::set('login_attempts', $attempts, 600);
+                        } else {
+                            $login_error = __('You are banned for 10 minutes. Try again later', 'users');
+                        }
+                    } else {
+                        Cookie::set('login_attempts', 1, 600);
+                    }
+
+                }
+            }
+        } else {
+            $login_error = __('Wrong <b>username</b> or <b>password</b>', 'users');
+
+            if (Cookie::get('login_attempts')) {
+                if (Cookie::get('login_attempts') < 5) {
+                    $attempts = Cookie::get('login_attempts') + 1;
+                    Cookie::set('login_attempts', $attempts, 600);
+                } else {
+                    $login_error = __('You are banned for 10 minutes. Try again later', 'users');
                 }
             } else {
-                $login_error = __('Wrong <b>username</b> or <b>password</b>', 'users');
+                Cookie::set('login_attempts', 1, 600);
             }
         }
-    } else {
-        $login_error = __('Wrong <b>username</b> or <b>password</b>', 'users');
     }
 }
 

admin/themes/default/index.template.php

@@ -11,15 +11,17 @@
     <!-- Styles -->
     <?php Stylesheet::add('public/assets/css/bootstrap.css', 'backend', 1); ?>
     <?php Stylesheet::add('public/assets/css/bootstrap-lightbox.css', 'backend', 2); ?>
-    <?php Stylesheet::add('public/assets/css/bootstrap-responsive.css', 'backend', 3); ?>
-    <?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 4); ?>
+    <?php Stylesheet::add('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?>
+    <?php Stylesheet::add('public/assets/css/bootstrap-responsive.css', 'backend', 4); ?>
+    <?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?>
     <?php Stylesheet::load(); ?>
 
     <!-- JavaScripts -->
     <?php Javascript::add('public/assets/js/jquery.js', 'backend', 1); ?>
     <?php Javascript::add('public/assets/js/bootstrap.js', 'backend', 2); ?>
     <?php Javascript::add('public/assets/js/bootstrap-lightbox.js', 'backend', 3); ?>
-    <?php Javascript::add('admin/themes/default/js/default.js', 'backend', 4); ?>
+    <?php Javascript::add('public/assets/js/bootstrap-fileupload.js', 'backend', 4); ?>
+    <?php Javascript::add('admin/themes/default/js/default.js', 'backend', 5); ?>
     <?php Javascript::load(); ?>
 
     <?php Action::run('admin_header'); ?>
@@ -117,11 +119,11 @@
         <footer>
             <p class="pull-right">
                 <span style="border-top:1px solid #E0E0E0; padding-top:10px;">
-                <span class="hidden-phone">
-                <a href="http://forum.monstra.org" target="_blank"><?php echo __('Official Support Forum', 'system'); ?></a> /
-                <a href="http://monstra.org/documentation" target="_blank"><?php echo __('Documentation', 'system'); ?></a> /
-                </span>
-                © 2012 - 2013 <a href="http://monstra.org" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?>
+                    <span class="hidden-phone">
+                        <a href="http://forum.monstra.org" target="_blank"><?php echo __('Official Support Forum', 'system'); ?></a> /
+                        <a href="http://monstra.org/documentation" target="_blank"><?php echo __('Documentation', 'system'); ?></a> /
+                    </span>
+                    © 2012 - 2014 <a href="http://monstra.org" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?>
                 </span>
             </p>
         </footer>

admin/themes/default/login.template.php

@@ -55,7 +55,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"></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>
@@ -83,7 +83,7 @@
                         <input name="login" class="input-xlarge" type="text" value="<?php echo $user_login; ?>" />
 
                         <?php if (Option::get('captcha_installed') == 'true') { ?>
-                        <label><?php echo __('Captcha'); ?><label>
+                        <label><?php echo __('Captcha', 'users'); ?></label>
                         <input type="text" name="answer" class="input-xlarge">
                         <?php CryptCaptcha::draw(); ?>
                         <?php } ?>
@@ -111,7 +111,7 @@
         </div>
 
         <div style="text-align:center">
-            <span class="small-grey-text">© 2012 <a href="http://monstra.org" class="small-grey-text" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?></span>
+            <span class="small-grey-text">© 2012 - 2014 <a href="http://monstra.org" class="small-grey-text" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?></span>
         </div>
 
     </body>

changelog.txt

@@ -1,4 +1,49 @@
-Monstra 2.2.0, xxxx-xx-xx
+Monstra 2.3.1, 2013-12-25
+------------------------
+- Localization: Major Fixes
+- Gelato: Image.php Major Fixes
+- Sitemap: Errors #175 - fixes
+- New favicon added #182 - by bernte
+- Layouts: General Fixes - by bernte
+- Installer: SERVER_PORT issue - fixed by KANekT
+- Gelato: Number Class - updated bytes format (JEDEC & IEC 60027) by mbarzda
+- Email Layout: footer fixes
+
+Monstra 2.3.0, 2013-12-19
+------------------------
+- Update Twitter Bootstrap to 2.3.2
+- Security: Added limits for login attempts #104
+- Security: Obfuscate users email to prevent spam-bots from sniffing it.
+- Core: Added ability to map Monstra Engine Directory.
+- Core: Maintenance Mode Improvements
+- Core: ORM::configure - driver options added
+- Gelato: Image.php fix for PNG files
+- Gelato: Number.php: Undefined offset fix
+- XMLDB: error select for empty table fix
+- Plugin API: Stylesheet.php updates - sourcecode misses a linebreak after minified css
+- Files Manager: jasny bootstrap-fileupload - added #89 
+- Users Plugin: login page fixes
+- Users Plugin: Deleting users - fixed by Oleg Gatseluk #158
+- Pages Plugin: General method getPages() created #123
+- Pages Plugin: page expand ajax bug #115 - fixed
+- Pages Plugin: Improved available() method to show only published pages
+- Pages Plugin: Bug with pages renaming - fixed
+- Monstra Email Templates #164
+- Localization: Major Fixes
+- Localization: PL added
+- Localization: NL added
+- .htaccess SEO improvements
+
+Monstra 2.2.1, 2013-04-06
+------------------------
+- Update Gelato to 1.0.3
+- Error Handler turned off for Production environment
+- Localization: Farsi(fa) translations fixes.
+- Pages Manager: fix translates #107
+- Missing Translation on Login Page - fixed #106
+- Lithuanian flag and other languages fixes. Thanks to mbarzda
+
+Monstra 2.2.0, 2013-03-25
 ------------------------
 - Mobile Ready! Monstra fully responsive for mobile devices, tablets, and normal computer screens.
 - Improved Monstra Architecture!
@@ -27,7 +72,6 @@ Monstra 2.2.0, xxxx-xx-xx
 - Pages Manager: page cloning problem - fixed.
 - Localizations: translations fixes.
 
-
 Monstra 2.1.3, 2012-12-09
 ------------------------
 - Pages Plugin: New shortcodes added - page_author, page_slug, page_url page_available, page_breadcrumbs, page_date, page_content.

engine/Alert.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Monstra.php

@@ -5,7 +5,7 @@
  *
  *  Monstra - Content Management System.
  *  Site: www.mostra.org
- *  Copyright (C) 2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ *  Copyright (C) 2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * This source file is part of the Monstra Engine. More information,
  * documentation and tutorials can be found at http://monstra.org
@@ -13,7 +13,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -39,7 +39,7 @@ class Monstra
     /**
      * The version of Monstra
      */
-    const VERSION = '2.2.0';
+    const VERSION = '2.3.1';
 
     /**
      * Monstra environment
@@ -126,6 +126,11 @@ class Monstra
          */
         include ROOT . DS . 'libraries'. DS .'Gelato'. DS .'Gelato.php';
 
+        /**
+         * Map Monstra Engine Directory
+         */
+        ClassLoader::directory(ROOT . DS . 'engine' . DS);
+
         /**
          * Map all Monstra Classes
          */
@@ -179,6 +184,7 @@ class Monstra
             ORM::configure(MONSTRA_DB_DSN);
             ORM::configure('username', MONSTRA_DB_USER);
             ORM::configure('password',  MONSTRA_DB_PASSWORD);
+            ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
         }
 
         /**

engine/Option.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Plugin/Action.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Plugin/Backend.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Plugin/Filter.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Plugin/Frontend.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Plugin/I18n.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Plugin/Javascript.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -128,7 +128,7 @@ class Javascript
             if (BACKEND) {
                 echo '<script type="text/javascript" src="'.Option::get('siteurl').'tmp/minify/backend_site.minify.js"></script>';
             } else {
-                echo '<script type="text/javascript" src="'.Option::get('siteurl').'tmp/minify/frontend_site.minify.js"></script>';
+                echo '<script type="text/javascript" src="'.Option::get('siteurl').'tmp/minify/frontend_site.minify.js"></script>'."\n";
             }
         }
     }

engine/Plugin/Navigation.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Plugin/Plugin.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Plugin/Stylesheet.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -130,7 +130,7 @@ class Stylesheet
             if (BACKEND) {
                 echo '<link rel="stylesheet" href="'.Option::get('siteurl').'tmp/minify/backend_site.minify.css'.'" type="text/css" />';
             } else {
-                echo '<link rel="stylesheet" href="'.Option::get('siteurl').'tmp/minify/frontend_site.minify.css'.'" type="text/css" />';
+                echo '<link rel="stylesheet" href="'.Option::get('siteurl').'tmp/minify/frontend_site.minify.css'.'" type="text/css" />'."\n";
             }
         }
     }

engine/Plugin/View.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Security.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Shortcode.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Site.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Uri.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Xmldb/DB.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/Xmldb/Table.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -807,6 +807,7 @@ class Table
 
             return $c;
         }
+        return $a;
     }
 
     /**

engine/Xmldb/XML.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

engine/_init.php

@@ -1,14 +1,5 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
-/**
- * Report All Errors
- *
- * By setting error reporting to -1, we essentially force PHP to report
- * every error, and this is guranteed to show every error on future
- * releases of PHP. This allows everything to be fixed early!
- */
-error_reporting(-1);
-
 /**
  *  Monstra requires PHP 5.2.3 or greater
  */
@@ -32,6 +23,15 @@ include ROOT . DS .'engine'. DS .'Monstra.php';
  */
 Monstra::$environment = Monstra::PRODUCTION;
 
+/**
+ * Report Errors
+ */
+if (Monstra::$environment == Monstra::PRODUCTION) {
+    error_reporting(0); 
+} else {
+    error_reporting(-1);
+}
+
 /**
  * Initialize Monstra
  */

engine/boot/actions.php

@@ -4,4 +4,4 @@
  * Set meta generator
  */
 Action::add('theme_meta', 'setMetaGenerator');
-function setMetaGenerator() { echo '<meta name="generator" content="Powered by Monstra '.Monstra::VERSION.'" />'; }
+function setMetaGenerator() { echo '<meta name="generator" content="Powered by Monstra '.Monstra::VERSION.'" />'."\n"; }

index.php

@@ -9,7 +9,7 @@
  * @package     Monstra
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -45,6 +45,9 @@ if (file_exists('install.php')) {
         if ((Session::exists('user_role')) and (Session::get('user_role') == 'admin' or Session::get('user_role') == 'editor')) {
             // Monstra show this page :)
         } else {
+            header('HTTP/1.1 503 Service Temporarily Unavailable');
+            header('Status: 503 Service Temporarily Unavailable');
+            header('Retry-After: 600');
             die (Text::toHtml(Option::get('maintenance_message')));
         }
     }

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']);
@@ -29,7 +32,7 @@
     $dir_array = array('public', 'storage', 'backups', 'tmp');
 
     // Languages array
-    $languages_array = array('en', 'fr', 'de', 'it', 'es', 'lt', 'pt-br', 'ru', 'uk', 'hu', 'fa' , 'sk', 'sr-yu');
+    $languages_array = array('en', 'fr', 'de', 'it', 'es', 'lt', 'pl', 'pt-br', 'ru', 'uk', 'hu', 'fa' , 'sk', 'nl', 'sr-yu');
 
     // Select Monstra language
     if (Request::get('language')) {
@@ -166,8 +169,8 @@
             }
 
             .install-languages a {
-                padding-left: 3px;
-                padding-right: 3px;
+                padding-left: 2px;
+                padding-right: 2px;
             }
 
             .language-link img {
@@ -295,7 +298,7 @@
                         <input class="input-xlarge" name="siteurl" type="text" value="<?php echo Html::toText($site_url); ?>" />
                         <br />
                         <label><?php echo __('Username', 'users'); ?></label>
-                        <input class="input-xlarge" class="login" name="login" value="<?php if(Request::post('login')) echo Html::toText(Request::post('login')); ?>" type="text" />
+                        <input class="input-xlarge login" name="login" value="<?php if(Request::post('login')) echo Html::toText(Request::post('login')); ?>" type="text" />
                         <br />
                         <label><?php echo __('Password', 'users'); ?></label>
                         <input class="input-xlarge" name="password" type="password" />
@@ -397,78 +400,78 @@
                     </form>
                 </div>
                 <hr>
-                <p align="center"><strong><?php echo __('...Monstra says...', 'system'); ?></strong></p>
+                <p class="text-center"><strong><?php echo __('...Monstra says...', 'system'); ?></strong></p>
                 <div>
                     <ul>
                     <?php
 
                         if (version_compare(PHP_VERSION, "5.2.0", "<")) {
-                            echo '<span class="error"><li>'.__('PHP 5.2 or greater is required', 'system').'</li></span>';
+                            echo '<li class="error">'.__('PHP 5.2 or greater is required', 'system').'</li>';
                         } else {
-                            echo '<span class="ok"><li>'.__('PHP Version', 'system').' '.PHP_VERSION.'</li></span>';
+                            echo '<li class="ok">'.__('PHP Version', 'system').' '.PHP_VERSION.'</li>';
                         }
 
                         if (in_array('SimpleXML', $php_modules)) {
-                            echo '<span class="ok"><li>'.__('Module SimpleXML is installed', 'system').'</li></span>';
+                            echo '<li class="ok">'.__('Module SimpleXML is installed', 'system').'</li>';
                         } else {
-                            echo '<span class="error"><li>'.__('SimpleXML module is required', 'system').'</li></span>';
+                            echo '<li class="error">'.__('SimpleXML module is required', 'system').'</li>';
                         }
 
                         if (in_array('dom', $php_modules)) {
-                            echo '<span class="ok"><li>'.__('Module DOM is installed', 'system').'</li></span>';
+                            echo '<li class="ok">'.__('Module DOM is installed', 'system').'</li>';
                         } else {
-                            echo '<span class="error"><li>'.__('Module DOM is required', 'system').'</li></span>';
+                            echo '<li class="error">'.__('Module DOM is required', 'system').'</li>';
                         }
 
                         if (function_exists('apache_get_modules')) {
                             if ( ! in_array('mod_rewrite',apache_get_modules())) {
-                                echo '<span class="error"><li>'.__('Apache Mod Rewrite is required', 'system').'</li></span>';
+                                echo '<li class="error">'.__('Apache Mod Rewrite is required', 'system').'</li>';
                             } else {
-                                echo '<span class="ok"><li>'.__('Module Mod Rewrite is installed', 'system').'</li></span>';
+                                echo '<li class="ok">'.__('Module Mod Rewrite is installed', 'system').'</li>';
                             }
                         } else {
-                            echo '<span class="ok"><li>'.__('Module Mod Rewrite is installed', 'system').'</li></span>';
+                            echo '<li class="ok">'.__('Module Mod Rewrite is installed', 'system').'</li>';
                         }
 
                         foreach ($dir_array as $dir) {
                             if (is_writable($dir.'/')) {
-                                echo '<span class="ok"><li>'.__('Directory: <b> :dir </b> writable', 'system', array(':dir' => $dir)).'</li></span>';
+                                echo '<li class="ok">'.__('Directory: <b> :dir </b> writable', 'system', array(':dir' => $dir)).'</li>';
                             } else {
-                                echo '<span class="error"><li>'.__('Directory: <b> :dir </b> not writable', 'system', array(':dir' => $dir)).'</li></span>';
+                                echo '<li class="error">'.__('Directory: <b> :dir </b> not writable', 'system', array(':dir' => $dir)).'</li>';
                             }
                         }
 
                         if (is_writable(__FILE__)) {
-                            echo '<span class="ok"><li>'.__('Install script writable', 'system').'</li></span>';
+                            echo '<li class="ok">'.__('Install script writable', 'system').'</li>';
                         } else {
-                            echo '<span class="error"><li>'.__('Install script not writable', 'system').'</li></span>';
+                            echo '<li class="error">'.__('Install script not writable', 'system').'</li>';
                         }
 
                         if (is_writable('sitemap.xml')) {
-                            echo '<span class="ok"><li>'.__('Sitemap file writable', 'system').'</li></span>';
+                            echo '<li class="ok">'.__('Sitemap file writable', 'system').'</li>';
                         } else {
-                            echo '<span class="error"><li>'.__('Sitemap file not writable', 'system').'</li></span>';
+                            echo '<li class="error">'.__('Sitemap file not writable', 'system').'</li>';
                         }
 
                         if (is_writable('.htaccess')) {
-                            echo '<span class="ok"><li>'.__('Main .htaccess file writable', 'system').'</li></span>';
+                            echo '<li class="ok">'.__('Main .htaccess file writable', 'system').'</li>';
                         } else {
-                            echo '<span class="error"><li>'.__('Main .htaccess file not writable', 'system').'</li></span>';
+                            echo '<li class="error">'.__('Main .htaccess file not writable', 'system').'</li>';
                         }
 
-                        if (isset($errors['sitename']))    echo '<span class="error"><li>'.$errors['sitename'].'</li></span>';
-                        if (isset($errors['siteurl']))     echo '<span class="error"><li>'.$errors['siteurl'].'</li></span>';
-                        if (isset($errors['login']))       echo '<span class="error"><li>'.$errors['login'].'</li></span>';
-                        if (isset($errors['password']))    echo '<span class="error"><li>'.$errors['password'].'</li></span>';
-                        if (isset($errors['email']))       echo '<span class="error"><li>'.$errors['email'].'</li></span>';
-                        if (isset($errors['email_valid'])) echo '<span class="error"><li>'.$errors['email_valid'].'</li></span>';
+                        if (isset($errors['sitename']))    echo '<li class="error">'.$errors['sitename'].'</li>';
+                        if (isset($errors['siteurl']))     echo '<li class="error">'.$errors['siteurl'].'</li>';
+                        if (isset($errors['login']))       echo '<li class="error">'.$errors['login'].'</li>';
+                        if (isset($errors['password']))    echo '<li class="error">'.$errors['password'].'</li>';
+                        if (isset($errors['email']))       echo '<li class="error">'.$errors['email'].'</li>';
+                        if (isset($errors['email_valid'])) echo '<li class="error">'.$errors['email_valid'].'</li>';
                     ?>
                     </ul>
                 </div>
             </div>
             <div class="install-block-footer">
                 <div style="text-align:center;">
-                    <span class="small-grey-text">© 2012 - 2013 <a href="http://monstra.org" class="small-grey-text" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?></span>
+                    <span class="small-grey-text">© 2012 - 2014 <a href="http://monstra.org" class="small-grey-text" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?></span>
                 </div>
             </div>
 

libraries/Gelato/Agent/Agent.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Arr/Arr.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Cache/Cache.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/ClassLoader/ClassLoader.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Cookie/Cookie.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Curl/Curl.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Date/Date.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Debug/Debug.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/ErrorHandler/ErrorHandler.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/FileSystem/Dir.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/FileSystem/File.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Form/Form.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Gelato.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,7 +18,7 @@
 /**
  * The version of Gelato
  */
-define('GELATO_VERSION', '1.0.2');
+define('GELATO_VERSION', '1.0.3');
 
 /** 
  * Define __DIR__ constant for PHP 5.2.x

libraries/Gelato/Html/Html.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -28,6 +28,13 @@ class Html
         'accept', 'tabindex', 'accesskey', 'alt', 'title', 'class',
         'style', 'selected', 'checked', 'readonly', 'disabled',
     );
+	
+	/**
+	 * The registered custom macros.
+	 *
+	 * @var array
+	 */
+	public static $macros = array();
 
     /**
      * Protected constructor since this is a static class.
@@ -279,7 +286,56 @@ class Html
         $attributes['alt'] = (isset($attributes['alt'])) ? $attributes['alt'] : pathinfo($file, PATHINFO_FILENAME);
 
         return '<img'.Html::attributes($attributes).' />';
-    }
+    }    
+    
+	/**
+	 * Obfuscate an e-mail address to prevent spam-bots from sniffing it.
+     *
+     *  <code>
+     *  	echo Html::email('gelato@monstra.org');
+     * 	</code>
+     *
+	 * @param  string  $email
+	 * @return string
+	 */
+	 public static function email($email)
+	 {
+	     return str_replace('@', '&#64;', Html::obfuscate($email));
+	 }
+    
+    /**
+	 * Obfuscate a string to prevent spam-bots from sniffing it.
+	 *
+     * This method obfuscate the value, randomly convert each
+     * letter to its entity or hexadecimal representation, keeping a
+     * bot from sniffing the randomly obfuscated letters.
+     *
+     *  <code>
+     *  	echo Html::obfuscate('gelato@monstra.org');
+     * 	</code>
+     *
+	 * @param  string  $value
+	 * @return string
+	 */
+	public static function obfuscate($value)
+	{
+		$safe = '';
+
+		foreach (str_split($value) as $letter) {
+			switch (rand(1, 3)) {
+				case 1:
+					$safe .= '&#'.ord($letter).';';
+				break;
+				case 2:
+					$safe .= '&#x'.dechex(ord($letter)).';';
+				break;
+				case 3:
+					$safe .= $letter;
+			}
+		}
+
+		return $safe;
+	}
 
     /**
      * Convert html to plain text

libraries/Gelato/Http/Request.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Http/Response.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Image/Image.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -173,9 +173,10 @@ class Image
     public function resize($width, $height = null, $aspect_ratio = null)
     {
         // Redefine vars
-        $width  	  = (int) $width;
-        $height 	  = ($height === null) ? null : (int) $height;
+        $width        = (int) $width;
+        $height       = ($height === null) ? null : (int) $height;
         $aspect_ratio = ($aspect_ratio === null) ? null : (int) $aspect_ratio;
+        $xpos = $ypos = 0;
 
         // Resizes the image to {$width}% of the original size
         if ($height === null) {
@@ -186,13 +187,18 @@ class Image
         } else {
 
             // Resizes the image to the smalles possible dimension while maintaining aspect ratio
-            if ($aspect_ratio === Image::AUTO) {
+            if ($aspect_ratio === Image::AUTO || $aspect_ratio === null) {
 
                 // Calculate smallest size based on given height and width while maintaining aspect ratio
                 $percentage = min(($width / $this->width), ($height / $this->height));
 
                 $new_width  = round($this->width * $percentage);
                 $new_height = round($this->height * $percentage);
+                
+                if ($aspect_ratio === null) {
+                    $xpos = (int)(($width - $new_width) / 2);
+                    $ypos = (int)(($height - $new_height) / 2);
+                }
 
             // Resizes the image using the width to maintain aspect ratio
             } elseif ($aspect_ratio === Image::WIDTH) {
@@ -216,24 +222,28 @@ class Image
             }
         }
 
-        // Create a new true color image width new width and height
-        $resized = imagecreatetruecolor($new_width, $new_height);
+        $old_image = $this->image;
+        
+        if ($aspect_ratio === null) {
+            $this->image = imagecreatetruecolor($width, $height);
+        } else {
+            $this->image = imagecreatetruecolor($new_width, $new_height);
+        }
+        
+        if ($this->type === IMAGETYPE_PNG) {
+            $bgcolor = imagecolorallocatealpha($this->image, 0, 0, 0, 127);
+        } else {
+            $bgcolor = imagecolorallocate($this->image, 255, 255, 255);
+        }
+        
+        imagefill($this->image, 0, 0, $bgcolor);
 
         // Copy and resize part of an image with resampling
-        imagecopyresampled($resized, $this->image, 0, 0, 0, 0, $new_width, $new_height, $this->width, $this->height);
+        imagecopyresampled($this->image, $old_image, $xpos, $ypos, 0, 0, $new_width, $new_height, $this->width, $this->height);
 
         // Destroy an image
-        imagedestroy($this->image);
-
-        // Create a new true color image width new width and height
-        $this->image = imagecreatetruecolor($new_width, $new_height);
-
-        // Copy and resize part of an image with resampling
-        imagecopyresampled($this->image, $resized, 0, 0, 0, 0, $new_width, $new_height, $new_width, $new_height);
-
-        // Destroy an image
-        imagedestroy($resized);
-
+        imagedestroy($old_image);
+        
         // Save new width and height
         $this->width = $new_width;
         $this->height = $new_height;
@@ -259,32 +269,28 @@ class Image
         // Redefine vars
         $width  = (int) $width;
         $height = (int) $height;
-        $x 	 	= (int) $x;
-        $y 		= (int) $y;
+        $x      = (int) $x;
+        $y      = (int) $y;
 
         // Calculate
         if ($x + $width > $this->width)   $width = $this->width - $x;
         if ($y + $height > $this->height) $height = $this->height - $y;
         if ($width <= 0 || $height <= 0) return false;
 
-        // Create a new true color image
-        $crop = imagecreatetruecolor($width, $height);
-
-        // Copy and resize part of an image with resampling
-        imagecopyresampled($crop, $this->image, 0, 0, $x, $y, $this->width, $this->height, $this->width, $this->height);
-
-        // Destroy an image
-        imagedestroy($this->image);
-
+        $old_image = $this->image;
+        
         // Create a new true color image
         $this->image = imagecreatetruecolor($width, $height);
+        
+        $transparent = imagecolorallocatealpha($this->image, 0, 0, 0, 127);
+        imagefill($this->image, 0, 0, $transparent);
 
         // Copy and resize part of an image with resampling
-        imagecopyresampled($this->image, $crop, 0, 0, 0, 0, $width, $height, $width, $height);
+        imagecopyresampled($this->image, $old_image, 0, 0, $x, $y, $width, $height, $width, $height);
 
         // Destroy an image
-        imagedestroy($crop);
-
+        imagedestroy($old_image);
+        
         // Save new width and height
         $this->width  = $width;
         $this->height = $height;

libraries/Gelato/Inflector/Inflector.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Log/Log.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Minify/MinifyCSS.php

@@ -10,7 +10,7 @@
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
  * @author      Stephen Clay <steve@mrclay.org>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Minify/MinifyHTML.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Minify/MinifyJS.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Notification/Notification.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Number/Number.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -28,7 +28,7 @@ class Number
     }
 
     /**
-     * Convert bytes in 'kb','mb','gb','tb','pb'
+     * Convert bytes in 'KB','MB','GB','TiB','PiB'
      *
      *  <code>
      *      echo Number::byteFormat(10000);
@@ -42,9 +42,9 @@ class Number
         // Redefine vars
         $size = (int) $size;
 
-        $unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
+        $unit = array('B', 'KB', 'MB', 'GB', 'TiB', 'PiB');
 
-        return @round($size/pow(1024, ($i=floor(log($size, 1024)))), 2).' '.$unit[$i];
+        return @round($size/pow(1024, ($i=floor(log($size, 1024)))), 2).' '.$unit[($i < 0 ? 0 : $i)];
     }
 
     /**

libraries/Gelato/README.md

@@ -4,6 +4,6 @@ Gelato is a PHP5 library for kickass Web Applications.
 
 ## Links
 - [Site](http://gelato.monstra.org)
-- [Github Repository](https://github.com/Monstra/gelato)
+- [Github Repository](https://github.com/MonstrLab/gelato)
 
 Copyright (C) 2013 Romanenko Sergey / Awilum [awilum@msn.com]

libraries/Gelato/Registry/Registry.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Security/Token.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Session/Session.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Text/Text.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Url/Url.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Validation/Valid.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/Zip/Zip.php

@@ -9,7 +9,7 @@
  * @package     Gelato
  *
  * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- * @copyright   2012-2013 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

libraries/Gelato/changelog.txt

@@ -1,3 +1,13 @@
+Gelato 1.0.3, 2013-04-03
+------------------------
+- Html Class: obfuscate() method added.
+- Html Class: email() method added.
+- Html Class: missing $macros var added.
+
+Gelato 1.0.2, 2013-03-17
+------------------------
+- Added support for PHP 5.2.3
+
 Gelato 1.0.1, 2013-03-05
 ------------------------
 - New constant GELATO_CLASS_LOADER instead of GELATO_AUTOLOADER

plugins/box/backup/backup.plugin.php

@@ -6,7 +6,7 @@
  *	@package Monstra
  *  @subpackage Plugins
  *	@author Romanenko Sergey / Awilum
- *	@copyright 2012-2013 Romanenko Sergey / Awilum
+ *	@copyright 2012-2014 Romanenko Sergey / Awilum
  *	@version 1.0.0
  *
  */

plugins/box/backup/languages/fa.lang.php

@@ -8,10 +8,10 @@
     		'Delete' => 'حذف',
             'storage' => 'ذخیره سازی',
             'public' => 'عمومی',
-            'plugins' => 'افزونه ها',
+            'plugins' => 'پلاگین',
             'Size' => 'اندازه',
             'Actions' => 'عملیات',
-            'Delete backup: :backup' => 'حذف پشتیبان: نسخه پشتیبان',
-            'Creating...' => 'درحال ایجاد ...',
+            'Delete backup: :backup' => 'حذف نسخه پشتیبان: :backup',
+            'Creating...' => 'ایجاد...',
         )
 	);

plugins/box/backup/languages/nl.lang.php

@@ -0,0 +1,17 @@
+<?php
+
+    return array(
+        'backup' => array(
+            'Backups' => 'Backups',
+            'Backup' => 'Backup',
+            'Create Backup' => 'Maak backup',
+            'Delete' => 'Verwijderen',
+            'storage' => 'Opslag',
+            'public' => 'Publiek',
+            'plugins' => 'Plugins',
+            'Size' => 'Grootte',
+            'Actions' => 'Acties',
+            'Delete backup: :backup' => 'Verwijder backup: :backup',
+            'Creating...' => 'Backup wordt gemaakt...',
+        )
+    );

plugins/box/backup/languages/pl.lang.php

@@ -0,0 +1,17 @@
+<?php
+
+    return array(
+        'backup' => array(
+        	'Backups' => 'Kopie zapasowe',
+            'Backup Date' => 'Data kopii zapasowej',
+    		'Create Backup' => 'Utwórz kopię zapasową',
+    		'Delete' => 'Usuń',
+            'storage' => 'magazyn',
+            'public' => 'publiczny',
+            'plugins' => 'wtyczki',
+            'Size' => 'Rozmiar',
+            'Actions' => 'Akcje',
+            'Delete backup: :backup' => 'Czy napewno usunąć kopię zapasową: :backup',
+            'Creating...' => 'Tworzenie kopii zapasowej...',
+        )
+	);

plugins/box/blocks/blocks.plugin.php

@@ -6,7 +6,7 @@
  *	@package Monstra
  *  @subpackage Plugins
  *	@author Romanenko Sergey / Awilum
- *	@copyright 2012-2013 Romanenko Sergey / Awilum
+ *	@copyright 2012-2014 Romanenko Sergey / Awilum
  *	@version 1.0.0
  *
  */

plugins/box/blocks/languages/de.lang.php

@@ -10,7 +10,7 @@
             'Create New Block' => 'Erstelle einen neuen Block',
             'New Block' => 'Neuer Block',
             'Edit Block' => 'Bearbeite Block',
-            'Save' => 'Save',
+            'Save' => 'Speichern',
             'Save and Exit' => 'Speichern und Schließen',
             'Actions' => 'Aktionen',
             'Required field' => 'Erforderliches Feld',
@@ -19,9 +19,9 @@
             'Delete block: :block' => 'Lösche Block: :block',
             'Block content' => 'Block-Inhalt',
             'Block <i>:name</i> deleted' => 'Block <i>:name</i> gelöscht',
-            'Your changes to the block <i>:name</i> have been saved.' => 'Deine Änderungen für den Block <i>:name</i> wurden übernommen.',
+            'Your changes to the block <i>:name</i> have been saved.' => 'Deine Änderungen für den Block <i>:name</i> wurden gespeichert.',
             'Delete block: :block' => 'Lösche Block: :block',
-            'View Embed Code' => 'View Embed Code',
+            'View Embed Code' => 'Zeige Embed Code',
             'Embed Code' => 'Embed Code',
             'Shortcode' => 'Shortcode',
             'PHP Code' => 'PHP Code',

plugins/box/blocks/languages/fa.lang.php

@@ -3,27 +3,27 @@
     return array(
         'blocks' => array(
             'Blocks' => 'بلوک',
-            'Blocks manager' => 'مدیریت بلوک',  
+            'Blocks manager' => 'مدیریت بلوک',
             'Delete' => 'حذف',
             'Edit' => 'ویرایش',
             'Name' => 'نام',
             'Create New Block' => 'ایجاد بلوک جدید',
             'New Block' => 'بلوک جدید',
-            'Edit Block' => 'ویرایش بلوک',        
-            'Save' => 'ذخیره',        
-            'Save and Exit' => 'ذخیره و خروج',       
-            'Actions' => 'عملیات', 
-            'Required field' => 'کادر اجباری',
+            'Edit Block' => 'ویرایش بلوک',
+            'Save' => 'ذخیره',
+            'Save and Exit' => 'ذخیره و خروج',
+            'Actions' => 'عملیات',
+            'Required field' => 'کادر الزامی',
             'This block already exists' => 'این بلوک در حال حاضر وجود دارد',
             'This block does not exist' => 'این بلوک وجود ندارد',
-            'Delete block: :block' => 'حذف بلوک: :block',
-            'Block content' => 'محتوی بلوک',
+            'Delete block: :block' => 'Delete block: :block',
+            'Block content' => 'حذف بلوک: :block',
             'Block <i>:name</i> deleted' => 'بلوک <i>:name</i> حذف شد',
-            'Your changes to the block <i>:name</i> have been saved.' => 'تغییرات روی بلوک <i>:name</i> ذخیره شد.',
+            'Your changes to the block <i>:name</i> have been saved.' => 'تغییرات شما بر روی بلوک <i>:name</i> ذخیره شد.',
             'Delete block: :block' => 'حذف بلوک: :block',
             'View Embed Code' => 'نمایش کد درج شده',
             'Embed Code' => 'کد درج شده', 
             'Shortcode' => 'کدکوتاه',
             'PHP Code' => 'کد PHP',
         )
-    );
+    );

plugins/box/blocks/languages/nl.lang.php

@@ -0,0 +1,29 @@
+<?php
+
+    return array(
+        'blocks' => array(
+            'Blocks' => 'Blokken',
+            'Blocks manager' => 'Blokken beheer',
+            'Delete' => 'Verwijderen',
+            'Edit' => 'Bewerken',
+            'Name' => 'Naam',
+            'Create New Block' => 'Nieuw blok',
+            'New Block' => 'Nieuw blok',
+            'Edit Block' => 'Bewerk blok',
+            'Save' => 'Opslaan',
+            'Save and Exit' => 'Opslaan en Terug',
+            'Actions' => 'Acties',
+            'Required field' => 'Vereist veld',
+            'This block already exists' => 'Dit blok bestaat al',
+            'This block does not exist' => 'Dit blok bestaat niet',
+            'Delete block: :block' => 'Verwijder blok: :block',
+            'Block content' => 'Inhoud blok',
+            'Block <i>:name</i> deleted' => 'Blok <i>:name</i> verwijderd',
+            'Your changes to the block <i>:name</i> have been saved.' => 'De aanpassingen aan blok <i>:name</i> zijn opgeslagen.',
+            'Delete block: :block' => 'Verwijder blok: :block',
+            'View Embed Code' => 'Bekijk insluitcode',
+            'Embed Code' => 'Insluitcode',
+            'Shortcode' => 'Verkorte code',
+            'PHP Code' => 'PHP Code',
+        )
+    );

plugins/box/blocks/languages/pl.lang.php

@@ -0,0 +1,29 @@
+<?php
+
+    return array(
+        'blocks' => array(
+            'Blocks' => 'Bloki',
+            'Blocks manager' => 'Zarządzaj blokami',
+            'Delete' => 'Usuń',
+            'Edit' => 'Edytuj',
+            'Name' => 'Nazwa',
+            'Create New Block' => 'Utwórz nowy blok',
+            'New Block' => 'Nowy blok',
+            'Edit Block' => 'Edytuj blok',
+            'Save' => 'Zapisz',
+            'Save and Exit' => 'Zapisz i wyjdź',
+            'Actions' => 'Akcje',
+            'Required field' => 'Pole wymagane',
+            'This block already exists' => 'Ten blok już istnieje',
+            'This block does not exist' => 'Ten blok nie istnieje',
+            'Delete block: :block' => 'Czy napewno usunąć blok: :block',
+            'Block content' => 'Zawartość bloku',
+            'Block <i>:name</i> deleted' => 'Blok <i>:name</i> został usunięty',
+            'Your changes to the block <i>:name</i> have been saved.' => 'Twoje zmiany dla bloku <i>:name</i> zostały zapisane.',
+            'Delete block: :block' => 'Czy napewno usunąć blok: :block',
+            'View Embed Code' => 'Pokaż osadzony kod',
+            'Embed Code' => 'Osadzony kod',
+            'Shortcode' => 'Krótki kod (shortcode)',
+            'PHP Code' => 'Kod PHP',
+        )
+    );

plugins/box/editor/editor.plugin.php

@@ -6,7 +6,7 @@
  *	@package Monstra
  *  @subpackage Plugins
  *	@author Romanenko Sergey / Awilum
- *	@copyright 2012-2013 Romanenko Sergey / Awilum
+ *	@copyright 2012-2014 Romanenko Sergey / Awilum
  *	@version 1.0.0
  *
  */

plugins/box/editor/languages/fa.lang.php

@@ -3,6 +3,6 @@
     return array(
         'Editor' => array(
             'Editor' => 'ویرایشگر',
-            'Editor plugin' => 'افزونه ویرایشگر',  
+            'Editor plugin' => 'پلاگین ویرایشگر',  
         )
-    );
+    );

plugins/box/editor/languages/nl.lang.php

@@ -0,0 +1,8 @@
+<?php
+
+    return array(
+        'Editor' => array(
+            'Editor' => 'Editor',
+            'Editor plugin' => 'Editor Plugin',
+        )
+    );

plugins/box/editor/languages/pl.lang.php

@@ -0,0 +1,8 @@
+<?php
+
+    return array(
+        'Editor' => array(
+            'Editor' => 'Edytor',
+            'Editor plugin' => 'Wtyczka edytora',
+        )
+    );

plugins/box/filesmanager/filesmanager.plugin.php

@@ -6,7 +6,7 @@
  *	@package Monstra
  *  @subpackage Plugins
  *	@author Romanenko Sergey / Awilum
- *	@copyright 2012-2013 Romanenko Sergey / Awilum
+ *	@copyright 2012-2014 Romanenko Sergey / Awilum
  *	@version 1.0.0
  *
  */

plugins/box/filesmanager/languages/de.lang.php

@@ -13,5 +13,7 @@
             'Delete file: :file' => 'Lösche Datei: file',
             'Extension' => 'Dateiendung',
             'Size' => 'Größe',
+            'Select file' => 'Datei wählen',
+            'Change' => 'Ändern',
         )
     );

plugins/box/filesmanager/languages/en.lang.php

@@ -13,5 +13,7 @@
             'Delete file: :file' => 'Delete file :file',
             'Extension' => 'Extension',
             'Size' => 'Size',
+            'Select file' => 'Select file',
+            'Change' => 'Change',
         )
     );

plugins/box/filesmanager/languages/es.lang.php

@@ -13,5 +13,7 @@
             'Delete file: :file' => 'Borrar archivo :file',
             'Extension' => 'Extension',
             'Size' => 'Tamaño',
+            'Select file' => 'Select file',
+            'Change' => 'Change',
         )
     );

plugins/box/filesmanager/languages/fa.lang.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 
     return array(
         'filesmanager' => array(
@@ -13,5 +13,7 @@
             'Delete file: :file' => 'حذف فایل :file',
             'Extension' => 'پسوند',
             'Size' => 'اندازه',
+            'Select file' => 'Select file',
+            'Change' => 'Change',
         )
-    );
+    );

plugins/box/filesmanager/languages/fr.lang.php

@@ -13,5 +13,7 @@
             'Delete file: :file' => 'Supprimer le fichier :file',
             'Extension' => 'Extension',
             'Size' => 'Taille',
+            'Select file' => 'Select file',
+            'Change' => 'Change',
         )
     );

plugins/box/filesmanager/languages/hu.lang.php

@@ -13,5 +13,7 @@
             'Delete file: :file' => 'Fájl törlése :file',
             'Extension' => 'Bővítmény',
             'Size' => 'Méret',
+            'Select file' => 'Select file',
+            'Change' => 'Change',
         )
     );

plugins/box/filesmanager/languages/it.lang.php

@@ -13,5 +13,7 @@
             'Delete file: :file' => 'Elimina file :file',
             'Extension' => 'Estensione',
             'Size' => 'Dimensione',
+            'Select file' => 'Select file',
+            'Change' => 'Change',
         )
     );

plugins/box/filesmanager/languages/lt.lang.php

@@ -13,5 +13,7 @@
             'Delete file: :file' => 'Ištrinti bylą :file',
             'Extension' => 'Plėtinys',
             'Size' => 'Dydis',
+            'Select file' => 'Select file',
+            'Change' => 'Change',
         )
     );

plugins/box/filesmanager/languages/nl.lang.php

@@ -0,0 +1,19 @@
+<?php
+
+    return array(
+        'filesmanager' => array(
+            'Files' => 'Bestanden',
+            'Files manager' => 'Bestandsbeheer',
+            'Name' => 'Naam',
+            'Actions' => 'Acties',
+            'Delete' => 'Verwijderen',
+            'Upload' => 'Uploaden',
+            'directory' => 'Map',
+            'Delete directory: :dir' => 'Verwijder map: :dir',
+            'Delete file: :file' => 'Verwijder bestand: :file',
+            'Extension' => 'Type',
+            'Size' => 'Grootte',
+            'Select file' => 'Select file',
+            'Change' => 'Change',
+        )
+    );

plugins/box/filesmanager/languages/pl.lang.php

@@ -0,0 +1,19 @@
+<?php
+
+    return array(
+        'filesmanager' => array(
+            'Files' => 'Pliki',
+            'Files manager' => 'Zarządzaj plikami',
+            'Name' => 'Nazwa',
+            'Actions' => 'Akcje',
+            'Delete' => 'Usuń',
+            'Upload' => 'Prześlij',
+            'directory' => 'katalog',
+            'Delete directory: :dir' => 'Czy napewno usunąć katalog: :dir',
+            'Delete file: :file' => 'Czy napewno usunąć plik :file',
+            'Extension' => 'Rozszerzenie',
+            'Size' => 'Rozmiar',
+            'Select file' => 'Select file',
+            'Change' => 'Change',
+        )
+    );

plugins/box/filesmanager/languages/pt-br.lang.php

@@ -13,5 +13,6 @@
             'Delete file: :file' => 'Deletar o arquivo :file',
             'Extension' => 'Extensão',
             'Size' => 'Tamanho',
+            'Select file' => 'Select file',
         )
     );

plugins/box/filesmanager/languages/ru.lang.php

@@ -13,5 +13,7 @@
             'Delete file: :file' => 'Удалить файл :file',
             'Extension' => 'Расширение',
             'Size' => 'Размер',
+            'Select file' => 'Выбрать файл',            
+            'Change' => 'Изменить',
         )
     );

plugins/box/filesmanager/languages/sk.lang.php

@@ -13,5 +13,6 @@
             'Delete file: :file' => 'Vymazať súbor :file',
             'Extension' => 'Rozšírenie',
             'Size' => 'Veľkosť',
+            'Select file' => 'Select file',
         )
     );

plugins/box/filesmanager/languages/sr-yu.lang.php

@@ -13,5 +13,6 @@
             'Delete file: :file' => 'Obriši fajl :file',
             'Extension' => 'Extenzija',
             'Size' => 'Veličina',
+            'Select file' => 'Select file',
         )
     );

plugins/box/filesmanager/languages/uk.lang.php

@@ -13,5 +13,7 @@
             'Delete file: :file' => 'Видалити файл: :file',
             'Extension' => 'Розширення',
             'Size' => 'Розмір',
+            'Select file' => 'Выбрать файл',
+            'Change' => 'Зминити',
         )
     );

plugins/box/filesmanager/views/backend/index.view.php

@@ -5,8 +5,16 @@
     <?php
         echo (
             Form::open(null, array('enctype' => 'multipart/form-data')).
-            Form::hidden('csrf', Security::token()).
-            Form::input('file', null, array('type' => 'file', 'size' => '25')).Html::br().
+            Form::hidden('csrf', Security::token())
+        );
+    ?>
+    <div class="fileupload fileupload-new" data-provides="fileupload">
+      <span class="btn btn-small btn-file"><span class="fileupload-new"><?php echo __('Select file', 'filesmanager'); ?></span><span class="fileupload-exists"><?php echo __('Change', 'filesmanager'); ?></span><input type="file" name="file" /></span>
+      <span class="fileupload-preview"></span>
+      <a href="#" class="close fileupload-exists" data-dismiss="fileupload">×</a>
+    </div>
+    <?php
+        echo (
             Form::submit('upload_file', __('Upload', 'filesmanager'), array('class' => 'btn')).
             Form::close()
         )

plugins/box/information/information.plugin.php

@@ -6,7 +6,7 @@
  *	@package Monstra
  *  @subpackage Plugins
  *	@author Romanenko Sergey / Awilum
- *	@copyright 2012-2013 Romanenko Sergey / Awilum
+ *	@copyright 2012-2014 Romanenko Sergey / Awilum
  *	@version 1.0.0
  *
  */

plugins/box/information/languages/de.lang.php

@@ -28,7 +28,7 @@
             'Monstra version' => 'Monstra version',
             'Directory Permissions' => 'Directory Berechtigungen',
             'Directory' => 'Verzeichnis',
-            'Writable' => 'Writable',
+            'Writable' => 'Beschreibbar',
             'Unwritable' => 'Nicht beschreibbar',
             'Status' => 'Status',
             'PHP Built On' => 'PHP Built On',

plugins/box/information/languages/fa.lang.php

@@ -27,7 +27,7 @@
             'فایل index.php  مونسترا قابل نوشتن میباشند .  توصیه میکنیم همه مجوزهای نوشتن را حذف کنید. <br/>در سیستمهای یونیکس میتوانید با دستور : <code>chmod -R a-w :path</code> انجام دهید',
             'Due to the type and amount of information an error might give intruders when Core::$environment = Core::DEVELOPMENT, we strongly advise setting Core::PRODUCTION in production systems.' =>
             'با توجه به نوع و مقدار اطلاعات ممکن است هنگام Core::$environment = Core::DEVELOPMENT خطایی رخ بدهد ، ما شدیداً Core::PRODUCTION  را د رسیستم تولید توصیه میکنیم ',
-            'Monstra version' => 'نسخه Monstra',
+            'Monstra version' => 'نسخه مونسترا',
             'Directory Permissions' => 'مجوزهای شاخه',
             'Directory' => 'شاخه',
             'Writable' => 'قابل نوشتن',
@@ -37,4 +37,4 @@
             'Web Server' => 'وب سرور',
             'WebServer to PHP Interface' => 'وب سرور به رابط PHP',
         )
-    );
+    );

plugins/box/information/languages/nl.lang.php

@@ -0,0 +1,38 @@
+<?php
+
+    return array(
+        'information' => array(
+            'Information' => 'Informatie',
+            'Debuging' => 'Debuggen',
+            'Name' => 'Naam',
+            'Value' => 'Waarde',
+            'Security' => 'Beveiliging',
+            'System' => 'Systeem',
+            'on' => 'Aan',
+            'off'=> 'Uit',
+            'Server' => 'Server',
+            'PHP version' => 'PHP Versie',
+            'SimpleXML module' => 'SimpleXML Module',
+            'DOM module' => 'DOM Module',
+            'Installed' => 'Geinstalleerd',
+            'Not Installed' => 'Niet geinstalleerd',
+            'Security check results' => 'Resultaten beveiligings-check',
+            'The configuration file has been found to be writable. We would advise you to remove all write permissions on defines.php on production systems.' =>
+            'Het configuratiebestand is schrijfbaar. We adviseren u om alle schrijfrechten op defines.php te verwijderen op productiewebsites.',
+            'The Monstra .htaccess file has been found to be writable. We would advise you to remove all write permissions. <br/>You can do this on unix systems with: <code>chmod a-w :path</code>' =>
+            'Het Monstra .htaccess bestand is schrijfbaar. We adviseren u om alle schrijfrechten voor dit bestand te verwijderen. <br/>Op unix-systemen doet u dit als volgt: <code>chmod a-w :path</code>.',
+            'The Monstra index.php file has been found to be writable. We would advise you to remove all write permissions. <br/>You can do this on unix systems with: <code>chmod a-w :path</code>' =>
+            'Het Monstra index.php bestand is schrijfbaar. We adviseren u alle schrijfrechten voor dit bestand te verwijderen. <br/>Op Unix-systemen doet u dit als volgt: <code>chmod a-w :path</code>.',
+            'Due to the type and amount of information an error might give intruders when Monstra::$environment = Monstra::DEVELOPMENT, we strongly advise setting Monstra::PRODUCTION in production systems.' =>
+            'Door het type en de hoeveelheid informatie die foutmeldingen kunnen geven aan indringers wanneer Monstra::$environment = Monstra::DEVELOPMENT, raden we u ten zeerste aan om de instelling op Monstra::PRODUCTION te zetten, wanneer u met een productiewebsite werkt.',
+            'Monstra version' => 'Monstra versie',
+            'Directory Permissions' => 'Map-rechten',
+            'Directory' => 'Map',
+            'Writable' => 'Schrijfbaar',
+            'Unwritable' => 'Niet schrijfbaar',
+            'Status' => 'Status',
+            'PHP Built On' => 'Systeem',
+            'Web Server' => 'Web Server',
+            'WebServer to PHP Interface' => 'WebServer PHP Interface',
+        )
+    );

plugins/box/information/languages/pl.lang.php

@@ -0,0 +1,40 @@
+<?php
+
+    return array(
+        'information' => array(
+            'Information' => 'Informacja',
+            'Debugging' => 'Odpluskwianie',
+            'Name' => 'Nazwa',
+            'Value' => 'Wartość',
+            'Security' => 'Bezpieczeństwo',
+            'System' => 'System',
+            'on' => 'włączone',
+            'off'=> 'wyłączone',
+            'Server' => 'Serwer',
+            'PHP version' => 'Wersja PHP',
+            'SimpleXML module' => 'Moduł SimpleXML',
+            'DOM module' => 'Moduł DOM',
+            'Installed' => 'Zainstalowane',
+            'Not Installed' => 'Nie zainstalowane',
+            'Security check results' => 'Wyniki sprawdzenia bezpieczeństwa',
+            'The configuration file has been found to be writable. We would advise you to remove all write permissions on defines.php on production systems.' =>
+            'Plik konfiguracyjny ma możliwość zapisu. Radzimy, aby w systemach produkcyjnych usunąć wszystkie uprawnienia zapisu dla pliku defines.php.',
+            'The Monstra core directory (":path") and/or files underneath it has been found to be writable. We would advise you to remove all write permissions. <br/>You can do this on unix systems with: <code>chmod -R a-w :path</code>' =>
+            'Katalog główny systemu Monstra (":path") i/lub pliki w nim zawarte mają możliwość zapisu. Radzimy, aby usunąć wszystkie uprawnienia zapisu. <br/>Na systemach UNIX możesz to zrobić za pomocą: <code>chmod -R a-w :path</code>',
+            'The Monstra .htaccess file has been found to be writable. We would advise you to remove all write permissions. <br/>You can do this on unix systems with: <code>chmod a-w :path</code>' =>
+            'Plik .htaccess systemu Monstra ma możliwość zapisu. Radzimy, aby usunąć wszystkie uprawnienia zapisu. <br/>Na systemach UNIX możesz to zrobić za pomocą: <code>chmod a-w :path</code>',
+            'The Monstra index.php file has been found to be writable. We would advise you to remove all write permissions. <br/>You can do this on unix systems with: <code>chmod a-w :path</code>' =>
+            'Plik index.php systemu Monstra ma możliwość zapisu. Radzimy, aby usunąć wszystkie uprawnienia zapisu. <br/>Na systemach UNIX możesz to zrobić za pomocą: <code>chmod a-w :path</code>',
+            'Due to the type and amount of information an error might give intruders when Monstra::$environment = Monstra::DEVELOPMENT, we strongly advise setting Monstra::PRODUCTION in production systems.' =>
+            'Ze względu na rodzaj i ilość informacji o błędach, które mogą dostać się w niepowołane ręce, gdy Monstra::$environment = Monstra::DEVELOPMENT, zdecydowanie zalecamy ustawienie Monstra::PRODUCTION w systemach produkcyjnych.',
+            'Monstra version' => 'Wersja systemu Monstra',
+            'Directory Permissions' => 'Uprawnienia katalogu',
+            'Directory' => 'Katalog',
+            'Writable' => 'Możliwość zapisu',
+            'Unwritable' => 'Brak możliwości zapisu',
+            'Status' => 'Status',
+            'PHP Built On' => 'Oparty na systemie',
+            'Web Server' => 'Serwer WWW',
+            'WebServer to PHP Interface' => 'Serwerowy interfejs PHP',
+        )
+    );

plugins/box/menu/languages/de.lang.php

@@ -9,7 +9,7 @@
             'Delete' => 'Löschen',
             'Order' => 'Reihenfolge',
             'Actions' => 'Aktionen',
-            'Create New Item' => 'Erstellen neuen Eintrag',
+            'Create New Item' => 'Erstelle neuen Eintrag',
             'New item' => 'Neuer Eintrag',
             'Item name' => 'Eintrags Name',
             'Item order' => 'Eintrags Reihenfolge',