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

Add namespace Processmaker\Core

Browse Source
This commit is contained in:
Marco A. Nina Mena
2017-08-14 16:13:46 -04:00
parent 06641a39c2
commit ee5a124bba
87 changed files with 623 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/methods/setup/cron.php
View File

@@ -2,6 +2,8 @@
global $RBAC;
use ProcessMaker\Core\System;
if ($RBAC->userCanAccess("PM_SETUP") != 1) {
G::SendTemporalMessage("ID_USER_HAVENT_RIGHTS_PAGE", "error", "labels");
exit(0);
@@ -62,7 +64,7 @@ $cronInfo["fileLogSize"] = $fileLogSize;
$cronInfo["fileLogPath"] = $fileLog;
//Workspaces
$workspaces = PmSystem::listWorkspaces();
$workspaces = System::listWorkspaces();
$arrayAux = array ();
foreach ($workspaces as $index => $workspace) {

6
workflow/engine/methods/setup/emails_Ajax.php
View File

@@ -21,7 +21,9 @@
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
use ProcessMaker\Core\System;
$filter = new InputFilter();
$_POST = $filter->xssFilterHard($_POST);
@@ -252,7 +254,7 @@ function sendTestMail ()
<tbody><tr><td><img id='logo' src='http://" . $_SERVER['SERVER_NAME'] . "/images/processmaker.logo.jpg' /></td></tr>
<tr><td style='font-size: 14px;'>$msg [" . date( 'H:i:s' ) . "] - $engine</td></tr>
<tr><td style='vertical-align:middel;'>
<br /><hr><b>This Business Process is powered by ProcessMaker ver. " . PmSystem::getVersion() . ".<b><br />
<br /><hr><b>This Business Process is powered by ProcessMaker ver. " . System::getVersion() . ".<b><br />
<a href='http://www.processmaker.com' style='color:#c40000;'>www.processmaker.com</a><br /></td>
</tr></tbody></table>";

6
workflow/engine/methods/setup/pluginsImportFile.php
View File

@@ -23,6 +23,8 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
global $RBAC;
@@ -279,8 +281,8 @@ try {
$oClass->iPMVersion = 0;
}
if ($oClass->iPMVersion > 0) {
if (PmSystem::getVersion() > 0) {
if ($oClass->iPMVersion > PmSystem::getVersion()) {
if (System::getVersion() > 0) {
if ($oClass->iPMVersion > System::getVersion()) {
//throw new Exception('This plugin needs version ' . $oClass->iPMVersion . ' or higher of ProcessMaker');
}
}

5
workflow/engine/methods/setup/skin_Ajax.php
View File

@@ -1,4 +1,7 @@
<?php
use ProcessMaker\Core\System;
if (! isset( $_REQUEST['action'] )) {
$res['success'] = false;
$res['error'] = $res['message'] = G::LoadTranslation('ID_REQUEST_ACTION');
@@ -46,7 +49,7 @@ function skinList ()
$textFilter = '';
}
$skinList = PmSystem::getSkingList();
$skinList = System::getSkingList();
$wildcard = '';
if (isset( $_REQUEST['activeskin'] )) {
$wildcard = '@';

4
workflow/engine/methods/setup/skinsExport.php
View File

@@ -1,5 +1,7 @@
<?php
use ProcessMaker\Core\System;
/**
* skinsExport.php
*
@@ -150,7 +152,7 @@ G::mk_dir( $pathPublic . 'images' );
$fields['className'] = $id;
$fields['version'] = $oConf->version;
$fields['description'] = $oConf->description;
$fields['PMversion'] = PmSystem::getVersion();
$fields['PMversion'] = System::getVersion();
savePluginFile( 'skinPluginMainClass', $pathHome . $id . '.php', $fields );
savePluginFile( 'skinPluginClass', $pathBase . 'class.' . $id . '.php', $fields );

8
workflow/engine/methods/setup/upgrade.php
View File

@@ -21,7 +21,11 @@
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
global $RBAC;
global
use ProcessMaker\Core\System;
$RBAC;
$access = $RBAC->userCanAccess( 'PM_SETUP_ADVANCE' );
if ($access != 1) {
switch ($access) {
@@ -61,7 +65,7 @@ $G_SUB_MENU = 'setup';
$G_ID_MENU_SELECTED = 'SETUP';
$G_ID_SUB_MENU_SELECTED = 'UPGRADE';
$Fields['PM_VERSION'] = PmSystem::getVersion();
$Fields['PM_VERSION'] = System::getVersion();
$Fields['MAX_FILE_SIZE'] = $uploadMaxSize . " (" . $UPLOAD_MAX_SIZE . ") ";
$G_PUBLISH = new Publisher();

4
workflow/engine/methods/setup/upgrade_System.php
View File

@@ -22,6 +22,8 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
use ProcessMaker\Core\System;
/**
* New System Upgrade controller
*
@@ -49,7 +51,7 @@ $G_ID_MENU_SELECTED = 'SETUP';
$G_ID_SUB_MENU_SELECTED = 'UPGRADE';
require_once "classes/class.system.php";
$oSystem = new PmSystem();
$oSystem = new System();
try {
if (! $oSystem->verifyFileForUpgrade()) {

5
workflow/engine/methods/setup/webServicesAjax.php
View File

@@ -21,6 +21,9 @@
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
use ProcessMaker\Core\System;
ini_set( "soap.wsdl_cache_enabled", "0" ); // enabling WSDL cache
$filter = new InputFilter();
@@ -149,7 +152,7 @@ try {
//Apply proxy settings
$proxy = array ();
$sysConf = PmSystem::getSystemConfiguration();
$sysConf = System::getSystemConfiguration();
if ($sysConf['proxy_host'] != '') {
$proxy['proxy_host'] = $sysConf['proxy_host'];
if ($sysConf['proxy_port'] != '') {