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

HOR-3610

Browse Source 
Fix System class conflict.
This commit is contained in:
davidcallizaya
2017-08-03 18:44:57 -04:00
parent f0c2511968
commit 81149399da
362 changed files with 1843 additions and 127409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/controllers/admin.php
View File

@@ -19,7 +19,7 @@ class Admin extends Controller
$RBAC->requirePermissions( 'PM_SETUP' );
require_once PATH_CONTROLLERS . 'main.php';
$skinsList = System::getSkingList();
$skinsList = PMSystem::getSkingList();
foreach ($skinsList['skins'] as $key => $value) {
if ($value['SKIN_WORKSPACE'] != 'Global') {
unset( $skinsList['skins'][$key] );
@@ -29,7 +29,7 @@ class Admin extends Controller
$mainController = new Main();
$languagesList = $mainController->getLanguagesList();
$languagesList[] = array ("", G::LoadTranslation("ID_USE_LANGUAGE_URL"));
$sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
$sysConf = PMSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
foreach ($skinsList['skins'] as $skin) {
$skins[] = array ($skin['SKIN_FOLDER_ID'],$skin['SKIN_NAME']);
@@ -268,7 +268,7 @@ class Admin extends Controller
if (defined('SYSTEM_NAME')) {
$systemName = SYSTEM_NAME;
}
$properties[] = array ($systemName. ' Ver.', System::getVersion() . $ee, $pmSection);
$properties[] = array ($systemName. ' Ver.', PMSystem::getVersion() . $ee, $pmSection);
$properties[] = array("PMUI JS Lib. Ver.", $pmuiVer, $pmSection);
$properties[] = array("MAFE JS Lib. Ver.", $mafeVer, $pmSection);
$properties[] = array("PM Dynaform JS Lib. Ver.", $pmdynaformVer, $pmSection);

10
workflow/engine/controllers/adminProxy.php
View File

@@ -38,7 +38,7 @@ class adminProxy extends HttpProxyController
$updateRedirector = false;
$restart = false;
self::validateDataSystemConf($httpData, $envFile);
$sysConf = System::getSystemConfiguration($envFile);
$sysConf = PMSystem::getSystemConfiguration($envFile);
$updatedConf = array();
if ($sysConf['default_lang'] != $httpData->default_lang) {
@@ -96,7 +96,7 @@ class adminProxy extends HttpProxyController
}
}
System::updateIndexFile(array(
PMSystem::updateIndexFile(array(
'lang' => $sysConf['default_lang'],
'skin' => $sysConf['default_skin']
));
@@ -611,7 +611,7 @@ class adminProxy extends HttpProxyController
$sBodyPre->prepare();
$sBodyPre->assign('server', $_SERVER['SERVER_NAME']);
$sBodyPre->assign('date', date('H:i:s'));
$sBodyPre->assign('ver', System::getVersion());
$sBodyPre->assign('ver', PMSystem::getVersion());
$sBodyPre->assign('engine', $engine);
$sBodyPre->assign('msg', $msg);
$sBody = $sBodyPre->getOutputContent();
@@ -1415,7 +1415,7 @@ class adminProxy extends HttpProxyController
$params['lt'] = isset($licInfo[SYS_SYS]) ? isset($licInfo[SYS_SYS]['TYPE'])? $licInfo[SYS_SYS]['TYPE'] : '' : '';
//ProcessMaker Version
$params['v'] = System::getVersion();
$params['v'] = PMSystem::getVersion();
if (file_exists(PATH_DATA. 'log/upgrades.log')) {
$params['pmu'] = serialize(file_get_contents(PATH_DATA. 'log/upgrades.log', 'r'));
} else {
@@ -1505,7 +1505,7 @@ class adminProxy extends HttpProxyController
//Country/city (Timezone)
$params['t'] = (defined('TIME_ZONE') && TIME_ZONE != "Unknown") ? TIME_ZONE : date_default_timezone_get();
$params['w'] = count(System::listWorkspaces());
$params['w'] = count(PMSystem::listWorkspaces());
$support = PATH_DATA_SITE . G::sanitizeString($licenseManager->info['FIRST_NAME'] . '-' . $licenseManager->info['LAST_NAME'] . '-' . SYS_SYS . '-' . date('YmdHis'), false, false) . '.spm';
file_put_contents($support, serialize($params));

2
workflow/engine/controllers/designer.php
View File

@@ -98,7 +98,7 @@ class Designer extends Controller
$this->setVar("SYS_SYS", SYS_SYS);
$this->setVar("SYS_LANG", SYS_LANG);
$this->setVar("SYS_SKIN", SYS_SKIN);
$this->setVar('HTTP_SERVER_HOSTNAME', System::getHttpServerHostnameRequestsFrontEnd());
$this->setVar('HTTP_SERVER_HOSTNAME', PMSystem::getHttpServerHostnameRequestsFrontEnd());
if ($debug) {
if (! file_exists(PATH_HTML . "lib-dev/pmUI/build.cache")) {

6
workflow/engine/controllers/home.php
View File

@@ -102,7 +102,7 @@ class Home extends Controller
$userProperty = new UsersProperties();
$process = new Process();
$case = new Cases();
$sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
$sysConf = PMSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
//Get ProcessStatistics Info
$start = 0;
@@ -186,7 +186,7 @@ class Home extends Controller
$solrEnabled = false;
if (($solrConf = System::solrEnv()) !== false) {
if (($solrConf = PMSystem::solrEnv()) !== false) {
$ApplicationSolrIndex = new AppSolr(
$solrConf["solr_enabled"],
@@ -411,7 +411,7 @@ class Home extends Controller
$type == "todo" || $type == "draft" || $type == "paused" || $type == "sent" ||
$type == "selfservice" || $type == "unassigned" || $type == "search"
) &&
(($solrConf = System::solrEnv()) !== false)
(($solrConf = PMSystem::solrEnv()) !== false)
) {
$ApplicationSolrIndex = new AppSolr(

4
workflow/engine/controllers/installer.php
View File

@@ -931,7 +931,7 @@ class Installer extends Controller
$envFile = PATH_CONFIG . 'env.ini';
// getting configuration from env.ini
$sysConf = System::getSystemConfiguration( $envFile );
$sysConf = PMSystem::getSystemConfiguration( $envFile );
$langUri = 'en';
if (isset($sysConf['default_lang'])) {
@@ -987,7 +987,7 @@ class Installer extends Controller
try {
// update the main index file
$indexFileUpdated = System::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin']));
$indexFileUpdated = PMSystem::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin']));
} catch (Exception $e) {
$info->result = false;
$info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array(PATH_HTML . "index.html."));

8
workflow/engine/controllers/main.php
View File

@@ -262,7 +262,7 @@ class Main extends Controller
}
$this->setVar( 'logo_company', $this->getCompanyLogo() );
$this->setVar( 'pmos_version', System::getVersion() );
$this->setVar( 'pmos_version', PMSystem::getVersion() );
$footerText = 'Copyright © 2003-' . date( 'Y' ) . ' Colosa, Inc. All rights reserved.';
$adviseText = 'Supplied free of charge with no support, certification, warranty,
@@ -312,7 +312,7 @@ class Main extends Controller
$this->includeExtJS( 'main/sysLogin' );
$this->setVar( 'logo_company', $this->getCompanyLogo() );
$this->setVar( 'pmos_version', System::getVersion() );
$this->setVar( 'pmos_version', PMSystem::getVersion() );
$footerText = G::LoadTranslation('ID_COPYRIGHT_FROM') . date( 'Y' ) . G::LoadTranslation('ID_COPYRIGHT_COL');
$adviseText = G::LoadTranslation('ID_COLOSA_AND_CERTIFIED_PARTNERS');
@@ -382,7 +382,7 @@ class Main extends Controller
$template->assign( 'passwd', $newPass );
$template->assign( 'poweredBy', G::loadTranslation( 'ID_PROCESSMAKER_SLOGAN1' ) );
$template->assign( 'versionLabel', G::loadTranslation( 'ID_VERSION' ) );
$template->assign( 'version', System::getVersion() );
$template->assign( 'version', PMSystem::getVersion() );
$template->assign( 'visit', G::loadTranslation( 'ID_VISIT' ) );
$template->assign( 'footer', '' );
@@ -731,7 +731,7 @@ class Main extends Controller
if (defined('SYSTEM_NAME')) {
$systemName = SYSTEM_NAME;
}
$properties[] = array ($systemName. ' Ver.', System::getVersion() . $ee, $pmSection);
$properties[] = array ($systemName. ' Ver.', PMSystem::getVersion() . $ee, $pmSection);
$properties[] = array("PMUI JS Lib. Ver.", $pmuiVer, $pmSection);
$properties[] = array("MAFE JS Lib. Ver.", $mafeVer, $pmSection);
$properties[] = array("PM Dynaform JS Lib. Ver.", $pmdynaformVer, $pmSection);

3350
workflow/engine/controllers/pmTablesProxy.php
View File

File diff suppressed because it is too large Load Diff

2
workflow/engine/controllers/strategicDashboard.php
View File

@@ -31,7 +31,7 @@ class StrategicDashboard extends Controller
$user = new Users();
$user = $user->load($RBAC->aUserInfo['USER_INFO']['USR_UID']);
$this->usrUnitCost = $this->currencySymbolToShow($user);
$this->urlProxy = System::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/';
$this->urlProxy = PMSystem::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/';
//change
$clientId = 'x-pm-local-client';
$client = $this->getClientCredentials($clientId);

2
workflow/engine/controllers/webEntryProxy.php
View File

@@ -183,7 +183,7 @@ class webEntryProxy extends HttpProxyController
$template->assign( 'dynaform', $dynTitle );
$template->assign( 'timestamp', date( 'l jS \of F Y h:i:s A' ) );
$template->assign( 'ws', SYS_SYS );
$template->assign( 'version', System::getVersion() );
$template->assign( 'version', PMSystem::getVersion() );
$fileName = $pathProcess . $dynTitle . 'Post.php';
file_put_contents( $fileName, $template->getOutputContent() );