fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-3633-C

Browse Source
This commit is contained in:
hjonathan
2017-08-10 13:47:28 -04:00
parent 90691b6d52 f8b4196169
commit caf48a2c76
3 changed files with 79 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
gulliver/system/class.bootstrap.php
View File

@@ -14,6 +14,27 @@ class Bootstrap
//below here only approved methods
/**
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function autoloadClass($class)
{
}
/**
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function registerClass($className, $includePath)
{
}
/**
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function registerDir($name, $dir)
{
}
/*
* these functions still under revision
*/
@@ -22,6 +43,12 @@ class Bootstrap
{
return PmSystem::getSystemConfiguration($globalIniFile, $wsIniFile, $wsName);
}
/**
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function registerSystemClasses()
{
}
//below this line, still not approved methods
@@ -122,6 +149,13 @@ class Bootstrap
$smarty->display($template);
}
/**
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function LoadSystem($strClass)
{
}
/**
* Get the temporal directory path on differents O.S.
* i.e. /temp -> linux, C:/Temp -> win
@@ -411,6 +445,19 @@ class Bootstrap
return $content;
}
/**
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function LoadClass($strClass)
{
}
/**
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function LoadThirdParty($sPath, $sFile)
{
}
/**
* Function LoadTranslationObject
@@ -1948,6 +1995,13 @@ class Bootstrap
return $result;
}
/**
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public function getModel($model)
{
}
/**
* Create an encrypted unique identifier based on $id and the selected scope id.
*
@@ -2427,6 +2481,13 @@ class Bootstrap
return strtoupper(PHP_OS) == "LINUX";
}
/**
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function initVendors()
{
}
public static function parseIniFile($filename)
{
$data = @parse_ini_file($filename, true);

38
gulliver/system/class.g.php
View File

@@ -44,11 +44,7 @@ class G
public static $httpHost;
/**
* Load Gulliver Classes
* @access public
* @param string $strClass
* @return void
* @deprecated 08-04-2017
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function LoadSystem($strClass)
{
@@ -56,11 +52,7 @@ class G
}
/**
* Load System Classes
* @access public
* @param string $strClass
* @return void
* @deprecated 08-04-2017
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public function LoadSystemExist($strClass)
{
@@ -68,11 +60,7 @@ class G
}
/**
* Include javascript files
* @access public
* @param string $strClass
* @return void
* @deprecated 08-04-2017
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public function LoadInclude($strClass)
{
@@ -80,11 +68,7 @@ class G
}
/**
* public function LoadClassRBAC
* @access public
* @param string $strClass
* @return void
* @deprecated 08-04-2017
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public function LoadClassRBAC($strClass)
{
@@ -92,12 +76,7 @@ class G
}
/**
* If the class is not defined by the aplication, it
* attempt to load the class from gulliver.system
* @access public
* @param string $strClass
* @return void
* @deprecated 08-04-2017
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function LoadClass($strClass)
{
@@ -105,12 +84,7 @@ class G
}
/**
* public function LoadThirdParty
* @access public
* @param string $sPath
* @param string $sFile
* @return void
* @deprecated 08-04-2017
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
*/
public static function LoadThirdParty($sPath, $sFile)
{

12
workflow/engine/methods/roles/roles_Ajax.php
View File

@@ -21,6 +21,18 @@
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
use ProcessMaker\Exception\RBACException;
global $RBAC;
switch ($RBAC->userCanAccess('PM_USERS')) {
case -2:
throw new RBACException('ID_USER_HAVENT_RIGHTS_SYSTEM', -2);
break;
case -1:
case -3:
throw new RBACException('ID_USER_HAVENT_RIGHTS_PAGE', -1);
break;
}
$REQUEST = (isset( $_GET['request'] )) ? $_GET['request'] : $_POST['request'];