lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 10:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace config_install

Browse Source
This commit is contained in:
Ad Schellevis 2015-03-13 17:22:11 +00:00
parent eae996e590
commit 2935542e63
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/www/diag_backup.php
View File

@ -27,6 +27,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("script/load_phalcon.php");
/* Allow additional execution time 0 = no limit. */
ini_set('max_execution_time', '0');
@ -384,7 +385,8 @@ if ($_POST) {
} else {
/* restore the entire configuration */
file_put_contents($_FILES['conffile']['tmp_name'], $data);
if (config_install($_FILES['conffile']['tmp_name']) == 0) {
$cnf = OPNsense\Core\Config::getInstance();
if ($cnf->restoreBackup($filename)) {
/* this will be picked up by /index.php */
mark_subsystem_dirty("restore");
touch("/conf/needs_package_sync");
@ -543,7 +545,8 @@ if ($_POST) {
$input_errors[] = gettext("XXX - this feature may hose your config (do NOT backrev configs!) - billm");
if ($ver2restore <> "") {
$conf_file = '/conf/backup/config-' . strtotime($ver2restore) . '.xml';
if (config_install($conf_file) == 0) {
$cnf = OPNsense\Core\Config::getInstance();
if ($cnf->restoreBackup($conf_file)) {
mark_subsystem_dirty("restore");
} else {
$input_errors[] = gettext("The configuration could not be restored.");

4
src/www/uploadconfig.php
View File

@ -28,6 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("script/load_phalcon.php");
header("Content-Type: text/plain");
@ -40,7 +41,8 @@ if ($_POST['config']) {
}
fwrite($fd, $_POST['config']);
fclose($fd);
if (config_install("{$g['tmp_path']}/config.xml") == 0) {
$cnf = OPNsense\Core\Config::getInstance();
if ($cnf->restoreBackup("{$g['tmp_path']}/config.xml")) {
echo gettext("OK")."\n";
system_reboot();
} else {