Merge branch 'dev'

Fix 404 when using certain server configurations

.htaccess

@@ -1,13 +1,15 @@
 #
-# Monstra CMS :: php & apache settings 
+# This file is part of the Monstra.
+#
+# (c) 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.
 #
 
 # Set default charset utf-8
 AddDefaultCharset UTF-8
 
-# Don't show directory listings for URLs which map to a directory.
-Options -Indexes
-
 # PHP 5, Apache 1 and 2.
 <IfModule mod_php5.c>
 	php_flag magic_quotes_gpc                 off
@@ -15,20 +17,47 @@ Options -Indexes
 	php_flag register_globals                 off
 </IfModule>
 
-
-# Setting rewrite rules.
 <IfModule mod_rewrite.c>
 	RewriteEngine on
-	
+
-	# Update code bellow for SEO improvements 
+	## Begin - Rewrite rules to block out some common exploits.
-	# RewriteCond %{HTTP_HOST} ^www.example.org [NC]
+	# If you experience problems on your site block out the operations listed below
- 	# RewriteRule ^(.*)$ http://example.org/$1 [R=301,L]
+	# This attempts to block the most common type of exploit `attempts` to Monstra
-	
+	#
+	# Block out any script trying to base64_encode data within the URL.
+	RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
+	# Block out any script that includes a <script> tag in URL.
+	RewriteCond %{QUERY_STRING} (<|%3C)([^s]*s)+cript.*(>|%3E) [NC,OR]
+	# Block out any script trying to set a PHP GLOBALS variable via URL.
+	RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
+	# Block out any script trying to modify a _REQUEST variable via URL.
+	RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
+	# Return 403 Forbidden header and show the content of the root homepage
+	RewriteRule .* index.php [F]
+	#
+	## End - Rewrite rules to block out some common exploits.
+
+	## Begin - Rewrite rules for Monstra
 	RewriteBase /%siteurlhere%/
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
-	
+	## End - Rewrite rules for Monstra
-	# Update code bellow for SEO improvements 
+
-	# Redirect 301 /home http://example.org/
+	## Begin - Rewrite rules for SEO improvements.
+	# RewriteCond %{HTTP_HOST} ^www.example.org [NC]
+ 	# RewriteRule ^(.*)$ http://example.org/$1 [R=301,L]
+	# Redirect 301 /index http://example.org/
+	## End - Rewrite rules for SEO improvements.
+
 </IfModule>
+
+# Prevent visitors from viewing files directly.
+<FilesMatch "(^#.*#|\.(md|txt|html|tpl|yml|yaml)|~)$">
+	Order allow,deny
+	Deny from all
+	Satisfy All
+</FilesMatch>
+
+# Don't show directory listings for URLs which map to a directory.
+Options -Indexes

CHANGELOG.md

@@ -1,3 +1,85 @@
+Monstra 3.0.3, 2016-01-29
+------------------------
+- Improved Monstra Security
+- Minimum PHP version for Monstra is 5.3.2
+- Admin: Fixed 404 error when using certain server configurations
+- Localization: Major Fixes for SR, KA-GE, and ES
+- Install Script Fixes
+
+Monstra 3.0.2, 2015-10-16
+------------------------
+- Added Monstra MIT LICENSE instead of GNU GENERAL PUBLIC LICENSE v3
+- Code standards fixes.
+- Localization: Major Fixes for ES and SR
+
+Monstra 3.0.1, 2014-08-10
+------------------------
+- Minimum php is 5.3
+- Themes Plugin: Imposible to create new CSS - fixed
+- Themes Plugin: js and css counter does not recalculate - fixed
+- Error in Monstra Notifications - fixed
+- Updated plugins url from plugins.monstra.org to monstra.org/download/plugins
+
+Monstra 3.0.0, 2014-08-01
+------------------------
+- Mobile Ready! Monstra fully responsive for mobile devices, tablets, and normal computer screens.
+- Twitter Bootstrap updated to 3.1.1
+- Idiorm updated to 1.4.1
+- jQuery updated to 2.1.0
+- Admin: New Modern User Interface
+- Site: New default theme
+- Layout fixes according to World Wide Web Consortium (W3C) Standards
+- Prefetch DNS to reduce look up times
+- Files Manager: added ability to create & rename directories.
+- Files Manager: Maximum upload file size message - added.
+- Files Manager: Bootstrap fileinput.js updated to 3.0.0
+- Files Manager: File Info Popup
+- Backup: Restore Site from Backup added
+- Plugins Manager: Uploading new plugins via the admin panel added
+- Plugins Manager: Read plugin help(README.MD) ability added.
+- Responsive Chocolat Lightbox instead of TB Lightbox
+- Blog Plugin as a part of Monstra CMS
+- CodeMirror Plugin as a part of Monstra CMS
+- Markdown Plugin as a part of Monstra CMS
+- MarkItUp Color Pallete fixes
+- Site Url without trailing slashes
+- Admin Help Section - added.
+- Pages Plugin: tags field added.
+- Pages Plugin: Meta Title added.
+- Sitemap Errors Fixes.
+- Monstra automatically renames files - fixed
+- Monstra Dashboard created and set as default Plugin for Admin Panel
+- Ink Framework for Monstra Email Templates
+- iCheck plugin for checkboxes added.
+- Emails Manager Plugin added.
+- HubSpot Messaging Library added for notifications
+- Gelato: Unzip Functionality added.
+- Gelato: Number Class new method convertToBytes() added.
+- Gelato: ErroHandler styles updates
+- Users Plugin getGravatarURL() improve
+- Plugin API - Actions - Closure support added.
+- Plugin API - Filters - Closure support added.
+- Core: Better statuses notification (error,success,warning)
+- Core: Store user_email in Session
+- Core: Javascript may be broken if there is no break line - fixed
+- Core: Added ability to avoid caching JS/CSS by the browser.
+- Core: Monstra automatically rename files Issue - fixed
+- Sandbox Plugin cleanup
+- New Flags: Japanese(JA), Indonesian(ID), Chinese(ZH-CN), Turkish(TR) added.
+- Localization: Japanese(JA), Indonesian(ID), Chinese(ZH-CN), Turkish(TR) translations added.
+- Localization: Major Fixes
+
+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
@@ -10,7 +92,7 @@ Monstra 2.3.0, 2013-12-19
 - 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 
+- 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
@@ -67,7 +149,7 @@ Monstra 2.1.3, 2012-12-09
 - Pages Plugin: add ability to get content for specific page.
 - XMLDB: New method factory() added.
 - Twitter Bootstrap updated to Version 2.2.2
-- Sitemap Plugin: _blank removed.
+- Sitemap Plugin: `_blank` removed.
 - Filesmanager Plugin: fixes.
 - Backup Plugin: fixes.
 
@@ -162,7 +244,7 @@ Monstra 2.0.0, 2012-10-09
 - Users Plugin: Admin - New User Registration Validation - Fixed
 - Users Plugin: Added ability to set "about me" information.
 - Improved Password Reset Logic.
-- Information Plugin: Added new tab "Server" with common server information. 
+- Information Plugin: Added new tab "Server" with common server information.
 - Box Plugins: CSRF vulnerability resolved.
 - Sitemap Plugin: Basic search engine optimization.
 - Improved Menu Plugin. Added ability to manage items categories.
@@ -172,12 +254,12 @@ Monstra 2.0.0, 2012-10-09
 - Dir Helper: Fixed size() method.
 - New Default Theme: built with best frontend optimization practice.
 - Options API: Updated get() method. Return empty string if option value doesnt exists.
-- CSS variables: Added - @theme_site_url @theme_admin_url 
+- CSS variables: Added - @theme_site_url @theme_admin_url
 - CSS variables: Deleted - @theme_url
 - Themes Plugin: Added ability to create/edit/clone JavaScripts. Added ability to change admin theme in one click.
-- Apply filter 'content' to Blocks. 
+- Apply filter 'content' to Blocks.
 - Array Helper: get() method improved. New methods keyExists() isAssoc() set() delete() random() added.
-- Plugin API: Fixed Javascript and Stylesheet class. 
+- Plugin API: Fixed Javascript and Stylesheet class.
 - Plugin API: Added ability to set view file from current theme folder.
 - New options theme_admin_name, theme_site_name, users_frontend_registration added.
 - Form Helper: Custom Macros - added
@@ -197,10 +279,10 @@ Monstra 1.3.0, 2012-09-01
 - Improve Default Monstra theme.
 - Security: Fix Script Insertion Vulnerability.
 - Blocks and Snippets plugins code fix. Issue #35, Issue #34
-- XMLDB: new method updateField() 
+- XMLDB: new method updateField()
-- Plugin API: path updates. 
+- Plugin API: path updates.
 - Dir Helper: new method size()
-- Filesmanager: shows directory size. 
+- Filesmanager: shows directory size.
 - Security Helper: update safeName() method.
 - Pages Plugin: new method children() Get children pages for a specific parent page.
 - Update translates.
@@ -208,11 +290,11 @@ Monstra 1.3.0, 2012-09-01
 
 Monstra 1.2.1, 2012-08-09
 ------------------------
-- Admin styles: add .error class 
+- Admin styles: add .error class
 - Fix translates
 - Security: fix Cross Site Request Forgery
 - Site Module: fix template() function
-- Html Helper: fix nbsp() function 
+- Html Helper: fix nbsp() function
 - Site Module: fix template() function
 
 Monstra 1.2.0, 2012-07-03
@@ -238,7 +320,7 @@ Monstra 1.1.4, 2012-06-09
 ------------------------
 - Improve Monstra Error Handler
 
- Monstra 1.1.3, 2012-06-06
+Monstra 1.1.3, 2012-06-06
 ------------------------
 - Improve Monstra Error Handler
 

LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2012 - 2016 Monstra Content Management
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,12 +1,12 @@
-# Monstra CMS
+# Monstra
-Fast and small content management system written in PHP!
+Monstra is a modern and lightweight Content Management System.   
+
+[![Join the chat at https://gitter.im/monstra-cms/monstra](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/monstra-cms/monstra?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## System Requirements
-- UNIX/Linux host
+Operation system: Unix, Linux, Windows, Mac OS   
-- PHP 5.2.3 or higher
+Middleware: PHP 5.3.2 or higher with PHP's [SimpleXML module](http://php.net/simplexml) and [Multibyte String module](http://php.net/mbstring)   
-- SimpleXML Module
+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)   
-- Apache Mod Rewrite
-- Multibyte String
 
 ## Steps to Install
 1. [Download the latest version.](http://monstra.org/download)
@@ -21,13 +21,14 @@ 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/Awilum/monstra-cms/issues)
+5. Find and [report issues.](https://github.com/monstra-cms/monstra/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/Awilum/monstra-cms)
+- [Github Repository](https://github.com/monstra-cms/monstra)
 
-Copyright (C) 2012-2014 Romanenko Sergey / Awilum [awilum@msn.com]
+## License
+See [LICENSE](https://github.com/monstra-cms/monstra/blob/master/LICENSE.md)

admin/index.php

@@ -1,20 +1,17 @@
 <?php
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 // Main engine defines
 define('DS', DIRECTORY_SEPARATOR);
 define('ROOT', rtrim(str_replace(array('admin'), array(''), dirname(__FILE__)), '\\/'));
@@ -32,13 +29,9 @@ $users = new Table('users');
 
 // Admin login
 if (Request::post('login_submit')) {
-
     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')) {
@@ -48,6 +41,7 @@ if (Request::post('login_submit')) {
                         Session::set('user_id', (int) $user['id']);
                         Session::set('user_login', (string) $user['login']);
                         Session::set('user_role', (string) $user['role']);
+                        Session::set('user_email', (string) $user['email']);
                         Request::redirect('index.php');
                     }
                 } else {
@@ -63,7 +57,6 @@ if (Request::post('login_submit')) {
                     } else {
                         Cookie::set('login_attempts', 1, 600);
                     }
-
                 }
             }
         } else {
@@ -81,6 +74,8 @@ if (Request::post('login_submit')) {
             }
         }
     }
+
+    Notification::setNow('error', $login_error);
 }
 
 // Errors
@@ -93,10 +88,15 @@ $user_login = trim(Request::post('login'));
 
 // Reset Password Form Submit
 if (Request::post('reset_password_submit')) {
-
+    if (Option::get('captcha_installed') == 'true' && ! CryptCaptcha::check(Request::post('answer'))) {
-    if (Option::get('captcha_installed') == 'true' && ! CryptCaptcha::check(Request::post('answer'))) $errors['users_captcha_wrong'] = __('Captcha code is wrong', 'users');
+        $errors['users_captcha_wrong'] = __('Captcha code is wrong', 'users');
-    if ($user_login == '') $errors['users_empty_field'] = __('Required field', 'users');
+    }
-    if ($user_login != '' && ! $users->select("[login='".$user_login."']")) $errors['users_user_doesnt_exists'] = __('This user doesnt exist', 'users');
+    if ($user_login == '') {
+        $errors['users_empty_field'] = __('Required field', 'users');
+    }
+    if ($user_login != '' && ! $users->select("[login='".$user_login."']")) {
+        $errors['users_user_doesnt_exists'] = __('This user doesnt exist', 'users');
+    }
 
     if (count($errors) == 0) {
 
@@ -116,13 +116,13 @@ if (Request::post('reset_password_submit')) {
         $mail->AddReplyTo(Option::get('system_email'));
         $mail->AddAddress($user['email'], $user['login']);
         $mail->Subject = __('Your login details for :site_name', 'users', array(':site_name' => $site_name));
-        $mail->MsgHTML(View::factory('box/users/views/emails/layout_email')
+        $mail->MsgHTML(View::factory('box/emails/views/emails/email_layout')
             ->assign('site_url', $site_url)
             ->assign('site_name', $site_name)
             ->assign('user_id', $user['id'])
             ->assign('user_login', $user['login'])
             ->assign('new_hash', $new_hash)
-            ->assign('view', 'reset_password_email')
+            ->assign('email_template', 'reset-password')
             ->render());
         $mail->Send();
 
@@ -131,8 +131,7 @@ if (Request::post('reset_password_submit')) {
         Notification::set('reset_password', 'reset_password');
 
         // Redirect to password-reset page
-        Request::redirect(Site::url().'admin');
+        Request::redirect(Site::url().'/admin');
-
     }
 
     Notification::setNow('reset_password', 'reset_password');
@@ -157,7 +156,7 @@ if ($is_admin) {
     if (Request::get('id')) {
         $area = Request::get('id');
     } else {
-        Request::redirect('index.php?id=pages');
+        Request::redirect(Site::url().'/admin/index.php?id=dashboard');
     }
 
     $plugins_registered = Plugin::$plugins;
@@ -180,12 +179,10 @@ if ($is_admin) {
 
     // Backend post render
     Action::run('admin_post_render');
-
 } else {
 
     // Display login template
     require 'themes'. DS . Option::get('theme_admin_name') . DS . 'login.template.php';
-
 }
 
 // Flush (send) the output buffer and turn off output buffering

admin/themes/default/index.template.php

@@ -2,135 +2,163 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
+
+    <meta http-equiv="x-dns-prefetch-control" content="on">
+    <link rel="dns-prefetch" href="<?php echo Site::url(); ?>" />
+    <link rel="dns-prefetch" href="//www.google-analytics.com" />
+    <link rel="dns-prefetch" href="//www.gravatar.com" />
+
     <title>Monstra :: <?php echo __('Administration', 'system'); ?></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="Monstra admin area" />
+    <meta name="description" content="Monstra Admin Area" />
-    <link rel="icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="<?php echo Option::get('siteurl'); ?>/favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>/favicon.ico" type="image/x-icon" />
 
     <!-- Styles -->
-    <?php Stylesheet::add('public/assets/css/bootstrap.css', 'backend', 1); ?>
+    <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/bootstrap.css" type="text/css" />
-    <?php Stylesheet::add('public/assets/css/bootstrap-lightbox.css', 'backend', 2); ?>
+    <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/messenger.css" type="text/css" />
+    <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/messenger-theme-flat.css" type="text/css" />
+    <?php Stylesheet::add('public/assets/css/chocolat.css', 'backend', 2); ?>
     <?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('public/assets/css/icheck-blue.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); ?>
+    <script src="<?php echo Site::url(); ?>/public/assets/js/jquery.min.js"></script>
-    <?php Javascript::add('public/assets/js/bootstrap.js', 'backend', 2); ?>
+    <script src="<?php echo Site::url(); ?>/public/assets/js/bootstrap.min.js"></script>
-    <?php Javascript::add('public/assets/js/bootstrap-lightbox.js', 'backend', 3); ?>
+    <script src="<?php echo Site::url(); ?>/public/assets/js/messenger.min.js"></script>
+    <script src="<?php echo Site::url(); ?>/public/assets/js/icheck.min.js"></script>
+    <?php Javascript::add('public/assets/js/jquery.chocolat.js', 'backend', 3); ?>
     <?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'); ?>
 
+    <script>
+        $(document).ready(function() {
+
+          $('.chocolat').Chocolat({
+              overlayColor          : '#000',
+              leftImg               : "<?php echo Option::get('siteurl'); ?>/public/assets/img/chocolat/left.gif",
+              rightImg              : "<?php echo Option::get('siteurl'); ?>/public/assets/img/chocolat/right.gif",
+              closeImg              : "<?php echo Option::get('siteurl'); ?>/public/assets/img/chocolat/close.gif",
+              loadingImg            : "<?php echo Option::get('siteurl'); ?>/public/assets/img/chocolat/loading.gif"
+          });
+
+          $('input').iCheck({
+              checkboxClass: 'icheckbox_square-blue',
+              radioClass: 'iradio_square-blue',
+              increaseArea: '20%'
+          });
+
+        });
+    </script>
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-    <link rel="stylesheet" href="css/ie.css" type="text/css" media="screen" />
+      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7/html5shiv.js"></script>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js"></script>
     <![endif]-->
+  </head>
 
-</head>
+  <body class="page-<?php echo Request::get('id'); ?>">
-<body>
 
-    <!-- Block_topbar -->
+    <nav class="navbar navbar-default navbar-inverse" role="navigation">
-    <div class="monstra-header">
+      <div class="container">
-        <div class="monstra-header-inner">
+          <div class="navbar-header">
-            <div class="container-fluid">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-                <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>
+              <span class="sr-only">Toggle navigation</span>
-                <p class="pull-right">
+              <span class="icon-bar"></span>
-                    <?php Navigation::draw('top', Navigation::TOP); ?>
+              <span class="icon-bar"></span>
-                </p>
+              <span class="icon-bar"></span>
-            </div>
+            </button>
-        </div>
+            <a class="navbar-brand" href="<?php echo Site::url(); ?>/admin/index.php?id=dashboard">MONSTRA</a>
-    </div>
+          </div>
-    <!-- /Block_topbar -->
 
-    <!-- Block_container -->
+          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-    <div class="container-fluid">
+            <ul class="nav navbar-nav">
-
+              <li<?php if (Request::get('id') == 'dashboard') { ?> class="active"<?php } ?>><a href="<?php echo Site::url(); ?>/admin/index.php?id=dashboard"><?php echo __('Dashboard', 'dashboard'); ?></a></li>
-        <div class="row-fluid">
+              <li class="dropdown">
-
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo __('Content', 'pages'); ?> <b class="caret"></b></a>
-            <!-- Block_sidebar -->
+                <ul class="dropdown-menu">
-
+                    <?php Navigation::draw('content'); ?>
-            <div class="span2 monstra-menu-sidebar">
+                </ul>
-
+              </li>
-                <div class="hidden-desktop">
+              <?php if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) { ?>
-                    <select class="input-block-level" name="sections" id="sections">
+              <li class="dropdown">
-                        <?php
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo __('Extends', 'system'); ?> <b class="caret"></b></a>
-                            Navigation::getDropdown('content');
+                <ul class="dropdown-menu">
-                            Navigation::getDropdown('extends');
+                    <?php Navigation::draw('extends'); ?>
-                            Navigation::getDropdown('system');
+                </ul>
-                        ?>
+              </li>
-                    </select>
+              <?php } ?>
-                </div>
+              <li class="dropdown">
-
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo __('System', 'system'); ?> <b class="caret"></b></a>
-                <div class="hidden-phone hidden-tablet">
+                <ul class="dropdown-menu">
-
+                    <?php Navigation::draw('system'); ?>
-                    <h3><?php echo __('Content', 'pages'); ?></h3>
+                </ul>
-                    <ul>
+              </li>
-                        <?php Navigation::draw('content'); ?>
+              <li class="dropdown">
-                    </ul>
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo __('Help', 'system'); ?> <b class="caret"></b></a>
-                    <div class="monstra-menu-category-separator"></div>
+                <ul class="dropdown-menu">
-                    <?php if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) { ?>
+                    <li><a href="http://monstra.org/documentation" target="_blank"><?php echo __('Documentation', 'system'); ?></a></li>
-                    <h3><?php echo __('Extends', 'system'); ?></h3>
+                    <?php if (Option::get('language') == 'ru') { ?>
-                    <ul>
+                    <li><a href="http://ru.forum.monstra.org" target="_blank"><?php echo __('Official Support Forum', 'system'); ?></a></li>
-                       <?php Navigation::draw('extends'); ?>
+                    <?php } else { ?>
-                    </ul>
+                    <li><a href="http://forum.monstra.org" target="_blank"><?php echo __('Official Support Forum', 'system'); ?></a></li>
-                    <div class="monstra-menu-category-separator"></div>
                     <?php } ?>
-                    <h3><?php echo __('System', 'system'); ?></h3>
+                </ul>
-                    <ul>
+              </li>
-                        <?php Navigation::draw('system'); ?>
+            </ul>
-                    </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li><a href="<?php echo Site::url(); ?>" target="_blank"><?php echo __('View Site', 'system'); ?></a></li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo Session::get('user_login'); ?> <img src="<?php echo Users::getGravatarURL(Session::get('user_email'), 28); ?>" alt=""> <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li><a href="<?php echo Site::url(); ?>/admin/index.php?id=users&action=edit&user_id=<?php echo Session::get('user_id'); ?>"><?php echo __('Profile', 'users')?></a></li>
+                  <li><a href="<?php echo Site::url(); ?>/admin/?logout=do"><?php echo __('Log Out', 'users'); ?></a></li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      </div>
+    </nav>
 
-                </div>
+    <div class="container">
 
-            </div>
+        <?php
-            <!-- /Block_sidebar -->
+            // Monstra Notifications
-
+            Notification::get('success') AND Alert::success(Notification::get('success'));
-            <!-- Block_content -->
+            Notification::get('warning') AND Alert::warning(Notification::get('warning'));
-            <div class="span10 monstra-content">
+            Notification::get('error')   AND Alert::error(Notification::get('error'));
-
+        ?>
-                <div id="update-monstra"></div>
-                <div><?php Action::run('admin_pre_template'); ?></div>
-                <div>
-                    <?php
-                        if ($plugin_admin_area) {
-                            if (is_callable(ucfirst(Plugin::$plugins[$area]['id']).'Admin::main')) {
-                                call_user_func(ucfirst(Plugin::$plugins[$area]['id']).'Admin::main');
-                            } else {
-                                echo '<div class="message-error">'.__('Plugin main admin function does not exist', 'system').'</div>';
-                            }
-                        } else {
-                            echo '<div class="message-error">'.__('Plugin does not exist', 'system').'</div>';
-                        }
-                    ?>
-                </div>
-                <div><?php Action::run('admin_post_template'); ?></div>
-
-            </div>
-            <!-- /Block_content -->
 
+        <div id="update-monstra"></div>
+        <div><?php Action::run('admin_pre_template'); ?></div>
+        <div>
+            <?php
+                if ($plugin_admin_area) {
+                    if (is_callable(ucfirst(Plugin::$plugins[$area]['id']).'Admin::main')) {
+                        call_user_func(ucfirst(Plugin::$plugins[$area]['id']).'Admin::main');
+                    } else {
+                        echo '<div class="message-error">'.__('Plugin main admin function does not exist', 'system').'</div>';
+                    }
+                } else {
+                    echo '<div class="message-error">'.__('Plugin does not exist', 'system').'</div>';
+                }
+            ?>
         </div>
-
+        <div><?php Action::run('admin_post_template'); ?></div>
-        <!-- Block_footer -->
+      </div>
-        <footer>
+      <div class="margin-top-1  margin-bottom-1 hidden-md"></div>
-            <p class="pull-right">
+      <footer class="container visible-md visible-lg">
-                <span style="border-top:1px solid #E0E0E0; padding-top:10px;">
+          <p class="pull-right">
-                    <span class="hidden-phone">
+            <span>
-                        <a href="http://forum.monstra.org" target="_blank"><?php echo __('Official Support Forum', 'system'); ?></a> /
+              <a href="http://monstra.org" target="_blank">Monstra</a> was made by <a href="http://awilum.github.io" target="_blank" class="highlight">Sergey Romanenko</a> and is maintained by <a href="https://github.com/monstra-cms/monstra/network/members" target="_blank" class="highlight">Monstra Community</a> / © 2012 - 2016 <a href="http://monstra.org/about/license" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?>
-                        <a href="http://monstra.org/documentation" target="_blank"><?php echo __('Documentation', 'system'); ?></a> /
+            </span>
-                    </span>
+          </p>
-                    © 2012 - 2014 <a href="http://monstra.org" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?>
+      </footer>
-                </span>
-            </p>
-        </footer>
-        <!-- /Block_footer -->
-
-    </div>
-    <!-- /Block_container -->
-
 </body>
 </html>

admin/themes/default/js/default.js

@@ -1,26 +1,23 @@
 /**
- *	Monstra JS module
+ * Monstra JS module
- *	@package Monstra
+ *
- *	@author Romanenko Sergey / Awilum
+ * This source file is part of the Monstra Engine. More information,
- *	@copyright 2012 Romanenko Sergey / Awilum
+ * documentation and tutorials can be found at http://monstra.org
- *	@version $Id$
+ *
- *	@since 1.0.0
+ * @package     Monstra
- *  @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ *
- *  Monstra is free software. This version may have been modified pursuant
+ * @author      Romanenko Sergey / Awilum <awilum@msn.com>
- *  to the GNU General Public License, and as distributed it includes or
+ * @copyright   2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
- *  is derivative of works licensed under the GNU General Public License or
+ *
- *  other free or open source software licenses.
+ * For the full copyright and license information, please view the LICENSE
- *  See COPYING.txt for copyright notices and details.
+ * file that was distributed with this source code.
- *  @filesource
  */
 
-
 /* Confirm delete */
 function confirmDelete(msg){var data=confirm(msg+" ?"); return data;}
 
-$(document).ready(function() {
+/* Messanger */
-    /* DropDown Menu for Mobile Devices */
+Messenger.options = {
-    $("#sections").change(function(){
+    extraClasses: 'messenger-fixed messenger-on-bottom messenger-on-right',
-       window.location = $('#sections option:selected').attr('rel');
+    theme: 'flat'
-    });
+}
-});

admin/themes/default/login.template.php

@@ -5,22 +5,28 @@
         <title>Monstra :: <?php echo __('Administration', 'system'); ?></title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="Monstra Admin Area">
-        <link rel="icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
+        <link rel="icon" href="<?php echo Option::get('siteurl'); ?>/favicon.ico" type="image/x-icon" />
-        <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
+        <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>/favicon.ico" type="image/x-icon" />
 
         <!-- Styles -->
-        <?php Stylesheet::add('public/assets/css/bootstrap.css', 'backend', 1); ?>
+        <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/bootstrap.css" type="text/css" />
+        <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/messenger.css" type="text/css" />
+        <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/messenger-theme-flat.css" type="text/css" />
         <?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('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?>
-        <?php Stylesheet::add('admin/themes/default/css/default.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); ?>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-        <?php Javascript::add('public/assets/js/bootstrap.js', 'backend', 2); ?>
+        <script src="<?php echo Site::url(); ?>/public/assets/js/bootstrap.min.js"></script>
+        <script src="<?php echo Site::url(); ?>/public/assets/js/messenger.min.js"></script>
+        <script src="<?php echo Site::url(); ?>/public/assets/js/messenger-theme-flat.js"></script>
         <?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(); ?>
+
         <script type="text/javascript">
             $().ready(function () {
                 <?php if (Notification::get('reset_password') == 'reset_password') { ?>
@@ -45,47 +51,56 @@
 
         <?php Action::run('admin_header'); ?>
 
-        <!--[if lt IE 9]>
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <link rel="stylesheet" href="css/ie.css" type="text/css" media="screen" />
+    <!--[if lt IE 9]>
-        <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7/html5shiv.js"></script>
-        <![endif]-->
+      <script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js"></script>
-
+    <![endif]-->
     </head>
     <body class="login-body">
 
+        <?php
+            // Monstra Notifications
+            Notification::get('success') AND Alert::success(Notification::get('success'));
+            Notification::get('warning') AND Alert::warning(Notification::get('warning'));
+            Notification::get('error')   AND Alert::error(Notification::get('error'));
+        ?>
+
         <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 class="text-center"><a class="brand" href="<?php echo Option::get('siteurl'); ?>/admin"><img src="<?php echo Option::get('siteurl'); ?>/public/assets/img/monstra-logo-256px.png" alt="monstra" /></a></div>
-            <div class="administration-area">
+            <div class="administration-area well">
-                <hr>
                 <div>
-                    <h2 style="text-align:center;"><?php echo __('Administration', 'system'); ?></h2><br />
                     <form method="post">
-                        <label><?php echo __('Username', 'users'); ?></label>
+                        <div class="form-group">
-                        <input class="input-xlarge" name="login" type="text" />
+                            <label><?php echo __('Username', 'users'); ?></label>
-
+                            <input class="form-control" name="login" type="text" />
-                        <label><?php echo __('Password', 'users'); ?></label>
+                        </div>
-                        <input class="input-xlarge" name="password" type="password" />
+                        <div class="form-group">
-                        <br />
+                            <label><?php echo __('Password', 'users'); ?></label>
-                        <?php if (isset($login_error) && $login_error !== '') { ?><div class="alert alert-error"><?php echo $login_error; ?></div><?php } ?>
+                            <input class="form-control" name="password" type="password" />
-                        <input type="submit" name="login_submit" class="btn" value="<?php echo __('Log In', 'users'); ?>" />
+                        </div>
+                        <div class="form-group">
+                            <input type="submit" name="login_submit" class="btn btn-primary" value="<?php echo __('Log In', 'users'); ?>" />
+                        </div>
                     </form>
                 </div>
             </div>
 
-            <div class="reset-password-area">
+            <div class="reset-password-area well">
-                <hr>
                 <div>
-                    <h2 style="text-align:center;"><?php echo __('Reset Password', 'users'); ?></h2><br />
-                    <?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
                     <form method="post">
+                        <div class="form-group">
                         <label><?php echo __('Username', 'users'); ?></label>
-                        <input name="login" class="input-xlarge" type="text" value="<?php echo $user_login; ?>" />
+                        <input name="login" class="form-control" type="text" value="<?php echo $user_login; ?>" />
-
+                        </div>
                         <?php if (Option::get('captcha_installed') == 'true') { ?>
+                        <div class="form-group">
                         <label><?php echo __('Captcha', 'users'); ?></label>
-                        <input type="text" name="answer" class="input-xlarge">
+                        <input type="text" name="answer" class="form-control">
+                        <br>
                         <?php CryptCaptcha::draw(); ?>
+                        </div>
                         <?php } ?>
                         <br>
                         <?php
@@ -95,24 +110,26 @@
                                 }
                             }
                         ?>
-                        <input type="submit" name="reset_password_submit" class="btn" value="<?php echo __('Send New Password', 'users')?>" />
+                        <div class="form-group">
+                            <input type="submit" name="reset_password_submit" class="btn btn-primary" value="<?php echo __('Send New Password', 'users')?>" />
+                        </div>
                     </form>
                 </div>
             </div>
 
-            <hr>
+        </div>
-            <div>
+
-                <div style="text-align:center;">
+        <div class="login-footer">
-                    <a class="small-grey-text" href="<?php echo Option::get('siteurl'); ?>"><?php echo __('< Back to Website', 'system');?></a> -
+
-                    <a class="small-grey-text reset-password-btn" href="javascript:;"><?php echo __('Forgot your password? >', 'system');?></a>
+            <div class="text-center">
-                    <a class="small-grey-text administration-btn" href="javascript:;"><?php echo __('Administration >', 'system');?></a>
+                <a href="<?php echo Option::get('siteurl'); ?>"><?php echo __('Back to Website', 'system');?></a> -
-                </div>
+                <a class="reset-password-btn" href="javascript:;"><?php echo __('Forgot your password ?', 'system');?></a>
+                <a class="administration-btn" href="javascript:;"><?php echo __('Log In', 'users');?></a>
+            </div>
+
+            <div class="text-center">
+                © 2012 - 2016 <a href="http://monstra.org/about/license" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?>
             </div>
         </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>
-        </div>
-
     </body>
 </html>

boot/defines.php

@@ -1,7 +1,7 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra CMS Defines
+ * Monstra Defines
  */
 
 /**
@@ -91,3 +91,4 @@ define('MONSTRA_GZIP', false);
 //define('MONSTRA_DB_DSN', 'mysql:dbname=monstra;host=localhost;port=3306');
 //define('MONSTRA_DB_USER', 'root');
 //define('MONSTRA_DB_PASSWORD', 'password');
+

engine/Alert.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Alert
 {
     /**
@@ -35,16 +32,21 @@ class Alert
      *  </code>
      *
      * @param string  $message Message
-     * @param integer $time    Time
+     * @param integer $seconds Seconds
      */
-    public static function success($message, $time = 3000)
+    public static function success($message, $seconds = 3)
     {
         // Redefine vars
         $message = (string) $message;
-        $time    = (int) $time;
+        $seconds    = (int) $seconds;
 
-        echo '<div class="alert alert-info">'.$message.'</div>
+        echo '<script type="text/javascript">
-              <script type="text/javascript">setTimeout(\'$(".alert").slideUp("slow")\', '.$time.'); </script>';
+                Messenger().post({
+                    type: "success",
+                    message : "'.$message.'",                    
+                    hideAfter: '.$seconds.'
+                });
+             </script>';
     }
 
     /**
@@ -55,16 +57,21 @@ class Alert
      *  </code>
      *
      * @param string  $message Message
-     * @param integer $time    Time
+     * @param integer $seconds Seconds
      */
-    public static function warning($message, $time = 3000)
+    public static function warning($message, $seconds = 3)
     {
         // Redefine vars
         $message = (string) $message;
-        $time    = (int) $time;
+        $seconds    = (int) $seconds;
 
-        echo '<div class="alert alert-warning">'.$message.'</div>
+        echo '<script type="text/javascript">
-              <script type="text/javascript">setTimeout(\'$(".alert").slideUp("slow")\', '.$time.'); </script>';
+                Messenger().post({
+                    type: "info",
+                    message : "'.$message.'",
+                    hideAfter: '.$seconds.'
+                });
+             </script>';
     }
 
     /**
@@ -75,16 +82,20 @@ class Alert
      *  </code>
      *
      * @param string  $message Message
-     * @param integer $time    Time
+     * @param integer $seconds Seconds
      */
-    public static function error($message, $time = 3000)
+    public static function error($message, $seconds = 3)
     {
         // Redefine vars
         $message = (string) $message;
-        $time    = (int) $time;
+        $seconds    = (int) $seconds;
 
-        echo '<div class="alert alert-error">'.$message.'</div>
+        echo '<script type="text/javascript">
-              <script type="text/javascript">setTimeout(\'$(".alert").slideUp("slow")\', '.$time.'); </script>';
+                Messenger().post({
+                    type: "error",
+                    message : "'.$message.'",
+                    hideAfter: '.$seconds.'
+                });
+             </script>';
     }
-
 }

engine/Monstra.php

@@ -1,19 +1,11 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- *  Monstra - Content Management System.
+ * @package Monstra
- *  Site: www.mostra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *  Copyright (C) 2012-2014 Romanenko Sergey / Awilum <awilum@msn.com>
+ * @link http://monstra.org
- *
- * This source file is part of the Monstra Engine. More information,
- * documentation and tutorials can be found at http://monstra.org
- *
- * @package     Monstra
- *
- * @author      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 +31,8 @@ class Monstra
     /**
      * The version of Monstra
      */
-    const VERSION = '2.3.0';
+    const VERSION = '3.0.3';
+
 
     /**
      * Monstra environment
@@ -84,7 +77,9 @@ class Monstra
          * Compress HTML with gzip
          */
         if (MONSTRA_GZIP) {
-            if ( ! ob_start("ob_gzhandler")) ob_start();
+            if (! ob_start("ob_gzhandler")) {
+                ob_start();
+            }
         } else {
             ob_start();
         }
@@ -93,16 +88,19 @@ class Monstra
          * Send default header and set internal encoding
          */
         header('Content-Type: text/html; charset=UTF-8');
-        function_exists('mb_language') AND mb_language('uni');
+        function_exists('mb_language') and mb_language('uni');
-        function_exists('mb_regex_encoding') AND mb_regex_encoding('UTF-8');
+        function_exists('mb_regex_encoding') and mb_regex_encoding('UTF-8');
-        function_exists('mb_internal_encoding') AND mb_internal_encoding('UTF-8');
+        function_exists('mb_internal_encoding') and mb_internal_encoding('UTF-8');
 
         /**
          * Gets the current configuration setting of magic_quotes_gpc
          * and kill magic quotes
          */
         if (get_magic_quotes_gpc()) {
-            function stripslashesGPC(&$value) { $value = stripslashes($value); }
+            function stripslashesGPC(&$value)
+            {
+                $value = stripslashes($value);
+            }
             array_walk_recursive($_GET, 'stripslashesGPC');
             array_walk_recursive($_POST, 'stripslashesGPC');
             array_walk_recursive($_COOKIE, 'stripslashesGPC');
@@ -119,7 +117,7 @@ class Monstra
         /**
          * Define Monstra Folder for Gelato Logs
          */
-        define ('GELATO_LOGS_PATH', LOGS);
+        define('GELATO_LOGS_PATH', LOGS);
 
         /**
          * Include Gelato Library
@@ -188,7 +186,7 @@ class Monstra
         }
 
         /**
-         * Auto cleanup if MONSTRA_DEBUG is TRUE
+         * Auto cleanup if DEVELOPMENT environment
          */
         if (Monstra::$environment == Monstra::DEVELOPMENT) {
             Monstra::cleanTmp();
@@ -208,7 +206,11 @@ class Monstra
          * Set default timezone
          */
         @ini_set('date.timezone', Option::get('timezone'));
-        if (function_exists('date_default_timezone_set')) date_default_timezone_set(Option::get('timezone')); else putenv('TZ='.Option::get('timezone'));
+        if (function_exists('date_default_timezone_set')) {
+            date_default_timezone_set(Option::get('timezone'));
+        } else {
+            putenv('TZ='.Option::get('timezone'));
+        }
 
         /**
          * Sanitize URL to prevent XSS - Cross-site scripting
@@ -238,7 +240,9 @@ class Monstra
         /**
          * Init site module
          */
-        if ( ! BACKEND) Site::init();
+        if (! BACKEND) {
+            Site::init();
+        }
     }
 
     /**
@@ -299,7 +303,6 @@ class Monstra
         } else {
             throw new RuntimeException("The pluggable shortcodes.php file does not exist.");
         }
-
     }
 
     /**
@@ -308,10 +311,18 @@ class Monstra
     public static function cleanTmp()
     {
         // Cleanup minify
-        if (count($files = File::scan(MINIFY, array('css', 'js', 'php'))) > 0) foreach ($files as $file) File::delete(MINIFY . DS . $file);
+        if (count($files = File::scan(MINIFY, array('css', 'js', 'php'))) > 0) {
+            foreach ($files as $file) {
+                File::delete(MINIFY . DS . $file);
+            }
+        }
 
         // Cleanup cache
-        if (count($namespaces = Dir::scan(CACHE)) > 0) foreach ($namespaces as $namespace) Dir::delete(CACHE . DS . $namespace);
+        if (count($namespaces = Dir::scan(CACHE)) > 0) {
+            foreach ($namespaces as $namespace) {
+                Dir::delete(CACHE . DS . $namespace);
+            }
+        }
     }
 
     /**
@@ -321,8 +332,9 @@ class Monstra
      */
     public static function init()
     {
-        if ( ! isset(self::$instance)) self::$instance = new Monstra();
+        if (! isset(self::$instance)) {
+            self::$instance = new Monstra();
+        }
         return self::$instance;
     }
-
 }

engine/Option.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Option
 {
     /**
@@ -38,7 +35,9 @@ class Option
      */
     public static function init()
     {
-        if ( ! isset(self::$instance)) self::$instance = new Option();
+        if (! isset(self::$instance)) {
+            self::$instance = new Option();
+        }
         return self::$instance;
     }
 
@@ -176,5 +175,4 @@ class Option
         // Check if option exists
         return (count(Option::$options->select('[name="'.$option.'"]', null)) > 0) ? true : false;
     }
-
 }

engine/Plugin/Action.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Action
 {
     /**
@@ -47,7 +44,7 @@ class Action
      *  </code>
      *
      * @param string  $action_name    Action name
-     * @param string  $added_function Added function
+     * @param mixed   $added_function Added function
      * @param integer $priority       Priority. Default is 10
      * @param array   $args           Arguments
      */
@@ -56,7 +53,7 @@ class Action
         // Hooks a function on to a specific action.
         Action::$actions[] = array(
                         'action_name' => (string) $action_name,
-                        'function'    => (string) $added_function,
+                        'function'    => $added_function,
                         'priority'    => (int) $priority,
                         'args'        => $args
         );
@@ -102,23 +99,15 @@ class Action
                         } else {
                             call_user_func_array($action['function'], $args);
                         }
-
                     } else {
-
                         if ($return) {
                             return call_user_func_array($action['function'], $action['args']);
                         } else {
                             call_user_func_array($action['function'], $action['args']);
                         }
-
                     }
-
                 }
-
             }
-
         }
-
     }
-
 }

engine/Plugin/Backend.php

@@ -1,15 +1,11 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
@@ -17,5 +13,7 @@
 
 class Backend
 {
-    public static function main() { }
+    public static function main()
+    {
+    }
 }

engine/Plugin/Filter.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Filter
 {
     /**
@@ -52,12 +49,12 @@ class Filter
 
         $args = array_slice(func_get_args(), 2);
 
-        if ( ! isset(Filter::$filters[$filter_name])) {
+        if (! isset(Filter::$filters[$filter_name])) {
             return $value;
         }
 
         foreach (Filter::$filters[$filter_name] as $priority => $functions) {
-            if ( ! is_null($functions)) {
+            if (! is_null($functions)) {
                 foreach ($functions as $function) {
                     $all_args = array_merge(array($value), $args);
                     $function_name = $function['function'];
@@ -91,7 +88,7 @@ class Filter
      *  </code>
      *
      * @param  string  $filter_name     The name of the filter to hook the $function_to_add to.
-     * @param  string  $function_to_add The name of the function to be called when the filter is applied.
+     * @param  mixed   $function_to_add The name of the function to be called when the filter is applied.
      * @param  integer $priority        Function to add priority - default is 10.
      * @param  integer $accepted_args   The number of arguments the function accept default is 1.
      * @return boolean
@@ -100,7 +97,7 @@ class Filter
     {
         // Redefine arguments
         $filter_name     = (string) $filter_name;
-        $function_to_add = (string) $function_to_add;
+        $function_to_add = $function_to_add;
         $priority        = (int) $priority;
         $accepted_args   = (int) $accepted_args;
 
@@ -120,5 +117,4 @@ class Filter
 
         return true;
     }
-
 }

engine/Plugin/Frontend.php

@@ -1,27 +1,40 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Frontend
 {
-    public static function main() { }
+    public static function main()
-    public static function title() { return ''; }
+    {
-    public static function description() { return ''; }
+    }
-    public static function keywords() { return ''; }
+    public static function title()
-    public static function template() { return 'index'; }
+    {
-    public static function content() { return ''; }
+        return '';
-
+    }
+    public static function description()
+    {
+        return '';
+    }
+    public static function keywords()
+    {
+        return '';
+    }
+    public static function template()
+    {
+        return 'index';
+    }
+    public static function content()
+    {
+        return '';
+    }
 }

engine/Plugin/I18n.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class I18n
 {
     /**
@@ -36,8 +33,10 @@ class I18n
         'fi' => 'Suomi',
         'fr' => 'Français',
         'gl' => 'Galego',
+        'ka-ge' => 'Georgian',
         'hu' => 'Magyar',
         'it' => 'Italiano',
+        'id' => 'Bahasa Indonesia',
         'ja' => '日本語',
         'lt' => 'Lietuvių',
         'nl' => 'Nederlands',
@@ -49,10 +48,10 @@ class I18n
         'sk' => 'Slovenčina',
         'sl' => 'Slovenščina',
         'sv' => 'Svenska',
-        'sr-yu' => 'Serbian',
+        'sr' => 'Srpski',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
-        'zh' => '中文',
+        'zh-cn' => '简体中文',
     );
 
     /**
@@ -76,7 +75,9 @@ class I18n
      */
     public static function init($locale)
     {
-        if ( ! isset(self::$instance)) self::$instance = new I18n($locale);
+        if (! isset(self::$instance)) {
+            self::$instance = new I18n($locale);
+        }
         return self::$instance;
     }
 
@@ -115,7 +116,6 @@ class I18n
 
             // Loop through each installed plugin
             foreach ($records as $record) {
-
                 if (is_dir(ROOT . DS . dirname($record['location']) . DS . 'languages')) {
 
                     // Init var
@@ -126,7 +126,6 @@ class I18n
 
                         // Merge the language strings into the sub table
                         $t = array_merge($t, include ROOT . DS . dirname($record['location']) . DS . 'languages' . DS . $locale . '.lang.php');
-
                     }
 
                     // Append the sub table, preventing less specific language files from overloading more specific files
@@ -163,9 +162,12 @@ class I18n
         $string = (string) $string;
 
         // Return string
-        if (isset(I18n::$dictionary[$namespace][$string])) return I18n::$dictionary[$namespace][$string]; else return $string;
+        if (isset(I18n::$dictionary[$namespace][$string])) {
+            return I18n::$dictionary[$namespace][$string];
+        } else {
+            return $string;
+        }
     }
-
 }
 
 /**

engine/Plugin/Javascript.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Javascript
 {
     /**
@@ -66,7 +63,6 @@ class Javascript
 
         // Load javascripts
         if (count(Javascript::$javascripts) > 0) {
-
             $backend_buffer = '';
             $backend_regenerate = false;
 
@@ -80,8 +76,8 @@ class Javascript
 
                 // Build backend site javascript
                 foreach ($javascripts as $javascript) {
-                    if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both')) ) {
+                    if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both'))) {
-                        if ( ! file_exists($backend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($backend_site_js_path)) {
+                        if (! file_exists($backend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($backend_site_js_path)) {
                             $backend_regenerate = true;
                             break;
                         }
@@ -91,20 +87,19 @@ class Javascript
                 // Regenerate site javascript
                 if ($backend_regenerate) {
                     foreach ($javascripts as $javascript) {
-                        if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both')) ) {
+                        if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both'))) {
-                            $backend_buffer .= file_get_contents(ROOT . DS . $javascript['file']);
+                            $backend_buffer .= file_get_contents(ROOT . DS . $javascript['file'])."\n";
                         }
                     }
                     file_put_contents($backend_site_js_path, $backend_buffer);
                     $backend_regenerate = false;
                 }
-
             } else {
 
                 // Build frontend site javascript
                 foreach ($javascripts as $javascript) {
-                        if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both')) ) {
+                    if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both'))) {
-                        if ( ! file_exists($frontend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($frontend_site_js_path)) {
+                        if (! file_exists($frontend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($frontend_site_js_path)) {
                             $frontend_regenerate = true;
                             break;
                         }
@@ -114,23 +109,29 @@ class Javascript
                 // Regenerate site javascript
                 if ($frontend_regenerate) {
                     foreach ($javascripts as $javascript) {
-                        if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both')) ) {
+                        if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both'))) {
-                            $frontend_buffer .= file_get_contents(ROOT . DS . $javascript['file']);
+                            $frontend_buffer .= file_get_contents(ROOT . DS . $javascript['file'])."\n";
                         }
                     }
                     file_put_contents($frontend_site_js_path, $frontend_buffer);
                     $frontend_regenerate = false;
                 }
-
             }
 
             // Render
             if (BACKEND) {
-                echo '<script type="text/javascript" src="'.Option::get('siteurl').'tmp/minify/backend_site.minify.js"></script>';
+                echo '<script type="text/javascript" src="'.Option::get('siteurl').'/tmp/minify/backend_site.minify.js?'.Option::get('javascript_version').'"></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?'.Option::get('javascript_version').'"></script>'."\n";
             }
         }
     }
 
+    /**
+     *  javascriptVersionIncrement
+     */
+    public static function javascriptVersionIncrement()
+    {
+        Option::update('javascript_version', (int) Option::get('javascript_version') + 1);
+    }
 }

engine/Plugin/Navigation.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Navigation
 {
     /**
@@ -83,7 +80,11 @@ class Navigation
             foreach ($items as $item) {
 
                 // If current plugin id == selected item id then set class to current
-                if (Request::get('id') == $item['id'] && $item['external'] == false) $class = 'class = "current" '; else $class = '';
+                if (Request::get('id') == $item['id'] && $item['external'] == false) {
+                    $class = 'class = "current" ';
+                } else {
+                    $class = '';
+                }
 
                 // If current category == item category and navigation type is left them draw this item
                 if ($item['category'] == $category && $item['type'] == Navigation::LEFT) {
@@ -133,7 +134,11 @@ class Navigation
             foreach ($items as $item) {
 
                 // If current plugin id == selected item id then set class to current
-                if (Request::get('id') == $item['id'] && $item['external'] == false) $class = 'class = "current" '; else $class = '';
+                if (Request::get('id') == $item['id'] && $item['external'] == false) {
+                    $class = 'class = "current" ';
+                } else {
+                    $class = '';
+                }
 
                 // If current category == item category and navigation type is left them draw this item
                 if ($item['category'] == $category && $item['type'] == Navigation::LEFT) {
@@ -158,7 +163,6 @@ class Navigation
                 }
             }
         }
-
     }
 
     /**
@@ -179,7 +183,11 @@ class Navigation
         foreach ($items as $item) {
 
             // If current plugin id == selected item id then set class to current
-            if (Request::get('id') == $item['id'] && $item['external'] == false) $class = 'selected = "selected" '; else $class = '';
+            if (Request::get('id') == $item['id'] && $item['external'] == false) {
+                $class = 'selected = "selected" ';
+            } else {
+                $class = '';
+            }
 
             // If current category == item category and navigation type is left them draw this item
             if ($item['category'] == $category && $item['type'] == Navigation::LEFT) {
@@ -191,5 +199,4 @@ class Navigation
             }
         }
     }
-
 }

engine/Plugin/Plugin.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Plugin
 {
     /**
@@ -45,7 +42,9 @@ class Plugin
      */
     public static function init()
     {
-        if ( ! isset(self::$instance)) self::$instance = new Plugin();
+        if (! isset(self::$instance)) {
+            self::$instance = new Plugin();
+        }
         return self::$instance;
     }
 
@@ -102,7 +101,7 @@ class Plugin
         if (BACKEND) {
 
             // Plugin admin folder
-            if ( ! empty($alt_folder)) {
+            if (! empty($alt_folder)) {
                 $folder = $alt_folder . DS . strtolower($plug);
             } else {
                 $folder = strtolower($plug);
@@ -157,7 +156,11 @@ class Plugin
         $id = strtolower(basename($file, '.plugin.php'));
 
         // Set plugin privilege 'box' if $box is true
-        if ($box) $privilege = 'box'; else $privilege = '';
+        if ($box) {
+            $privilege = 'box';
+        } else {
+            $privilege = '';
+        }
 
         // Register plugin in global plugins array.
         Plugin::$plugins[$id] = array(
@@ -175,9 +178,8 @@ class Plugin
         // Example:
         //    www.example.org/guestbook
         //    www.example.org/news
-        if ( ! empty($component)) {
+        if (! empty($component)) {
             Plugin::$components[] = $component;
         }
     }
-
 }

engine/Plugin/Stylesheet.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Stylesheet
 {
     /**
@@ -66,7 +63,6 @@ class Stylesheet
 
         // Load stylesheets
         if (count(Stylesheet::$stylesheets) > 0) {
-
             $backend_buffer = '';
             $backend_regenerate = false;
 
@@ -80,8 +76,8 @@ class Stylesheet
 
                 // Build backend site stylesheets
                 foreach ($stylesheets as $stylesheet) {
-                    if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both')) ) {
+                    if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both'))) {
-                        if ( ! file_exists($backend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($backend_site_css_path)) {
+                        if (! file_exists($backend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($backend_site_css_path)) {
                             $backend_regenerate = true;
                             break;
                         }
@@ -91,7 +87,7 @@ class Stylesheet
                 // Regenerate site stylesheet
                 if ($backend_regenerate) {
                     foreach ($stylesheets as $stylesheet) {
-                        if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both')) ) {
+                        if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both'))) {
                             $backend_buffer .= file_get_contents(ROOT . DS . $stylesheet['file']);
                         }
                     }
@@ -99,13 +95,12 @@ class Stylesheet
                     file_put_contents($backend_site_css_path, MinifyCSS::process($backend_buffer));
                     $backend_regenerate = false;
                 }
-
             } else {
 
                 // Build frontend site stylesheets
                 foreach ($stylesheets as $stylesheet) {
-                    if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both')) ) {
+                    if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both'))) {
-                        if ( ! file_exists($frontend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($frontend_site_css_path)) {
+                        if (! file_exists($frontend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($frontend_site_css_path)) {
                             $frontend_regenerate = true;
                             break;
                         }
@@ -115,7 +110,7 @@ class Stylesheet
                 // Regenerate site stylesheet
                 if ($frontend_regenerate) {
                     foreach ($stylesheets as $stylesheet) {
-                        if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both')) ) {
+                        if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both'))) {
                             $frontend_buffer .= file_get_contents(ROOT . DS . $stylesheet['file']);
                         }
                     }
@@ -123,14 +118,13 @@ class Stylesheet
                     file_put_contents($frontend_site_css_path, MinifyCSS::process($frontend_buffer));
                     $frontend_regenerate = false;
                 }
-
             }
 
             // Render
             if (BACKEND) {
-                echo '<link rel="stylesheet" href="'.Option::get('siteurl').'tmp/minify/backend_site.minify.css'.'" type="text/css" />';
+                echo '<link rel="stylesheet" href="'.Option::get('siteurl').'/tmp/minify/backend_site.minify.css?'.Option::get('styles_version').'" type="text/css" />';
             } else {
-                echo '<link rel="stylesheet" href="'.Option::get('siteurl').'tmp/minify/frontend_site.minify.css'.'" type="text/css" />'."\n";
+                echo '<link rel="stylesheet" href="'.Option::get('siteurl').'/tmp/minify/frontend_site.minify.css?'.Option::get('styles_version').'" type="text/css" />'."\n";
             }
         }
     }
@@ -144,9 +138,16 @@ class Stylesheet
                                  '@theme_site_url',
                                  '@theme_admin_url'),
                            array(Option::get('siteurl'),
-                                 Option::get('siteurl').'public/themes/'.Option::get('theme_site_name'),
+                                 Option::get('siteurl').'/public/themes/'.Option::get('theme_site_name'),
-                                 Option::get('siteurl').'admin/themes/'.Option::get('theme_admin_name')),
+                                 Option::get('siteurl').'/admin/themes/'.Option::get('theme_admin_name')),
                            $frontend_buffer);
     }
 
+    /**
+     * stylesVersionIncrement
+     */
+    public static function stylesVersionIncrement()
+    {
+        Option::update('styles_version',  (int) Option::get('styles_version') + 1);
+    }
 }

engine/Plugin/View.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class View
 {
     /**

engine/Security.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Security
 {
     /**
@@ -100,7 +97,7 @@ class Security
      */
     public static function encryptPassword($password)
     {
-       return md5(md5(trim($password) . MONSTRA_PASSWORD_SALT));
+        return md5(md5(trim($password) . MONSTRA_PASSWORD_SALT));
     }
 
     /**
@@ -111,7 +108,7 @@ class Security
      *  </code>
      *
      * @param  string  $str       String
-     * @param  string  $delimiter String delimiter
+     * @param  mixed   $delimiter String delimiter
      * @param  boolean $lowercase String Lowercase
      * @return string
      */
@@ -119,9 +116,9 @@ class Security
     {
         // Redefine vars
         $str       = (string) $str;
-        $delimiter = (string) $delimiter;
+        $delimiter = $delimiter;
         $lowercase = (bool) $lowercase;
-        $delimiter = (string) $delimiter;
+        $delimiter = $delimiter;
 
         // Remove tags
         $str = filter_var($str, FILTER_SANITIZE_STRING);
@@ -149,16 +146,20 @@ class Security
         $str = iconv('UTF-8', 'ASCII//TRANSLIT', $str);
 
         // Remove characters
-        $str = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $str );
+        $str = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $str);
-        $str = preg_replace("/[\/_|+ -]+/", $delimiter, $str );
+        if ($delimiter != null) {
-        $str = trim($str, $delimiter);
+            $str = preg_replace("/[\/_|+ -]+/", $delimiter, $str);
+            $str = trim($str, $delimiter);
+        }
 
         // Lowercase
-        if ($lowercase === true) $str = Text::lowercase($str);
+        if ($lowercase === true) {
+            $str = Text::lowercase($str);
+        }
 
         // Return safe name
         return $str;
-     }
+    }
 
     /**
      * Create safe url.
@@ -174,9 +175,9 @@ class Security
     {
         $url = trim($url);
         $url = rawurldecode($url);
-        $url = str_replace(array('--','&quot;','!','@','#','$','%','^','*','(',')','+','{','}','|',':','"','<','>',
+        $url = str_replace(array('--', '&quot;', '!', '@', '#', '$', '%', '^', '*', '(', ')', '+', '{', '}', '|', ':', '"', '<', '>',
-                                  '[',']','\\',';',"'",',','*','+','~','`','laquo','raquo',']>','&#8216;','&#8217;','&#8220;','&#8221;','&#8211;','&#8212;'),
+                                  '[', ']', '\\', ';', "'", ',', '*', '+', '~', '`', 'laquo', 'raquo', ']>', '&#8216;', '&#8217;', '&#8220;', '&#8221;', '&#8211;', '&#8212;'),
-                            array('-','-','','','','','','','','','','','','','','','','','','','','','','','','','','',''),
+                            array('-', '-', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
                             $url);
         $url = str_replace('--', '-', $url);
         $url = rtrim($url, "-");
@@ -187,7 +188,7 @@ class Security
         $url = preg_replace('/^\./', '', $url);
 
         return $url;
-     }
+    }
 
     /**
      * Sanitize URL to prevent XSS - Cross-site scripting
@@ -235,5 +236,4 @@ class Security
         // Return safe string
         return $str;
     }
-
 }

engine/Shortcode.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Shortcode
 {
     /**
@@ -55,7 +52,9 @@ class Shortcode
         $shortcode = (string) $shortcode;
 
         // Add new shortcode
-        if (is_callable($callback_function)) Shortcode::$shortcode_tags[$shortcode] = $callback_function;
+        if (is_callable($callback_function)) {
+            Shortcode::$shortcode_tags[$shortcode] = $callback_function;
+        }
     }
 
     /**
@@ -73,7 +72,9 @@ class Shortcode
         $shortcode = (string) $shortcode;
 
         // Delete shortcode
-        if (Shortcode::exists($shortcode)) unset(Shortcode::$shortcode_tags[$shortcode]);
+        if (Shortcode::exists($shortcode)) {
+            unset(Shortcode::$shortcode_tags[$shortcode]);
+        }
     }
 
     /**
@@ -121,7 +122,9 @@ class Shortcode
      */
     public static function parse($content)
     {
-        if ( ! Shortcode::$shortcode_tags) return $content;
+        if (! Shortcode::$shortcode_tags) {
+            return $content;
+        }
 
         $shortcodes = implode('|', array_map('preg_quote', array_keys(Shortcode::$shortcode_tags)));
         $pattern    = "/(.?)\{([$shortcodes]+)(.*?)(\/)?\}(?(4)|(?:(.+?)\{\/\s*\\2\s*\}))?(.?)/s";
@@ -147,9 +150,9 @@ class Shortcode
 
         if (preg_match_all('/(\w+) *= *(?:([\'"])(.*?)\\2|([^ "\'>]+))/', $matches[3], $match, PREG_SET_ORDER)) {
             foreach ($match as $attribute) {
-                if ( ! empty($attribute[4])) {
+                if (! empty($attribute[4])) {
                     $attributes[strtolower($attribute[1])] = $attribute[4];
-                } elseif ( ! empty($attribute[3])) {
+                } elseif (! empty($attribute[3])) {
                     $attributes[strtolower($attribute[1])] = $attribute[3];
                 }
             }
@@ -158,5 +161,4 @@ class Shortcode
         // 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 : '';
     }
-
 }

engine/Site.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Site
 {
     /**
@@ -31,7 +28,9 @@ class Site
      */
     public static function init()
     {
-        if ( ! isset(self::$instance)) self::$instance = new Site();
+        if (! isset(self::$instance)) {
+            self::$instance = new Site();
+        }
         return self::$instance;
     }
 
@@ -173,20 +172,20 @@ class Site
         // else return default template: index
         // also compress template file :)
         if (File::exists(THEMES_SITE . DS . $current_theme . DS . $template . '.template.php')) {
-            if ( ! file_exists(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $template . '.template.php') or
+            if (! file_exists(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $template . '.template.php') or
                 filemtime(THEMES_SITE . DS . $current_theme . DS . $template .'.template.php') > filemtime(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $template . '.template.php')) {
-                    $buffer = file_get_contents(THEMES_SITE. DS . $current_theme . DS . $template .'.template.php');
+                $buffer = file_get_contents(THEMES_SITE. DS . $current_theme . DS . $template .'.template.php');
-                    $buffer = MinifyHTML::process($buffer);
+                $buffer = MinifyHTML::process($buffer);
-                    file_put_contents(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $template . '.template.php', $buffer);
+                file_put_contents(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $template . '.template.php', $buffer);
             }
 
             return 'minify.'.$template;
         } else {
-            if ( ! File::exists(MINIFY . DS . 'theme.' . $current_theme . '.' . 'minify.index.template.php') or
+            if (! File::exists(MINIFY . DS . 'theme.' . $current_theme . '.' . 'minify.index.template.php') or
                 filemtime(THEMES_SITE . DS . $current_theme . DS . 'index.template.php') > filemtime(MINIFY . DS . 'theme.' . $current_theme . '.' . 'minify.index.template.php')) {
-                    $buffer = file_get_contents(THEMES_SITE . DS . $current_theme . DS . 'index.template.php');
+                $buffer = file_get_contents(THEMES_SITE . DS . $current_theme . DS . 'index.template.php');
-                    $buffer = MinifyHTML::process($buffer);
+                $buffer = MinifyHTML::process($buffer);
-                    file_put_contents(MINIFY . DS . 'theme.' . $current_theme . '.' . 'minify.index.template.php', $buffer);
+                file_put_contents(MINIFY . DS . 'theme.' . $current_theme . '.' . 'minify.index.template.php', $buffer);
             }
 
             return 'minify.index';
@@ -220,5 +219,4 @@ class Site
     {
         return __('Powered by', 'system').' <a href="http://monstra.org" target="_blank">Monstra</a> ' . Monstra::VERSION;
     }
-
 }

engine/Uri.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Uri
 {
     /**
@@ -61,7 +58,14 @@ class Uri
 
         // Ability to pass parameters
         foreach ($uri as $i => $u) {
-            if (isset($uri[$i])) { $pos = strrpos($uri[$i], "?"); if ($pos === false) { $uri[$i] = Security::sanitizeURL($uri[$i]); } else { $uri[$i] = Security::sanitizeURL(substr($uri[$i], 0, $pos)); } }
+            if (isset($uri[$i])) {
+                $pos = strrpos($uri[$i], "?");
+                if ($pos === false) {
+                    $uri[$i] = Security::sanitizeURL($uri[$i]);
+                } else {
+                    $uri[$i] = Security::sanitizeURL(substr($uri[$i], 0, $pos));
+                }
+            }
         }
 
         // Return uri segments
@@ -99,10 +103,10 @@ class Uri
         // Get uri segments
         $uri = Uri::segments();
 
-        if ( ! isset($uri[0])) {
+        if (! isset($uri[0])) {
             $uri[0] = Uri::$default_component;
         } else {
-            if ( ! in_array($uri[0], Plugin::$components)  ) {
+            if (! in_array($uri[0], Plugin::$components)) {
                 $uri[0] = Uri::$default_component;
             } else {
                 $uri[0] = $uri[0];
@@ -130,18 +134,16 @@ class Uri
         $uri = Uri::segments();
 
         // http://site.com/ and http://site.com/index.php same main home pages
-        if ( ! isset($uri[0])) {
+        if (! isset($uri[0])) {
             $uri[0] = '';
         }
 
         // param1/param2
         if ($uri[0] !== Uri::$default_component) {
             if (isset($uri[1])) {
-
                 foreach ($uri as $part) {
                     $data[] = $part;
                 }
-
             } else { // default
                 $data[0] = $uri[0];
             }
@@ -158,5 +160,4 @@ class Uri
 
         return $data;
     }
-
 }

engine/Xmldb/DB.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class DB
 {
     /**
@@ -42,7 +39,9 @@ class DB
      */
     public static function configure($setting, $value)
     {
-        if (property_exists("db", $setting)) DB::$$setting = $value;
+        if (property_exists("db", $setting)) {
+            DB::$$setting = $value;
+        }
     }
 
     /**
@@ -58,7 +57,9 @@ class DB
         $db_name = (string) $db_name;
 
         // Create
-        if (is_dir(DB::$db_dir . '/' . $db_name)) return false;
+        if (is_dir(DB::$db_dir . '/' . $db_name)) {
+            return false;
+        }
         return mkdir(DB::$db_dir . '/' . $db_name, $chmod);
     }
 
@@ -74,8 +75,18 @@ class DB
         $db_name = (string) $db_name;
 
         // Drop
-        if (is_dir(DB::$db_dir . '/' . $db_name)){$ob=scandir(DB::$db_dir . '/' . $db_name); foreach ($ob as $o) {if ($o!='.'&&$o!='..') {if(filetype(DB::$db_dir . '/' . $db_name.'/'.$o)=='dir')DB::drop(DB::$db_dir . '/' . $db_name.'/'.$o); else unlink(DB::$db_dir . '/' . $db_name.'/'.$o);}}}
+        if (is_dir(DB::$db_dir . '/' . $db_name)) {
-        reset($ob); rmdir(DB::$db_dir . '/' . $db_name);
+            $ob=scandir(DB::$db_dir . '/' . $db_name); foreach ($ob as $o) {
+     if ($o!='.'&&$o!='..') {
+         if (filetype(DB::$db_dir . '/' . $db_name.'/'.$o)=='dir') {
+             DB::drop(DB::$db_dir . '/' . $db_name.'/'.$o);
+         } else {
+             unlink(DB::$db_dir . '/' . $db_name.'/'.$o);
+         }
+     }
+ }
+        }
+        reset($ob);
+        rmdir(DB::$db_dir . '/' . $db_name);
     }
-
 }

engine/Xmldb/Table.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class Table
 {
     /**
@@ -46,7 +43,9 @@ class Table
      */
     public static function configure($setting, $value)
     {
-        if (property_exists("table", $setting)) Table::$$setting = $value;
+        if (property_exists("table", $setting)) {
+            Table::$$setting = $value;
+        }
     }
 
     /**
@@ -113,7 +112,7 @@ class Table
         // Redefine vars
         $table_name = (string) $table_name;
 
-        if ( ! file_exists(Table::$tables_dir . '/' . $table_name . '.table.xml') &&
+        if (! file_exists(Table::$tables_dir . '/' . $table_name . '.table.xml') &&
             is_dir(dirname(Table::$tables_dir)) &&
             is_writable(dirname(Table::$tables_dir)) &&
             isset($fields) &&
@@ -121,12 +120,13 @@ class Table
 
             // Create table fields
             $_fields = '<fields>';
-            foreach ($fields as $field) $_fields .= "<$field/>";
+            foreach ($fields as $field) {
+                $_fields .= "<$field/>";
+            }
             $_fields .= '</fields>';
 
             // Create new table
-            return file_put_contents(Table::$tables_dir . '/' . $table_name . '.table.xml','<?xml version="1.0" encoding="UTF-8"?><root><options><autoincrement>0</autoincrement></options>'.$_fields.'</root>', LOCK_EX);
+            return file_put_contents(Table::$tables_dir . '/' . $table_name . '.table.xml', '<?xml version="1.0" encoding="UTF-8"?><root><options><autoincrement>0</autoincrement></options>'.$_fields.'</root>', LOCK_EX);
-
         } else {
 
             // Something wrong... return false
@@ -150,7 +150,7 @@ class Table
         $table_name = (string) $table_name;
 
         // Drop
-        if ( ! is_dir(Table::$tables_dir . '/' . $table_name . '.table.xml')) {
+        if (! is_dir(Table::$tables_dir . '/' . $table_name . '.table.xml')) {
             return unlink(Table::$tables_dir . '/' . $table_name . '.table.xml');
         }
 
@@ -260,12 +260,9 @@ class Table
 
             // Save table
             return Table::_save($table);
-
         } else {
             return false;
-
         }
-
     }
 
     /**
@@ -297,10 +294,8 @@ class Table
 
             // Save table
             return Table::_save($table);
-
         } else {
             return false;
-
         }
     }
 
@@ -408,7 +403,6 @@ class Table
 
             // If exists fields to insert then insert them
             if (count($fields) !== 0) {
-
                 $table_fields = array_diff_key($field_names, $fields);
 
                 // Defined fields
@@ -424,10 +418,8 @@ class Table
 
             // Save table
             return Table::_save($this->table);
-
         } else {
             return false;
-
         }
     }
 
@@ -474,12 +466,10 @@ class Table
         // If row count is null then select only one record
         // eg: $users->select('[login="admin"]', null);
         if ($row_count == null) {
-
             if (isset($tmp[0])) {
                 $_records   = $tmp[0];
                 $one_record = true;
             }
-
         } else {
 
             // If row count is 'all' then select all records
@@ -496,12 +486,9 @@ class Table
 
         // If array of fields is exits then get records with this fields only
         if (count($fields) > 0) {
-
             if (count($_records) > 0) {
-
                 $count = 0;
                 foreach ($_records as $key => $record) {
-
                     foreach ($fields as $field) {
                         $record_array[$count][$field] = (string) $record->$field;
                     }
@@ -515,7 +502,6 @@ class Table
                     }
 
                     $count++;
-
                 }
 
                 // Sort records
@@ -527,9 +513,7 @@ class Table
                 } elseif ($offset !== null && is_int($row_count)) {
                     $records = array_slice($records, $offset, $row_count);
                 }
-
             }
-
         } else {
 
             // Convert from XML object to array
@@ -537,7 +521,6 @@ class Table
             if (! $one_record) {
                 $count = 0;
                 foreach ($_records as $xml_objects) {
-
                     $vars = get_object_vars($xml_objects);
 
                     foreach ($vars as $key => $value) {
@@ -562,7 +545,6 @@ class Table
                 } elseif ($offset !== null && is_int($row_count)) {
                     $records = array_slice($records, $offset, $row_count);
                 }
-
             } else {
 
                 // Single record
@@ -575,7 +557,6 @@ class Table
 
         // Return records
         return $records;
-
     }
 
     /**
@@ -601,7 +582,6 @@ class Table
 
             // Delete
             unset($xml_arr[0]);
-
         }
 
         // Save table
@@ -631,7 +611,6 @@ class Table
 
             // Delete
             unset($xml_arr[0]);
-
         }
 
         // Save table
@@ -690,10 +669,8 @@ class Table
 
             // Save table
             return Table::_save($this->table);
-
         } else {
             return false;
-
         }
     }
 
@@ -747,16 +724,13 @@ class Table
 
                     // And add new one
                     $xml_arr->addChild($key, XML::safe($value, false));
-
                 }
             }
 
             // Save table
             return Table::_save($this->table);
-
         } else {
             return false;
-
         }
     }
 
@@ -801,9 +775,17 @@ class Table
     protected static function subvalSort($a, $subkey, $order = null)
     {
         if (count($a) != 0 || (!empty($a))) {
-            foreach ($a as $k=>$v) $b[$k] = function_exists('mb_strtolower') ? mb_strtolower($v[$subkey]) : strtolower($v[$subkey]);
+            foreach ($a as $k=>$v) {
-            if ($order==null || $order== 'ASC') asort($b); else if ($order == 'DESC') arsort($b);
+                $b[$k] = function_exists('mb_strtolower') ? mb_strtolower($v[$subkey]) : strtolower($v[$subkey]);
-            foreach ($b as $key=>$val) $c[] = $a[$key];
+            }
+            if ($order==null || $order== 'ASC') {
+                asort($b);
+            } elseif ($order == 'DESC') {
+                arsort($b);
+            }
+            foreach ($b as $key=>$val) {
+                $c[] = $a[$key];
+            }
 
             return $c;
         }
@@ -872,5 +854,4 @@ class Table
             // report about errors...
         }
     }
-
 }

engine/Xmldb/XML.php

@@ -1,20 +1,17 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 class XML
 {
     /**
@@ -52,7 +49,9 @@ class XML
         } while ($cleaned != $str);
 
         // htmlspecialchars
-        if ($flag) $str = htmlspecialchars($str, ENT_QUOTES, 'utf-8');
+        if ($flag) {
+            $str = htmlspecialchars($str, ENT_QUOTES, 'utf-8');
+        }
 
         // Return safe string
         return $str;
@@ -92,5 +91,4 @@ class XML
             }
         }
     }
-
 }

engine/_init.php

@@ -1,10 +1,10 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- *  Monstra requires PHP 5.2.3 or greater
+ *  Monstra requires PHP 5.3.2 or greater
  */
-if (version_compare(PHP_VERSION, "5.2.3", "<")) {
+if (version_compare(PHP_VERSION, "5.3.2", "<")) {
-    exit("Monstra requires PHP 5.2.3 or greater.");
+    exit("Monstra requires PHP 5.3.2 or greater.");
 }
 
 /**
@@ -27,7 +27,7 @@ Monstra::$environment = Monstra::PRODUCTION;
  * Report Errors
  */
 if (Monstra::$environment == Monstra::PRODUCTION) {
-    error_reporting(0); 
+    error_reporting(0);
 } else {
     error_reporting(-1);
 }

engine/boot/actions.php

@@ -4,4 +4,7 @@
  * 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";
+}

engine/boot/defines.php

@@ -1,7 +1,7 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra CMS Defines
+ * Monstra Defines
  */
 
 /**
@@ -91,3 +91,4 @@ define('MONSTRA_GZIP', false);
 //define('MONSTRA_DB_DSN', 'mysql:dbname=monstra;host=localhost;port=3306');
 //define('MONSTRA_DB_USER', 'root');
 //define('MONSTRA_DB_PASSWORD', 'password');
+

engine/boot/filters.php

@@ -3,7 +3,9 @@
 /**
  * Evaluate a string as PHP code
  */
-if (MONSTRA_EVAL_PHP) Filter::add('content', 'evalPHP');
+if (MONSTRA_EVAL_PHP) {
+    Filter::add('content', 'evalPHP');
+}
 function obEval($mathes)
 {
     ob_start();
@@ -13,7 +15,10 @@ function obEval($mathes)
 
     return $mathes;
 }
-function evalPHP($str) { return preg_replace_callback('/\[php\](.*?)\[\/php\]/ms','obEval', $str); }
+function evalPHP($str)
+{
+    return preg_replace_callback('/\[php\](.*?)\[\/php\]/ms', 'obEval', $str);
+}
 
 /**
  * Add shortcode parser filter

engine/boot/shortcodes.php

@@ -4,4 +4,7 @@
  * Add new shortcode {siteurl}
  */
 Shortcode::add('siteurl', 'returnSiteUrl');
-function returnSiteUrl() { return Option::get('siteurl'); }
+function returnSiteUrl()
+{
+    return Option::get('siteurl');
+}

index.php

@@ -1,20 +1,17 @@
 <?php
 
 /**
- * Monstra Engine
+ * Monstra
  *
- * This source file is part of the Monstra Engine. More information,
+ * @package Monstra
- * documentation and tutorials can be found at http://monstra.org
+ * @author Romanenko Sergey / Awilum <awilum@msn.com>
- *
+ * @link http://monstra.org
- * @package     Monstra
- *
- * @author      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.
  */
 
+
 // Main engine defines
 define('DS', DIRECTORY_SEPARATOR);
 define('ROOT', rtrim(dirname(__FILE__), '\\/'));
@@ -48,7 +45,7 @@ if (file_exists('install.php')) {
             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')));
+            die(Text::toHtml(Option::get('maintenance_message')));
         }
     }
 

install.php

@@ -5,10 +5,18 @@
      */
 
     // Main engine defines
-    if ( ! defined('DS')) define('DS', DIRECTORY_SEPARATOR);
+    if (! defined('DS')) {
-    if ( ! defined('ROOT')) define('ROOT', rtrim(dirname(__FILE__), '\\/'));
+        define('DS', DIRECTORY_SEPARATOR);
-    if ( ! defined('BACKEND')) define('BACKEND', false);
+    }
-    if ( ! defined('MONSTRA_ACCESS')) define('MONSTRA_ACCESS', true);
+    if (! defined('ROOT')) {
+        define('ROOT', rtrim(dirname(__FILE__), '\\/'));
+    }
+    if (! defined('BACKEND')) {
+        define('BACKEND', false);
+    }
+    if (! defined('MONSTRA_ACCESS')) {
+        define('MONSTRA_ACCESS', true);
+    }
 
     // Load bootstrap file
     require_once(ROOT . DS . 'engine' . DS . '_init.php');
@@ -16,8 +24,18 @@
     // 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']);
+
+    // Replace last slash in site_url
+    $site_url = rtrim($site_url, '/');
 
     // Rewrite base
     $rewrite_base = str_replace(array("index.php", "install.php"), "", $_SERVER['PHP_SELF']);
@@ -29,38 +47,74 @@
     $dir_array = array('public', 'storage', 'backups', 'tmp');
 
     // Languages array
-    $languages_array = array('en', 'fr', 'de', 'it', 'es', 'lt', 'pl', 'pt-br', 'ru', 'uk', 'hu', 'fa' , 'sk', 'nl', 'sr-yu');
+    $languages_array = array('en', 'ru', 'fr', 'de', 'it', 'es', 'lt', 'pl', 'pt-br', 'hu', 'fa' , 'sk', 'uk', 'nl', 'sr', 'id', 'ja', 'zh-cn', 'tr');
 
     // Select Monstra language
     if (Request::get('language')) {
+        if (Request::get('action') && Request::get('action') == 'install') {
+            $action = '?action=install';
+        } else {
+            $action = '';
+        }
         if (in_array(Request::get('language'), $languages_array)) {
             if (Option::update('language', Request::get('language'))) {
-                Request::redirect($site_url);
+                Request::redirect($site_url.$action);
             }
         } else {
-            Request::redirect($site_url);
+            Request::redirect($site_url.$action);
         }
     }
 
     // If pressed <Install> button then try to install
     if (Request::post('install_submit')) {
-
+        if (Request::post('sitename') == '') {
-        if (Request::post('sitename') == '')           $errors['sitename'] = __('Field "Site name" is empty', 'system');
+            $errors['sitename'] = __('Field "Site name" is empty', 'system');
-        if (Request::post('siteurl') == '')            $errors['siteurl'] = __('Field "Site url" is empty', 'system');
+        }
-        if (Request::post('login') == '')              $errors['login'] = __('Field "Username" is empty', 'system');
+        if (Request::post('siteurl') == '') {
-        if (Request::post('password') == '')           $errors['password'] = __('Field "Password" is empty', 'system');
+            $errors['siteurl'] = __('Field "Site url" is empty', 'system');
-        if (Request::post('email') == '')              $errors['email'] = __('Field "Email" is empty', 'system');
+        }
-        if ( ! Valid::email(Request::post('email')))   $errors['email_valid'] = __('Email not valid', 'system');
+        if (Request::post('login') == '') {
-        if (trim(Request::post('php') !== ''))         $errors['php'] = true;
+            $errors['login'] = __('Field "Username" is empty', 'system');
-        if (trim(Request::post('simplexml') !== ''))   $errors['simplexml'] = true;
+        }
-        if (trim(Request::post('mod_rewrite') !== '')) $errors['mod_rewrite'] = true;
+        if (Request::post('password') == '') {
-        if (trim(Request::post('htaccess') !== ''))    $errors['htaccess'] = true;
+            $errors['password'] = __('Field "Password" is empty', 'system');
-        if (trim(Request::post('sitemap') !== ''))     $errors['sitemap'] = true;
+        }
-        if (trim(Request::post('install') !== ''))     $errors['install'] = true;
+        if (Request::post('email') == '') {
-        if (trim(Request::post('public') !== ''))      $errors['public'] = true;
+            $errors['email'] = __('Field "Email" is empty', 'system');
-        if (trim(Request::post('storage') !== ''))     $errors['storage'] = true;
+        }
-        if (trim(Request::post('backups') !== ''))     $errors['backups'] = true;
+        if (! Valid::email(Request::post('email'))) {
-        if (trim(Request::post('tmp') !== ''))         $errors['tmp'] = true;
+            $errors['email_valid'] = __('Email not valid', 'system');
+        }
+        if (trim(Request::post('php') !== '')) {
+            $errors['php'] = true;
+        }
+        if (trim(Request::post('simplexml') !== '')) {
+            $errors['simplexml'] = true;
+        }
+        if (trim(Request::post('mod_rewrite') !== '')) {
+            $errors['mod_rewrite'] = true;
+        }
+        if (trim(Request::post('htaccess') !== '')) {
+            $errors['htaccess'] = true;
+        }
+        if (trim(Request::post('sitemap') !== '')) {
+            $errors['sitemap'] = true;
+        }
+        if (trim(Request::post('install') !== '')) {
+            $errors['install'] = true;
+        }
+        if (trim(Request::post('public') !== '')) {
+            $errors['public'] = true;
+        }
+        if (trim(Request::post('storage') !== '')) {
+            $errors['storage'] = true;
+        }
+        if (trim(Request::post('backups') !== '')) {
+            $errors['backups'] = true;
+        }
+        if (trim(Request::post('tmp') !== '')) {
+            $errors['tmp'] = true;
+        }
 
         // If errors is 0 then install cms
         if (count($errors) == 0) {
@@ -93,12 +147,14 @@
             $htaccess = file_get_contents('.htaccess');
             $save_htaccess_content = str_replace("/%siteurlhere%/", $rewrite_base, $htaccess);
 
-            $handle = fopen ('.htaccess', "w");
+            $handle = fopen('.htaccess', "w");
             fwrite($handle, $save_htaccess_content);
             fclose($handle);
 
             // Installation done :)
             header("location: index.php?install=done");
+        } else {
+            Notification::setNow('errors', $errors);
         }
     }
 ?>
@@ -109,60 +165,75 @@
         <title>Monstra :: Install</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="Monstra Install Area">
-        <link rel="icon" href="<?php echo $site_url; ?>favicon.ico" type="image/x-icon" />
+        <link rel="icon" href="<?php echo $site_url; ?>/favicon.ico" type="image/x-icon" />
-        <link rel="shortcut icon" href="<?php echo $site_url; ?>favicon.ico" type="image/x-icon" />
+        <link rel="shortcut icon" href="<?php echo $site_url; ?>/favicon.ico" type="image/x-icon" />
-        <link rel="stylesheet" href="<?php echo $site_url; ?>public/assets/css/bootstrap.css" media="all" type="text/css" />
+        <link rel="stylesheet" href="<?php echo $site_url; ?>/public/assets/css/bootstrap.css" media="all" type="text/css" />
-        <link rel="stylesheet" href="<?php echo $site_url; ?>public/assets/css/bootstrap-responsive.css" media="all" type="text/css" />
+        <link rel="stylesheet" href="<?php echo $site_url; ?>/admin/themes/default/css/default.css" media="all" type="text/css" />
-        <link rel="stylesheet" href="<?php echo $site_url; ?>admin/themes/default/css/default.css" media="all" type="text/css" />
+
         <style>
 
-            .input-xlarge {
+            .install-body {
-                width: 285px;
+                margin-top: 40px;
+                background: #FAFAFA;
             }
 
             .install-languages {
-                margin: 0 auto 15px;
+                margin: 20px auto 20px;
                 text-align: center;
-                width: 390px;
+                width: 600px;
             }
 
-            .install-block {
+            .install-block,
+            .monstra-dialog,
+            .install-block-footer {
                 margin: 0 auto;
-                float: none!important;
+                width: 600px;
-                max-width: 300px;
-                 padding: 19px 29px 29px;
-                  background: none repeat scroll 0 0 #fff;
-                  -webkit-box-shadow: 0 1px 5px rgba(0,0,0,.15);
-                     -moz-box-shadow: 0 1px 5px rgba(0,0,0,.15);
-                          box-shadow: 0 1px 5px rgba(0,0,0,.15);
-                -webkit-border-radius: 4px;
-                -moz-border-radius: 4px;
-                border-radius: 4px;
             }
 
             .install-block-footer {
-                margin: 0 auto;
+                margin-top: 20px;
-                float: none!important;
+                margin-bottom: 20px;
-                margin-top:10px;
-                margin-bottom:10px;
-                max-width: 300px;
             }
 
-            .install-body {
+            .well {
-                background-color: #FBFBFB;
+                border: none;
-                padding-top:40px;
+                border-radius: 0px;
+                background: #fff;
+                color: #555;
+                -webkit-font-smoothing: subpixel-antialiased;
+                -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.13);
+                        box-shadow: 0 1px 3px rgba(0,0,0,.13);
+            }
+
+
+            .form-control {
+                border-radius: 0px;
+            }
+
+            .monstra-says {
+                margin: 20px;
             }
 
             .error {
                 color:#8E0505;
+                padding-top: 5px;
+                padding-bottom: 5px;
+                padding-top: 5px;
+                padding-bottom: 5px;
+                margin-bottom: 5px;
             }
 
             .ok {
                 color:#00853F;
+                padding-top: 5px;
+                padding-bottom: 5px;
+                margin-bottom: 5px;
             }
 
             .warn {
                 color: #F74C18;
+                padding-top: 5px;
+                padding-bottom: 5px;
             }
 
             .install-languages a {
@@ -173,12 +244,12 @@
             .language-link img {
                 -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
                 filter: alpha(opacity=30);
-                -moz-opacity:0.3;
                 -khtml-opacity: 0.3;
-                opacity: 0.3;
+                  -moz-opacity:0.3;
+                       opacity: 0.3;
             }
 
-            .language-link-current img{
+            .language-link-current img {
                 -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
                 filter: alpha(opacity=100);
                 -moz-opacity:1.0;
@@ -194,49 +265,38 @@
                 opacity: 1.0;
             }
 
-            @media (max-width: 480px) {
+            .continue {
-
+                width: 100%;
-                .input-xlarge {
-                    width: 100%;
-                }
-
-                .install-languages {
-                    text-align: left;
-                }
-
-                .install-languages a {
-                    padding: 0;
-                }
-
             }
 
        </style>
-       <script type="text/javascript" src="<?php echo $site_url; ?>public/assets/js/jquery.js"></script>
+       <script src="<?php echo $site_url; ?>/public/assets/js/jquery.min.js"></script>
-       <script type="text/javascript" src="<?php echo $site_url; ?>public/assets/js/bootstrap.js"></script>
+       <script src="<?php echo $site_url; ?>/public/assets/js/bootstrap.min.js"></script>
     </head>
     <body class="install-body">
 
+
     <?php
-        if (version_compare(PHP_VERSION, "5.2.0", "<")) {
+        if (version_compare(PHP_VERSION, "5.3.2", "<")) {
             $errors['php'] = 'error';
         } else {
             $errors['php'] = '';
         }
 
         if (in_array('SimpleXML', $php_modules)) {
-             $errors['simplexml'] = '';
+            $errors['simplexml'] = '';
         } else {
-             $errors['simplexml'] = 'error';
+            $errors['simplexml'] = 'error';
         }
 
         if (function_exists('apache_get_modules')) {
-            if ( ! in_array('mod_rewrite', apache_get_modules())) {
+            if (! in_array('mod_rewrite', apache_get_modules())) {
                 $errors['mod_rewrite'] = 'error';
             } else {
-                 $errors['mod_rewrite'] = '';
+                $errors['mod_rewrite'] = '';
             }
         } else {
-             $errors['mod_rewrite'] = '';
+            $errors['mod_rewrite'] = '';
         }
 
         if (is_writable(__FILE__)) {
@@ -265,215 +325,297 @@
                 $errors[$dir] = 'error';
             }
         }
-        ?>
+    ?>
 
-            <div class="install-languages">
+        <div class="text-center"><a class="brand" href="<?php echo Html::toText($site_url); ?>"><img src="<?php echo $site_url; ?>/public/assets/img/monstra-logo-256px.png" alt="Monstra"></a></div>
-                <?php foreach ($languages_array as $lang_code) { ?>
-                <a data-placement="top" class="language-link<?php if (Option::get('language') == $lang_code) echo ' language-link-current';?>" title="<?php echo I18n::$locales[$lang_code]; ?>" href="<?php echo $site_url.'?language=' . $lang_code; ?>"><img src="<?php echo $site_url; ?>public/assets/img/flags/<?php echo $lang_code?>.png" alt="<?php echo $lang_code?>"></a>
-                <?php } ?>
-            </div>
-            <div class="install-block">
-                <div style="text-align:center;"><a class="brand" href="<?php echo Html::toText($site_url); ?>"><img src="<?php echo $site_url; ?>public/assets/img/monstra-logo.png" height="27" width="171" alt="Monstra"></a></div>
-                <hr>
-                <div>
-                    <form action="install.php" method="post">
-                        <input type="hidden" name="php" value="<?php echo $errors['php']; ?>" />
-                        <input type="hidden" name="simplexml" value="<?php echo $errors['simplexml']; ?>" />
-                        <input type="hidden" name="mod_rewrite" value="<?php echo $errors['mod_rewrite']; ?>" />
-                        <input type="hidden" name="install" value="<?php echo $errors['install']; ?>" />
-                        <input type="hidden" name="sitemap" value="<?php echo $errors['sitemap']; ?>" />
-                        <input type="hidden" name="htaccess" value="<?php echo $errors['htaccess']; ?>" />
-                        <input type="hidden" name="public" value="<?php echo $errors['public']; ?>" />
-                        <input type="hidden" name="storage" value="<?php echo $errors['storage']; ?>" />
-                        <input type="hidden" name="backups" value="<?php echo $errors['backups']; ?>" />
-                        <input type="hidden" name="tmp" value="<?php echo $errors['tmp']; ?>" />
 
-                        <label><?php echo __('Site Name', 'system'); ?></label>
+        <div class="install-languages">
-                        <input class="input-xlarge" name="sitename" type="text" value="<?php if (Request::post('sitename')) echo Html::toText(Request::post('sitename')); ?>" />
+            <?php
-                        <br />
+                if (Request::get('action') && Request::get('action') == 'install') {
-                        <label><?php echo __('Site Url', 'system'); ?></label>
+                    $action = '&action=install';
-                        <input class="input-xlarge" name="siteurl" type="text" value="<?php echo Html::toText($site_url); ?>" />
+                } else {
-                        <br />
+                    $action = '';
-                        <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" />
+            ?>
-                        <br />
+            <?php foreach ($languages_array as $lang_code) {
-                        <label><?php echo __('Password', 'users'); ?></label>
+    ?>
-                        <input class="input-xlarge" name="password" type="password" />
+            <a data-placement="top" data-toggle="tooltip" class="language-link<?php if (Option::get('language') == $lang_code) {
-                        <br />
+    echo ' language-link-current';
-                        <label><?php echo __('Time zone', 'system'); ?></label>
+}
-                        <select class="input-xlarge" name="timezone">
+    ?>" title="<?php echo I18n::$locales[$lang_code];
-                            <option value="Kwajalein">(GMT-12:00) International Date Line West</option>
+    ?>" href="<?php echo $site_url.'/?language=' . $lang_code.$action;
-                            <option value="Pacific/Samoa">(GMT-11:00) Midway Island, Samoa</option>
+    ?>"><img src="<?php echo $site_url;
-                            <option value="Pacific/Honolulu">(GMT-10:00) Hawaii</option>
+    ?>/public/assets/img/flags/<?php echo $lang_code?>.png" alt="<?php echo $lang_code?>"></a>
-                            <option value="America/Anchorage">(GMT-09:00) Alaska</option>
+            <?php
-                            <option value="America/Los_Angeles">(GMT-08:00) Pacific Time (US &amp; Canada)</option>
-                            <option value="America/Tijuana">(GMT-08:00) Tijuana, Baja California</option>
-                            <option value="America/Denver">(GMT-07:00) Mountain Time (US &amp; Canada)</option>
-                            <option value="America/Chihuahua">(GMT-07:00) Chihuahua, La Paz, Mazatlan</option>
-                            <option value="America/Phoenix">(GMT-07:00) Arizona</option>
-                            <option value="America/Regina">(GMT-06:00) Saskatchewan</option>
-                            <option value="America/Tegucigalpa">(GMT-06:00) Central America</option>
-                            <option value="America/Chicago">(GMT-06:00) Central Time (US &amp; Canada)</option>
-                            <option value="America/Mexico_City">(GMT-06:00) Guadalajara, Mexico City, Monterrey</option>
-                            <option value="America/New_York">(GMT-05:00) Eastern Time (US &amp; Canada)</option>
-                            <option value="America/Bogota">(GMT-05:00) Bogota, Lima, Quito, Rio Branco</option>
-                            <option value="America/Indiana/Indianapolis">(GMT-05:00) Indiana (East)</option>
-                            <option value="America/Caracas">(GMT-04:30) Caracas</option>
-                            <option value="America/Halifax">(GMT-04:00) Atlantic Time (Canada)</option>
-                            <option value="America/Manaus">(GMT-04:00) Manaus</option>
-                            <option value="America/Santiago">(GMT-04:00) Santiago</option>
-                            <option value="America/La_Paz">(GMT-04:00) La Paz</option>
-                            <option value="America/St_Johns">(GMT-03:30) Newfoundland</option>
-                            <option value="America/Argentina/Buenos_Aires">(GMT-03:00) Buenos Aires</option>
-                            <option value="America/Sao_Paulo">(GMT-03:00) Brasilia</option>
-                            <option value="America/Godthab">(GMT-03:00) Greenland</option>
-                            <option value="America/Montevideo">(GMT-03:00) Montevideo</option>
-                            <option value="America/Argentina/Buenos_Aires">(GMT-03:00) Georgetown</option>
-                            <option value="Atlantic/South_Georgia">(GMT-02:00) Mid-Atlantic</option>
-                            <option value="Atlantic/Azores">(GMT-01:00) Azores</option>
-                            <option value="Atlantic/Cape_Verde">(GMT-01:00) Cape Verde Is.</option>
-                            <option value="Europe/London">(GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London</option>
-                            <option value="Atlantic/Reykjavik">(GMT) Monrovia, Reykjavik</option>
-                            <option value="Africa/Casablanca">(GMT) Casablanca</option>
-                            <option value="Europe/Belgrade">(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague</option>
-                            <option value="Europe/Sarajevo">(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb</option>
-                            <option value="Europe/Brussels">(GMT+01:00) Brussels, Copenhagen, Madrid, Paris</option>
-                            <option value="Africa/Algiers">(GMT+01:00) West Central Africa</option>
-                            <option value="Europe/Amsterdam">(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna</option>
-                            <option value="Africa/Cairo">(GMT+02:00) Cairo</option>
-                            <option value="Europe/Helsinki">(GMT+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius</option>
-                            <option value="Europe/Athens">(GMT+02:00) Athens, Bucharest, Istanbul</option>
-                            <option value="Asia/Jerusalem">(GMT+02:00) Jerusalem</option>
-                            <option value="Asia/Amman">(GMT+02:00) Amman</option>
-                            <option value="Asia/Beirut">(GMT+02:00) Beirut</option>
-                            <option value="Africa/Windhoek">(GMT+02:00) Windhoek</option>
-                            <option value="Africa/Harare">(GMT+02:00) Harare, Pretoria</option>
-                            <option value="Asia/Kuwait">(GMT+03:00) Kuwait, Riyadh</option>
-                            <option value="Asia/Baghdad">(GMT+03:00) Baghdad</option>
-                            <option value="Europe/Minsk">(GMT+03:00) Minsk</option>
-                            <option value="Africa/Nairobi">(GMT+03:00) Nairobi</option>
-                            <option value="Asia/Tbilisi">(GMT+03:00) Tbilisi</option>
-                            <option value="Asia/Tehran">(GMT+03:30) Tehran</option>
-                            <option value="Asia/Muscat">(GMT+04:00) Abu Dhabi, Muscat</option>
-                            <option value="Asia/Baku">(GMT+04:00) Baku</option>
-                            <option value="Europe/Moscow">(GMT+04:00) Moscow, St. Petersburg, Volgograd</option>
-                            <option value="Asia/Yerevan">(GMT+04:00) Yerevan</option>
-                            <option value="Asia/Karachi">(GMT+05:00) Islamabad, Karachi</option>
-                            <option value="Asia/Tashkent">(GMT+05:00) Tashkent</option>
-                            <option value="Asia/Kolkata">(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi</option>
-                            <option value="Asia/Colombo">(GMT+05:30) Sri Jayawardenepura</option>
-                            <option value="Asia/Katmandu">(GMT+05:45) Kathmandu</option>
-                            <option value="Asia/Dhaka">(GMT+06:00) Astana, Dhaka</option>
-                            <option value="Asia/Yekaterinburg">(GMT+06:00) Ekaterinburg</option>
-                            <option value="Asia/Rangoon">(GMT+06:30) Yangon (Rangoon)</option>
-                            <option value="Asia/Novosibirsk">(GMT+07:00) Almaty, Novosibirsk</option>
-                            <option value="Asia/Bangkok">(GMT+07:00) Bangkok, Hanoi, Jakarta</option>
-                            <option value="Asia/Beijing">(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi</option>
-                            <option value="Asia/Krasnoyarsk">(GMT+08:00) Krasnoyarsk</option>
-                            <option value="Asia/Ulaanbaatar">(GMT+08:00) Irkutsk, Ulaan Bataar</option>
-                            <option value="Asia/Kuala_Lumpur">(GMT+08:00) Kuala Lumpur, Singapore</option>
-                            <option value="Asia/Taipei">(GMT+08:00) Taipei</option>
-                            <option value="Australia/Perth">(GMT+08:00) Perth</option>
-                            <option value="Asia/Seoul">(GMT+09:00) Seoul</option>
-                            <option value="Asia/Tokyo">(GMT+09:00) Osaka, Sapporo, Tokyo</option>
-                            <option value="Australia/Darwin">(GMT+09:30) Darwin</option>
-                            <option value="Australia/Adelaide">(GMT+09:30) Adelaide</option>
-                            <option value="Australia/Sydney">(GMT+10:00) Canberra, Melbourne, Sydney</option>
-                            <option value="Australia/Brisbane">(GMT+10:00) Brisbane</option>
-                            <option value="Australia/Hobart">(GMT+10:00) Hobart</option>
-                            <option value="Asia/Yakutsk">(GMT+10:00) Yakutsk</option>
-                            <option value="Pacific/Guam">(GMT+10:00) Guam, Port Moresby</option>
-                            <option value="Asia/Vladivostok">(GMT+11:00) Vladivostok</option>
-                            <option value="Pacific/Fiji">(GMT+12:00) Fiji, Kamchatka, Marshall Is.</option>
-                            <option value="Asia/Magadan">(GMT+12:00) Magadan, Solomon Is., New Caledonia</option>
-                            <option value="Pacific/Auckland">(GMT+12:00) Auckland, Wellington</option>
-                            <option value="Pacific/Tongatapu">(GMT+13:00) Nukualofa</option>
-                        </select>
 
-                        <label><?php echo __('Email', 'users'); ?></label>
+} ?>
-                        <input name="email" class="input-xlarge" value="<?php if (Request::post('email')) echo Html::toText(Request::post('email')); ?>" type="text" />
+        </div>
-                        <br /><br />
+
-                        <input type="submit" class="btn" name="install_submit" value="<?php echo __('Install', 'system'); ?>" />
+        <div class="install-block <?php if (Request::get('action') && Request::get('action') == 'install') {
-                    </form>
+    ?><?php
+
+} else {
+    ?> hide <?php
+
+} ?>">
+
+            <ul class="list-unstyled">
+            <?php
+                // Monstra Notifications
+                if (Notification::get('errors') && count(Notification::get('errors') > 0)) {
+                    foreach (Notification::get('errors') as $error) {
+                        ?>
+                 <li class="error alert alert-danger"><?php echo $error;
+                        ?></li>
+            <?php
+
+                    }
+                }
+            ?>
+            </ul>
+
+        <div class="well">
+            <form action="install.php?action=install" method="post">
+                <input type="hidden" name="php" value="<?php echo $errors['php']; ?>">
+                <input type="hidden" name="simplexml" value="<?php echo $errors['simplexml']; ?>">
+                <input type="hidden" name="mod_rewrite" value="<?php echo $errors['mod_rewrite']; ?>">
+                <input type="hidden" name="install" value="<?php echo $errors['install']; ?>">
+                <input type="hidden" name="sitemap" value="<?php echo $errors['sitemap']; ?>">
+                <input type="hidden" name="htaccess" value="<?php echo $errors['htaccess']; ?>">
+                <input type="hidden" name="public" value="<?php echo $errors['public']; ?>">
+                <input type="hidden" name="storage" value="<?php echo $errors['storage']; ?>">
+                <input type="hidden" name="backups" value="<?php echo $errors['backups']; ?>">
+                <input type="hidden" name="tmp" value="<?php echo $errors['tmp']; ?>">
+
+                <div class="form-group">
+                    <label><?php echo __('Site Name', 'system'); ?></label>
+                    <input class="form-control" name="sitename" type="text" value="<?php if (Request::post('sitename')) {
+    echo Html::toText(Request::post('sitename'));
+} ?>" />
                 </div>
-                <hr>
-                <p align="center"><strong><?php echo __('...Monstra says...', 'system'); ?></strong></p>
-                <div>
-                    <ul>
-                    <?php
 
-                        if (version_compare(PHP_VERSION, "5.2.0", "<")) {
+                <div class="form-group">
-                            echo '<span class="error"><li>'.__('PHP 5.2 or greater is required', 'system').'</li></span>';
+                    <label><?php echo __('Site Url', 'system'); ?></label>
-                        } else {
+                    <input class="form-control" name="siteurl" type="text" value="<?php echo Html::toText($site_url); ?>" />
-                            echo '<span class="ok"><li>'.__('PHP Version', 'system').' '.PHP_VERSION.'</li></span>';
-                        }
-
-                        if (in_array('SimpleXML', $php_modules)) {
-                            echo '<span class="ok"><li>'.__('Module SimpleXML is installed', 'system').'</li></span>';
-                        } else {
-                            echo '<span class="error"><li>'.__('SimpleXML module is required', 'system').'</li></span>';
-                        }
-
-                        if (in_array('dom', $php_modules)) {
-                            echo '<span class="ok"><li>'.__('Module DOM is installed', 'system').'</li></span>';
-                        } else {
-                            echo '<span class="error"><li>'.__('Module DOM is required', 'system').'</li></span>';
-                        }
-
-                        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>';
-                            } else {
-                                echo '<span class="ok"><li>'.__('Module Mod Rewrite is installed', 'system').'</li></span>';
-                            }
-                        } else {
-                            echo '<span class="ok"><li>'.__('Module Mod Rewrite is installed', 'system').'</li></span>';
-                        }
-
-                        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>';
-                            } else {
-                                echo '<span class="error"><li>'.__('Directory: <b> :dir </b> not writable', 'system', array(':dir' => $dir)).'</li></span>';
-                            }
-                        }
-
-                        if (is_writable(__FILE__)) {
-                            echo '<span class="ok"><li>'.__('Install script writable', 'system').'</li></span>';
-                        } else {
-                            echo '<span class="error"><li>'.__('Install script not writable', 'system').'</li></span>';
-                        }
-
-                        if (is_writable('sitemap.xml')) {
-                            echo '<span class="ok"><li>'.__('Sitemap file writable', 'system').'</li></span>';
-                        } else {
-                            echo '<span class="error"><li>'.__('Sitemap file not writable', 'system').'</li></span>';
-                        }
-
-                        if (is_writable('.htaccess')) {
-                            echo '<span class="ok"><li>'.__('Main .htaccess file writable', 'system').'</li></span>';
-                        } else {
-                            echo '<span class="error"><li>'.__('Main .htaccess file not writable', 'system').'</li></span>';
-                        }
-
-                        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>';
-                    ?>
-                    </ul>
                 </div>
-            </div>
+
-            <div class="install-block-footer">
+                <div class="form-group">
-                <div style="text-align:center;">
+                    <label><?php echo __('Username', 'users'); ?></label>
-                    <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>
+                    <input class="form-control login" name="login" value="<?php if (Request::post('login')) {
+    echo Html::toText(Request::post('login'));
+} ?>" type="text" />
                 </div>
+
+                <div class="form-group">
+                    <label><?php echo __('Password', 'users'); ?></label>
+                    <input class="form-control" name="password" type="password" />
+                </div>
+
+                <div class="form-group">
+                    <label><?php echo __('Time zone', 'system'); ?></label>
+                    <select class="form-control" name="timezone">
+                        <option value="Kwajalein">(GMT-12:00) International Date Line West</option>
+                        <option value="Pacific/Samoa">(GMT-11:00) Midway Island, Samoa</option>
+                        <option value="Pacific/Honolulu">(GMT-10:00) Hawaii</option>
+                        <option value="America/Anchorage">(GMT-09:00) Alaska</option>
+                        <option value="America/Los_Angeles">(GMT-08:00) Pacific Time (US &amp; Canada)</option>
+                        <option value="America/Tijuana">(GMT-08:00) Tijuana, Baja California</option>
+                        <option value="America/Denver">(GMT-07:00) Mountain Time (US &amp; Canada)</option>
+                        <option value="America/Chihuahua">(GMT-07:00) Chihuahua, La Paz, Mazatlan</option>
+                        <option value="America/Phoenix">(GMT-07:00) Arizona</option>
+                        <option value="America/Regina">(GMT-06:00) Saskatchewan</option>
+                        <option value="America/Tegucigalpa">(GMT-06:00) Central America</option>
+                        <option value="America/Chicago">(GMT-06:00) Central Time (US &amp; Canada)</option>
+                        <option value="America/Mexico_City">(GMT-06:00) Guadalajara, Mexico City, Monterrey</option>
+                        <option value="America/New_York">(GMT-05:00) Eastern Time (US &amp; Canada)</option>
+                        <option value="America/Bogota">(GMT-05:00) Bogota, Lima, Quito, Rio Branco</option>
+                        <option value="America/Indiana/Indianapolis">(GMT-05:00) Indiana (East)</option>
+                        <option value="America/Caracas">(GMT-04:30) Caracas</option>
+                        <option value="America/Halifax">(GMT-04:00) Atlantic Time (Canada)</option>
+                        <option value="America/Manaus">(GMT-04:00) Manaus</option>
+                        <option value="America/Santiago">(GMT-04:00) Santiago</option>
+                        <option value="America/La_Paz">(GMT-04:00) La Paz</option>
+                        <option value="America/St_Johns">(GMT-03:30) Newfoundland</option>
+                        <option value="America/Argentina/Buenos_Aires">(GMT-03:00) Buenos Aires</option>
+                        <option value="America/Sao_Paulo">(GMT-03:00) Brasilia</option>
+                        <option value="America/Godthab">(GMT-03:00) Greenland</option>
+                        <option value="America/Montevideo">(GMT-03:00) Montevideo</option>
+                        <option value="America/Argentina/Buenos_Aires">(GMT-03:00) Georgetown</option>
+                        <option value="Atlantic/South_Georgia">(GMT-02:00) Mid-Atlantic</option>
+                        <option value="Atlantic/Azores">(GMT-01:00) Azores</option>
+                        <option value="Atlantic/Cape_Verde">(GMT-01:00) Cape Verde Is.</option>
+                        <option value="Europe/London">(GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London</option>
+                        <option value="Atlantic/Reykjavik">(GMT) Monrovia, Reykjavik</option>
+                        <option value="Africa/Casablanca">(GMT) Casablanca</option>
+                        <option value="Europe/Belgrade">(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague</option>
+                        <option value="Europe/Sarajevo">(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb</option>
+                        <option value="Europe/Brussels">(GMT+01:00) Brussels, Copenhagen, Madrid, Paris</option>
+                        <option value="Africa/Algiers">(GMT+01:00) West Central Africa</option>
+                        <option value="Europe/Amsterdam">(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna</option>
+                        <option value="Africa/Cairo">(GMT+02:00) Cairo</option>
+                        <option value="Europe/Helsinki">(GMT+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius</option>
+                        <option value="Europe/Athens">(GMT+02:00) Athens, Bucharest, Istanbul</option>
+                        <option value="Asia/Jerusalem">(GMT+02:00) Jerusalem</option>
+                        <option value="Asia/Amman">(GMT+02:00) Amman</option>
+                        <option value="Asia/Beirut">(GMT+02:00) Beirut</option>
+                        <option value="Africa/Windhoek">(GMT+02:00) Windhoek</option>
+                        <option value="Africa/Harare">(GMT+02:00) Harare, Pretoria</option>
+                        <option value="Asia/Kuwait">(GMT+03:00) Kuwait, Riyadh</option>
+                        <option value="Asia/Baghdad">(GMT+03:00) Baghdad</option>
+                        <option value="Europe/Minsk">(GMT+03:00) Minsk</option>
+                        <option value="Africa/Nairobi">(GMT+03:00) Nairobi</option>
+                        <option value="Asia/Tbilisi">(GMT+03:00) Tbilisi</option>
+                        <option value="Asia/Tehran">(GMT+03:30) Tehran</option>
+                        <option value="Asia/Muscat">(GMT+04:00) Abu Dhabi, Muscat</option>
+                        <option value="Asia/Baku">(GMT+04:00) Baku</option>
+                        <option value="Europe/Moscow">(GMT+04:00) Moscow, St. Petersburg, Volgograd</option>
+                        <option value="Asia/Yerevan">(GMT+04:00) Yerevan</option>
+                        <option value="Asia/Karachi">(GMT+05:00) Islamabad, Karachi</option>
+                        <option value="Asia/Tashkent">(GMT+05:00) Tashkent</option>
+                        <option value="Asia/Kolkata">(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi</option>
+                        <option value="Asia/Colombo">(GMT+05:30) Sri Jayawardenepura</option>
+                        <option value="Asia/Katmandu">(GMT+05:45) Kathmandu</option>
+                        <option value="Asia/Dhaka">(GMT+06:00) Astana, Dhaka</option>
+                        <option value="Asia/Yekaterinburg">(GMT+06:00) Ekaterinburg</option>
+                        <option value="Asia/Rangoon">(GMT+06:30) Yangon (Rangoon)</option>
+                        <option value="Asia/Novosibirsk">(GMT+07:00) Almaty, Novosibirsk</option>
+                        <option value="Asia/Bangkok">(GMT+07:00) Bangkok, Hanoi, Jakarta</option>
+                        <option value="Asia/Beijing">(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi</option>
+                        <option value="Asia/Krasnoyarsk">(GMT+08:00) Krasnoyarsk</option>
+                        <option value="Asia/Ulaanbaatar">(GMT+08:00) Irkutsk, Ulaan Bataar</option>
+                        <option value="Asia/Kuala_Lumpur">(GMT+08:00) Kuala Lumpur, Singapore</option>
+                        <option value="Asia/Taipei">(GMT+08:00) Taipei</option>
+                        <option value="Australia/Perth">(GMT+08:00) Perth</option>
+                        <option value="Asia/Seoul">(GMT+09:00) Seoul</option>
+                        <option value="Asia/Tokyo">(GMT+09:00) Osaka, Sapporo, Tokyo</option>
+                        <option value="Australia/Darwin">(GMT+09:30) Darwin</option>
+                        <option value="Australia/Adelaide">(GMT+09:30) Adelaide</option>
+                        <option value="Australia/Sydney">(GMT+10:00) Canberra, Melbourne, Sydney</option>
+                        <option value="Australia/Brisbane">(GMT+10:00) Brisbane</option>
+                        <option value="Australia/Hobart">(GMT+10:00) Hobart</option>
+                        <option value="Asia/Yakutsk">(GMT+10:00) Yakutsk</option>
+                        <option value="Pacific/Guam">(GMT+10:00) Guam, Port Moresby</option>
+                        <option value="Asia/Vladivostok">(GMT+11:00) Vladivostok</option>
+                        <option value="Pacific/Fiji">(GMT+12:00) Fiji, Kamchatka, Marshall Is.</option>
+                        <option value="Asia/Magadan">(GMT+12:00) Magadan, Solomon Is., New Caledonia</option>
+                        <option value="Pacific/Auckland">(GMT+12:00) Auckland, Wellington</option>
+                        <option value="Pacific/Tongatapu">(GMT+13:00) Nukualofa</option>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label><?php echo __('Email', 'users'); ?></label>
+                    <input name="email" class="form-control" value="<?php if (Request::post('email')) {
+    echo Html::toText(Request::post('email'));
+} ?>" type="text" />
+                </div>
+                <div class="form-group">
+                    <input type="submit" class="btn btn-primary" name="install_submit" value="<?php echo __('Install', 'system'); ?>" />
+                </div>
+            </form>
+
             </div>
+        </div>
+
+        <div class="monstra-dialog <?php if (Request::get('action') && Request::get('action') == 'install') {
+    ?>hide<?php
+
+} ?>">
+            <ul class="list-unstyled">
+            <?php
+
+                if (version_compare(PHP_VERSION, "5.3.2", "<")) {
+                    echo '<li class="error alert alert-danger">'.__('PHP 5.3.2 or greater is required', 'system').'</li>';
+                } else {
+                    echo '<li class="ok alert alert-success">'.__('PHP Version', 'system').' '.PHP_VERSION.'</li>';
+                }
+
+                if (in_array('SimpleXML', $php_modules)) {
+                    echo '<li class="ok alert alert-success">'.__('Module SimpleXML is installed', 'system').'</li>';
+                } else {
+                    echo '<li class="error alert alert-danger">'.__('SimpleXML module is required', 'system').'</li>';
+                }
+
+                if (in_array('dom', $php_modules)) {
+                    echo '<li class="ok alert alert-success">'.__('Module DOM is installed', 'system').'</li>';
+                } else {
+                    echo '<li class="error alert alert-danger">'.__('Module DOM is required', 'system').'</li>';
+                }
+
+                if (function_exists('apache_get_modules')) {
+                    if (! in_array('mod_rewrite', apache_get_modules())) {
+                        echo '<li class="error alert alert-danger">'.__('Apache Mod Rewrite is required', 'system').'</li>';
+                    } else {
+                        echo '<li class="ok alert alert-success">'.__('Module Mod Rewrite is installed', 'system').'</li>';
+                    }
+                } else {
+                    echo '<li class="ok alert alert-success">'.__('Module Mod Rewrite is installed', 'system').'</li>';
+                }
+
+                foreach ($dir_array as $dir) {
+                    if (is_writable($dir.'/')) {
+                        echo '<li class="ok alert alert-success">'.__('Directory: <b> :dir </b> writable', 'system', array(':dir' => $dir)).'</li>';
+                    } else {
+                        echo '<li class="error alert alert-danger">'.__('Directory: <b> :dir </b> not writable', 'system', array(':dir' => $dir)).'</li>';
+                    }
+                }
+
+                if (is_writable(__FILE__)) {
+                    echo '<li class="ok alert alert-success">'.__('Install script writable', 'system').'</li>';
+                } else {
+                    echo '<li class="error alert alert-danger">'.__('Install script not writable', 'system').'</li>';
+                }
+
+                if (is_writable('sitemap.xml')) {
+                    echo '<li class="ok alert alert-success">'.__('Sitemap file writable', 'system').'</li>';
+                } else {
+                    echo '<li class="error alert alert-danger">'.__('Sitemap file not writable', 'system').'</li>';
+                }
+
+                if (is_writable('.htaccess')) {
+                    echo '<li class="ok alert alert-success">'.__('Main .htaccess file writable', 'system').'</li>';
+                } else {
+                    echo '<li class="error alert alert-danger">'.__('Main .htaccess file not writable', 'system').'</li>';
+                }
+
+                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>
+            <a href="install.php?action=install" class="btn btn-primary continue"><?php echo __('Continue', 'system'); ?></a>
+        </div>
+
+        <div class="install-block-footer login-footer">
+            <div class="text-center">
+                <span>© 2012 - 2016 <a href="http://monstra.org" class="small-grey-text" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?></span>
+            </div>
+        </div>
 
        <script type="text/javascript">
             $('.language-link').tooltip();
+
+            $(document).ready(function() {
+                $('.continue').click(function() {
+                    $('.monstra-dialog').addClass('hide');
+                    $('.install-block').removeClass('hide');
+                });
+            });
        </script>
     </body>
 </html>

libraries/Gelato/Agent/Agent.php

@@ -71,6 +71,12 @@ class Agent
         'infoseek',
         'lycos',
         'ia_archiver',
+        'yandex',
+        'mail.ru',
+        'ask.com',
+        'Copyscape.com',
+        'bing.com',
+
     );
 
     /**

libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php

@@ -4,23 +4,17 @@
 <meta charset="utf-8">
 <title>Error</title>
 <style type="text/css">
+body {
+    background: #F5F5F5;
+    padding: 0;
+    margin: 0;
+}
 #gelato-error {
-    background:#eee;
+    background:#F5F5F5;
     color:0;
-    width:95%;
+    width:100%;
     font-size:14px;
     font-family:Verdana, Arial, Helvetica, "Nimbus Sans", FreeSans, Malayalam, sans-serif;
-    margin:20px auto;
-
-    -webkit-box-shadow: 1px 1px 18px rgba(50, 50, 50, 0.75);
-    -moz-box-shadow:    1px 1px 18px rgba(50, 50, 50, 0.75);
-    box-shadow:         1px 1px 18px rgba(50, 50, 50, 0.75);
-
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-
-
 }
 
 #gelato-error pre {
@@ -31,23 +25,17 @@
 }
 
 #gelato-error a {
-    color:#cc0a0a;
+    color:#DC143C;
     text-decoration:none;
 }
 
 #gelato-error .error {
-    background:#cc0a0a;
+    background:#DC143C;
     color:#fff;
     font-size:24px;
     font-weight:700;
     padding:10px;
 
-    -moz-border-radius-topleft: 5px;
-    -webkit-border-top-left-radius: 5px;
-     border-top-left-radius: 5px;
-    -moz-border-radius-topright: 5px;
-    -webkit-border-top-right-radius: 5px;
-    border-top-right-radius: 5px;
 }
 
 #gelato-error .body {
@@ -288,7 +276,10 @@
     <?php endforeach; ?>
     </table>
     </div>
-    <div style="padding-top:20px;padding-bottom:20px; padding-left:10px;"><a href="http://gelato.monstra.org">Gelato Library</a></div>
+    <div style="padding-top:20px;padding-bottom:20px; padding-left:10px;">
+        <a href="http://monstra.org">MONSTRA</a>
+        <a href="http://gelato.monstra.org">GELATO</a>
+    </div>
 </div>
 
 <script type="text/javascript">

libraries/Gelato/FileSystem/Dir.php

@@ -203,4 +203,26 @@ class Dir
         return $total_size;
     }
 
+    /**
+     * Copy directory.
+     * <code>
+     *      Dir::copy('source_folder_path', 'destination_folder_path);
+     *  </code>
+     * @param $src
+     * @param $dst
+     */
+    public static function copy($src, $dst) {
+        $dir = opendir($src);
+        @mkdir($dst);
+        while(false !== ( $file = readdir($dir)) ) {
+            if (( $file != '.' ) && ( $file != '..' )) {
+                if ( is_dir($src .'/'. $file) ) {
+                    self::copy($src .'/'. $file, $dst .'/'. $file);
+                } else {
+                    copy($src .'/'. $file,$dst .'/'. $file);
+                }
+            }
+        }
+        closedir($dir);
+    }
 }

libraries/Gelato/Form/Form.php

@@ -141,7 +141,7 @@ class Form
             $attributes['type'] = 'text';
         }
 
-        return '<input'.Html::attributes($attributes).' />';
+        return '<input'.Html::attributes($attributes).'>';
     }
 
     /**

libraries/Gelato/Html/Html.php

@@ -51,7 +51,7 @@ class Html
      *
      *  <code>
      *
-     *      // Registering a Htmlk macro
+     *      // Registering a Html macro
      *      Html::macro('my_element', function() {
      *          return '<element id="monstra">';
      *      });
@@ -61,7 +61,7 @@ class Html
      *
      *
      *      // Registering a Html macro with parameters
-     *      Html::macro('my_element', function(id = '') {
+     *      Html::macro('my_element', function($id = '') {
      *      	return '<element id="'.$id.'">';
      *      });
      *
@@ -157,7 +157,7 @@ class Html
      */
     public static function br($num = 1)
     {
-        return str_repeat("<br />",(int) $num);
+        return str_repeat("<br>",(int) $num);
     }
 
     /**
@@ -285,7 +285,7 @@ class Html
         $attributes['src'] = $file;
         $attributes['alt'] = (isset($attributes['alt'])) ? $attributes['alt'] : pathinfo($file, PATHINFO_FILENAME);
 
-        return '<img'.Html::attributes($attributes).' />';
+        return '<img'.Html::attributes($attributes).'>';
     }    
     
 	/**

libraries/Gelato/Image/Image.php

@@ -659,4 +659,3 @@ class Image
     }
 
 }
-code

libraries/Gelato/Minify/MinifyCSS.php

@@ -109,23 +109,9 @@ class MinifyCSS
                 (\\b|[#\'"-])        # 3 = first character of a value
             /x', '$1$2:$3', $css);
 
-        // remove ws in selectors
-        $css = preg_replace_callback('/
-                (?:              # non-capture
-                    \\s*
-                    [^~>+,\\s]+  # selector part
-                    \\s*
-                    [,>+~]       # combinators
-                )+
-                \\s*
-                [^~>+,\\s]+      # selector part
-                {                # open declaration block
-            /x'
-            ,array($this, '_selectorsCB'), $css);
-
         // minimize hex colors
-        $css = preg_replace('/([^=])#([a-f\\d])\\2([a-f\\d])\\3([a-f\\d])\\4([\\s;\\}])/i'
+        /*$css = preg_replace('/([^=])#([a-f\\d])\\2([a-f\\d])\\3([a-f\\d])\\4([\\s;\\}])/i'
-            , '$1#$2$3$4$5', $css);
+            , '$1#$2$3$4$5', $css);*/
 
         // remove spaces between font families
         $css = preg_replace_callback('/font-family:([^;}]+)([;}])/'

libraries/Gelato/Number/Number.php

@@ -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,11 +42,33 @@ 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 < 0 ? 0 : $i)];
     }
 
+    /**
+     * Convert 'KB','MB','GB' in bytes
+     *
+     *  <code>
+     *      echo Number::convertToBytes('10MB');
+     *  </code>
+     *
+     * @param  string $num Number to convert
+     * @return int
+     */
+    public static function convertToBytes( $num ) {
+        $num  = strtolower( $num );
+        $bytes = (int) $num;
+        if ( strpos( $num, 'k' ) !== false )
+            $bytes = intval( $num ) * 1024;
+        elseif ( strpos( $num, 'm' ) !== false )
+            $bytes = intval($num) * 1024 * 1024;
+        elseif ( strpos( $num, 'g' ) !== false )
+            $bytes = intval( $num ) * 1024 * 1024 * 1024;
+        return $bytes;
+    }
+
     /**
      * Converts a number into a more readable human-type number.
      *

libraries/Gelato/Zip/Zip.php

@@ -24,6 +24,12 @@ class Zip
     public $offset     = 0;
     public $now;
 
+    private $_archive_info  = array();
+    private $_zip_signature = "\x50\x4b\x03\x04";
+    private $_dir_signature = "\x50\x4b\x01\x02";
+    private $_central_signature_end = "\x50\x4b\x05\x06";
+    private $farc = null;
+    
     /**
      * Constructor
      */
@@ -264,7 +270,7 @@ class Zip
      * @param  string  $root_path         Root path
      * @return mixed
      */
-    public function readDir($path, $preserve_filepath = true, $root_path = null)
+    public function readDir($path, $preserve_filepath = true, $root_path = null, $exclude_files = array())
     {
         if ( ! $fp = @opendir($path)) {
             return false;
@@ -277,12 +283,12 @@ class Zip
 
         while (false !== ($file = readdir($fp))) {
 
-            if (substr($file, 0, 1) == '.') {
+            if (substr($file, 0, 1) == '.' || in_array($path.$file, $exclude_files)) {
                 continue;
             }
 
             if (@is_dir($path.$file)) {
-                $this->readDir($path.$file."/", $preserve_filepath, $root_path);
+                $this->readDir($path.$file."/", $preserve_filepath, $root_path, $exclude_files);
             } else {
                 if (false !== ($data = file_get_contents($path.$file))) {
                     $name = str_replace("\\", "/", $path);
@@ -372,4 +378,302 @@ class Zip
         $this->offset       = 0;
     }
 
+    public function extract($zip_file, $target_dir = null)
+    {
+        $chmod = 0777;
+        $this->_archive_info = array();
+
+        $files = $this->_read_archive($zip_file);
+
+        if (!$files) {
+            return false;
+        }
+
+        $file_locations = array();
+        foreach ($files as $file => $trash) {
+            $dirname = pathinfo($file, PATHINFO_DIRNAME);
+
+            $folders = explode('/', $dirname);
+            $out_dn = $target_dir . '/' . $dirname;
+
+            if ( !is_dir($out_dn)) {
+                $str = '';
+                foreach ($folders as $folder) {
+                    $str = $str ? $str . '/' . $folder : $folder;
+                    if ( !is_dir($target_dir . '/' . $str)) {
+                        if ( ! @mkdir($target_dir . '/' . $str)) {
+                            return false;
+                        }
+
+                        chmod($target_dir . '/' . $str, $chmod);
+                    }
+                }
+            }
+
+            if (substr($file, -1, 1) == '/') {
+                continue;
+            }
+
+            $file_locations[] = $file_location = $target_dir . '/' . $file;
+
+            $this->_extract_file($file, $file_location);
+        }
+
+        $this->_archive_info = array();
+
+        return $file_locations;
+    }
+
+    private function _read_archive($zip_file)
+    {
+        if (sizeof($this->_archive_info)) {
+            return $this->_archive_info;
+        }
+
+        $fh = fopen($zip_file, 'r');
+        $this->farc = &$fh;
+
+        if ( !$fh) {
+            return false;
+        }
+
+        if ( !$this->_read_file_list_by_eof($fh)) {
+            if ( !$this->_read_files_by_signatures($fh)) {
+                return false;
+            }
+        }
+
+        return $this->_archive_info;
+    }
+
+    private function _read_file_list_by_eof(&$fh)
+    {
+        for ($x = 0; $x < 1024; $x++) {
+            fseek($fh, -22 - $x, SEEK_END);
+
+            $signature = fread($fh, 4);
+
+            if ($signature == $this->_central_signature_end) {
+                $eodir['disk_number_this'] = unpack("v", fread($fh, 2));
+                $eodir['disk_number'] = unpack("v", fread($fh, 2));
+                $eodir['total_entries_this'] = unpack("v", fread($fh, 2));
+                $eodir['total_entries'] = unpack("v", fread($fh, 2));
+                $eodir['size_of_cd'] = unpack("V", fread($fh, 4));
+                $eodir['offset_start_cd'] = unpack("V", fread($fh, 4));
+                $zip_comment_lenght = unpack("v", fread($fh, 2));
+                $eodir['zipfile_comment'] = $zip_comment_lenght[1] ? fread($fh, $zip_comment_lenght[1]) : '';
+
+                fseek($fh, $eodir['offset_start_cd'][1]);
+                $signature = fread($fh, 4);
+
+                while ($signature == $this->_dir_signature) {
+                    $dir['version_madeby'] = unpack("v", fread($fh, 2));
+                    $dir['version_needed'] = unpack("v", fread($fh, 2));
+                    $dir['general_bit_flag'] = unpack("v", fread($fh, 2));
+                    $dir['compression_method'] = unpack("v", fread($fh, 2));
+                    $dir['lastmod_time'] = unpack("v", fread($fh, 2));
+                    $dir['lastmod_date'] = unpack("v", fread($fh, 2));
+                    $dir['crc-32'] = fread($fh, 4);
+                    $dir['compressed_size'] = unpack("V", fread($fh, 4));
+                    $dir['uncompressed_size'] = unpack("V", fread($fh, 4));
+                    $zip_file_length = unpack("v", fread($fh, 2));
+                    $extra_field_length = unpack("v", fread($fh, 2));
+                    $fileCommentLength = unpack("v", fread($fh, 2));
+                    $dir['disk_number_start'] = unpack("v", fread($fh, 2));
+                    $dir['internal_attributes'] = unpack("v", fread($fh, 2));
+                    $dir['external_attributes1'] = unpack("v", fread($fh, 2));
+                    $dir['external_attributes2'] = unpack("v", fread($fh, 2));
+                    $dir['relative_offset'] = unpack("V", fread($fh, 4));
+                    $dir['file_name'] = fread($fh, $zip_file_length[1]);
+                    $dir['extra_field'] = $extra_field_length[1] ? fread($fh, $extra_field_length[1]) : '';
+                    $dir['file_comment'] = $fileCommentLength[1] ? fread($fh, $fileCommentLength[1]) : '';
+
+                    $binary_mod_date = str_pad(decbin($dir['lastmod_date'][1]), 16, '0', STR_PAD_LEFT);
+                    $binary_mod_time = str_pad(decbin($dir['lastmod_time'][1]), 16, '0', STR_PAD_LEFT);
+                    $last_mod_year = bindec(substr($binary_mod_date, 0, 7)) + 1980;
+                    $last_mod_month = bindec(substr($binary_mod_date, 7, 4));
+                    $last_mod_day = bindec(substr($binary_mod_date, 11, 5));
+                    $last_mod_hour = bindec(substr($binary_mod_time, 0, 5));
+                    $last_mod_minute = bindec(substr($binary_mod_time, 5, 6));
+                    $last_mod_second = bindec(substr($binary_mod_time, 11, 5));
+
+                    $central_dir_list[$dir['file_name']] = array(
+                        'version_madeby' => $dir['version_madeby'][1],
+                        'version_needed' => $dir['version_needed'][1],
+                        'general_bit_flag' => str_pad(decbin($dir['general_bit_flag'][1]), 8, '0', STR_PAD_LEFT),
+                        'compression_method' => $dir['compression_method'][1],
+                        'lastmod_datetime' => mktime($last_mod_hour, $last_mod_minute, $last_mod_second, $last_mod_month, $last_mod_day, $last_mod_year),
+                        'crc-32' => str_pad(dechex(ord($dir['crc-32'][3])), 2, '0', STR_PAD_LEFT) .
+                            str_pad(dechex(ord($dir['crc-32'][2])), 2, '0', STR_PAD_LEFT) .
+                            str_pad(dechex(ord($dir['crc-32'][1])), 2, '0', STR_PAD_LEFT) .
+                            str_pad(dechex(ord($dir['crc-32'][0])), 2, '0', STR_PAD_LEFT),
+                        'compressed_size' => $dir['compressed_size'][1],
+                        'uncompressed_size' => $dir['uncompressed_size'][1],
+                        'disk_number_start' => $dir['disk_number_start'][1],
+                        'internal_attributes' => $dir['internal_attributes'][1],
+                        'external_attributes1' => $dir['external_attributes1'][1],
+                        'external_attributes2' => $dir['external_attributes2'][1],
+                        'relative_offset' => $dir['relative_offset'][1],
+                        'file_name' => $dir['file_name'],
+                        'extra_field' => $dir['extra_field'],
+                        'file_comment' => $dir['file_comment'],
+                    );
+
+                    $signature = fread($fh, 4);
+                }
+
+                if (isset($central_dir_list)) {
+                    foreach ($central_dir_list as $filename => $details) {
+                        $i = $this->_get_file_header($fh, $details['relative_offset']);
+
+                        $this->_archive_info[$filename]['file_name'] = $filename;
+                        $this->_archive_info[$filename]['compression_method'] = $details['compression_method'];
+                        $this->_archive_info[$filename]['version_needed'] = $details['version_needed'];
+                        $this->_archive_info[$filename]['lastmod_datetime'] = $details['lastmod_datetime'];
+                        $this->_archive_info[$filename]['crc-32'] = $details['crc-32'];
+                        $this->_archive_info[$filename]['compressed_size'] = $details['compressed_size'];
+                        $this->_archive_info[$filename]['uncompressed_size'] = $details['uncompressed_size'];
+                        $this->_archive_info[$filename]['lastmod_datetime'] = $details['lastmod_datetime'];
+                        $this->_archive_info[$filename]['extra_field'] = $i['extra_field'];
+                        $this->_archive_info[$filename]['contents_start_offset'] = $i['contents_start_offset'];
+                    }
+                }
+
+                return true;
+            }
+        }
+        return true;
+    }
+
+    private function _read_files_by_signatures(&$fh)
+    {
+        fseek($fh, 0);
+
+        $return = false;
+        for (;;) {
+            $details = $this->_get_file_header($fh);
+
+            if ( !$details) {
+                fseek($fh, 12 - 4, SEEK_CUR);
+                $details = $this->_get_file_header($fh);
+            }
+
+            if ( !$details) {
+                break;
+            }
+
+            $filename = $details['file_name'];
+            $this->_archive_info[$filename] = $details;
+            $return = true;
+        }
+
+        return $return;
+    }
+
+    private function _get_file_header(&$fh, $start_offset = FALSE)
+    {
+        if ($start_offset !== false) {
+            fseek($fh, $start_offset);
+        }
+
+        $signature = fread($fh, 4);
+
+        if ($signature == $this->_zip_signature) {
+            $file['version_needed'] = unpack("v", fread($fh, 2));
+            $file['general_bit_flag'] = unpack("v", fread($fh, 2));
+            $file['compression_method'] = unpack("v", fread($fh, 2));
+            $file['lastmod_time'] = unpack("v", fread($fh, 2));
+            $file['lastmod_date'] = unpack("v", fread($fh, 2));
+            $file['crc-32'] = fread($fh, 4);
+            $file['compressed_size'] = unpack("V", fread($fh, 4));
+            $file['uncompressed_size'] = unpack("V", fread($fh, 4));
+            $zip_file_length = unpack("v", fread($fh, 2));
+            $extra_field_length = unpack("v", fread($fh, 2));
+            $file['file_name'] = fread($fh, $zip_file_length[1]);
+            $file['extra_field'] = $extra_field_length[1] ? fread($fh, $extra_field_length[1]) : '';
+            $file['contents_start_offset'] = ftell($fh);
+
+            fseek($fh, $file['compressed_size'][1], SEEK_CUR);
+
+            $binary_mod_date = str_pad(decbin($file['lastmod_date'][1]), 16, '0', STR_PAD_LEFT);
+            $binary_mod_time = str_pad(decbin($file['lastmod_time'][1]), 16, '0', STR_PAD_LEFT);
+
+            $last_mod_year = bindec(substr($binary_mod_date, 0, 7)) + 1980;
+            $last_mod_month = bindec(substr($binary_mod_date, 7, 4));
+            $last_mod_day = bindec(substr($binary_mod_date, 11, 5));
+            $last_mod_hour = bindec(substr($binary_mod_time, 0, 5));
+            $last_mod_minute = bindec(substr($binary_mod_time, 5, 6));
+            $last_mod_second = bindec(substr($binary_mod_time, 11, 5));
+
+            return array(
+                'file_name' => $file['file_name'],
+                'compression_method' => $file['compression_method'][1],
+                'version_needed' => $file['version_needed'][1],
+                'lastmod_datetime' => mktime($last_mod_hour, $last_mod_minute, $last_mod_second, $last_mod_month, $last_mod_day, $last_mod_year),
+                'crc-32' => str_pad(dechex(ord($file['crc-32'][3])), 2, '0', STR_PAD_LEFT) .
+                    str_pad(dechex(ord($file['crc-32'][2])), 2, '0', STR_PAD_LEFT) .
+                    str_pad(dechex(ord($file['crc-32'][1])), 2, '0', STR_PAD_LEFT) .
+                    str_pad(dechex(ord($file['crc-32'][0])), 2, '0', STR_PAD_LEFT),
+                'compressed_size' => $file['compressed_size'][1],
+                'uncompressed_size' => $file['uncompressed_size'][1],
+                'extra_field' => $file['extra_field'],
+                'general_bit_flag' => str_pad(decbin($file['general_bit_flag'][1]), 8, '0', STR_PAD_LEFT),
+                'contents_start_offset' => $file['contents_start_offset']
+            );
+        }
+
+        return false;
+    }
+
+    private function _extract_file($compressed_file_name, $target_file_name = false)
+    {
+        if ( !sizeof($this->_archive_info)) {
+            return false;
+        }
+
+        $fdetails = &$this->_archive_info[$compressed_file_name];
+
+        if ( ! isset($this->_archive_info[$compressed_file_name])) {
+            return false;
+        }
+
+        if (substr($compressed_file_name, -1) == '/') {
+            return false;
+        }
+
+        if ( !$fdetails['uncompressed_size']) {
+            return $target_file_name ? file_put_contents($target_file_name, '') : '';
+        }
+
+        fseek($this->farc, $fdetails['contents_start_offset']);
+        $ret = $this->_uncompress(
+            fread($this->farc, $fdetails['compressed_size']),
+            $fdetails['compression_method'],
+            $fdetails['uncompressed_size'],
+            $target_file_name
+        );
+
+        if ($target_file_name) {
+            chmod($target_file_name, 0644);
+        }
+
+        return $ret;
+    }
+
+    private function _uncompress($content, $mode, $uncompressed_size, $target_file_name = false)
+    {
+        switch ($mode) {
+            case 0:
+                return $target_file_name ? file_put_contents($target_file_name, $content) : $content;
+            case 8:
+                return $target_file_name
+                    ? file_put_contents($target_file_name, gzinflate($content, $uncompressed_size))
+                    : gzinflate($content, $uncompressed_size);
+            case 12:
+                return $target_file_name
+                    ? file_put_contents($target_file_name, bzdecompress($content)) : bzdecompress($content);
+            default:
+                return false;
+        }
+    }
 }

license.txt

@@ -1,221 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-Version 3, 29 June 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-Preamble
-The GNU General Public License is a free, copyleft license for software and other kinds of works.
-
-The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
-
-To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
-
-For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
-
-Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
-
-Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-TERMS AND CONDITIONS
-0. Definitions.
-<EFBFBD>This License<73> refers to version 3 of the GNU General Public License.
-
-<EFBFBD>Copyright<EFBFBD> also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
-
-<EFBFBD>The Program<61> refers to any copyrightable work licensed under this License. Each licensee is addressed as <20>you<6F>. <20>Licensees<65> and <20>recipients<74> may be individuals or organizations.
-
-To <20>modify<66> a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a <20>modified version<6F> of the earlier work or a work <20>based on<6F> the earlier work.
-
-A <20>covered work<72> means either the unmodified Program or a work based on the Program.
-
-To <20>propagate<74> a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
-
-To <20>convey<65> a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays <20>Appropriate Legal Notices<65> to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-
-1. Source Code.
-The <20>source code<64> for a work means the preferred form of the work for making modifications to it. <20>Object code<64> means any non-source form of a work.
-
-A <20>Standard Interface<63> means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
-
-The <20>System Libraries<65> of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A <20>Major Component<6E>, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
-
-The <20>Corresponding Source<63> for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
-
-The Corresponding Source for a work in source code form is that same work.
-
-2. Basic Permissions.
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
-
-When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
-
-4. Conveying Verbatim Copies.
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-
-5. Conveying Modified Source Versions.
-You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
-
-a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to <20>keep intact all notices<65>.
-c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an <20>aggregate<74> if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
-
-6. Conveying Non-Source Forms.
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
-
-a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
-
-A <20>User Product<63> is either (1) a <20>consumer product<63>, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, <20>normally used<65> refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
-
-<EFBFBD>Installation Information<6F> for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
-
-The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
-
-7. Additional Terms.
-<EFBFBD>Additional permissions<6E> are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
-
-a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
-All other non-permissive additional terms are considered <20>further restrictions<6E> within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
-
-8. Termination.
-You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
-
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
-
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-
-9. Acceptance Not Required for Having Copies.
-You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-
-10. Automatic Licensing of Downstream Recipients.
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
-
-An <20>entity transaction<6F> is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-
-11. Patents.
-A <20>contributor<6F> is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's <20>contributor version<6F>.
-
-A contributor's <20>essential patent claims<6D> are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, <20>control<6F> includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
-
-In the following three paragraphs, a <20>patent license<73> is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To <20>grant<6E> such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. <20>Knowingly relying<6E> means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
-
-A patent license is <20>discriminatory<72> if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-
-12. No Surrender of Others' Freedom.
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-
-13. Use with the GNU Affero General Public License.
-Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
-
-14. Revised Versions of this License.
-The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License <20>or any later version<6F> applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
-
-Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
-
-15. Disclaimer of Warranty.
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM <20>AS IS<49> WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. Limitation of Liability.
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-17. Interpretation of Sections 15 and 16.
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the <20>copyright<68> line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an <20>about box<6F>.
-
-You should also get your employer (if you work as a programmer) or school, if any, to sign a <20>copyright disclaimer<65> for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>.
-
-The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.

plugins/blog/README.md

@@ -0,0 +1,40 @@
+Blog
+================
+
+### Usage
+
+#### Get Post
+	<?php echo Blog::getPost(); ?>
+
+#### Get Posts
+	<?php echo Blog::getPosts(); ?>
+
+#### Get 5 Posts (could be any amount, 5 or 1 or 25):
+	<?php echo Blog::getPosts(5); ?>
+
+#### Get related Posts
+	<?php echo Blog::getRelatedPosts(); ?>
+
+#### Get 4 latest posts from Blog
+	<?php echo Blog::getPostsBlock(4); ?>
+
+#### Get Tags&Keywords
+	<?php Blog::getTags(); ?>
+
+#### Get Tags&Keywords for current page
+	<?php Blog::getTags(Page::slug()); ?>
+
+Get Post Title
+	<?php echo Blog::getPostTitle(); ?>
+
+### Shortcode for content 
+
+#### Divided post into 2 parts (short and full)
+	{cut}
+
+Example:
+
+	<p>Best free themes for Monstra CMS at monstrathemes.com</p>
+	{cut}
+	<p>There is going to display your content as blog post =)</p>
+ 

plugins/blog/blog.plugin.php

@@ -0,0 +1,399 @@
+<?php
+
+/**
+ *  Blog plugin
+ *
+ *  @package Monstra
+ *  @subpackage Plugins
+ *  @author Romanenko Sergey / Awilum
+ *  @copyright 2012 Romanenko Sergey / Awilum
+ *  @version 1.7.3
+ *
+ */
+
+
+// Register plugin
+Plugin::register( __FILE__,                    
+                __('Blog', 'blog'),
+                __('Blog plugin for Monstra', 'blog'),  
+                '1.7.3',
+                'Awilum',            
+                'http://monstra.org/');
+
+// Add action
+Action::add('frontend_pre_render', 'Blog::_rss');
+
+/**
+ * Blog Class
+ */
+class Blog {
+
+
+    /**
+     * Parrent page name(slug)
+     *
+     * @var string
+     */
+    public static $parent_page_name = 'blog';
+
+    /**
+     * Get tags
+     *
+     *  <code> 
+     *      echo Blog::getTags();
+     *  </code>
+     *
+     * @return string
+     */
+    public static function getTags($slug = null) {
+
+        // Display view
+        return View::factory('blog/views/frontend/tags')
+                ->assign('tags', Blog::getTagsArray($slug))
+                ->render();
+
+    }
+
+
+    /**
+     * Get breadcrumbs
+     *
+     *  <code> 
+     *      echo Blog::breadcrumbs();
+     *  </code>
+     *
+     * @return string
+     */
+    public static function breadcrumbs() {
+        $current_page = Pages::$requested_page;
+        $parent_page = '';
+        if ($current_page !== 'error404') {  
+            $page = Pages::$pages->select('[slug="'.$current_page.'"]', null);
+            if (trim($page['parent']) !== '') {
+                $parent = true;    
+                $parent_page = Pages::$pages->select('[slug="'.$page['parent'].'"]', null);
+            } else { 
+                $parent = false;
+            }
+            
+            // Display view
+            View::factory('blog/views/frontend/breadcrumbs')
+                    ->assign('current_page', $current_page)                                 
+                    ->assign('page', $page)
+                    ->assign('parent', $parent)
+                    ->assign('parent_page', $parent_page)
+                    ->display();
+        }
+    }
+
+
+    /**
+     * Get tags array
+     *
+     *  <code> 
+     *      echo Blog::getTagsArray();
+     *  </code>
+     *
+     * @return array
+     */
+    public static function getTagsArray($slug = null) {
+
+        // Init vars
+        $tags = array();
+        $tags_string = '';
+
+        if ($slug == null) {
+            $posts = Pages::$pages->select('[parent="'.Blog::$parent_page_name.'" and status="published"]', 'all');
+        } else {
+            $posts = Pages::$pages->select('[parent="'.Blog::$parent_page_name.'" and status="published" and slug="'.$slug.'"]', 'all');
+        }
+    
+        foreach($posts as $post) {
+            if (isset($post['tags'])) {
+                $tags_string .= $post['tags'].',';
+            }
+        }
+
+        $tags_string = substr($tags_string, 0, strlen($tags_string)-1);   
+
+        // Explode tags in tags array
+        $tags = explode(',', $tags_string);   
+
+        // Remove empty array elementss
+        foreach ($tags as $key => $value) {
+            if ($tags[$key] == '') {
+                unset($tags[$key]);
+            }
+        }
+
+        // Trim tags
+        array_walk($tags, create_function('&$val', '$val = trim($val);')); 
+
+        // Get unique tags
+        $tags = array_unique($tags);
+
+        // Return tags
+        return $tags;
+    }
+
+
+    /**
+     * Get posts
+     *
+     *  <code> 
+     *      // Get all posts
+     *      echo Blog::getPosts();
+     *
+     *      // Get last 5 posts
+     *      echo Blog::getPosts(5);
+     *  </code>
+     *
+     * @param  integer $num Number of posts to show
+     * @return string
+     */
+    public static function getPosts($nums = 10) {
+
+        // Get page param
+        $page = (Request::get('page')) ? (int)Request::get('page') : 1;
+
+        if (Request::get('tag')) {
+            $query = '[parent="'.Blog::$parent_page_name.'" and status="published" and contains(tags, "'.Request::get('tag').'")]';                
+            Notification::set('tag', Request::get('tag'));
+        } else {
+            $query = '[parent="'.Blog::$parent_page_name.'" and status="published"]';
+            Notification::clean();
+        }
+
+        // Get Elements Count
+        $elements = count(Pages::$pages->select($query, 'all'));
+
+        // Get Pages Count
+        $pages = ceil($elements/$nums);
+
+
+        if ($page < 1) {
+            $page = 1;
+        } elseif ($page > $pages) {
+            $page = $pages;
+        }
+
+        $start = ($page-1)*$nums;
+
+        // If there is no posts
+        if ($start < 0) $start = 0;
+
+        // Get posts and sort by DESC
+        $posts = Pages::$pages->select($query, $nums, $start, array('slug', 'title', 'author', 'date'), 'date', 'DESC');
+
+        // Loop
+        foreach($posts as $key => $post) {
+            $post_short = explode("{cut}", Text::toHtml(File::getContent(STORAGE . DS . 'pages' . DS . $post['id'] . '.page.txt')));
+            $posts[$key]['content'] = Filter::apply('content', $post_short[0]);
+        }
+
+        // Display view
+        return View::factory('blog/views/frontend/index')
+                ->assign('posts', $posts)
+                ->render().
+               View::factory('blog/views/frontend/pager')
+                ->assign('pages', $pages)
+                ->assign('page', $page)
+                ->render();
+    }
+
+
+    /**
+     * Get posts block
+     *
+     *  <code> 
+     *      // Get all posts
+     *      echo Blog::getPostsBlock();
+     *
+     *      // Get last 5 posts
+     *      echo Blog::getPostsBlock(5);
+     *  </code>
+     *
+     * @param  integer $num Number of posts to show
+     * @return string
+     */
+    public static function getPostsBlock($nums = 10) {
+
+        // XPath Query
+        $query = '[parent="'.Blog::$parent_page_name.'" and status="published"]';
+
+        // Get posts and sort by DESC
+        $posts = Pages::$pages->select($query, $nums, 0, array('slug', 'title', 'author', 'date'), 'date', 'DESC');
+
+        // Loop
+        foreach($posts as $key => $post) {
+            $post_short = explode("{cut}", Text::toHtml(File::getContent(STORAGE . DS . 'pages' . DS . $post['id'] . '.page.txt')));
+            $posts[$key]['content'] = Filter::apply('content', $post_short[0]);
+        }
+
+        // Display view
+        return View::factory('blog/views/frontend/block')
+                ->assign('posts', $posts)
+                ->render();
+
+    }
+
+
+    /**
+     * Get related posts
+     *
+     *  <code> 
+     *      echo Blog::getRelatedPosts();
+     *  </code>
+     *
+     * @return string
+     */
+    public static function getRelatedPosts($limit = null) {
+
+        $related_posts = array();
+        $tags = Blog::getTagsArray(Page::slug());
+
+        foreach($tags as $tag) {
+
+            $query = '[parent="'.Blog::$parent_page_name.'" and status="published" and contains(tags, "'.$tag.'") and slug!="'.Page::slug().'"]';
+            
+            if ($result = Arr::subvalSort(Pages::$pages->select($query, ($limit == null) ? 'all' : (int)$limit), 'date', 'DESC')) {
+                $related_posts = $result; 
+            }
+        }
+
+        // Display view
+        return View::factory('blog/views/frontend/related_posts')
+                ->assign('related_posts', $related_posts)
+                ->render();
+
+    }
+
+
+    /**
+     * Get post content
+     *
+     *  <code> 
+     *      echo Blog::getPost();
+     *  </code>
+     *
+     * @return string
+     */
+    public static function getPost() {
+
+        // Get post
+        $post = Text::toHtml(File::getContent(STORAGE . DS . 'pages' . DS . Pages::$page['id'] . '.page.txt'));                
+
+        // Apply content filter
+        $post = Filter::apply('content', $post);
+
+        // Remove {cut} shortcode
+        $post = strtr($post, array('{cut}' => ''));
+
+        // Return post
+        return $post;
+    }
+
+
+    /** 
+     *  Get post content before cut
+     * 
+     *  <code> 
+     *      echo Blog::getPostBeforeCut('home');
+     *  </code>
+     *
+     * @return string
+     */
+    public static function getPostBeforeCut($slug) {
+
+        $page = Pages::$pages->select('[slug="'.$slug.'"]', null);
+
+        // Get post
+        $post = explode("{cut}", Text::toHtml(File::getContent(STORAGE . DS . 'pages' . DS . $page['id'] . '.page.txt')));
+
+        // Apply content filter
+        $post_content = Filter::apply('content', $post[0]);
+
+        // Return post
+        return $post_content;
+    }
+
+
+    /** 
+     *  Get post content after cut
+     * 
+     *  <code> 
+     *      echo Blog::getPostAfterCut('home');
+     *  </code>
+     *
+     * @return string
+     */
+    public static function getPostAfterCut($slug) {
+
+        $page = Pages::$pages->select('[slug="'.$slug.'"]', null);
+
+        // Get post
+        $post = explode("{cut}", Text::toHtml(File::getContent(STORAGE . DS . 'pages' . DS . $page['id'] . '.page.txt')));
+
+        // Apply content filter
+        $post_content = Filter::apply('content', $post[1]);
+
+        // Return post
+        return $post_content;
+    }
+
+
+    /**
+     * Get Blog Post title
+     *
+     *  <code> 
+     *      echo Blog::getPostTitle();
+     *  </code>
+     *
+     * @return string
+     */
+    public static function getPostTitle() {
+        return Page::title();
+    }
+
+
+    /**
+     * Get Blog Post Date
+     *
+     *  <code> 
+     *      echo Blog::getPostDate();
+     *  </code>
+     *
+     * @param  string $format Date format
+     * @return string
+     */
+    public static function getPostDate($format = 'Y-m-d') {
+        return Page::date($format);
+    }
+
+
+    /**
+     * Get author of current post
+     *
+     *  <code>
+     *      echo Blog::getPostAuthor();
+     *  </code>
+     *
+     * @return string
+     */
+    public static function getPostAuthor()
+    {
+        return Page::author();
+    }
+
+    /**
+     * _rss
+     */
+    public static function _rss() {
+        if (Uri::segment(0) == 'rss') {
+            include PLUGINS . DS . 'blog' . DS . 'rss.php';
+            Request::shutdown();
+        }
+    }
+
+}
+

plugins/blog/install/blog.manifest.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+    <plugin_location>plugins/blog/blog.plugin.php</plugin_location>
+    <plugin_status>active</plugin_status>
+    <plugin_priority>15</plugin_priority>
+    <plugin_name>Blog</plugin_name>
+    <plugin_description>Blog plugin for Monstra</plugin_description>
+    <plugin_version>1.7.3</plugin_version>
+    <plugin_author>Awilum</plugin_author>
+    <plugin_author_uri>http://monstra.org/</plugin_author_uri>
+</root>

plugins/blog/languages/en.lang.php

@@ -0,0 +1,12 @@
+<?php
+
+    return array(
+        'blog' => array(
+            'Blog' => 'Blog',
+            'Blog plugin for Monstra' => 'Blog plugin for Monstra',
+            'begin' => 'begin',
+            'end' => 'end',
+            'prev' => 'prev',
+            'next' => 'next',
+        ) 
+    );

plugins/blog/languages/pl.lang.php

@@ -0,0 +1,12 @@
+<?php
+
+    return array(
+        'blog' => array(
+            'Blog' => 'Blog',
+            'Blog plugin for Monstra' => 'Wtyczka Blog dla systemu Monstra',
+            'begin' => 'początek',
+            'end' => 'koniec',
+            'prev' => 'poprzedni',
+            'next' => 'następny',
+        ) 
+    );

plugins/blog/languages/ru.lang.php

@@ -0,0 +1,13 @@
+<?php
+
+    return array(
+        'blog' => array(
+            'Blog' => 'Блог',
+            'Blog plugin for Monstra' => 'Плагин блога для Monstra',
+            'begin' => 'начало',
+            'end' => 'конец',
+            'prev' => 'назад',
+            'next' => 'вперед',
+            'Related posts' => 'Статьи по теме',
+        ) 
+    );

plugins/blog/languages/sr.lang.php

@@ -0,0 +1,11 @@
+<?php
+    return array(
+        'blog' => array(
+            'Blog' => 'Blog',
+            'Blog plugin for Monstra' => 'Blog, dodatak za Monstra',
+            'begin' => 'početak',
+            'end' => 'kraj',
+            'prev' => 'predhodna',
+            'next' => 'sledeća',
+        ) 
+    );

plugins/blog/languages/tr.lang.php

@@ -0,0 +1,12 @@
+<?php
+
+    return array(
+        'blog' => array(
+            'Blog' => 'Günce',
+            'Blog plugin for Monstra' => 'Monstra için günce eklentisi',
+            'begin' => 'Baş',
+            'end' => 'Son',
+            'prev' => 'Önceki',
+            'next' => 'Sonraki',
+        ) 
+    );

plugins/blog/rss.php

@@ -0,0 +1,34 @@
+<?php
+
+// Get all posts for blog parent page/post
+$posts = Pages::$pages->select('[parent="'.Blog::$parent_page_name.'" and status="published"]', 5, 0, array('slug', 'title', 'author', 'date'), 'date', 'DESC');
+
+// Date now
+$now = date("D, d M Y H:i:s T");
+ob_end_clean();
+?>
+<?php header('Content-type: text/xml; charset="utf-8"'); ?>
+<?php echo'<?xml version="1.0" encoding="utf-8"?>'."\n"; ?>
+<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+<title>MonstraCMS::BLOG::RSS</title>
+<link><?php echo Option::get('siteurl'); ?>/blog</link>
+<description>The latest updates for <?php echo Option::get('sitename'); ?>.</description>
+<language>en-us</language>
+<pubDate><?php echo $now; ?></pubDate>
+<lastBuildDate><?php echo $now; ?></lastBuildDate>
+<atom:link href="<?php echo Option::get('siteurl'); ?>/rss.php" rel="self" type="application/rss+xml" />
+<generator>Monstra</generator>
+<?php foreach ($posts as $post) { ?>
+<item>
+<title><?php echo $post['title']; ?></title>
+<link><?php echo Option::get('siteurl').'/blog/'.$post['slug']; ?></link>
+<guid><?php echo Option::get('siteurl').'/blog/'.$post['slug']; ?></guid>
+<pubDate><?php echo Date::format($post['date'], 'd M Y'); ?></pubDate>
+<description><![CDATA[<?php echo Text::toHtml(Text::cut(File::getContent(STORAGE . DS . 'pages' . DS . $post['id'] . '.page.txt'), 300)); ?>]]></description>
+<author><?php echo $post['author']; ?></author>
+</item>
+<?php } ?>
+</channel>
+</rss>
+<?php Response::status(200); ?>

plugins/blog/views/frontend/block.view.php

@@ -0,0 +1,7 @@
+<?php foreach($posts as $post) { ?>
+    <h3 class="monstra-blog-title"><a href="<?php echo Option::get('siteurl'); ?>/<?php echo Blog::$parent_page_name; ?>/<?php echo $post['slug'] ?>"><?php echo $post['title']; ?></a></h3>
+    <small class="monstra-blog-date"><?php echo Date::format($post['date'], 'd M Y'); ?></small>
+    <div class="monstra-blog-post">
+	    <?php echo $post['content']; ?>
+    </div>    
+<?php } ?>

plugins/blog/views/frontend/breadcrumbs.view.php

@@ -0,0 +1,5 @@
+<?php if ($parent) { ?>
+    <a href="<?php echo Site::url()."/".$page['parent']; ?><?php if(Notification::get('tag')) { ?>?tag=<?php echo Notification::get('tag'); ?><?php } ?>"><?php echo $parent_page['title']; ?></a>&nbsp;<span>&rarr;</span>&nbsp;<a href="<?php echo Site::url().$page['parent'].'/'.$page['slug']; ?>"><?php echo $page['title']; ?></a>
+<?php } else { ?>
+    <a href="<?php echo Site::url()."/".$page['slug']; ?><?php if(Notification::get('tag')) { ?>?tag=<?php echo Notification::get('tag'); ?><?php } ?>"><?php echo $page['title']; ?></a>
+<?php } ?>

plugins/blog/views/frontend/index.view.php

@@ -0,0 +1,7 @@
+<?php foreach($posts as $post) { ?>
+    <h3 class="monstra-blog-title"><a href="<?php echo Option::get('siteurl'); ?>/<?php echo Blog::$parent_page_name; ?>/<?php echo $post['slug'] ?>"><?php echo $post['title']; ?></a></h3>
+    <small class="monstra-blog-date"><?php echo Date::format($post['date'], 'd M Y'); ?> / <?php echo $post['author']; ?></small>
+    <div class="monstra-blog-post">
+	    <?php echo $post['content']; ?>
+    </div>    
+<?php } ?>

plugins/blog/views/frontend/pager.view.php

@@ -0,0 +1,29 @@
+<br><br>
+<?php
+
+    if (Request::get('tag')) $tag = '&tag='.Request::get('tag'); else $tag = '';
+
+    $neighbours = 6;
+    $left_neighbour = $page - $neighbours;
+    if ($left_neighbour < 1) $left_neighbour = 1;
+
+    $right_neighbour = $page + $neighbours;
+    if ($right_neighbour > $pages) $right_neighbour = $pages;
+
+    if ($page > 1) {
+        echo ' <a href="?page=1'.$tag.'">'.__('begin', 'blog').'</a> ... <a href="?page=' . ($page-1) . $tag.'"> '.__('prev', 'blog').'</a> ';
+    }
+
+    for ($i=$left_neighbour; $i<=$right_neighbour; $i++) {
+        if ($i != $page) {
+            echo ' <a href="?page=' . $i . $tag.'">' . $i . '</a> ';
+        } else {
+            echo ' <b>' . $i . '</b> ';
+        }
+    }
+
+    if ($page < $pages) {
+        echo  ' <a href="?page=' . ($page+1) . $tag.'">'.__('next', 'blog').'</a> ... <a href="?page=' . $pages . $tag.'">'.__('end', 'blog').'</a> ';
+    }
+
+?>

plugins/blog/views/frontend/related_posts.view.php

@@ -0,0 +1,7 @@
+<br><br>
+<b><?php echo __('Related posts', 'blog'); ?>:</b>
+<div>
+<?php foreach($related_posts as $related_post) { ?>
+<a href="<?php echo Option::get('siteurl'); ?>/<?php echo Blog::$parent_page_name; ?>/<?php echo $related_post['slug']; ?>"><?php echo $related_post['title']; ?></a><br>
+<?php } ?>
+</div>

plugins/blog/views/frontend/tags.view.php

@@ -0,0 +1,3 @@
+<?php foreach($tags as $tag) { ?>
+    <a href="<?php echo Option::get('siteurl'); ?>/<?php echo Blog::$parent_page_name; ?>?tag=<?php echo $tag; ?>" class="monstra-blog-tag"><span class="label label-primary"><?php echo $tag; ?></span></a>
+<?php } ?>

plugins/box/backup/backup.admin.php

@@ -15,8 +15,6 @@ class BackupAdmin extends Backend
     {
         $backups_path = ROOT . DS . 'backups';
 
-        $backups_list = array();
-
         // Create backup
         // -------------------------------------
         if (Request::post('create_backup')) {
@@ -32,12 +30,18 @@ class BackupAdmin extends Backend
                 $zip->readDir(STORAGE . DS, false);
 
                 // Add public folder
-                if (Request::post('add_public_folder')) $zip->readDir(ROOT . DS . 'public' . DS, false);
+                $zip->readDir(ROOT . DS . 'public' . DS, false);
 
                 // Add plugins folder
-                if (Request::post('add_plugins_folder')) $zip->readDir(PLUGINS . DS, false);
+                $zip->readDir(PLUGINS . DS, false, null, array(PLUGINS . DS . 'box'));
 
-                $zip->archive($backups_path . DS . Date::format(time(), "Y-m-d-H-i-s").'.zip');
+                if ($zip->archive($backups_path . DS . Date::format(time(), "Y-m-d-H-i-s").'.zip')) {
+                    Notification::set('success', __('Backup was created', 'backup'));
+                } else {
+                    Notification::set('error', __('Backup was not created', 'backup'));
+                }
+
+                Request::redirect(Option::get('siteurl').'/admin/index.php?id=backup');
 
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
@@ -48,8 +52,13 @@ class BackupAdmin extends Backend
 
             if (Security::check(Request::get('token'))) {
 
-                File::delete($backups_path . DS . Request::get('delete_file'));
+                if (File::delete($backups_path . DS . Request::get('delete_file'))) {
-                Request::redirect(Option::get('siteurl').'admin/index.php?id=backup');
+                    Notification::set('success', __('Backup was deleted', 'backup'));
+                } else {
+                    Notification::set('error', __('Backup was not deleted', 'backup'));
+                }
+                
+                Request::redirect(Option::get('siteurl').'/admin/index.php?id=backup');
 
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
@@ -62,12 +71,34 @@ class BackupAdmin extends Backend
             } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
         }
 
-        // Get backup list
+        // Restore backup
-        $backups_list = File::scan($backups_path, '.zip');
+        // -------------------------------------
+        if (Request::get('restore')) {
+
+            if (Security::check(Request::get('token'))) {
+
+                $tmp_dir = ROOT . DS . 'tmp' . DS . uniqid('backup_');
+
+                if (Dir::create($tmp_dir)) {
+                    $file_locations = Zip::factory()->extract($backups_path . DS . Request::get('restore'), $tmp_dir);
+                     if (!empty($file_locations)) {
+                         Dir::copy($tmp_dir, ROOT . DS);
+                         Notification::set('success', __('Backup was restored', 'backup'));
+                     } else {
+                         Notification::set('error', __('Unzip error', 'backup'));
+                     }
+                } else {
+                    Notification::set('error', __('Backup was not restored', 'backup'));
+                }
+
+                Request::redirect(Option::get('siteurl').'/admin/index.php?id=backup');
+
+            } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
+        }
 
         // Display view
         View::factory('box/backup/views/backend/index')
-                ->assign('backups_list', $backups_list)
+                ->assign('backups_list', File::scan($backups_path, '.zip'))
                 ->display();
     }
 }

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

@@ -3,8 +3,10 @@
     return array(
         'backup' => array(
     		'Backups' => 'Backups',
+    		'Backup' => 'Backup',
             'Backup Date' => 'Backup Date',
     		'Create Backup' => 'Create Backup',
+    		'Restore' => 'Restore',
     		'Delete' => 'Delete',
             'storage' => 'storage',
             'public' => 'public',
@@ -13,5 +15,12 @@
             'Actions' => 'Actions',
             'Delete backup: :backup' => 'Delete backup: :backup',
             'Creating...' => 'Creating...',
+            'Backup was created' => 'Backup was created',
+            'Backup was not created' => 'Backup was not created',
+            'Backup was deleted' => 'Backup was deleted',
+            'Backup was not deleted' => 'Backup was not deleted',
+            'Backup was restored' => 'Backup was restored',
+            'Unzip error' => 'Unzip error',
+            'Backup was not restored' => 'Backup was not restored',
         )
-	);
+	);

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

@@ -1,17 +1,26 @@
 <?php
 
     return array(
-        'backup' => array(
+            'backup' => array(
-    		'Backups' => 'Backup',
+    	       'Backups' => 'Backups',
-            'Backup date' => 'Backup dia',
+	       'Backup' => 'Backup',
-    		'Create Backup' => 'Crear Backup',
+            'Backup Date' => 'Fecha del backup',
-    		'Delete' => 'Borrar',
+    	       'Create Backup' => 'Crear backup',
-            'storage' => 'Almacen',
+	       'Restore' => 'Restaurar', 
-            'public' => 'publico',
+	       'Delete' => 'Eliminar',
+            'storage' => 'Almacenamiento',
+            'public' => 'público',
             'plugins' => 'plugins',
             'Size' => 'Tamaño',
             'Actions' => 'Acciones',
-            'Delete backup: :backup' => 'Borrar Backup: :backup',
+            'Delete backup: :backup' => 'Eliminar backup: :backup',
-            'Creating...' => 'Creando...',
+            'Creating...' => 'Creando...', 
+            'Backup was created' => 'El backup fue creado',
+            'Backup was not created' => 'El backup no fue creado',
+            'Backup was deleted' => 'El backup fue eliminado',
+            'Backup was not deleted' => 'El backup no fue eliminado',
+            'Backup was restored' => 'El backup fue restaurado',
+            'Unzip error' => 'Error de descompresión',
+            'Backup was not restored' => 'El backup no fue restaurado',
         )
-	);
+	);

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

@@ -0,0 +1,17 @@
+<?php
+
+    return array(
+        'backup' => array(
+                    'Backups' => 'Cadangan',
+            'Backup date' => 'Tanggal Cadangan',
+                    'Create Backup' => 'Buat Cadangan',
+                    'Delete' => 'Hapus',
+            'storage' => 'Penyimpanan',
+            'public' => 'Umum',
+            'plugins' => 'Plugins',
+            'Size' => 'Ukuran',
+            'Actions' => 'Tindakan',
+            'Delete backup: :backup' => 'Hapus Cadangan: :backup',
+            'Creating...' => 'Dibuat...',
+        )
+        );

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

@@ -0,0 +1,17 @@
+<?php
+
+    return array(
+        'backup' => array(
+    		'Backups' => 'バックアップ',
+            'Backup Date' => 'バックアップ日',
+    		'Create Backup' => 'バックアップの作成',
+    		'Delete' => '削除',
+            'storage' => 'ストレージ',
+            'public' => '公開',
+            'plugins' => 'プラグイン',
+            'Size' => 'サイズ',
+            'Actions' => 'アクション',
+            'Delete backup: :backup' => 'バックアップの削除: :backup',
+            'Creating...' => '作成中...',
+        )
+	);

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

@@ -13,5 +13,9 @@
             'Actions' => 'Действия',
             'Delete backup: :backup' => 'Удалить бекап: :backup',
             'Creating...' => 'Создание...',
+            'Backup was deleted' => 'Бекап не был создан',
+            'Backup was created' => 'Бекап был создан',
+            'Backup was not restored' => 'Бекап не был восстановлен',
+            'Backup was restored' => 'Бекап был восстановлен',
         )
     );

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

@@ -3,7 +3,7 @@
     return array(
         'backup' => array(
             'Backups' => 'Bekapovi',
-            'Backup' => 'Backup',
+            'Backup' => 'Backap',
             'Create Backup' => 'Kreiraj Bekap',
             'Delete' => 'Obriši',
             'storage' => 'lokacija arhive',

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

@@ -0,0 +1,26 @@
+<?php
+
+    return array(
+        'backup' => array(
+    		'Backups' => 'Yedekler',
+    		'Backup' => 'Yedek',
+            'Backup Date' => 'Yedekleme Tarihi',
+    		'Create Backup' => 'Yedek Al',
+    		'Delete' => 'Sil',
+    		'Restore' => 'Geri Yükle',
+            'storage' => 'depo',
+            'public' => 'genel',
+            'plugins' => 'eklentiler',
+            'Size' => 'Boyut',
+            'Actions' => 'Eylemler',
+            'Delete backup: :backup' => ':backup adlı yedek silinsin mi',
+            'Creating...' => 'Oluşturuluyor...',
+            'Backup was created' => 'Yedek oluşturuldu',
+            'Backup was not created' => 'Yedek oluşturulmadı',
+            'Backup was deleted' => 'Yedek silindi',
+            'Backup was not deleted' => 'Yedek silinmedi',
+            'Backup was restored' => 'Yedek geri yüklendi',
+            'Unzip error' => 'Sıkıştırılmış yedeği açma (unzip) hatası',
+            'Backup was not restored' => 'Yedek geri yüklenmedi',
+        )
+	);

plugins/box/backup/languages/zh-cn.lang.php

@@ -0,0 +1,17 @@
+<?php
+
+    return array(
+        'backup' => array(
+    		'Backups' => '备份',
+            'Backup Date' => '备份日期',
+    		'Create Backup' => '创建备份',
+    		'Delete' => '删除',
+            'storage' => '存储',
+            'public' => '公开',
+            'plugins' => '插件',
+            'Size' => '大小',
+            'Actions' => '操作',
+            'Delete backup: :backup' => '删除备份: :backup',
+            'Creating...' => '正在创建...',
+        )
+	);

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

@@ -1,30 +1,28 @@
-<h2><?php echo __('Backups', 'backup'); ?></h2>
+<script>$().ready(function(){$('[name=create_backup]').click(function(){$(this).button('loading');});});</script>
-<br />
 
-<?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
+<div class="vertical-align margin-bottom-1">
-
+    <div class="text-left row-phone">
-<script>
+        <h2><?php echo __('Backups', 'backup'); ?></h2>
-$().ready(function(){$('[name=create_backup]').click(function(){$(this).button('loading');});});
+    </div>
-</script>
+    <div class="text-right row-phone">
-
+        <?php
-<?php
+            echo (
-    echo (
+                Form::open(null, array('class' => 'form-inline')) .
-        Form::open() .
+                Form::hidden('csrf', Security::token()).
-        Form::hidden('csrf', Security::token()).
+                Form::submit('create_backup', __('Create Backup', 'backup'), array('class' => 'btn btn-phone btn-primary', 'data-loading-text' => __('Creating...', 'backup'))).
-        Form::checkbox('add_storage_folder', null, true, array('disabled' => 'disabled')) . ' ' . __('storage', 'backup') . ' ' . Html::nbsp(2) .
+                Form::close()
-        Form::checkbox('add_public_folder') . ' ' . __('public', 'backup') . ' ' . Html::nbsp(2) .
+            );
-        Form::checkbox('add_plugins_folder') . ' ' . __('plugins', 'backup') . ' ' . Html::nbsp(2) .
+        ?>
-        Form::submit('create_backup', __('Create Backup', 'backup'), array('class' => 'btn', 'data-loading-text' => __('Creating...', 'backup'))).
+    </div>
-        Form::close()
+</div>
-    );
-?>
 
 <!-- Backup_list -->
+<div class="table-responsive">
 <table class="table table-bordered">
     <thead>
         <tr>
             <th><?php echo __('Backup', 'backup'); ?></th>
-            <th><?php echo __('Size', 'backup'); ?></th>
+            <th class="visible-lg hidden-xs"><?php echo __('Size', 'backup'); ?></th>
             <th></th>
         </tr>
     </thead>
@@ -33,14 +31,21 @@ $().ready(function(){$('[name=create_backup]').click(function(){$(this).button('
     <tr>
         <td>
             <?php $name = strtotime(str_replace('-', '', basename($backup, '.zip'))); ?>
-            <?php echo Html::anchor(Date::format($name, 'F jS, Y - g:i A'), Option::get('siteurl').'admin/index.php?id=backup&download='.$backup.'&token='.Security::token()); ?>
+            <?php echo Html::anchor(Date::format($name, 'F jS, Y - g:i A'), Option::get('siteurl').'/admin/index.php?id=backup&download='.$backup.'&token='.Security::token()); ?>
         </td>
-        <td><?php echo Number::byteFormat(filesize(ROOT . DS . 'backups' . DS . $backup)); ?></td>
+        <td class="visible-lg hidden-xs"><?php echo Number::byteFormat(filesize(ROOT . DS . 'backups' . DS . $backup)); ?></td>
         <td>
             <div class="pull-right">
+            <?php
+				if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
+					echo Html::anchor(__('Restore', 'backup'),
+						'index.php?id=backup&restore='.$backup.'&token='.Security::token(),
+							  array('class' => 'btn btn-primary'));
+				}
+            ?>
             <?php echo Html::anchor(__('Delete', 'backup'),
                       'index.php?id=backup&delete_file='.$backup.'&token='.Security::token(),
-                       array('class' => 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete backup: :backup', 'backup', array(':backup' => Date::format($name, 'F jS, Y - g:i A')))."')"));
+                       array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete backup: :backup', 'backup', array(':backup' => Date::format($name, 'F jS, Y - g:i A')))."')"));
             ?>
             </div>
         </td>
@@ -48,4 +53,5 @@ $().ready(function(){$('[name=create_backup]').click(function(){$(this).button('
     <?php } ?>
     </tbody>
 </table>
+</div>
 <!-- /Backup_list -->

plugins/box/blocks/blocks.admin.php

@@ -2,6 +2,7 @@
 
 // Add plugin navigation link
 Navigation::add(__('Blocks', 'blocks'), 'content', 'blocks', 2);
+Dashboard::addNewItem('blocks', __('Blocks', 'blocks'), 'index.php?id=blocks&action=add_block', 2);
 
 /**
  * Blocks Admin Class

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Embed Code',
             'Shortcode' => 'Shortcode',
             'PHP Code' => 'PHP Code',
+            'Cancel' => 'Abbrechen',
         )
     );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Embed Code',
             'Shortcode' => 'Shortcode',
             'PHP Code' => 'PHP Code',
+            'Cancel' => 'Cancel',
         )
     );

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

@@ -3,27 +3,28 @@
     return array(
         'blocks' => array(
             'Blocks' => 'Bloques',
-            'Blocks manager' => 'Administrar bloques',
+            'Blocks manager' => 'Administrador de bloques',
-            'Delete' => 'Borrar',
+            'Delete' => 'Eliminar',
             'Edit' => 'Editar',
             'Name' => 'Nombre',
             'Create New Block' => 'Crear nuevo bloque',
-            'New block' => 'Nuevo bloque',
+            'New Block' => 'Nuevo bloque',
-            'Edit block' => 'Editar bloque',
+            'Edit Block' => 'Editar bloque',
             'Save' => 'Guardar',
             'Save and Exit' => 'Guardar y salir',
             'Actions' => 'Acciones',
             'Required field' => 'Dato requerido',
-            'This block already exists' => 'Este bloque ya esiste',
+            'This block already exists' => 'Este bloque ya existe',
-            'This block does not exist' => 'Este bloque no esiste',
+            'This block does not exist' => 'Este bloque no existe',
-            'Delete block: :block' => 'Borrar bloque: :block',
+            'Delete block: :block' => 'Eliminar bloque: :block',
             'Block content' => 'Contenido del bloque',
-            'Block <i>:name</i> deleted' => 'bloque <i>:name</i> borrdo',
+            'Block <i>:name</i> deleted' => 'Bloque <i>:name</i> eliminado',
-            'Your changes to the block <i>:name</i> have been saved.' => 'Tus cambios en el bloque <i>:name</i> han sido guardados.',
+            'Your changes to the block <i>:name</i> have been saved.' => 'Sus cambios en el bloque <i>:name</i> han sido guardados.',
-            'Delete block: :block' => 'Borrar bloque: :block',
+            'Delete block: :block' => 'Eliminar bloque: :block',
-            'View Embed Code' => 'Ver codigo para incrustar',
+            'View Embed Code' => 'Ver código incrustado',
-            'Embed Code' => 'Codigo para incrustar',
+            'Embed Code' => 'Incrustar código',
-            'Shortcode' => 'Codigo corto',
+            'Shortcode' => 'Código corto',
-            'PHP Code' => 'Codigo PHP',
+            'PHP Code' => 'Código PHP',
+            'Cancel' => 'Cancelar',
         )
-    );
+    );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'کد درج شده', 
             'Shortcode' => 'کدکوتاه',
             'PHP Code' => 'کد PHP',
+            'Cancel' => 'Cancel',
         )
     );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Code intégré', 
             'Shortcode' => 'Code court',
             'PHP Code' => 'Code PHP',
+            'Cancel' => 'Cancel',
         )
     );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Beágyazott kód',
             'Shortcode' => 'Shortcode',
             'PHP Code' => 'PHP Code',
+            'Cancel' => 'Cancel',
         )
     );

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

@@ -0,0 +1,29 @@
+<?php
+
+    return array(
+        'blocks' => array(
+            'Blocks' => 'Block',
+            'Blocks manager' => 'Pengelolaan Block',
+            'Delete' => 'Hapus',
+            'Edit' => 'Perbaiki',
+            'Name' => 'Nama',
+            'Create New Block' => 'Buat Block Baru',
+            'New Block' => 'Block Baru',
+            'Edit Block' => 'Edit Block',
+            'Save' => 'Simpan',
+            'Save and Exit' => 'Simpan dan Keluar',
+            'Actions' => 'Tindakan',
+            'Required field' => 'Isian yang Dibutuhkan',
+            'This block already exists' => 'Block ini sudah ada',
+            'This block does not exist' => 'Block ini belum ada',
+            'Delete block: :block' => 'Hapus Block: :block',
+            'Block content' => 'Isi Block',
+            'Block <i>:name</i> deleted' => 'Block <i>:nama</i> dihapus',
+            'Your changes to the block <i>:name</i> have been saved.' => 'Perubahan pada block <i>:nama</i> telah disimpan.',
+            'Delete block: :block' => 'Hapus Block: :block',
+            'View Embed Code' => 'Lihat Embed Code',
+            'Embed Code' => 'Embed Code',
+            'Shortcode' => 'Shortcode',
+            'PHP Code' => 'PHP Code',
+        )
+    );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Embed Code',
             'Shortcode' => 'Shortcode',
             'PHP Code' => 'PHP Code',
+            'Cancel' => 'Cancel',
         )
     );

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

@@ -0,0 +1,29 @@
+<?php
+
+    return array(
+        'blocks' => array(
+            'Blocks' => 'ブロック',
+            'Blocks manager' => 'ブロックの管理',
+            'Delete' => '削除',
+            'Edit' => '編集',
+            'Name' => '名前',
+            'Create New Block' => '新しいブロックを作成',
+            'New Block' => '新しいブロック',
+            'Edit Block' => 'ブロックを編集',
+            'Save' => '保存',
+            'Save and Exit' => '保存して終了',
+            'Actions' => 'アクション',
+            'Required field' => '必須項目',
+            'This block already exists' => 'このブロックはすでに存在しています',
+            'This block does not exist' => 'このブロックは存在していません',
+            'Delete block: :block' => 'ブロックの削除: :block',
+            'Block content' => 'ブロックの内容',
+            'Block <i>:name</i> deleted' => '<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/ka-ge.lang.php

@@ -0,0 +1,30 @@
+<?php
+
+    return array(
+        'blocks' => array(
+            'Blocks' => 'ბლოკები',
+            'Blocks manager' => 'ბლოკების მენეჯერი',
+            'Delete' => 'წაშლა',
+            'Edit' => 'რედაქტირება',
+            'New Block' => 'ახალი ბლოკი',
+            'Create New Block' => 'ახალი ბლოკის შექმნა',
+            'Name' => 'სახელი',
+            'Edit Block' => 'ბლოკის რედაქტირება',
+            'Save' => 'შენახვა',
+            'Actions' => 'მოქმედება',
+            'Save and Exit' => 'შენახვა და შემდეგ გამოსვლა',
+            'Required field' => 'აუცილებელი ველი',
+            'This block already exists' => 'ასეთი ბლოკი უკვე არსებობს',
+            'This block does not exist' => 'ასეთი ბლოკი არ არსებობს',
+            'Delete block: :block' => 'ბლოკის წაშლა: :block',
+            'Block content' => 'ბლოკის შემადგენლობა',
+            'Block <i>:name</i> deleted' => 'ბლოკი <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' => 'Shortcode-ი',
+            'PHP Code' => 'PHP კოდი',
+            'Cancel' => 'გაუქმება',
+        )
+    );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Embed Code',
             'Shortcode' => 'Shortcode',
             'PHP Code' => 'PHP Code',
+            'Cancel' => 'Cancel',
         )
     );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Insluitcode',
             'Shortcode' => 'Verkorte code',
             'PHP Code' => 'PHP Code',
+            'Cancel' => 'Cancel',
         )
     );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Osadzony kod',
             'Shortcode' => 'Krótki kod (shortcode)',
             'PHP Code' => 'Kod PHP',
+            'Cancel' => 'Cancel',
         )
     );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Embed Code',
             'Shortcode' => 'Shortcode',
             'PHP Code' => 'PHP Code',
+            'Cancel' => 'Cancel',
         )
     );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Код для вставки',
             'Shortcode' => 'Шорткод',
             'PHP Code' => 'PHP код',
+            'Cancel' => 'Отмена',
         )
     );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Vložený kód',
             'Shortcode' => 'Skrátený kód',
             'PHP Code' => 'PHP kód',
+            'Cancel' => 'Cancel',
         )
     );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Embed Kod', 
             'Shortcode' => 'Kratak kod',
             'PHP Code' => 'PHP kod',
+            'Cancel' => 'Otkaži',
         )
-    );
+    );

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

@@ -0,0 +1,30 @@
+<?php
+
+    return array(
+        'blocks' => array(
+            'Blocks' => 'Bloklar',
+            'Blocks manager' => 'Blok yöneticisi',
+            'Delete' => 'Sil',
+            'Edit' => 'Düzenle',
+            'Name' => 'Ad',
+            'Create New Block' => 'Yeni Blok Oluştur',
+            'New Block' => 'Yeni Blok',
+            'Edit Block' => 'Bloğu Düzenle',
+            'Save' => 'Kaydet',
+            'Save and Exit' => 'Kaydet ve Çık',
+            'Actions' => 'İşlemler',
+            'Required field' => 'Zorunlu alan',
+            'This block already exists' => 'Bu blok zaten var.',
+            'This block does not exist' => 'Blok bulunamadı.',
+            'Delete block: :block' => ':block adlı blok silinsin mi',
+            'Block content' => 'Blok içeriği',
+            'Block <i>:name</i> deleted' => '<i>:name</i> adlı blok silindi.',
+            'Your changes to the block <i>:name</i> have been saved.' => 'Değişiklikler <i>:name</i> bloğuna kaydedildi.',
+            'Delete block: :block' => ':block adlı blok silinsin mi',
+            'View Embed Code' => 'Gömülür Kodu Görüntüle',
+            'Embed Code' => 'Gömülür Kodu',
+            'Shortcode' => 'Kısa Kod',
+            'PHP Code' => 'PHP Kodu',
+            'Cancel' => 'Vazgeç',
+        )
+    );

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

@@ -25,5 +25,6 @@
             'Embed Code' => 'Код для вставки',
             'Shortcode' => 'Шорткод',
             'PHP Code' => 'PHP код',
+            'Cancel' => 'Відмінити',
         )
     );

plugins/box/blocks/languages/zh-cn.lang.php

@@ -0,0 +1,29 @@
+<?php
+
+    return array(
+        'blocks' => array(
+            'Blocks' => '版块',
+            'Blocks manager' => '版块管理',
+            'Delete' => '删除',
+            'Edit' => '编辑',
+            'Name' => '名称',
+            'Create New Block' => '创建新版块',
+            'New Block' => '新版块',
+            'Edit Block' => '编辑版块',
+            'Save' => '保存',
+            'Save and Exit' => '保存并退出',
+            'Actions' => '操作',
+            'Required field' => '必填字段',
+            'This block already exists' => '此版块已存在',
+            'This block does not exist' => '此版块不存在',
+            'Delete block: :block' => '删除版块: :block',
+            'Block content' => '版块内容',
+            'Block <i>:name</i> deleted' => '版块 <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/views/backend/add.view.php

@@ -1,7 +1,4 @@
-<h2><?php echo __('New Block', 'blocks'); ?></h2>
+<h2 class="margin-bottom-1"><?php echo __('New Block', 'blocks'); ?></h2>
-<br />
-
-<?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
 <?php if (isset($errors['blocks_empty_name']) or isset($errors['blocks_exists'])) $error_class = 'error'; else $error_class = ''; ?>
 
@@ -9,25 +6,26 @@
 
 <?php echo (Form::hidden('csrf', Security::token())); ?>
 
-    <?php echo (Form::label('name', __('Name', 'blocks'))); ?>
+<div class="form-group margin-bottom-1">
+  <?php echo (Form::label('name', __('Name', 'blocks'))); ?>
+  <?php echo (Form::input('name', $name, array('class' => (isset($errors['blocks_empty_name']) || isset($errors['blocks_exists'])) ? 'form-control error-field' : 'form-control'))); ?>
+  <?php
+      if (isset($errors['blocks_empty_name'])) echo '<span class="error-message">'.$errors['blocks_empty_name'].'</span>';
+      if (isset($errors['blocks_exists'])) echo '<span class="error-message">'.$errors['blocks_exists'].'</span>';
+  ?>
+</div>
 
-    <?php echo (Form::input('name', $name, array('class' => (isset($errors['blocks_empty_name']) || isset($errors['blocks_exists'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))); ?>
+<div class="row margin-bottom-1">
+    <div class="col-xs-12">
+        <?php Action::run('admin_editor', array(Html::toText($content))); ?>
+    </div>
+</div>
 
-    <?php
-        if (isset($errors['blocks_empty_name'])) echo '&nbsp;&nbsp;&nbsp;<span style="color:red">'.$errors['blocks_empty_name'].'</span>';
-        if (isset($errors['blocks_exists'])) echo '&nbsp;&nbsp;&nbsp;<span style="color:red">'.$errors['blocks_exists'].'</span>';
-    ?>
-
-<br /><br />
 <?php
-
-    Action::run('admin_editor', array(Html::toText($content)));
-
     echo (
-       Html::br().
+       Form::submit('add_blocks_and_exit', __('Save and Exit', 'blocks'), array('class' => 'btn btn-phone btn-primary')).Html::nbsp(2).
-       Form::submit('add_blocks_and_exit', __('Save and Exit', 'blocks'), array('class' => 'btn')).Html::nbsp(2).
+       Form::submit('add_blocks', __('Save', 'blocks'), array('class' => 'btn btn-phone btn-primary')).Html::nbsp(2).
-       Form::submit('add_blocks', __('Save', 'blocks'), array('class' => 'btn')).
+       Html::anchor(__('Cancel', 'blocks'), 'index.php?id=blocks', array('title' => __('Cancel', 'blocks'), 'class' => 'btn btn-phone btn-default')).
        Form::close()
     );
-
 ?>

plugins/box/blocks/views/backend/edit.view.php

@@ -1,7 +1,4 @@
-<h2><?php echo __('Edit Block', 'blocks'); ?></h2>
+<h2 class="margin-bottom-1"><?php echo __('Edit Block', 'blocks'); ?></h2>
-<br />
-
-<?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
 
 <?php
     if ($content !== null) {
@@ -9,31 +6,32 @@
         if (isset($errors['blocks_empty_name']) or isset($errors['blocks_exists'])) $error_class = 'error'; else $error_class = '';
 
         echo (Form::open());
-
         echo (Form::hidden('csrf', Security::token()));
-
         echo (Form::hidden('blocks_old_name', Request::get('filename')));
 
 ?>
 
-    <?php echo (Form::label('name', __('Name', 'blocks'))); ?>
+        <div class="form-group margin-bottom-1">
-
+        <?php echo (Form::label('name', __('Name', 'blocks'))); ?>
-        <?php echo (Form::input('name', $name, array('class' => (isset($errors['blocks_empty_name']) || isset($errors['blocks_exists'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))); ?>
+        <?php echo (Form::input('name', $name, array('class' => (isset($errors['blocks_empty_name']) || isset($errors['blocks_exists'])) ? 'form-control error-field' : 'form-control'))); ?>
-
         <?php
-            if (isset($errors['blocks_empty_name'])) echo '&nbsp;&nbsp;&nbsp;<span style="color:red">'.$errors['blocks_empty_name'].'</span>';
+            if (isset($errors['blocks_empty_name'])) echo '<span class="error-message">'.$errors['blocks_empty_name'].'</span>';
-            if (isset($errors['blocks_exists'])) echo '&nbsp;&nbsp;&nbsp;<span style="color:red">'.$errors['blocks_exists'].'</span>';
+            if (isset($errors['blocks_exists'])) echo '<span class="error-message">'.$errors['blocks_exists'].'</span>';
         ?>
+        </div>
 
-<br /><br />
-<?php
 
-        Action::run('admin_editor', array(Html::toText($content)));
+<div class="row margin-bottom-1">
+    <div class="col-xs-12">
+        <?php Action::run('admin_editor', array(Html::toText($content))); ?>
+    </div>
+</div>
 
+<?php      
         echo (
-           Html::br().
+           Form::submit('edit_blocks_and_exit', __('Save and Exit', 'blocks'), array('class' => 'btn btn-phone btn-primary')).Html::nbsp(2).
-           Form::submit('edit_blocks_and_exit', __('Save and Exit', 'blocks'), array('class' => 'btn default')).Html::nbsp(2).
+           Form::submit('edit_blocks', __('Save', 'blocks'), array('class' => 'btn btn-phone btn-primary')). Html::nbsp(2).
-           Form::submit('edit_blocks', __('Save', 'blocks'), array('class' => 'btn default')). Html::nbsp().
+           Html::anchor(__('Cancel', 'blocks'), 'index.php?id=blocks', array('title' => __('Cancel', 'blocks'), 'class' => 'btn btn-phone btn-default')).
            Form::close()
         );
 

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

@@ -1,15 +1,15 @@
-<h2><?php echo __('Blocks', 'blocks'); ?></h2>
+<div class="vertical-align margin-bottom-1">
-<br />
+    <div class="text-left row-phone">
-
+        <h2><?php echo __('Blocks', 'blocks'); ?></h2>
-<?php if(Notification::get('success')) Alert::success(Notification::get('success')); ?>
+    </div>
-
+    <div class="text-right row-phone">
-<?php
+        <?php
-    echo (
+            echo (
-            Html::anchor(__('Create New Block', 'blocks'), 'index.php?id=blocks&action=add_block', array('title' => __('Create New Block', 'blocks'), 'class' => 'btn default btn-small')). Html::nbsp(3)
+                Html::anchor(__('Create New Block', 'blocks'), 'index.php?id=blocks&action=add_block', array('title' => __('Create New Block', 'blocks'), 'class' => 'btn btn-phone btn-primary'))
-        );
+            );
-?>
+        ?>
-
+    </div>
-<br /><br />
+</div>
 
 <!-- Blocks_list -->
 <table class="table table-bordered">
@@ -24,20 +24,21 @@
     <tr>
         <td><?php echo basename($block, '.block.html'); ?></td>
         <td>
-            <div class="pull-right">
+            <div class="pull-right">            
-            <div class="btn-toolbar">
                 <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'blocks'), 'index.php?id=blocks&action=edit_block&filename='.basename($block, '.block.html'), array('class' => 'btn btn-actions btn-small')); ?>
+                    <?php echo Html::anchor(__('Edit', 'blocks'), 'index.php?id=blocks&action=edit_block&filename='.basename($block, '.block.html'), array('class' => 'btn btn-primary')); ?>
-                    <a class="btn dropdown-toggle btn-actions btn-small" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
+                    <button type="button" class="btn dropdown-toggle btn-primary" data-toggle="dropdown">
-                    <ul class="dropdown-menu">
+                        <span class="caret"></span>
+                        <span class="sr-only">Toggle Dropdown</span>
+                    </button>
+                    <ul class="dropdown-menu" role="menu">
                         <li><?php echo Html::anchor(__('View Embed Code', 'blocks'), 'javascript:;', array('title' => __('View Embed Code', 'blocks'), 'onclick' => '$.monstra.blocks.showEmbedCodes("'.basename($block, '.block.html').'");')); ?></li>
                     </ul>
-                    <?php echo Html::anchor(__('Delete', 'blocks'),
-                              'index.php?id=blocks&action=delete_block&filename='.basename($block, '.block.html').'&token='.Security::token(),
-                               array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete block: :block', 'blocks', array(':block' => basename($block, '.block.html')))."')"));
-                    ?>
                 </div>
-            </div>
+                <?php echo Html::anchor(__('Delete', 'blocks'),
+                          'index.php?id=blocks&action=delete_block&filename='.basename($block, '.block.html').'&token='.Security::token(),
+                           array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete block: :block', 'blocks', array(':block' => basename($block, '.block.html')))."')"));
+                ?>            
             </div>
         </td>
     </tr>
@@ -46,18 +47,20 @@
 </table>
 <!-- /Blocks_list -->
 
-<div id="embedCodes" class="modal hide fade">
+<div class="modal fade" id="embedCodes"> 
-<div class="modal-header">
+    <div class="modal-dialog">
-<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <div class="modal-content">
-<h3><?php echo __('Embed Code', 'blocks'); ?></h3>
+            <div class="modal-header">
-</div>
+                <div class="close" data-dismiss="modal">&times;</div>
-<div class="modal-body">
+                <h4 class="modal-title"><?php echo __('Embed Code', 'snippets'); ?></h4>
-<p>
+            </div>
-    <b><?php echo __('Shortcode', 'blocks'); ?></b><br>
+            <div class="modal-body">
-    <code id="shortcode"></code>
+                <b><?php echo __('Shortcode', 'snippets'); ?></b><br>
-    <br> <br>
+                <pre><code id="shortcode"></code></pre>
-    <b><?php echo __('PHP Code', 'blocks'); ?></b><br>
+                <br>
-    <code id="phpcode"></code>
+                <b><?php echo __('PHP Code', 'snippets'); ?></b><br>
-</p>
+                <pre><code id="phpcode"></code></pre>
-</div>
+            </div>
-</div>
+        </div>
+    </div>
+</div>