fernando/luos
1
0
Fork 0
Code Releases Activity

Merged 3.0.1.8 into MT-10

Browse Source
This commit is contained in:
Gustavo Cruz
2016-03-18 14:30:05 -04:00
parent bb06effad9 be25df3cdd
commit 35d9162323
10 changed files with 852 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

784
composer.lock generated
View File

@@ -1,10 +1,11 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "9c7ee173ce908a40f4ed9aecaa30b068", "hash": "fc3e38af436accb0aa5aea36913e62fa",
"content-hash": "80f83ad1776f76da5bae90a4e0a10a01",
"packages": [ "packages": [
{ {
"name": "bshaffer/oauth2-server-php", "name": "bshaffer/oauth2-server-php",
@@ -29,7 +30,7 @@
"OAuth2": "src/" "OAuth2": "src/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "http://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
@@ -37,7 +38,7 @@
{ {
"name": "Brent Shaffer", "name": "Brent Shaffer",
"email": "bshafs@gmail.com", "email": "bshafs@gmail.com",
"homepage": "http://brentertainment.com" "homepage": "http://github.com/bshaffer"
} }
], ],
"description": "OAuth2 Server for PHP", "description": "OAuth2 Server for PHP",
@@ -55,7 +56,7 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "git@bitbucket.org:colosa/michelangelofe.git", "url": "git@bitbucket.org:colosa/michelangelofe.git",
"reference": "8878311a3f6c08cad2a0ee2cff9f6ecb7aa097a7" "reference": "7e889f23a7e8397c052a4d9ae6331334b57c9d48"
}, },
"require": { "require": {
"colosa/pmui": "3.0.1.8-dev" "colosa/pmui": "3.0.1.8-dev"
@@ -66,7 +67,7 @@
"keywords": [ "keywords": [
"js app ProcessMaker" "js app ProcessMaker"
], ],
"time": "2016-02-29 19:49:15" "time": "2016-03-09 20:18:44"
}, },
{ {
"name": "colosa/pmDynaform", "name": "colosa/pmDynaform",
@@ -74,7 +75,7 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "git@bitbucket.org:colosa/pmdynaform.git", "url": "git@bitbucket.org:colosa/pmdynaform.git",
"reference": "320128bf394f851209d9216123a45afd269bcf4c" "reference": "c2008027bd721ac42e4a7d98cc773f82ac25921e"
}, },
"type": "library", "type": "library",
"description": "JS Library to render ProcessMaker Dynaforms", "description": "JS Library to render ProcessMaker Dynaforms",
@@ -82,7 +83,7 @@
"keywords": [ "keywords": [
"js lib ProcessMaker Dynaforms" "js lib ProcessMaker Dynaforms"
], ],
"time": "2016-02-26 21:40:47" "time": "2016-03-15 17:46:33"
}, },
{ {
"name": "colosa/pmUI", "name": "colosa/pmUI",
@@ -100,6 +101,53 @@
], ],
"time": "2016-02-26 21:41:50" "time": "2016-02-26 21:41:50"
}, },
{
"name": "dapphp/securimage",
"version": "3.6.4",
"source": {
"type": "git",
"url": "https://github.com/dapphp/securimage.git",
"reference": "2ed50264ae5541fec8d8c79e4c9b6235a7cfd506"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dapphp/securimage/zipball/2ed50264ae5541fec8d8c79e4c9b6235a7cfd506",
"reference": "2ed50264ae5541fec8d8c79e4c9b6235a7cfd506",
"shasum": ""
},
"require": {
"ext-gd": "*",
"php": ">=5.2.0"
},
"suggest": {
"ext-pdo": "For database storage support",
"ext-pdo_mysql": "For MySQL database support",
"ext-pdo_sqlite": "For SQLite3 database support"
},
"type": "library",
"autoload": {
"classmap": [
"securimage.php"
]
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"BSD"
],
"authors": [
{
"name": "Drew Phillips",
"email": "drew@drew-phillips.com"
}
],
"description": "PHP CAPTCHA Library",
"homepage": "https://www.phpcaptcha.org",
"keywords": [
"captcha",
"security"
],
"time": "2016-03-04 21:08:00"
},
{ {
"name": "google/apiclient", "name": "google/apiclient",
"version": "1.1.6", "version": "1.1.6",
@@ -221,25 +269,729 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "behat/behat", "name": "behat/behat",
"version": "2.4.6", "version": "v2.4.6",
"source": {
"type": "git",
"url": "https://github.com/Behat/Behat.git",
"reference": "f1d2964667cf4b21bb6c2c1564f26829a6954155"
},
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Behat/Behat/zipball/f1d2964667cf4b21bb6c2c1564f26829a6954155", "url": "https://api.github.com/repos/Behat/Behat/zipball/f1d2964667cf4b21bb6c2c1564f26829a6954155",
"reference": null, "reference": "f1d2964667cf4b21bb6c2c1564f26829a6954155",
"shasum": "d8aada3ba96925c26f242a602f4692709810a39b" "shasum": ""
}, },
"type": "library" "require": {
"behat/gherkin": "~2.2.9",
"php": ">=5.3.1",
"symfony/config": "~2.0",
"symfony/console": "~2.0",
"symfony/dependency-injection": "~2.0",
"symfony/event-dispatcher": "~2.0",
"symfony/finder": "~2.0",
"symfony/translation": "~2.0",
"symfony/yaml": "~2.0"
},
"require-dev": {
"phpunit/phpunit": "~3.7.19"
},
"suggest": {
"behat/mink-extension": "for integration with Mink testing framework",
"behat/symfony2-extension": "for integration with Symfony2 web framework",
"behat/yii-extension": "for integration with Yii web framework"
},
"bin": [
"bin/behat"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-develop": "2.4-dev"
}
},
"autoload": {
"psr-0": {
"Behat\\Behat": "src/"
}
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Konstantin Kudryashov",
"email": "ever.zet@gmail.com",
"homepage": "http://everzet.com"
}
],
"description": "Scenario-oriented BDD framework for PHP 5.3",
"homepage": "http://behat.org/",
"keywords": [
"BDD",
"Behat",
"Symfony2"
],
"time": "2013-06-06 10:46:48"
},
{
"name": "behat/gherkin",
"version": "v2.2.9",
"source": {
"type": "git",
"url": "https://github.com/Behat/Gherkin.git",
"reference": "cca2c477921ca38578d6e9759ea5e450f29c2d8f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Behat/Gherkin/zipball/cca2c477921ca38578d6e9759ea5e450f29c2d8f",
"reference": "cca2c477921ca38578d6e9759ea5e450f29c2d8f",
"shasum": ""
},
"require": {
"php": ">=5.3.1",
"symfony/finder": ">=2.0,<2.4-dev"
},
"require-dev": {
"symfony/config": ">=2.0,<2.4-dev",
"symfony/translation": ">=2.0,<2.4-dev",
"symfony/yaml": ">=2.0,<2.4-dev"
},
"suggest": {
"symfony/config": "If you want to use Config component to manage resources",
"symfony/translation": "If you want to use Symfony2 translations adapter",
"symfony/yaml": "If you want to parse features, represented in YAML files"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-develop": "2.2-dev"
}
},
"autoload": {
"psr-0": {
"Behat\\Gherkin": "src/"
}
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Konstantin Kudryashov",
"email": "ever.zet@gmail.com",
"homepage": "http://everzet.com"
}
],
"description": "Gherkin DSL parser for PHP 5.3",
"homepage": "http://behat.org/",
"keywords": [
"BDD",
"Behat",
"DSL",
"Symfony2",
"parser"
],
"time": "2013-03-02 10:38:40"
}, },
{ {
"name": "guzzle/guzzle", "name": "guzzle/guzzle",
"version": "3.1.2", "version": "v3.1.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "7901ea7d27373d0cc85eac6f6694e4c2ced90a26"
},
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/7901ea7d27373d0cc85eac6f6694e4c2ced90a26", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7901ea7d27373d0cc85eac6f6694e4c2ced90a26",
"reference": null, "reference": "7901ea7d27373d0cc85eac6f6694e4c2ced90a26",
"shasum": "25bc38119541c151c455c3140b4dc388d7ec4187" "shasum": ""
}, },
"type": "library" "require": {
"ext-curl": "*",
"php": ">=5.3.2",
"symfony/event-dispatcher": ">=2.1"
},
"replace": {
"guzzle/batch": "self.version",
"guzzle/cache": "self.version",
"guzzle/common": "self.version",
"guzzle/http": "self.version",
"guzzle/inflection": "self.version",
"guzzle/iterator": "self.version",
"guzzle/log": "self.version",
"guzzle/parser": "self.version",
"guzzle/plugin": "self.version",
"guzzle/plugin-async": "self.version",
"guzzle/plugin-backoff": "self.version",
"guzzle/plugin-cache": "self.version",
"guzzle/plugin-cookie": "self.version",
"guzzle/plugin-curlauth": "self.version",
"guzzle/plugin-history": "self.version",
"guzzle/plugin-log": "self.version",
"guzzle/plugin-md5": "self.version",
"guzzle/plugin-mock": "self.version",
"guzzle/plugin-oauth": "self.version",
"guzzle/service": "self.version",
"guzzle/stream": "self.version"
},
"require-dev": {
"doctrine/common": "*",
"monolog/monolog": "1.*",
"phpunit/phpunit": "3.7.*",
"symfony/class-loader": "*",
"zend/zend-cache1": "1.12",
"zend/zend-log1": "1.12",
"zendframework/zend-cache": "2.0.*",
"zendframework/zend-log": "2.0.*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.1-dev"
}
},
"autoload": {
"psr-0": {
"Guzzle\\Tests": "tests/",
"Guzzle": "src/"
}
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Guzzle Community",
"homepage": "https://github.com/guzzle/guzzle/contributors"
}
],
"description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
"homepage": "http://guzzlephp.org/",
"keywords": [
"client",
"curl",
"framework",
"http",
"http client",
"rest",
"web service"
],
"time": "2013-01-28 00:07:40"
},
{
"name": "symfony/config",
"version": "v2.8.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19",
"reference": "0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/filesystem": "~2.3|~3.0.0"
},
"suggest": {
"symfony/yaml": "To use the yaml reference dumper"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Config\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"time": "2016-02-22 16:12:45"
},
{
"name": "symfony/console",
"version": "v2.8.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "56cc5caf051189720b8de974e4746090aaa10d44"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/56cc5caf051189720b8de974e4746090aaa10d44",
"reference": "56cc5caf051189720b8de974e4746090aaa10d44",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/event-dispatcher": "~2.1|~3.0.0",
"symfony/process": "~2.1|~3.0.0"
},
"suggest": {
"psr/log": "For using the console logger",
"symfony/event-dispatcher": "",
"symfony/process": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Console\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2016-02-28 16:20:50"
},
{
"name": "symfony/dependency-injection",
"version": "v2.8.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "62251761a7615435b22ccf562384c588b431be44"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/62251761a7615435b22ccf562384c588b431be44",
"reference": "62251761a7615435b22ccf562384c588b431be44",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"conflict": {
"symfony/expression-language": "<2.6"
},
"require-dev": {
"symfony/config": "~2.2|~3.0.0",
"symfony/expression-language": "~2.6|~3.0.0",
"symfony/yaml": "~2.1|~3.0.0"
},
"suggest": {
"symfony/config": "",
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
"symfony/yaml": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\DependencyInjection\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"time": "2016-02-28 16:34:46"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.8.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "78c468665c9568c3faaa9c416a7134308f2d85c3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/78c468665c9568c3faaa9c416a7134308f2d85c3",
"reference": "78c468665c9568c3faaa9c416a7134308f2d85c3",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.0,>=2.0.5|~3.0.0",
"symfony/dependency-injection": "~2.6|~3.0.0",
"symfony/expression-language": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0"
},
"suggest": {
"symfony/dependency-injection": "",
"symfony/http-kernel": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\EventDispatcher\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2016-01-27 05:14:19"
},
{
"name": "symfony/filesystem",
"version": "v2.8.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "65cb36b6539b1d446527d60457248f30d045464d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/65cb36b6539b1d446527d60457248f30d045464d",
"reference": "65cb36b6539b1d446527d60457248f30d045464d",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Filesystem\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2016-02-22 15:02:30"
},
{
"name": "symfony/finder",
"version": "v2.3.39",
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "24cbc57da78ef7d05250c657b18b1ddcb1298bdf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/24cbc57da78ef7d05250c657b18b1ddcb1298bdf",
"reference": "24cbc57da78ef7d05250c657b18b1ddcb1298bdf",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.3-dev"
}
},
"autoload": {
"psr-0": {
"Symfony\\Component\\Finder\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2016-03-09 12:50:31"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "1289d16209491b584839022f29257ad859b8532d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
"reference": "1289d16209491b584839022f29257ad859b8532d",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"suggest": {
"ext-mbstring": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Mbstring\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for the Mbstring extension",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"mbstring",
"polyfill",
"portable",
"shim"
],
"time": "2016-01-20 09:13:37"
},
{
"name": "symfony/translation",
"version": "v2.8.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "b7b4ebadd2b5e614ff7d2d6fc63e0ed0578909c7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/b7b4ebadd2b5e614ff7d2d6fc63e0ed0578909c7",
"reference": "b7b4ebadd2b5e614ff7d2d6fc63e0ed0578909c7",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
"symfony/config": "<2.7"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.8",
"symfony/intl": "~2.4|~3.0.0",
"symfony/yaml": "~2.2|~3.0.0"
},
"suggest": {
"psr/log": "To use logging capability in translator",
"symfony/config": "",
"symfony/yaml": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Translation\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2016-02-02 09:49:18"
},
{
"name": "symfony/yaml",
"version": "v2.8.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/2a4ee40acb880c56f29fb1b8886e7ffe94f3b995",
"reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Yaml\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "http://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-02-23 07:41:20"
} }
], ],
"aliases": [], "aliases": [],

3
processmaker
View File

@@ -6,6 +6,7 @@
define("PROCESSMAKER_PATH", $scriptDir); define("PROCESSMAKER_PATH", $scriptDir);
define("WORKFLOW_PATH", $scriptDir . 'workflow/'); define("WORKFLOW_PATH", $scriptDir . 'workflow/');
define("WORKFLOW_BIN_PATH", $scriptDir . 'workflow/engine/bin/'); define("WORKFLOW_BIN_PATH", $scriptDir . 'workflow/engine/bin/');
error_reporting(error_reporting() & ~E_DEPRECATED & ~E_STRICT);
include WORKFLOW_BIN_PATH . '/cli.php'; include WORKFLOW_BIN_PATH . '/cli.php';

2
workflow/engine/classes/class.indicatorsCalculator.php
View File

@@ -653,7 +653,7 @@ class indicatorsCalculator
G::loadClass('wsTools'); G::loadClass('wsTools');
$currentWS = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined'; $currentWS = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined';
$workSpace = new workspaceTools($currentWS); $workSpace = new workspaceTools($currentWS);
$arrayHost = split(":", $workSpace->dbHost); $arrayHost = explode(':', $workSpace->dbHost);
$host = "host=".$arrayHost[0]; $host = "host=".$arrayHost[0];
$port = count($arrayHost) > 1 ? ";port=".$arrayHost[1] : ""; $port = count($arrayHost) > 1 ? ";port=".$arrayHost[1] : "";
$db = ";dbname=".$workSpace->dbName; $db = ";dbname=".$workSpace->dbName;

6
workflow/engine/classes/class.pmFunctions.php
View File

@@ -245,7 +245,11 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter
G::loadClass('system'); G::loadClass('system');
$blackList = System::getQueryBlackList(); $blackList = System::getQueryBlackList();
$aListQueries = explode('|', $blackList['queries']); $aListQueries = explode('|', $blackList['queries']);
$aListAllTables = explode('|', $blackList['tables'].$blackList['pmtables']); $aListAllTables = explode(
'|',
((isset($blackList['tables']))? $blackList['tables'] : '') .
((isset($blackList['pmtables']))? $blackList['pmtables'] : '')
);
$parseSqlStm = new PHPSQLParser($SqlStatement); $parseSqlStm = new PHPSQLParser($SqlStatement);
try { try {
//Parsing queries and check the blacklist //Parsing queries and check the blacklist

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

@@ -1139,11 +1139,13 @@ class pmTablesProxy extends HttpProxyController
$aErrors[$count]['IS_PMTABLE'] = $isPmTable; $aErrors[$count]['IS_PMTABLE'] = $isPmTable;
$aErrors[$count]['PRO_UID'] = $tableProUid; $aErrors[$count]['PRO_UID'] = $tableProUid;
} else { } else {
$aErrors[$count]['NAME_TABLE'] = $contentSchema['ADD_TAB_NAME']; if ($tableExists !== false && !$overWrite) {
$aErrors[$count]['ERROR_TYPE'] = ERROR_RP_TABLES_OVERWRITE; $aErrors[$count]['NAME_TABLE'] = $contentSchema['ADD_TAB_NAME'];
$aErrors[$count]['ERROR_MESS'] = G::loadTranslation('ID_OVERWRITE_RPTABLE', array($contentSchema['ADD_TAB_NAME'])); $aErrors[$count]['ERROR_TYPE'] = ERROR_RP_TABLES_OVERWRITE;
$aErrors[$count]['IS_PMTABLE'] = $isPmTable; $aErrors[$count]['ERROR_MESS'] = G::loadTranslation('ID_OVERWRITE_RPTABLE', array($contentSchema['ADD_TAB_NAME']));
$aErrors[$count]['PRO_UID'] = $tableProUid; $aErrors[$count]['IS_PMTABLE'] = $isPmTable;
$aErrors[$count]['PRO_UID'] = $tableProUid;
}
} }
} }
} else { } else {

4
workflow/engine/data/mysql/insert.sql
View File

@@ -3093,7 +3093,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CREATED_BY','en','Created By','2014-01-15') , ( 'LABEL','ID_CREATED_BY','en','Created By','2014-01-15') ,
( 'LABEL','ID_REPORT_TABLE_TITLE','en','Title','2014-01-15') , ( 'LABEL','ID_REPORT_TABLE_TITLE','en','Title','2014-01-15') ,
( 'LABEL','ID_REPORT_TABLE','en','Report Table','2014-01-15') , ( 'LABEL','ID_REPORT_TABLE','en','Report Table','2014-01-15') ,
( 'LABEL','ID_ASSIGNED_FIEDS','en','ASSIGNED FIELDS','2014-01-15') , ( 'LABEL','ID_ASSIGNED_FIELDS','en','ASSIGNED FIELDS','2014-01-15') ,
( 'LABEL','ID_SAVE_AND_CONTINUE','en','Save and Continue','2014-01-15') , ( 'LABEL','ID_SAVE_AND_CONTINUE','en','Save and Continue','2014-01-15') ,
( 'LABEL','ID_NO_SELECTED_FIELDS','en','No selected fields','2014-01-15') , ( 'LABEL','ID_NO_SELECTED_FIELDS','en','No selected fields','2014-01-15') ,
( 'LABEL','ID_DYNAFORM_FIELD','en','Dynaform Field','2014-01-15') , ( 'LABEL','ID_DYNAFORM_FIELD','en','Dynaform Field','2014-01-15') ,
@@ -61374,4 +61374,4 @@ INSERT INTO ADDONS_MANAGER (ADDON_DESCRIPTION,ADDON_ID,ADDON_NAME,ADDON_NICK,ADD
('SSO with an LDAP provider.','windowsSSO','windowsSSO','windowsSSO','Colosa','localRegistry','ready','00000000000000000000000000010011','features','','','0'), ('SSO with an LDAP provider.','windowsSSO','windowsSSO','windowsSSO','Colosa','localRegistry','ready','00000000000000000000000000010011','features','','','0'),
('Integration with Gmail','pmGmail','pmGmail','pmGmail','Colosa','localRegistry','ready','00000000000000000000000000010012','features','','','0'), ('Integration with Gmail','pmGmail','pmGmail','pmGmail','Colosa','localRegistry','ready','00000000000000000000000000010012','features','','','0'),
('User-based Language Management.','userBasedLanguage','userBasedLanguage','userBasedLanguage','Colosa','localRegistry','ready','00000000000000000000000000010013','features','','','0'), ('User-based Language Management.','userBasedLanguage','userBasedLanguage','userBasedLanguage','Colosa','localRegistry','ready','00000000000000000000000000010013','features','','','0'),
('User-based Time Zone Management.','userBasedTimeZone','userBasedTimeZone','userBasedTimeZone','Colosa','localRegistry','ready','00000000000000000000000000010014','features','','','0'); ('User-based Time Zone Management.','userBasedTimeZone','userBasedTimeZone','userBasedTimeZone','Colosa','localRegistry','ready','00000000000000000000000000010014','features','','','0');

32
workflow/engine/src/ProcessMaker/BusinessModel/BpmnProcess.php Normal file
View File

@@ -0,0 +1,32 @@
<?php
namespace ProcessMaker\BusinessModel;
class BpmnProcess
{
/**
* Update all processes data by project uid
* @param $prjUid
* @param $data
* @throws \PropelException
*/
public function updateAllProcessesByProject($prjUid, $data)
{
$oCriteria = new \Criteria();
$oCriteria->addSelectColumn(\BpmnProcessPeer::PRO_UID);
$oCriteria->add(\BpmnProcessPeer::PRJ_UID, $prjUid);
$rs = \BpmnProcessPeer::doSelectRS($oCriteria);
$rs->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
if (!empty($data['PRO_UID'])) {
unset($data['PRO_UID']);
}
while ($rs->next()) {
$row = $rs->getRow();
$project = \BpmnProcessPeer::retrieveByPK($row['PRO_UID']);
if (!empty($project)) {
$project->fromArray($data, \BasePeer::TYPE_FIELDNAME);
$project->save();
}
}
}
}

13
workflow/engine/src/ProcessMaker/BusinessModel/BpmnProject.php Normal file
View File

@@ -0,0 +1,13 @@
<?php
namespace ProcessMaker\BusinessModel;
class BpmnProject
{
public function update($prj_uid, $data)
{
$project = \BpmnProjectPeer::retrieveByPK($prj_uid);
$project->fromArray($data, \BasePeer::TYPE_FIELDNAME);
$project->save();
}
}

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

@@ -874,24 +874,26 @@ class EmailServer
try { try {
$emailServer = \EmailServerPeer::retrieveByPK($emailServerUid); $emailServer = \EmailServerPeer::retrieveByPK($emailServerUid);
$passwd = $arrayData["MESS_PASSWORD"]; if (isset($arrayData['MESS_PASSWORD'])) {
$passwdDec = \G::decrypt($passwd, "EMAILENCRYPT"); $passwd = $arrayData['MESS_PASSWORD'];
$auxPass = explode("hash:", $passwdDec); $passwdDec = \G::decrypt($passwd, 'EMAILENCRYPT');
$auxPass = explode('hash:', $passwdDec);
if (count($auxPass) > 1) { if (count($auxPass) > 1) {
if (count($auxPass) == 2) { if (count($auxPass) == 2) {
$passwd = $auxPass[1]; $passwd = $auxPass[1];
} else { } else {
array_shift($auxPass); array_shift($auxPass);
$passwd = implode("", $auxPass); $passwd = implode('', $auxPass);
}
} }
}
$arrayData["MESS_PASSWORD"] = $passwd; $arrayData['MESS_PASSWORD'] = $passwd;
if ($arrayData["MESS_PASSWORD"] != "") { if ($arrayData['MESS_PASSWORD'] != '') {
$arrayData["MESS_PASSWORD"] = "hash:" . $arrayData["MESS_PASSWORD"]; $arrayData['MESS_PASSWORD'] = 'hash:' . $arrayData['MESS_PASSWORD'];
$arrayData["MESS_PASSWORD"] = \G::encrypt($arrayData["MESS_PASSWORD"], "EMAILENCRYPT"); $arrayData['MESS_PASSWORD'] = \G::encrypt($arrayData['MESS_PASSWORD'], 'EMAILENCRYPT');
}
} }
$emailServer->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME); $emailServer->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);

6
workflow/engine/src/ProcessMaker/BusinessModel/Process.php
View File

@@ -562,6 +562,12 @@ class Process
$this->throwExceptionIfNotExistsUser($arrayData["PRO_CREATE_USER"], $this->arrayFieldNameForException["processCreateUser"]); $this->throwExceptionIfNotExistsUser($arrayData["PRO_CREATE_USER"], $this->arrayFieldNameForException["processCreateUser"]);
} }
//Update name in table Bpmn_Project and Bpmn_Process
$oProject = new BpmnProject();
$oProject->update($processUid, array('PRJ_NAME'=>$arrayData['PRO_TITLE']));
$oProcess = new BpmnProcess();
//The relationship Bpmn_Project with Bpmn_Process is 1:n
$oProcess->updateAllProcessesByProject($processUid, array('PRO_NAME'=>$arrayData['PRO_TITLE']));
//Update //Update
$process = new \Process(); $process = new \Process();