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

Fix for GET /api/1.0/workflow/project/{prj_uid}/ws/user/can-start-task, it works again

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-03-14 15:53:41 -04:00
parent bf8ff46fe7
commit f5a9cee203
3 changed files with 83 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
framework/src/Maveriks/WebApplication.php
View File

@@ -240,45 +240,45 @@ class WebApplication
{
$lang = "en";
define('SYS_LANG', $lang);
define('PATH_SEP', DIRECTORY_SEPARATOR);
define("SYS_LANG", $lang);
define("PATH_SEP", DIRECTORY_SEPARATOR);
define('PATH_TRUNK', $this->rootDir . PATH_SEP);
define('PATH_OUTTRUNK', realpath($this->rootDir . '/../') . PATH_SEP);
define('PATH_HOME', $this->rootDir . PATH_SEP . 'workflow' . PATH_SEP);
define("PATH_TRUNK", $this->rootDir . PATH_SEP);
define("PATH_OUTTRUNK", realpath($this->rootDir . "/../") . PATH_SEP);
define("PATH_HOME", $this->rootDir . PATH_SEP . "workflow" . PATH_SEP);
define('PATH_HTML', PATH_HOME . 'public_html' . PATH_SEP);
define('PATH_RBAC_HOME', PATH_TRUNK . 'rbac' . PATH_SEP);
define('PATH_GULLIVER_HOME', PATH_TRUNK . 'gulliver' . PATH_SEP);
define('PATH_GULLIVER', PATH_GULLIVER_HOME . 'system' . PATH_SEP); //gulliver system classes
define('PATH_GULLIVER_BIN', PATH_GULLIVER_HOME . 'bin' . PATH_SEP); //gulliver bin classes
define('PATH_TEMPLATE', PATH_GULLIVER_HOME . 'templates' . PATH_SEP);
define('PATH_THIRDPARTY', PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP);
define('PATH_RBAC', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP); //to enable rbac version 2
define('PATH_RBAC_CORE', PATH_RBAC_HOME . 'engine' . PATH_SEP);
define('PATH_CORE', PATH_HOME . 'engine' . PATH_SEP);
define('PATH_CLASSES', PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP);
define('PATH_SKINS', PATH_CORE . 'skins' . PATH_SEP);
define('PATH_SKIN_ENGINE', PATH_CORE . 'skinEngine' . PATH_SEP);
define('PATH_METHODS', PATH_CORE . 'methods' . PATH_SEP);
define('PATH_XMLFORM', PATH_CORE . 'xmlform' . PATH_SEP);
define('PATH_CONFIG', PATH_CORE . 'config' . PATH_SEP);
define('PATH_PLUGINS', PATH_CORE . 'plugins' . PATH_SEP);
define('PATH_HTMLMAIL', PATH_CORE . 'html_templates' . PATH_SEP);
define('PATH_TPL', PATH_CORE . 'templates' . PATH_SEP);
define('PATH_TEST', PATH_CORE . 'test' . PATH_SEP);
define('PATH_FIXTURES', PATH_TEST . 'fixtures' . PATH_SEP);
define('PATH_RTFDOCS', PATH_CORE . 'rtf_templates' . PATH_SEP);
define('PATH_DYNACONT', PATH_CORE . 'content' . PATH_SEP . 'dynaform' . PATH_SEP);
define('SYS_UPLOAD_PATH', PATH_HOME . "public_html/files/" );
define('PATH_UPLOAD', PATH_HTML . 'files' . PATH_SEP);
define('PATH_WORKFLOW_MYSQL_DATA', PATH_CORE . 'data' . PATH_SEP . 'mysql' . PATH_SEP);
define('PATH_RBAC_MYSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP . 'mysql' . PATH_SEP);
define('FILE_PATHS_INSTALLED', PATH_CORE . 'config' . PATH_SEP . 'paths_installed.php' );
define('PATH_WORKFLOW_MSSQL_DATA', PATH_CORE . 'data' . PATH_SEP . 'mssql' . PATH_SEP);
define('PATH_RBAC_MSSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP . 'mssql' . PATH_SEP);
define('PATH_CONTROLLERS', PATH_CORE . 'controllers' . PATH_SEP);
define('PATH_SERVICES_REST', PATH_CORE . 'services' . PATH_SEP . 'rest' . PATH_SEP);
define("PATH_HTML", PATH_HOME . "public_html" . PATH_SEP);
define("PATH_RBAC_HOME", PATH_TRUNK . "rbac" . PATH_SEP);
define("PATH_GULLIVER_HOME", PATH_TRUNK . "gulliver" . PATH_SEP);
define("PATH_GULLIVER", PATH_GULLIVER_HOME . "system" . PATH_SEP); //gulliver system classes
define("PATH_GULLIVER_BIN", PATH_GULLIVER_HOME . "bin" . PATH_SEP); //gulliver bin classes
define("PATH_TEMPLATE", PATH_GULLIVER_HOME . "templates" . PATH_SEP);
define("PATH_THIRDPARTY", PATH_GULLIVER_HOME . "thirdparty" . PATH_SEP);
define("PATH_RBAC", PATH_RBAC_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP); //to enable rbac version 2
define("PATH_RBAC_CORE", PATH_RBAC_HOME . "engine" . PATH_SEP);
define("PATH_CORE", PATH_HOME . "engine" . PATH_SEP);
define("PATH_CLASSES", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP);
define("PATH_SKINS", PATH_CORE . "skins" . PATH_SEP);
define("PATH_SKIN_ENGINE", PATH_CORE . "skinEngine" . PATH_SEP);
define("PATH_METHODS", PATH_CORE . "methods" . PATH_SEP);
define("PATH_XMLFORM", PATH_CORE . "xmlform" . PATH_SEP);
define("PATH_CONFIG", PATH_CORE . "config" . PATH_SEP);
define("PATH_PLUGINS", PATH_CORE . "plugins" . PATH_SEP);
define("PATH_HTMLMAIL", PATH_CORE . "html_templates" . PATH_SEP);
define("PATH_TPL", PATH_CORE . "templates" . PATH_SEP);
define("PATH_TEST", PATH_CORE . "test" . PATH_SEP);
define("PATH_FIXTURES", PATH_TEST . "fixtures" . PATH_SEP);
define("PATH_RTFDOCS", PATH_CORE . "rtf_templates" . PATH_SEP);
define("PATH_DYNACONT", PATH_CORE . "content" . PATH_SEP . "dynaform" . PATH_SEP);
define("SYS_UPLOAD_PATH", PATH_HOME . "public_html/files/" );
define("PATH_UPLOAD", PATH_HTML . "files" . PATH_SEP);
define("PATH_WORKFLOW_MYSQL_DATA", PATH_CORE . "data" . PATH_SEP . "mysql" . PATH_SEP);
define("PATH_RBAC_MYSQL_DATA", PATH_RBAC_CORE . "data" . PATH_SEP . "mysql" . PATH_SEP);
define("FILE_PATHS_INSTALLED", PATH_CORE . "config" . PATH_SEP . "paths_installed.php");
define("PATH_WORKFLOW_MSSQL_DATA", PATH_CORE . "data" . PATH_SEP . "mssql" . PATH_SEP);
define("PATH_RBAC_MSSQL_DATA", PATH_RBAC_CORE . "data" . PATH_SEP . "mssql" . PATH_SEP);
define("PATH_CONTROLLERS", PATH_CORE . "controllers" . PATH_SEP);
define("PATH_SERVICES_REST", PATH_CORE . "services" . PATH_SEP . "rest" . PATH_SEP);
\Bootstrap::registerSystemClasses();
@@ -287,26 +287,27 @@ class WebApplication
$config = \System::getSystemConfiguration();
// Do not change any of these settings directly, use env.ini instead
ini_set( 'display_errors', $config['display_errors']);
ini_set( 'error_reporting', $config['error_reporting']);
ini_set( 'short_open_tag', 'On' ); // ??
ini_set( 'default_charset', "UTF-8" ); // ??
ini_set( 'memory_limit', $config['memory_limit'] );
ini_set( 'soap.wsdl_cache_enabled', $config['wsdl_cache'] );
ini_set( 'date.timezone', $config['time_zone'] );
ini_set( "display_errors", $config["display_errors"]);
ini_set( "error_reporting", $config["error_reporting"]);
ini_set( "short_open_tag", "On" ); // ??
ini_set( "default_charset", "UTF-8" ); // ??
ini_set( "memory_limit", $config["memory_limit"] );
ini_set( "soap.wsdl_cache_enabled", $config["wsdl_cache"] );
ini_set( "date.timezone", $config["time_zone"] );
define('DEBUG_SQL_LOG', $config['debug_sql']);
define('DEBUG_TIME_LOG', $config['debug_time']);
define('DEBUG_CALENDAR_LOG', $config['debug_calendar']);
define('MEMCACHED_ENABLED', $config['memcached']);
define('MEMCACHED_SERVER', $config['memcached_server']);
define('TIME_ZONE', $config['time_zone']);
define("DEBUG_SQL_LOG", $config["debug_sql"]);
define("DEBUG_TIME_LOG", $config["debug_time"]);
define("DEBUG_CALENDAR_LOG", $config["debug_calendar"]);
define("MEMCACHED_ENABLED", $config["memcached"]);
define("MEMCACHED_SERVER", $config["memcached_server"]);
define("TIME_ZONE", $config["time_zone"]);
define("SYS_SKIN", $config["default_skin"]);
// set include path
set_include_path(
PATH_CORE . PATH_SEPARATOR .
PATH_THIRDPARTY . PATH_SEPARATOR .
PATH_THIRDPARTY . 'pear' . PATH_SEPARATOR .
PATH_THIRDPARTY . "pear" . PATH_SEPARATOR .
PATH_RBAC_CORE . PATH_SEPARATOR .
get_include_path()
);
@@ -321,54 +322,52 @@ class WebApplication
}
// include the server installed configuration
require_once FILE_PATHS_INSTALLED;
require_once PATH_CORE . "config" . PATH_SEP . "paths_installed.php";
// defining system constant when a valid server environment exists
define('PATH_LANGUAGECONT', PATH_DATA . "META-INF" . PATH_SEP );
define('PATH_CUSTOM_SKINS', PATH_DATA . 'skins' . PATH_SEP );
define('PATH_TEMPORAL', PATH_C . 'dynEditor/');
define('PATH_DB', PATH_DATA . 'sites' . PATH_SEP);
define("PATH_LANGUAGECONT", PATH_DATA . "META-INF" . PATH_SEP );
define("PATH_CUSTOM_SKINS", PATH_DATA . "skins" . PATH_SEP );
define("PATH_TEMPORAL", PATH_C . "dynEditor/");
define("PATH_DB", PATH_DATA . "sites" . PATH_SEP);
define('SYS_SYS', $workspace);
define("SYS_SYS", $workspace);
if (! file_exists( PATH_DB . SYS_SYS . '/db.php' )) {
throw new \Exception(\G::loadTranslation('ID_NOT_WORKSPACE'));
if (! file_exists( PATH_DB . SYS_SYS . "/db.php" )) {
throw new \Exception(\G::loadTranslation("ID_NOT_WORKSPACE"));
}
require_once (PATH_DB . SYS_SYS . '/db.php');
require_once (PATH_DB . SYS_SYS . "/db.php");
// defining constant for workspace shared directory
define('PATH_WORKSPACE', PATH_DB . SYS_SYS . PATH_SEP);
define("PATH_WORKSPACE", PATH_DB . SYS_SYS . PATH_SEP);
// including workspace shared classes -> particularlly for pmTables
set_include_path(get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE);
// smarty constants
// define( 'PATH_SMARTY_C', PATH_C . 'smarty' . PATH_SEP . 'c' );
// define( 'PATH_SMARTY_CACHE', PATH_C . 'smarty' . PATH_SEP . 'cache' );
// define( "PATH_SMARTY_C", PATH_C . "smarty" . PATH_SEP . "c" );
// define( "PATH_SMARTY_CACHE", PATH_C . "smarty" . PATH_SEP . "cache" );
define("PATH_DATA_SITE", PATH_DATA . "sites/" . SYS_SYS . "/");
define("PATH_DOCUMENT", PATH_DATA_SITE . "files/");
define("PATH_DATA_MAILTEMPLATES", PATH_DATA_SITE . "mailTemplates/");
define("PATH_DATA_PUBLIC", PATH_DATA_SITE . "public/");
define("PATH_DATA_REPORTS", PATH_DATA_SITE . "reports/");
define("PATH_DYNAFORM", PATH_DATA_SITE . "xmlForms/");
define("PATH_IMAGES_ENVIRONMENT_FILES", PATH_DATA_SITE . "usersFiles" . PATH_SEP);
define("PATH_IMAGES_ENVIRONMENT_USERS", PATH_DATA_SITE . "usersPhotographies" . PATH_SEP);
//***************** PM Paths DATA **************************
define('PATH_DATA_SITE', PATH_DATA . 'sites/' . SYS_SYS . '/');
define('PATH_DOCUMENT', PATH_DATA_SITE . 'files/');
define('PATH_DATA_MAILTEMPLATES', PATH_DATA_SITE . 'mailTemplates/');
define('PATH_DATA_PUBLIC', PATH_DATA_SITE . 'public/');
define('PATH_DATA_REPORTS', PATH_DATA_SITE . 'reports/');
define('PATH_DYNAFORM', PATH_DATA_SITE . 'xmlForms/');
define('PATH_IMAGES_ENVIRONMENT_FILES', PATH_DATA_SITE . 'usersFiles' . PATH_SEP);
define('PATH_IMAGES_ENVIRONMENT_USERS', PATH_DATA_SITE . 'usersPhotographies' . PATH_SEP);
if (is_file(PATH_DATA_SITE.PATH_SEP . '.server_info')) {
$SERVER_INFO = file_get_contents(PATH_DATA_SITE.PATH_SEP.'.server_info');
if (is_file(PATH_DATA_SITE.PATH_SEP . ".server_info")) {
$SERVER_INFO = file_get_contents(PATH_DATA_SITE.PATH_SEP.".server_info");
$SERVER_INFO = unserialize($SERVER_INFO);
define('SERVER_NAME', $SERVER_INFO ['SERVER_NAME']);
define('SERVER_PORT', $SERVER_INFO ['SERVER_PORT']);
define("SERVER_NAME", $SERVER_INFO ["SERVER_NAME"]);
define("SERVER_PORT", $SERVER_INFO ["SERVER_PORT"]);
} else {
echo "WARNING! No server info found!";
}
// create memcached singleton
//\Bootstrap::LoadClass('memcached');
//\Bootstrap::LoadClass("memcached");
//$memcache = PMmemcached::getSingleton( SYS_SYS );
\Propel::init(PATH_CONFIG . "databases.php");

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

@@ -193,7 +193,7 @@ class Bootstrap
self::registerClass("dynaformEditorAjax", PATH_CLASSES . "class.dynaformEditor.php");
self::registerClass("FieldValidator", PATH_CLASSES . "class.fieldValidator.php");
self::registerClass("FileCache", PATH_CLASSES . "class.fileCache.php");
self::registerClass("GroupUser", PATH_CLASSES . "class.groupUser.php");
//self::registerClass("GroupUser", PATH_CLASSES . "class.groupUser.php"); -> this have conflicts with model/GroupUser.php
self::registerClass("Groups", PATH_CLASSES . "class.groups.php");
self::registerClass("JavaBridgePM", PATH_CLASSES . "class.javaBridgePM.php");
self::registerClass("Jrml", PATH_CLASSES . "class.jrml.php");

10
workflow/public_html/sysGeneric.php
View File

@@ -278,16 +278,16 @@ $config = Bootstrap::getSystemConfiguration();
// starting session
if (isset($config['session.gc_maxlifetime'])) {
$timelife = $config['session.gc_maxlifetime'];
$timelife = $config['session.gc_maxlifetime'];
} else {
$timelife = ini_get('session.gc_maxlifetime');
$timelife = ini_get('session.gc_maxlifetime');
}
if (is_null($timelife)) {
$timelife = 1440;
$timelife = 1440;
}
ini_set('session.gc_maxlifetime', $timelife);
if (preg_match("/msie/i", $_SERVER ['HTTP_USER_AGENT']) != 1 || $config['ie_cookie_lifetime'] == 1) {
ini_set('session.cookie_lifetime', $timelife);
if ((isset($_SERVER ['HTTP_USER_AGENT']) && preg_match("/msie/i", $_SERVER ['HTTP_USER_AGENT']) != 1) || $config['ie_cookie_lifetime'] == 1) {
ini_set('session.cookie_lifetime', $timelife);
}
//session_start();