fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-2689 Removed instances of LoadSystem, LoadThirdParty

Browse Source
This commit is contained in:
Chloe Deguzman
2017-02-15 16:26:02 +00:00
committed by davidcallizaya
parent 60efcf7ac7
commit 5d3a4c073f
132 changed files with 285 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/classes/class.wsTools.php
View File

@@ -484,7 +484,7 @@ class workspaceTools
{
$this->initPropel(true);
$this->checkDataConsistenceInContentTable();
G::LoadThirdParty('pear/json', 'class.json');
$language = new Language();
@@ -533,7 +533,7 @@ class workspaceTools
return $this->db;
}
G::LoadSystem('database_' . strtolower($this->dbAdapter));
if ($rbac == true) {
$this->db = new database($this->dbAdapter, $this->dbRbacHost, $this->dbRbacUser, $this->dbRbacPass, $this->dbRbacName);
} else {
@@ -1292,7 +1292,7 @@ class workspaceTools
*/
static public function createBackup($filename, $compress = true)
{
G::LoadThirdParty('pear/Archive', 'Tar');
if (!file_exists(dirname($filename))) {
mkdir(dirname($filename));
}
@@ -1547,7 +1547,7 @@ class workspaceTools
static public function getBackupInfo($filename)
{
G::LoadThirdParty('pear/Archive', 'Tar');
$backup = new Archive_Tar($filename);
//Get a temporary directory in the upgrade directory
$tempDirectory = PATH_DATA . "upgrade/" . basename(tempnam(__FILE__, ''));
@@ -1613,7 +1613,7 @@ class workspaceTools
*/
static public function restore($filename, $srcWorkspace, $dstWorkspace = null, $overwrite = true, $lang = 'en', $port = '')
{
G::LoadThirdParty('pear/Archive', 'Tar');
$backup = new Archive_Tar($filename);
//Get a temporary directory in the upgrade directory
$tempDirectory = PATH_DATA . "upgrade/" . basename(tempnam(__FILE__, ''));
@@ -1886,7 +1886,7 @@ class workspaceTools
}
if ($swv == 1) {
G::LoadThirdParty("pear/Archive", "Tar");
//Extract
$tar = new Archive_Tar($f);
@@ -2856,7 +2856,7 @@ class workspaceTools
public function checkRbacPermissions(){
CLI::logging("-> Verifying roles permissions in RBAC \n");
//Update table RBAC permissions
Bootstrap::LoadSystem('rbac');
$RBAC = &RBAC::getSingleton();
$RBAC->initRBAC();
$result = $RBAC->verifyPermissions();