Merge pull request #122 from cdgco/2.1.1

2.1.1

.htaccess

@@ -6,15 +6,15 @@
 
 # Custom Error Documents:
 
-ErrorDocument 400     '<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/style.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/colors/blue.css" id="theme" rel="stylesheet"><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--> <section id="wrapper" class="error-page"> <div class="error-box"> <div class="error-body text-center"> <h1 class="text-danger">400</h1> <h3 class="text-uppercase">Page Not Found !</h3><p class="text-muted m-t-30 m-b-30 text-uppercase">Your browser sent an invalid request. Please try again.</p><a href="#" onclick="window.history.go(-1);" class="btn btn-danger btn-rounded waves-effect waves-light m-b-40">Go Back</a> </div></div></section> <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/node-waves/0.7.6/waves.min.js"></script><script>Waves.attach(".button", ["waves-effect"]);Waves.init();</script>'
+ErrorDocument 400     '<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/style.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/colors/blue.css" id="theme" rel="stylesheet"><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--> <section id="wrapper" class="error-page"> <div class="error-box"> <div class="error-body text-center"> <h1 class="text-danger">400</h1> <h3 class="text-uppercase">Page Not Found !</h3><p class="text-muted m-t-30 m-b-30 text-uppercase">Your browser sent an invalid request. Please try again.</p><a href="#" onclick="window.history.go(-1);" class="btn btn-danger btn-rounded waves-effect waves-light m-b-40">Go Back</a> </div></div></section> <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/node-waves/0.7.6/waves.min.js"></script><script>Waves.attach(".button", ["waves-effect"]);Waves.init();</script>'
 
-ErrorDocument 403     '<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/style.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/colors/blue.css" id="theme" rel="stylesheet"><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--> <section id="wrapper" class="error-page"> <div class="error-box"> <div class="error-body text-center"> <h1 class="text-info">403</h1> <h3 class="text-uppercase">Forbidden Error</h3><p class="text-muted m-t-30 m-b-30 text-uppercase">You do not have permission to access this file or folder</p><a href="#" onclick="window.history.go(-1);" class="btn btn-info btn-rounded waves-effect waves-light m-b-40">Go Back</a> </div></div></section> <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"><script src="https://cdnjs.cloudflare.com/ajax/libs/node-waves/0.7.6/waves.min.js"></script></script><script>Waves.attach(".button", ["waves-effect"]);Waves.init();</script>'
+ErrorDocument 403     '<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/style.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/colors/blue.css" id="theme" rel="stylesheet"><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--> <section id="wrapper" class="error-page"> <div class="error-box"> <div class="error-body text-center"> <h1 class="text-info">403</h1> <h3 class="text-uppercase">Forbidden Error</h3><p class="text-muted m-t-30 m-b-30 text-uppercase">You do not have permission to access this file or folder</p><a href="#" onclick="window.history.go(-1);" class="btn btn-info btn-rounded waves-effect waves-light m-b-40">Go Back</a> </div></div></section> <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"><script src="https://cdnjs.cloudflare.com/ajax/libs/node-waves/0.7.6/waves.min.js"></script></script><script>Waves.attach(".button", ["waves-effect"]);Waves.init();</script>'
 
-ErrorDocument 404     '<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/style.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/colors/blue.css" id="theme" rel="stylesheet"><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--> <section id="wrapper" class="error-page"> <div class="error-box"> <div class="error-body text-center"> <h1 class="text-danger">404</h1> <h3 class="text-uppercase">Page Not Found !</h3> <p class="text-muted m-t-30 m-b-30 text-uppercase">The page you are looking for does not exist</p><a href="#" onclick="window.history.go(-1);" class="btn btn-danger btn-rounded waves-effect waves-light m-b-40">Go Back</a> </div></div></section> <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"><script src="https://cdnjs.cloudflare.com/ajax/libs/node-waves/0.7.6/waves.min.js"></script></script><script>Waves.attach(".button", ["waves-effect"]);Waves.init();</script>'
+ErrorDocument 404     '<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/style.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/colors/blue.css" id="theme" rel="stylesheet"><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--> <section id="wrapper" class="error-page"> <div class="error-box"> <div class="error-body text-center"> <h1 class="text-danger">404</h1> <h3 class="text-uppercase">Page Not Found !</h3> <p class="text-muted m-t-30 m-b-30 text-uppercase">The page you are looking for does not exist</p><a href="#" onclick="window.history.go(-1);" class="btn btn-danger btn-rounded waves-effect waves-light m-b-40">Go Back</a> </div></div></section> <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"><script src="https://cdnjs.cloudflare.com/ajax/libs/node-waves/0.7.6/waves.min.js"></script></script><script>Waves.attach(".button", ["waves-effect"]);Waves.init();</script>'
 
-ErrorDocument 500     '<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/style.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/colors/blue.css" id="theme" rel="stylesheet"><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--> <section id="wrapper" class="error-page"> <div class="error-box"> <div class="error-body text-center"> <h1>500</h1> <h3 class="text-uppercase">Internal Server Error</h3><p class="text-muted m-t-30 m-b-30 text-uppercase">Please try again later</p><a href="#" onclick="window.history.go(-1);" class="btn btn-info btn-rounded waves-effect waves-light m-b-40">Go Back</a> </div></div></section> <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/node-waves/0.7.6/waves.min.js"></script><script>Waves.attach(".button", ["waves-effect"]);Waves.init();</script>'
+ErrorDocument 500     '<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/style.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/colors/blue.css" id="theme" rel="stylesheet"><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--> <section id="wrapper" class="error-page"> <div class="error-box"> <div class="error-body text-center"> <h1>500</h1> <h3 class="text-uppercase">Internal Server Error</h3><p class="text-muted m-t-30 m-b-30 text-uppercase">Please try again later</p><a href="#" onclick="window.history.go(-1);" class="btn btn-info btn-rounded waves-effect waves-light m-b-40">Go Back</a> </div></div></section> <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/node-waves/0.7.6/waves.min.js"></script><script>Waves.attach(".button", ["waves-effect"]);Waves.init();</script>'
 
-ErrorDocument 503     '<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/style.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/colors/blue.css" id="theme" rel="stylesheet"><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--> <section id="wrapper" class="error-page"> <div class="error-box"> <div class="error-body text-center"> <h1 class="text-warning">503</h1> <h3 class="text-uppercase ">This site is unavailable or undergoing maintenance</h3><p class="text-muted m-t-30 m-b-30 text-uppercase">Please wait and try again</p><a href="#" onclick="window.history.go(-1);" class="btn btn-info btn-rounded waves-effect waves-light m-b-40">Go Back</a> </div></div></section> <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/node-waves/0.7.6/waves.min.js"></script><script>Waves.attach(".button", ["waves-effect"]);Waves.init();</script>'
+ErrorDocument 503     '<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/style.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/colors/blue.css" id="theme" rel="stylesheet"><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]--> <section id="wrapper" class="error-page"> <div class="error-box"> <div class="error-body text-center"> <h1 class="text-warning">503</h1> <h3 class="text-uppercase ">This site is unavailable or undergoing maintenance</h3><p class="text-muted m-t-30 m-b-30 text-uppercase">Please wait and try again</p><a href="#" onclick="window.history.go(-1);" class="btn btn-info btn-rounded waves-effect waves-light m-b-40">Go Back</a> </div></div></section> <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/node-waves/0.7.6/waves.min.js"></script><script>Waves.attach(".button", ["waves-effect"]);Waves.init();</script>'
 
 # Block access to config file:
 

build.sh

@@ -9,16 +9,16 @@ if [ -f includes/version.php ] ; then
     rm includes/version.php
 fi
 
-echo "<?php \$currentversion = '$VERSION';" > includes/version.php
+echo "<?php \$currentversion = v'$VERSION';" > includes/version.php
 
 sed -i "s#Vesta Web Interface.*>#Vesta Web Interface $VERSION\n>#g" docs/_coverpage.md
 sed -i "s#archive/.*.zip#archive/$VERSION.zip#g" docs/manual-install.md
 sed -i "s#archive/.*.zip#archive/$VERSION.zip#g" docs/manual-upgrade.md
 sed -i "s#archive/.*.zip#archive/$VERSION.zip#g" docs/select-install.md
 sed -i "s#archive/.*.zip#archive/$VERSION.zip#g" docs/select-upgrade.md
 
-if [ -f docs/readme.md ] ; then
-    rm docs/readme.md
+if [ -f docs/README.md ] ; then
+    rm docs/README.md
 fi
 
 
@@ -51,7 +51,7 @@ If you like VWI, please consider [donating](http://paypal.me/CJREvents) to show
 
 ## License
 
-GNU General Public License v3.0" > docs/readme.md
+GNU General Public License v3.0" > docs/README.md
 else
 echo "# Vesta Web Interface $VERSION
 <hr>
@@ -79,7 +79,7 @@ If you like VWI, please consider [donating](http://paypal.me/CJREvents) to show
 
 ## License
 
-GNU General Public License v3.0" > docs/readme.md
+GNU General Public License v3.0" > docs/README.md
 fi
 
 sed -i "s#VestaWebInterface@.*/css/style.css#VestaWebInterface@$VERSION/css/style.css#g" install/vesta/web/download/backup/vwi.php

docs/README.md

@@ -1,4 +1,4 @@
-# Vesta Web Interface v2.1.0
+# Vesta Web Interface v2.1.1
 <hr>
 
 ## About

docs/_coverpage.md

@@ -1,4 +1,4 @@
-# Vesta Web Interface v2.1.0
+# Vesta Web Interface v2.1.1
 
 > A PHP Control Panel for VestaCP 
 

docs/changelog.md

@@ -1,20 +1,25 @@
 ## Changelog
 
-### v2.1.0
+### v2.1.1
 
-Bug Fixes
-Dependencies
+Bug Fixes<br>
 Plugin System Upgrades
-Custom Ad Support
-Custom Script Support
+
+### v2.1.0
+
+Bug Fixes<br>
+Dependencies<br>
+Plugin System Upgrades<br>
+Custom Ad Support<br>
+Custom Script Support<br>
 Add support for PHP 5.4+
 
 ### v2.0.0
 Bug Fixes<br>
 Dependencies<br>
 Locale System Upgrade<br>
 Translations<br>
-Encrypt Credentials
+Encrypt Credentials<br>
 Bump Mimimum PHP to 7.1
 
 ### v1.0.1

docs/manual-install.md

@@ -2,7 +2,7 @@
 To selectively install VWI or to install the web interface on a non-VestaCP server, follow these steps:
 
 #### Step 1:
-[Download the latest release](https://github.com/cdgco/VestaWebInterface/archive/2.1.0.zip) of VWI from GitHub.
+[Download the latest release](https://github.com/cdgco/VestaWebInterface/archive/2.1.1.zip) of VWI from GitHub.
 
 #### Step 2:
 Extract Vesta Web Interface to a blank domain directory.

docs/manual-upgrade.md

@@ -6,7 +6,7 @@ NOTE: v1.0.1 and older require a clean install and cannot be installed through u
 Delete all files in your existing VWI web directory except includs/config.php. Ensure you delete any files starting with a period such as '.htaccess', '.git', or '.gitignore'.
 
 #### Step 2:
-[Download the latest release](https://github.com/cdgco/VestaWebInterface/archive/2.1.0.zip) of VWI from GitHub.
+[Download the latest release](https://github.com/cdgco/VestaWebInterface/archive/2.1.1.zip) of VWI from GitHub.
 
 #### Step 3:
 Extract Vesta Web Interface to the blank domain directory.

docs/select-install.md

@@ -3,7 +3,7 @@ To selectively install VWI or to install the web interface on a non-VestaCP serv
 
 
 #### Step 1:
-[Download the latest release](https://github.com/cdgco/VestaWebInterface/archive/2.1.0.zip) of VWI from GitHub.
+[Download the latest release](https://github.com/cdgco/VestaWebInterface/archive/2.1.1.zip) of VWI from GitHub.
 
 #### Step 2:
 Extract Vesta Web Interface to a blank domain directory.

docs/select-upgrade.md

@@ -7,7 +7,7 @@ Delete all files in your existing VWI web directory except includs/config.php. E
 
 
 #### Step 2:
-[Download the latest release](https://github.com/cdgco/VestaWebInterface/archive/2.1.0.zip) of VWI from GitHub.
+[Download the latest release](https://github.com/cdgco/VestaWebInterface/archive/2.1.1.zip) of VWI from GitHub.
 
 #### Step 3:
 Extract Vesta Web Interface to the blank domain directory.

includes/version.php

@@ -1 +1 @@
-<?php $currentversion = 'v2.1.0';
+<?php $currentversion = 'v2.1.1';

install/vesta/web/download/backup/vwi.php

@@ -72,7 +72,7 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.0/css/style.css" rel="stylesheet">
+        <link href="https://cdn.jsdelivr.net/gh/cdgco/VestaWebInterface@2.1.1/css/style.css" rel="stylesheet">
     </head>
     <body class="fix-header">
         <div class="preloader">