diff --git a/datamodels/2.x/itop-backup/backup.php b/datamodels/2.x/itop-backup/backup.php index edf7e4331..9861bd0c8 100644 --- a/datamodels/2.x/itop-backup/backup.php +++ b/datamodels/2.x/itop-backup/backup.php @@ -30,9 +30,6 @@ if (!defined('APPROOT')) } } require_once(APPROOT.'application/application.inc.php'); -require_once(APPROOT.'application/webpage.class.inc.php'); -require_once(APPROOT.'application/csvpage.class.inc.php'); -require_once(APPROOT.'application/clipage.class.inc.php'); require_once(APPROOT.'application/ajaxwebpage.class.inc.php'); require_once(APPROOT.'core/log.class.inc.php'); diff --git a/datamodels/2.x/itop-backup/dbrestore.class.inc.php b/datamodels/2.x/itop-backup/dbrestore.class.inc.php index 9ffd66657..f8d84f431 100644 --- a/datamodels/2.x/itop-backup/dbrestore.class.inc.php +++ b/datamodels/2.x/itop-backup/dbrestore.class.inc.php @@ -28,8 +28,8 @@ class DBRestore extends DBBackup { parent::__construct($oConfig); - $this->sDBUser = $oConfig->Get('db_user'); - $this->sDBPwd = $oConfig->Get('db_pwd'); + $this->sDBUser = $this->oConfig->Get('db_user'); + $this->sDBPwd = $this->oConfig->Get('db_pwd'); } protected function LogInfo($sMsg) diff --git a/datamodels/2.x/itop-backup/restore.php b/datamodels/2.x/itop-backup/restore.php index 3fea8a693..4d72e6172 100644 --- a/datamodels/2.x/itop-backup/restore.php +++ b/datamodels/2.x/itop-backup/restore.php @@ -30,14 +30,10 @@ if (!defined('APPROOT')) } } require_once(APPROOT.'application/application.inc.php'); -require_once(APPROOT.'application/webpage.class.inc.php'); -require_once(APPROOT.'application/csvpage.class.inc.php'); -require_once(APPROOT.'application/clipage.class.inc.php'); require_once(APPROOT.'application/ajaxwebpage.class.inc.php'); - require_once(APPROOT.'core/log.class.inc.php'); - require_once(APPROOT.'application/startup.inc.php'); +require_once(dirname(__FILE__).'/dbrestore.class.inc.php'); class MyDBRestore extends DBRestore {