fernando/luos
1
0
Fork 0
Code Releases 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

2
workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
View File

@@ -404,7 +404,7 @@ class ActionsByEmail
$arrayConfigAux = $row;
$arrayConfigAux["SMTPSecure"] = $row["SMTPSECURE"];
}
$aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : \System::getEmailConfiguration();
$aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : \PMSystem::getEmailConfiguration();
$spool = new \spoolRun();
$spool->setConfig($aSetup);

4
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -181,7 +181,7 @@ class Cases
{
try {
$solrEnabled = false;
$solrConf = \System::solrEnv();
$solrConf = \PMSystem::solrEnv();
if ($solrConf !== false) {
$ApplicationSolrIndex = new \AppSolr(
@@ -373,7 +373,7 @@ class Cases
{
try {
$solrEnabled = 0;
if (($solrEnv = \System::solrEnv()) !== false) {
if (($solrEnv = \PMSystem::solrEnv()) !== false) {
$appSolr = new \AppSolr(
$solrEnv["solr_enabled"],
$solrEnv["solr_host"],

2
workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
View File

@@ -139,7 +139,7 @@ class EmailServer
$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();

2
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -1261,7 +1261,7 @@ class Light
$offset = timezone_offset_get( new \DateTimeZone( $tz ), new \DateTime() );
$response['timeZone'] = sprintf( "GMT%s%02d:%02d", ( $offset >= 0 ) ? '+' : '-', abs( $offset / 3600 ), abs( ($offset % 3600) / 60 ) );
$response['multiTimeZone'] = $multiTimeZone;
$fields = \System::getSysInfo();
$fields = \PMSystem::getSysInfo();
$response['version'] = $fields['PM_VERSION'];
$buildType = 'Community';

2
workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
View File

@@ -11,7 +11,7 @@ class NotificationDevice
public function checkMobileNotifications()
{
$conf = \System::getSystemConfiguration('', '', SYS_SYS);
$conf = \PMSystem::getSystemConfiguration('', '', SYS_SYS);
$activeNotifications = true;
if (isset($conf['mobileNotifications'])) {
$activeNotifications = $conf['mobileNotifications'] == 1 ? true : false;

2
workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
View File

@@ -54,7 +54,7 @@ class PushMessageAndroid
*/
public function setSettingNotification()
{
$conf = \System::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
$conf = \PMSystem::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
$this->setUrl($conf['android']['url']);
$this->setKey($conf['android']['serverApiKey']);
}

2
workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
View File

@@ -67,7 +67,7 @@ class PushMessageIOS
*/
public function setSettingNotification()
{
$conf = \System::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
$conf = \PMSystem::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
$this->setUrl($conf['apple']['url']);
$this->setKey($conf['apple']['passphrase']);
$this->setPemFile($conf['apple']['pemFile']);

2
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
View File

@@ -133,7 +133,7 @@ class GranularExporter
$data["version"] = "3.1";
$data["container"] = "ProcessMaker-Project";
$data["metadata"] = array(
"vendor_version" => \System::getVersion(),
"vendor_version" => \PMSystem::getVersion(),
"vendor_version_code" => "Michelangelo",
"export_timestamp" => date("U"),
"export_datetime" => date("Y-m-d\TH:i:sP"),

2
workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
View File

@@ -30,7 +30,7 @@ class Pmgmail {
//getting the skin
require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.system.php");
$sysConf = new \System();
$sysConf = new \PMSystem();
$responseSysConfig = $sysConf->getSystemConfiguration( PATH_CONFIG . 'env.ini' );
$response['enviroment'] = $responseSysConfig['default_skin'];

2
workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
View File

@@ -447,7 +447,7 @@ class WebEntry
$template->assign("dynaform", $arrayDynaFormData["DYN_TITLE"]);
$template->assign("timestamp", date("l jS \of F Y h:i:s A"));
$template->assign("ws", $this->sysSys);
$template->assign("version", \System::getVersion());
$template->assign("version", \PMSystem::getVersion());
$fileName = $pathDataPublicProcess . PATH_SEP . $weTitle . "Post.php";