HOR-3670-HQ

update
This commit is contained in:
hjonathan
2017-08-14 10:56:14 -04:00
parent 73031feb70
commit 1cd6309874
50 changed files with 741 additions and 875 deletions

View File

@@ -619,7 +619,7 @@ class adminProxy extends HttpProxyController
$sBodyPre->assign('msg', $msg);
$sBody = $sBodyPre->getOutputContent();
$oSpool = new spoolRun();
$oSpool = new SpoolRun();
$oSpool->setConfig($aConfiguration);
@@ -1384,7 +1384,7 @@ class adminProxy extends HttpProxyController
require_once (PATH_CONTROLLERS . "installer.php");
$params = array ();
$oServerConf = &serverConf::getSingleton();
$oServerConf = &ServerConf::getSingleton();
$pluginRegistry = PluginRegistry::loadSingleton();
$licenseManager = &PmLicenseManager::getSingleton();

View File

@@ -133,7 +133,7 @@ class Home extends Controller
}
}
$oServerConf = & serverConf::getSingleton();
$oServerConf = & ServerConf::getSingleton();
if ($oServerConf->isRtl( SYS_LANG )) {
$swRtl = 1;

View File

@@ -199,7 +199,7 @@ class Main extends Controller
if (($nextBeatDate = $this->memcache->get( 'nextBeatDate' )) === false) {
//get the serverconf singleton, and check if we can send the heartbeat
$oServerConf = & serverConf::getSingleton();
$oServerConf = & ServerConf::getSingleton();
$sflag = $oServerConf->getHeartbeatProperty( 'HB_OPTION', 'HEART_BEAT_CONF' );
$sflag = (trim( $sflag ) != '') ? $sflag : '1';
//get date of next beat
@@ -305,7 +305,7 @@ class Main extends Controller
$aField['LOGIN_VERIFY_MSG'] = G::loadTranslation( 'LOGIN_VERIFY_MSG' );
//Get Server Configuration
$oServerConf = & serverConf::getSingleton();
$oServerConf = & ServerConf::getSingleton();
$availableLangArray = $this->getLanguagesList();
@@ -515,7 +515,7 @@ class Main extends Controller
private function getWorkspacesAvailable ()
{
$oServerConf = & serverConf::getSingleton();
$oServerConf = & ServerConf::getSingleton();
$dir = PATH_DB;
$filesArray = array ();
if (file_exists( $dir )) {

View File

@@ -267,7 +267,7 @@ class pmTablesProxy extends HttpProxyController
}
if ($row->type == 'CLASSIC') {
$rp = new reportTables();
$rp = new ReportTables();
$rp->deleteReportTable( $row->id );
$count ++;
} else {