beenull/EHCP-Force-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do NOT Store EHCP Files By Default in Backups Since this Can Cause Problems on Restore (changed credentials)

Browse source
This commit is contained in:
earnolmartin 2018-07-13 11:28:01 -06:00
parent 9f308e5972
commit d38a4164e2
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ehcp/classapp.php
View file

@ -3158,6 +3158,7 @@ function doRestore(){
function daemonRestore($action,$info,$info2='') {
$this->requireCommandLine(__FUNCTION__,True);
$filename=securefilename($info);
$backupname=$filename;
@ -3226,6 +3227,10 @@ function daemonRestore($action,$info,$info2='') {
echo "\n\nRestore complete.... you should restart the ehcp daemon...";
$this->infotoadminemail("The EHCP backup was successfully restored!","Backup Restored",False);
// Restart web server and EHCP daemon
$this->restart_webserver();
manageService("ehcp", "restart");
return True;
}
@ -11635,6 +11640,8 @@ function restart_webserver(){
manageService("apache2", "stop");
manageService("nginx", "restart");
}
return true;
}
function is_webserver_running(){

2
ehcp/scripts/ehcp_backup/createBackup.php
View file

@ -12,7 +12,7 @@
if(isset($filename)){
$backup='-mysql-files-ehcpfiles-ehcpdb-emailaccounts-emailcontents-gzipbackup'; # what will be backed up
$backup='-mysql-files-ehcpdb-emailaccounts-emailcontents-gzipbackup'; # what will be backed up
// Code from classapp.php in EHCP
/*