From c2d9435b7b23490ed53a4e46b62300930a59d693 Mon Sep 17 00:00:00 2001
From: Bobby Allen <bobbyallen.uk@gmail.com>
Date: Mon, 28 Oct 2013 13:50:54 +0000
Subject: [PATCH] Adding removal of getdownload.php to ensure that if users who
 upgrade from 10.0.2 to 10.1.0 and didn't follow our manual patch advice this
 is now automatically taken care of during the upgrade.

---
 .../zpanelx-update/10-1-0/shell/zpanel_update.sh          | 8 +++++---
 .../zpanelx-update/10-1-0/shell/zpanel_update.sh          | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/etc/build/config_packs/centos_6_3/zpanelx-update/10-1-0/shell/zpanel_update.sh b/etc/build/config_packs/centos_6_3/zpanelx-update/10-1-0/shell/zpanel_update.sh
index f4d1e0028..13e2ed362 100644
--- a/etc/build/config_packs/centos_6_3/zpanelx-update/10-1-0/shell/zpanel_update.sh
+++ b/etc/build/config_packs/centos_6_3/zpanelx-update/10-1-0/shell/zpanel_update.sh
@@ -11,12 +11,12 @@ genpasswd() {
 result=`mysql -u postfix -ppostfix --skip-column-names -e "SHOW DATABASES LIKE 'zpanel_postfix'"`
 
 if [ "$result" == "zpanel_postfix" ]; then
-	
+
 	password=`genpasswd`;
 	mysqlrootpass=`cat /root/mysqlrootpass`
 	echo "UPDATE mysql.user SET Password=PASSWORD('$password') WHERE User='postfix' AND Host='localhost';" | mysql -u root -p$mysqlrootpass
 	echo "FLUSH PRIVILEGES;" | mysql -u root -p$mysqlrootpass
-	
+
 	sed -i "s|password \= postfix|password \= $password|" /etc/zpanel/configs/postfix/mysql-relay_domains_maps.cf
 	sed -i "s|password \= postfix|password \= $password|" /etc/zpanel/configs/postfix/mysql-virtual_alias_maps.cf
 	sed -i "s|password \= postfix|password \= $password|" /etc/zpanel/configs/postfix/mysql-virtual_domains_maps.cf
@@ -27,4 +27,6 @@ if [ "$result" == "zpanel_postfix" ]; then
 	sed -i "s|password=postfix|password=$password|" /etc/zpanel/configs/dovecot2/dovecot-mysql.conf
 	echo -e "Your new MySQL 'postfix' is : $password";
 	echo -e "MySQL Postfix Password : $password" >> /root/passwords.txt
-fi
\ No newline at end of file
+fi
+
+rm /etc/zpanel/panel/modules/backupmgr/code/getdownload.php
\ No newline at end of file
diff --git a/etc/build/config_packs/ubuntu_12_04/zpanelx-update/10-1-0/shell/zpanel_update.sh b/etc/build/config_packs/ubuntu_12_04/zpanelx-update/10-1-0/shell/zpanel_update.sh
index e4d8dc839..293269757 100644
--- a/etc/build/config_packs/ubuntu_12_04/zpanelx-update/10-1-0/shell/zpanel_update.sh
+++ b/etc/build/config_packs/ubuntu_12_04/zpanelx-update/10-1-0/shell/zpanel_update.sh
@@ -11,12 +11,12 @@ genpasswd() {
 result=`mysql -u postfix -ppostfix --skip-column-names -e "SHOW DATABASES LIKE 'zpanel_postfix'"`
 
 if [ "$result" == "zpanel_postfix" ]; then
-	
+
 	password=`genpasswd`;
 	mysqlrootpass=`cat /root/mysqlrootpass`
 	echo "UPDATE mysql.user SET Password=PASSWORD('$password') WHERE User='postfix' AND Host='localhost';" | mysql -u root -p$mysqlrootpass
 	echo "FLUSH PRIVILEGES;" | mysql -u root -p$mysqlrootpass
-	
+
 	sed -i "s|password \= postfix|password \= $password|" /etc/zpanel/configs/postfix/mysql-relay_domains_maps.cf
 	sed -i "s|password \= postfix|password \= $password|" /etc/zpanel/configs/postfix/mysql-virtual_alias_maps.cf
 	sed -i "s|password \= postfix|password \= $password|" /etc/zpanel/configs/postfix/mysql-virtual_domains_maps.cf
@@ -27,4 +27,6 @@ if [ "$result" == "zpanel_postfix" ]; then
 	sed -i "s|password=postfix|password=$password|" /etc/zpanel/configs/dovecot2/dovecot-mysql.conf
 	echo -e "Your new MySQL 'postfix' is : $password";
 	echo -e "MySQL Postfix Password : $password" >> /root/passwords.txt
-fi
\ No newline at end of file
+fi
+
+rm /etc/zpanel/panel/modules/backupmgr/code/getdownload.php
\ No newline at end of file