From bc7f02fb75e17e3cbbc9aef64bef0f2b8da43426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristhian=20Mart=C3=ADnez=20Ochoa?= <cristhian@qrokes.com>
Date: Sat, 27 Oct 2018 18:54:13 -0600
Subject: [PATCH] command improvements

- Arguments are now case insensitive
- server-update now check if source files exist before update.
- some minor improvements to prevent errors.
---
 lib/install      |  2 +-
 plugins/httpauth |  2 +-
 plugins/log      |  8 ++++----
 plugins/site     | 10 +++++-----
 plugins/stack    |  8 ++++----
 plugins/webinoly | 18 +++++++++++-------
 weby             |  2 +-
 7 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/lib/install b/lib/install
index 722af07..ad02051 100644
--- a/lib/install
+++ b/lib/install
@@ -480,7 +480,7 @@ php_tool() {
 
 mysql_tool() {
 	api-events_update im5
-	sudo mkdir /var/www/$(conf_read tools-port)/htdocs/pma
+	sudo mkdir -p /var/www/$(conf_read tools-port)/htdocs/pma
 	sudo wget --timeout=15 -t 1 -qrO /var/www/$(conf_read tools-port)/htdocs/pma.tar.xz https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-all-languages.tar.xz
 	sudo tar -xf /var/www/$(conf_read tools-port)/htdocs/pma.tar.xz -C /var/www/$(conf_read tools-port)/htdocs/pma
 	sudo mv /var/www/$(conf_read tools-port)/htdocs/pma/phpMyAdmin-*-all-languages/* /var/www/$(conf_read tools-port)/htdocs/pma/
diff --git a/plugins/httpauth b/plugins/httpauth
index 37c7267..a2e61d3 100644
--- a/plugins/httpauth
+++ b/plugins/httpauth
@@ -1,6 +1,6 @@
 #!/bin/bash
 source /opt/webinoly/lib/general
-opt="$1"
+opt=${1,,}
 
 # Http-Authentication Plugin
 # Syntax: httpauth <option>
diff --git a/plugins/log b/plugins/log
index b4aced6..dd4bfcb 100644
--- a/plugins/log
+++ b/plugins/log
@@ -6,8 +6,8 @@
 # Notes: If no domain or option is entered, access logs are displayed.
 
 source /opt/webinoly/lib/general
-domain="$1"
-opt="$2"
+domain=${1,,}
+opt=${2,,}
 
 error() {
 	echo ""
@@ -18,8 +18,8 @@ error() {
 
 # Validations
 if [[ $domain =~ ^(-error|-wp)$ || $domain == "-only-error="* ]]; then
-	domain="$2"
-	opt="$1"
+	domain=${2,,}
+	opt=${1,,}
 fi
 
 # Extract value if exist
diff --git a/plugins/site b/plugins/site
index 218074f..867c782 100644
--- a/plugins/site
+++ b/plugins/site
@@ -8,9 +8,9 @@
 # shopt is necessary for this kind !(html|22222) of patterns
 shopt -s extglob
 
-domain="$1"
-type="$2"
-cache="$3"
+domain=${1,,}
+type=${2,,}
+cache=${3,,}
 
 source /opt/webinoly/lib/general
 source /opt/webinoly/lib/sites
@@ -25,8 +25,8 @@ fi
 
 # Check if user entered arg before option and correct it.
 if [[ -n $cache && ($type == "-cache" || $type == "-root" || $type == "-root-path" || $type == "-subdomain" || $type == "-ignore-ssl" || $type == "-wildcard") ]]; then
-	type="$3"
-	cache="$2"
+	type=${3,,}
+	cache=${2,,}
 fi
 
 
diff --git a/plugins/stack b/plugins/stack
index 3a9f13e..2b0ce34 100644
--- a/plugins/stack
+++ b/plugins/stack
@@ -7,14 +7,14 @@
 
 source /opt/webinoly/lib/install
 source /opt/webinoly/lib/webin
-opt="$1"
-arg="$2"
+opt=${1,,}
+arg=${2,,}
 
 
 # Check if user entered arg before option and correct it.
 if [[ $opt == "-purge" || $opt == "-notools" || $opt == "-noptim" ]]; then
-	opt="$2"
-	arg="$1"
+	opt=${2,,}
+	arg=${1,,}
 fi
 
 # FORCE - Unattended Purge
diff --git a/plugins/webinoly b/plugins/webinoly
index 420518f..ae739da 100644
--- a/plugins/webinoly
+++ b/plugins/webinoly
@@ -4,7 +4,7 @@
 # Syntax: webinoly <option>
 # Options: -update, -server-update or -server-reset, -verify, -dbpass, -tools-port, -login-www-data, -nologin-www-data, -config-cache, -uninstall, -info, -external-sources-update, -clear-cache, -version, -blockip, -unblockip, -conf-value_, -yoast-sitemap
 
-opt="$1"
+opt=${1,,}
 source /opt/webinoly/lib/webin
 
 # Extract value if exist
@@ -12,7 +12,7 @@ if [[ $opt == "-tools-port="* || $opt == "-config-cache="* || $opt == "-clear-ca
 	value=$(echo "${opt}" | cut -d'=' -f 2 -s)
 	opt=$(echo "${opt}" | cut -d'=' -f 1 -s)
 	# Prevent cases like -conf-value where is valid enter a value without = causing empty opt.
-	[[ -z $opt ]] && opt=$1
+	[[ -z $opt ]] && opt=${1,,}
 fi
 
 
@@ -46,11 +46,15 @@ elif [[ $opt == "-server-update" || $opt == "-server-reset" ]]; then
 	
 	# Regenerate PHP conf files
 	if [[ $(conf_read php-optim) == "true" && ( $value == "php" || $value = "all" ) ]]; then
-		sudo cat /opt/webinoly/templates/source/php.ini > /etc/php/$(conf_read php-ver)/fpm/php.ini
-		sudo cat /opt/webinoly/templates/source/www.conf > /etc/php/$(conf_read php-ver)/fpm/pool.d/www.conf
-		sudo rm /etc/php/$(conf_read php-ver)/fpm/pool.d/debug.conf
-		php_optim
-		echo "${gre}PHP settings has been updated successfully!${end}"
+		if [[ -a /opt/webinoly/templates/source/php.ini && -a /opt/webinoly/templates/source/www.conf ]]; then
+			sudo cat /opt/webinoly/templates/source/php.ini > /etc/php/$(conf_read php-ver)/fpm/php.ini
+			sudo cat /opt/webinoly/templates/source/www.conf > /etc/php/$(conf_read php-ver)/fpm/pool.d/www.conf
+			sudo rm -rf /etc/php/$(conf_read php-ver)/fpm/pool.d/debug.conf
+			php_optim
+			echo "${gre}PHP settings has been updated successfully!${end}"
+		else
+			echo "${red}[ERROR] PHP could not been updated, source files not found!${end}"
+		fi
 	elif [[ $(conf_read php-optim) != "true" && ( $value == "php" || $value = "all" ) ]]; then
 		echo "${red}PHP settings couldn't been updated, seems like is not installed in your server!${end}"
 	fi
diff --git a/weby b/weby
index 1ec0439..648d358 100644
--- a/weby
+++ b/weby
@@ -74,7 +74,7 @@ fi
 sudo tar -xf $HOME/webinoly.tar -C /opt/webinoly
 sudo find /opt/webinoly -type d -exec chmod 755 {} \;
 sudo find /opt/webinoly -type f -exec chmod 644 {} \;
-sudo chmod 744 /opt/webinoly/lib/ex-*
+sudo chmod -f 744 /opt/webinoly/lib/ex-*
 
 # Install plugins
 sudo chmod 755 /opt/webinoly/plugins/*