Merge remote-tracking branch 'upstream/3.0.1.8' into 3.0.1.7-Gmail
This commit is contained in:
Dante
784
composer.lock
generated
784
composer.lock
generated
@@ -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": [],
|
||||||
|
|||||||
@@ -489,48 +489,30 @@ class DataBaseMaintenance
|
|||||||
*/
|
*/
|
||||||
function backupDataBase ($outfile)
|
function backupDataBase ($outfile)
|
||||||
{
|
{
|
||||||
$tablesBpmn = array(
|
$aHost = explode(':', $this->host);
|
||||||
'BPMN_PROJECT','BPMN_DIAGRAM','BPMN_DOCUMENTATION','BPMN_EXTENSION','BPMN_PARTICIPANT',
|
$dbHost = $aHost[0];
|
||||||
'BPMN_PROCESS','BPMN_ACTIVITY','BPMN_ARTIFACT','BPMN_DATA','BPMN_EVENT','BPMN_GATEWAY',
|
if (isset($aHost[1])) {
|
||||||
'BPMN_LANESET','BPMN_BOUND','BPMN_FLOW','BPMN_LANE'
|
$dbPort = $aHost[1];
|
||||||
);
|
$command = 'mysqldump'
|
||||||
$sqlTablesBpmn = array();
|
. ' --user=' . $this->user
|
||||||
$aTables = $this->getTablesList();
|
. ' --password=' . str_replace('"', '\"', str_replace("'", "\'", quotemeta($this->passwd)))
|
||||||
$ws = explode( '_', $this->dbName );
|
. ' --host=' . $dbHost
|
||||||
$ws = isset( $ws[1] ) ? $ws[1] : $this->dbName;
|
. ' --port=' . $dbPort
|
||||||
$schema = "\n";
|
. ' --opt'
|
||||||
$schema .= " -- Processmaker Data Base Maintenance Tool\n";
|
. ' --skip-comments'
|
||||||
$schema .= " --\n";
|
. ' ' . $this->dbName
|
||||||
$schema .= " -- Workspace: " . $ws . "\n";
|
. ' > ' . $outfile;
|
||||||
$schema .= " -- Data Base: " . $this->dbName . "\n";
|
} else {
|
||||||
$schema .= " -- Tables: " . (count( $aTables )) . "\n";
|
$command = 'mysqldump'
|
||||||
$schema .= " -- Date: " . (date( 'l jS \of F Y h:i:s A' )) . "\n";
|
. ' --host=' . $dbHost
|
||||||
$schema .= " --\n\n";
|
. ' --user=' . $this->user
|
||||||
$schema .= "SET FOREIGN_KEY_CHECKS=0; \n\n";
|
. ' --opt'
|
||||||
|
. ' --skip-comments'
|
||||||
$file = fopen( $outfile, "w+" );
|
. ' --password=' . str_replace('"', '\"', str_replace("'", "\'", quotemeta($this->passwd)))
|
||||||
|
. ' ' . $this->dbName
|
||||||
fwrite( $file, $schema );
|
. ' > ' . $outfile;
|
||||||
|
|
||||||
foreach ($aTables as $table) {
|
|
||||||
$tableSchema = "\nDROP TABLE IF EXISTS `$table`;\n\n";
|
|
||||||
$tableSchema .= $this->getSchemaFromTable( $table );
|
|
||||||
$data = $this->dumpSqlInserts( $table );
|
|
||||||
if (in_array($table, $tablesBpmn)) {
|
|
||||||
$sqlTablesBpmn[$table] = $tableSchema . $data;
|
|
||||||
} else {
|
|
||||||
fwrite( $file, $tableSchema );
|
|
||||||
fwrite( $file, $data );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
shell_exec($command);
|
||||||
if (count ($sqlTablesBpmn) > 0) {
|
|
||||||
foreach ($tablesBpmn as $table) {
|
|
||||||
fwrite( $file, $sqlTablesBpmn[$table] );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fclose( $file );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
2
gulliver/thirdparty/pear/Net/FTP/Socket.php
vendored
2
gulliver/thirdparty/pear/Net/FTP/Socket.php
vendored
@@ -362,7 +362,7 @@ function ftp_pasv(&$control, $pasv)
|
|||||||
$pos2 = strrpos($cont, ')')-$pos;
|
$pos2 = strrpos($cont, ')')-$pos;
|
||||||
$string = substr($cont, $pos, $pos2);
|
$string = substr($cont, $pos, $pos2);
|
||||||
|
|
||||||
$array = split(',', $string);
|
$array = explode(',', $string);
|
||||||
// IP we are connecting to
|
// IP we are connecting to
|
||||||
$ip = $array[0]. '.' .$array[1]. '.' .$array[2]. '.' .$array[3];
|
$ip = $array[0]. '.' .$array[1]. '.' .$array[2]. '.' .$array[3];
|
||||||
// Port ( 256*lowbit + highbit
|
// Port ( 256*lowbit + highbit
|
||||||
|
|||||||
2
gulliver/thirdparty/pear/OS/Guess.php
vendored
2
gulliver/thirdparty/pear/OS/Guess.php
vendored
@@ -106,7 +106,7 @@ class OS_Guess
|
|||||||
if ($uname === null) {
|
if ($uname === null) {
|
||||||
$uname = php_uname();
|
$uname = php_uname();
|
||||||
}
|
}
|
||||||
$parts = split('[[:space:]]+', trim($uname));
|
$parts = explode('[[:space:]]+', trim($uname));
|
||||||
$n = count($parts);
|
$n = count($parts);
|
||||||
|
|
||||||
$release = $machine = $cpu = '';
|
$release = $machine = $cpu = '';
|
||||||
|
|||||||
@@ -720,10 +720,10 @@ class Interop_Client
|
|||||||
. "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"
|
. "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"
|
||||||
. "<tr><td class=\"BLANK\">Endpoint</td>\n";
|
. "<tr><td class=\"BLANK\">Endpoint</td>\n";
|
||||||
foreach ($methods as $method) {
|
foreach ($methods as $method) {
|
||||||
$info = split(':', $method);
|
$info = explode(':', $method);
|
||||||
echo "<td class='BLANK' valign='top'>";
|
echo "<td class='BLANK' valign='top'>";
|
||||||
foreach ($info as $m) {
|
foreach ($info as $m) {
|
||||||
$hi = split(',', $m);
|
$hi = explode(',', $m);
|
||||||
echo '<b>'. $hi[0] . "</b><br>\n";
|
echo '<b>'. $hi[0] . "</b><br>\n";
|
||||||
if (count($hi) > 1) {
|
if (count($hi) > 1) {
|
||||||
echo " Actor="
|
echo " Actor="
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ foreach ($args[0] as $arg) {
|
|||||||
help();
|
help();
|
||||||
exit(0);
|
exit(0);
|
||||||
case 'l':
|
case 'l':
|
||||||
$iop->skipEndpointList = split(',', $arg[1]);
|
$iop->skipEndpointList = explode(',', $arg[1]);
|
||||||
break;
|
break;
|
||||||
case 'm':
|
case 'm':
|
||||||
$iop->testMethod = $arg[1];
|
$iop->testMethod = $arg[1];
|
||||||
|
|||||||
2
gulliver/thirdparty/pear/SOAP/Parser.php
vendored
2
gulliver/thirdparty/pear/SOAP/Parser.php
vendored
@@ -383,7 +383,7 @@ class SOAP_Parser extends SOAP_Base
|
|||||||
$this->message[$pos]['arrayType'] = $vqn->name;
|
$this->message[$pos]['arrayType'] = $vqn->name;
|
||||||
|
|
||||||
} elseif ($kqn->name == 'offset') {
|
} elseif ($kqn->name == 'offset') {
|
||||||
$this->message[$pos]['arrayOffset'] = split(',', substr($value, 1, strlen($value) - 2));
|
$this->message[$pos]['arrayOffset'] = explode(',', substr($value, 1, strlen($value) - 2));
|
||||||
|
|
||||||
} elseif ($kqn->name == 'id') {
|
} elseif ($kqn->name == 'id') {
|
||||||
// Save id to reference array.
|
// Save id to reference array.
|
||||||
|
|||||||
@@ -269,13 +269,13 @@ class SOAP_Transport_HTTP extends SOAP_Transport
|
|||||||
{
|
{
|
||||||
/* Largely borrowed from HTTP_Request. */
|
/* Largely borrowed from HTTP_Request. */
|
||||||
$this->result_headers = array();
|
$this->result_headers = array();
|
||||||
$headers = split("\r?\n", $headers);
|
$headers = explode("\r?\n", $headers);
|
||||||
foreach ($headers as $value) {
|
foreach ($headers as $value) {
|
||||||
if (strpos($value,':') === false) {
|
if (strpos($value,':') === false) {
|
||||||
$this->result_headers[0] = $value;
|
$this->result_headers[0] = $value;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
list($name, $value) = split(':', $value);
|
list($name, $value) = explode(':', $value);
|
||||||
$headername = strtolower($name);
|
$headername = strtolower($name);
|
||||||
$headervalue = trim($value);
|
$headervalue = trim($value);
|
||||||
$this->result_headers[$headername] = $headervalue;
|
$this->result_headers[$headername] = $headervalue;
|
||||||
|
|||||||
@@ -680,10 +680,10 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
|
|||||||
|
|
||||||
// Split the range into 2 cell refs
|
// Split the range into 2 cell refs
|
||||||
if (preg_match("/^([A-Ia-i]?[A-Za-z])(\d+)\:([A-Ia-i]?[A-Za-z])(\d+)$/",$range)) {
|
if (preg_match("/^([A-Ia-i]?[A-Za-z])(\d+)\:([A-Ia-i]?[A-Za-z])(\d+)$/",$range)) {
|
||||||
list($cell1, $cell2) = split(':', $range);
|
list($cell1, $cell2) = explode(':', $range);
|
||||||
}
|
}
|
||||||
elseif (preg_match("/^([A-Ia-i]?[A-Za-z])(\d+)\.\.([A-Ia-i]?[A-Za-z])(\d+)$/",$range)) {
|
elseif (preg_match("/^([A-Ia-i]?[A-Za-z])(\d+)\.\.([A-Ia-i]?[A-Za-z])(\d+)$/",$range)) {
|
||||||
list($cell1, $cell2) = split('\.\.', $range);
|
list($cell1, $cell2) = explode('\.\.', $range);
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -733,7 +733,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
|
|||||||
$class = 2; // as far as I know, this is magick.
|
$class = 2; // as far as I know, this is magick.
|
||||||
|
|
||||||
// Split the ref at the ! symbol
|
// Split the ref at the ! symbol
|
||||||
list($ext_ref, $range) = split('!', $token);
|
list($ext_ref, $range) = explode('!', $token);
|
||||||
|
|
||||||
// Convert the external reference part (different for BIFF8)
|
// Convert the external reference part (different for BIFF8)
|
||||||
if ($this->_BIFF_version == 0x0500) {
|
if ($this->_BIFF_version == 0x0500) {
|
||||||
@@ -750,7 +750,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Split the range into 2 cell refs
|
// Split the range into 2 cell refs
|
||||||
list($cell1, $cell2) = split(':', $range);
|
list($cell1, $cell2) = explode(':', $range);
|
||||||
|
|
||||||
// Convert the cell references
|
// Convert the cell references
|
||||||
if (preg_match("/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/", $cell1))
|
if (preg_match("/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/", $cell1))
|
||||||
@@ -839,7 +839,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
|
|||||||
$class = 2; // as far as I know, this is magick.
|
$class = 2; // as far as I know, this is magick.
|
||||||
|
|
||||||
// Split the ref at the ! symbol
|
// Split the ref at the ! symbol
|
||||||
list($ext_ref, $cell) = split('!', $cell);
|
list($ext_ref, $cell) = explode('!', $cell);
|
||||||
|
|
||||||
// Convert the external reference part (different for BIFF8)
|
// Convert the external reference part (different for BIFF8)
|
||||||
if ($this->_BIFF_version == 0x0500) {
|
if ($this->_BIFF_version == 0x0500) {
|
||||||
@@ -891,7 +891,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
|
|||||||
// Check if there is a sheet range eg., Sheet1:Sheet2.
|
// Check if there is a sheet range eg., Sheet1:Sheet2.
|
||||||
if (preg_match("/:/", $ext_ref))
|
if (preg_match("/:/", $ext_ref))
|
||||||
{
|
{
|
||||||
list($sheet_name1, $sheet_name2) = split(':', $ext_ref);
|
list($sheet_name1, $sheet_name2) = explode(':', $ext_ref);
|
||||||
|
|
||||||
$sheet1 = $this->_getSheetIndex($sheet_name1);
|
$sheet1 = $this->_getSheetIndex($sheet_name1);
|
||||||
if ($sheet1 == -1) {
|
if ($sheet1 == -1) {
|
||||||
@@ -940,7 +940,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
|
|||||||
// Check if there is a sheet range eg., Sheet1:Sheet2.
|
// Check if there is a sheet range eg., Sheet1:Sheet2.
|
||||||
if (preg_match("/:/", $ext_ref))
|
if (preg_match("/:/", $ext_ref))
|
||||||
{
|
{
|
||||||
list($sheet_name1, $sheet_name2) = split(':', $ext_ref);
|
list($sheet_name1, $sheet_name2) = explode(':', $ext_ref);
|
||||||
|
|
||||||
$sheet1 = $this->_getSheetIndex($sheet_name1);
|
$sheet1 = $this->_getSheetIndex($sheet_name1);
|
||||||
if ($sheet1 == -1) {
|
if ($sheet1 == -1) {
|
||||||
|
|||||||
@@ -1318,7 +1318,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
|
|||||||
$row = $match[2];
|
$row = $match[2];
|
||||||
|
|
||||||
// Convert base26 column string to number
|
// Convert base26 column string to number
|
||||||
$chars = split('', $col);
|
$chars = explode('', $col);
|
||||||
$expn = 0;
|
$expn = 0;
|
||||||
$col = 0;
|
$col = 0;
|
||||||
|
|
||||||
@@ -2032,13 +2032,13 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
|
|||||||
// Determine if the link contains a sheet reference and change some of the
|
// Determine if the link contains a sheet reference and change some of the
|
||||||
// parameters accordingly.
|
// parameters accordingly.
|
||||||
// Split the dir name and sheet name (if it exists)
|
// Split the dir name and sheet name (if it exists)
|
||||||
list($dir_long , $sheet) = split('/\#/', $url);
|
list($dir_long , $sheet) = explode('/\#/', $url);
|
||||||
$link_type = 0x01 | $absolute;
|
$link_type = 0x01 | $absolute;
|
||||||
|
|
||||||
if (isset($sheet)) {
|
if (isset($sheet)) {
|
||||||
$link_type |= 0x08;
|
$link_type |= 0x08;
|
||||||
$sheet_len = pack("V", strlen($sheet) + 0x01);
|
$sheet_len = pack("V", strlen($sheet) + 0x01);
|
||||||
$sheet = join("\0", split('', $sheet));
|
$sheet = join("\0", explode('', $sheet));
|
||||||
$sheet .= "\0\0\0";
|
$sheet .= "\0\0\0";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -2057,7 +2057,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
|
|||||||
$dir_short = preg_replace('/\.\.\\/', '', $dir_long) . "\0";
|
$dir_short = preg_replace('/\.\.\\/', '', $dir_long) . "\0";
|
||||||
|
|
||||||
// Store the long dir name as a wchar string (non-null terminated)
|
// Store the long dir name as a wchar string (non-null terminated)
|
||||||
$dir_long = join("\0", split('', $dir_long));
|
$dir_long = join("\0", explode('', $dir_long));
|
||||||
$dir_long = $dir_long . "\0";
|
$dir_long = $dir_long . "\0";
|
||||||
|
|
||||||
// Pack the lengths of the dir strings
|
// Pack the lengths of the dir strings
|
||||||
|
|||||||
@@ -932,7 +932,7 @@ class soap_transport_http extends nusoap_base {
|
|||||||
*/
|
*/
|
||||||
function parseCookie($cookie_str) {
|
function parseCookie($cookie_str) {
|
||||||
$cookie_str = str_replace('; ', ';', $cookie_str) . ';';
|
$cookie_str = str_replace('; ', ';', $cookie_str) . ';';
|
||||||
$data = split(';', $cookie_str);
|
$data = explode(';', $cookie_str);
|
||||||
$value_str = $data[0];
|
$value_str = $data[0];
|
||||||
|
|
||||||
$cookie_param = 'domain=';
|
$cookie_param = 'domain=';
|
||||||
@@ -1035,4 +1035,4 @@ class soap_transport_http extends nusoap_base {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
2
gulliver/thirdparty/pear/nusoap.colosa.php
vendored
2
gulliver/thirdparty/pear/nusoap.colosa.php
vendored
@@ -2940,7 +2940,7 @@ class soap_transport_http extends nusoap_base_colosa {
|
|||||||
*/
|
*/
|
||||||
function parseCookie($cookie_str) {
|
function parseCookie($cookie_str) {
|
||||||
$cookie_str = str_replace('; ', ';', $cookie_str) . ';';
|
$cookie_str = str_replace('; ', ';', $cookie_str) . ';';
|
||||||
$data = split(';', $cookie_str);
|
$data = explode(';', $cookie_str);
|
||||||
$value_str = $data[0];
|
$value_str = $data[0];
|
||||||
|
|
||||||
$cookie_param = 'domain=';
|
$cookie_param = 'domain=';
|
||||||
|
|||||||
4
gulliver/thirdparty/pear/nusoap.php
vendored
4
gulliver/thirdparty/pear/nusoap.php
vendored
@@ -2943,7 +2943,7 @@ class soap_transport_http extends nusoap_base {
|
|||||||
*/
|
*/
|
||||||
function parseCookie($cookie_str) {
|
function parseCookie($cookie_str) {
|
||||||
$cookie_str = str_replace('; ', ';', $cookie_str) . ';';
|
$cookie_str = str_replace('; ', ';', $cookie_str) . ';';
|
||||||
$data = split(';', $cookie_str);
|
$data = explode(';', $cookie_str);
|
||||||
$value_str = $data[0];
|
$value_str = $data[0];
|
||||||
|
|
||||||
$cookie_param = 'domain=';
|
$cookie_param = 'domain=';
|
||||||
@@ -7299,4 +7299,4 @@ class soapclient extends nusoap_base {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ class CoverageReportTask extends TaskPhing
|
|||||||
|
|
||||||
$html = $geshi->parse_code();
|
$html = $geshi->parse_code();
|
||||||
|
|
||||||
$lines = split("<li>|</li>", $html);
|
$lines = explode("<li>|</li>", $html);
|
||||||
|
|
||||||
// skip first and last line
|
// skip first and last line
|
||||||
array_pop($lines);
|
array_pop($lines);
|
||||||
@@ -404,4 +404,4 @@ class CoverageReportTask extends TaskPhing
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -181,12 +181,12 @@ function smarty_function_fetch($params, &$smarty)
|
|||||||
$content .= fgets($fp,4096);
|
$content .= fgets($fp,4096);
|
||||||
}
|
}
|
||||||
fclose($fp);
|
fclose($fp);
|
||||||
$csplit = split("\r\n\r\n",$content,2);
|
$csplit = explode("\r\n\r\n",$content,2);
|
||||||
|
|
||||||
$content = $csplit[1];
|
$content = $csplit[1];
|
||||||
|
|
||||||
if(!empty($params['assign_headers'])) {
|
if(!empty($params['assign_headers'])) {
|
||||||
$smarty->assign($params['assign_headers'],split("\r\n",$csplit[0]));
|
$smarty->assign($params['assign_headers'],explode("\r\n",$csplit[0]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -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';
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ INSERT INTO `RBAC_PERMISSIONS` VALUES
|
|||||||
('00000000000000000000000000000018','PM_CANCELCASE','2011-12-11 00:00:00','2011-12-11 00:00:00',1,'00000000000000000000000000000002'),
|
('00000000000000000000000000000018','PM_CANCELCASE','2011-12-11 00:00:00','2011-12-11 00:00:00',1,'00000000000000000000000000000002'),
|
||||||
('00000000000000000000000000000019','PM_FOLDER_DELETE','2011-12-11 00:00:00','2011-12-11 00:00:00',1,'00000000000000000000000000000002'),
|
('00000000000000000000000000000019','PM_FOLDER_DELETE','2011-12-11 00:00:00','2011-12-11 00:00:00',1,'00000000000000000000000000000002'),
|
||||||
('00000000000000000000000000000020','PM_SETUP_LOGO','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
|
('00000000000000000000000000000020','PM_SETUP_LOGO','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
|
||||||
('00000000000000000000000000000021','PM_SETUP_EMAIL','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'000000000000000000000000000000022'),
|
('00000000000000000000000000000021','PM_SETUP_EMAIL','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
|
||||||
('00000000000000000000000000000022','PM_SETUP_CALENDAR','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
|
('00000000000000000000000000000022','PM_SETUP_CALENDAR','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
|
||||||
('00000000000000000000000000000023','PM_SETUP_PROCESS_CATEGORIES','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
|
('00000000000000000000000000000023','PM_SETUP_PROCESS_CATEGORIES','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
|
||||||
('00000000000000000000000000000024','PM_SETUP_CLEAR_CACHE','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
|
('00000000000000000000000000000024','PM_SETUP_CLEAR_CACHE','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ class actionsByEmailCoreClass extends PMPlugin
|
|||||||
if(isset($variables['items'][0]['items'])){
|
if(isset($variables['items'][0]['items'])){
|
||||||
$fields = $variables['items'][0]['items'];
|
$fields = $variables['items'][0]['items'];
|
||||||
foreach ($fields as $key => $value) {
|
foreach ($fields as $key => $value) {
|
||||||
foreach($value as $var){ G::pr($var);
|
foreach($value as $var){
|
||||||
if(isset($var['variable'])){
|
if(isset($var['variable'])){
|
||||||
if ($var['variable'] == $actionField) {
|
if ($var['variable'] == $actionField) {
|
||||||
$field->label = $var['label'];
|
$field->label = $var['label'];
|
||||||
|
|||||||
@@ -258,6 +258,7 @@ class Cases
|
|||||||
$c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
|
$c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
|
||||||
$c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
|
$c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
|
||||||
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
|
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
|
||||||
|
$c->add(ProcessPeer::PRO_SUBPROCESS, '0');
|
||||||
$c->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
|
$c->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
|
||||||
$c->add(TaskPeer::TAS_START, 'TRUE');
|
$c->add(TaskPeer::TAS_START, 'TRUE');
|
||||||
$c->add(TaskUserPeer::USR_UID, $sUIDUser);
|
$c->add(TaskUserPeer::USR_UID, $sUIDUser);
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -115,7 +115,9 @@ class pmDynaform
|
|||||||
$flagTrackerUser = false;
|
$flagTrackerUser = false;
|
||||||
|
|
||||||
if (!isset($_SESSION['USER_LOGGED'])) {
|
if (!isset($_SESSION['USER_LOGGED'])) {
|
||||||
if (!preg_match("/^.*\/" . SYS_SKIN . "\/tracker\/.*$/", $_SERVER["REQUEST_URI"])) {
|
if (!preg_match("/^.*\/" . SYS_SKIN . "\/tracker\/.*$/", $_SERVER["REQUEST_URI"]) &&
|
||||||
|
!preg_match("/^.*\/" . SYS_SKIN . "\/[a-z0-9A-Z]+\/[a-z0-9A-Z]+\.php$/", $_SERVER["REQUEST_URI"])
|
||||||
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -415,6 +417,7 @@ class pmDynaform
|
|||||||
$oCriteria->add(AppDocumentPeer::APP_UID, $this->fields["APP_DATA"]["APPLICATION"]);
|
$oCriteria->add(AppDocumentPeer::APP_UID, $this->fields["APP_DATA"]["APPLICATION"]);
|
||||||
$oCriteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name);
|
$oCriteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name);
|
||||||
$oCriteria->add(ContentPeer::CON_CATEGORY, 'APP_DOC_FILENAME');
|
$oCriteria->add(ContentPeer::CON_CATEGORY, 'APP_DOC_FILENAME');
|
||||||
|
$oCriteria->add(ContentPeer::CON_LANG, $this->lang);
|
||||||
$rs = AppDocumentPeer::doSelectRS($oCriteria);
|
$rs = AppDocumentPeer::doSelectRS($oCriteria);
|
||||||
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||||
$links = array();
|
$links = array();
|
||||||
@@ -1529,7 +1532,7 @@ class pmDynaform
|
|||||||
'scope' => implode(' ', $oauthServer->getScope())
|
'scope' => implode(' ', $oauthServer->getScope())
|
||||||
));
|
));
|
||||||
|
|
||||||
$response = $oauthServer->postAuthorize($authorize, $userId, true);
|
$response = $oauthServer->postAuthorize($authorize, $userId, true, array('USER_LOGGED' => $_SESSION['USER_LOGGED']));
|
||||||
$code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40);
|
$code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40);
|
||||||
|
|
||||||
return $code;
|
return $code;
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ class AppCacheView extends BaseAppCacheView
|
|||||||
|
|
||||||
$criteria->addSelectColumn(AppCacheViewPeer::TAS_UID);
|
$criteria->addSelectColumn(AppCacheViewPeer::TAS_UID);
|
||||||
$criteria->addSelectColumn(AppCacheViewPeer::PRO_UID);
|
$criteria->addSelectColumn(AppCacheViewPeer::PRO_UID);
|
||||||
|
$criteria->addSelectColumn(AppCacheViewPeer::DEL_RISK_DATE);
|
||||||
|
|
||||||
$criteria->add(AppCacheViewPeer::APP_STATUS, "TO_DO", CRITERIA::EQUAL);
|
$criteria->add(AppCacheViewPeer::APP_STATUS, "TO_DO", CRITERIA::EQUAL);
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ class Language extends BaseLanguage
|
|||||||
public function findById ($LAN_ID)
|
public function findById ($LAN_ID)
|
||||||
{
|
{
|
||||||
if (strpos($LAN_ID, '_') !== false) {
|
if (strpos($LAN_ID, '_') !== false) {
|
||||||
$aux = split('_', $LAN_ID);
|
$aux = explode('_', $LAN_ID);
|
||||||
$LAN_ID = $aux[0];
|
$LAN_ID = $aux[0];
|
||||||
}
|
}
|
||||||
$oCriteria = new Criteria( 'workflow' );
|
$oCriteria = new Criteria( 'workflow' );
|
||||||
|
|||||||
@@ -520,6 +520,7 @@ class ListInbox extends BaseListInbox
|
|||||||
$criteria->addSelectColumn(ListInboxPeer::DEL_INIT_DATE);
|
$criteria->addSelectColumn(ListInboxPeer::DEL_INIT_DATE);
|
||||||
$criteria->addSelectColumn(ListInboxPeer::DEL_DUE_DATE);
|
$criteria->addSelectColumn(ListInboxPeer::DEL_DUE_DATE);
|
||||||
$criteria->addSelectColumn(ListInboxPeer::DEL_PRIORITY);
|
$criteria->addSelectColumn(ListInboxPeer::DEL_PRIORITY);
|
||||||
|
$criteria->addSelectColumn(ListInboxPeer::DEL_RISK_DATE);
|
||||||
$criteria->addSelectColumn(UsersPeer::USR_UID);
|
$criteria->addSelectColumn(UsersPeer::USR_UID);
|
||||||
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
|
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
|
||||||
$criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
|
$criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
|
||||||
|
|||||||
4
workflow/engine/content/languages/translation.en
Executable file → Normal file
4
workflow/engine/content/languages/translation.en
Executable file → Normal file
File diff suppressed because one or more lines are too long
@@ -1,8 +1,8 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: ProcessMaker (Branch 3.0.1.7)\n"
|
"Project-Id-Version: ProcessMaker (Branch 3.0.1.8)\n"
|
||||||
"POT-Creation-Date: \n"
|
"POT-Creation-Date: \n"
|
||||||
"PO-Revision-Date: 2015-12-10 16:08:31\n"
|
"PO-Revision-Date: 2016-03-18 20:11:58\n"
|
||||||
"Last-Translator: \n"
|
"Last-Translator: \n"
|
||||||
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
|
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
@@ -11086,8 +11086,8 @@ msgstr "File \"{0}\" imported successfully."
|
|||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_PMTABLE_IMPORT_WITH_ERRORS
|
# LABEL/ID_PMTABLE_IMPORT_WITH_ERRORS
|
||||||
#: LABEL/ID_PMTABLE_IMPORT_WITH_ERRORS
|
#: LABEL/ID_PMTABLE_IMPORT_WITH_ERRORS
|
||||||
msgid "File \"{0}\" imported but with errors."
|
msgid "File \"{0}\" imported but with errors:"
|
||||||
msgstr "File \"{0}\" imported but with errors."
|
msgstr "File \"{0}\" imported but with errors:"
|
||||||
|
|
||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/DBS_NAME
|
# LABEL/DBS_NAME
|
||||||
@@ -16168,8 +16168,8 @@ msgstr "The output with {0}: '{1}' does not exist."
|
|||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_PROCESS_NOT_EXIST
|
# LABEL/ID_PROCESS_NOT_EXIST
|
||||||
#: LABEL/ID_PROCESS_NOT_EXIST
|
#: LABEL/ID_PROCESS_NOT_EXIST
|
||||||
msgid "The process with {0}: '{1}' does not exist."
|
msgid "The report table '{0}' is related to a process not present in the workspace, import the related process first. To relate the report table to other process, open the process in the designer and import from there. The report table can't be imported."
|
||||||
msgstr "The process with {0}: '{1}' does not exist."
|
msgstr "The report table '{0}' is related to a process not present in the workspace, import the related process first. To relate the report table to other process, open the process in the designer and import from there. The report table can't be imported."
|
||||||
|
|
||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_PROJECT_NOT_EXIST
|
# LABEL/ID_PROJECT_NOT_EXIST
|
||||||
@@ -18916,8 +18916,8 @@ msgstr "Grid Variables"
|
|||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_OVERWRITE_PMTABLE
|
# LABEL/ID_OVERWRITE_PMTABLE
|
||||||
#: LABEL/ID_OVERWRITE_PMTABLE
|
#: LABEL/ID_OVERWRITE_PMTABLE
|
||||||
msgid "The table name already exists, do you wish overwrite it?"
|
msgid "The PMTable '{0}' already exists in the workspace, what do you want to do?"
|
||||||
msgstr "The table name already exists, do you wish overwrite it?"
|
msgstr "The PMTable '{0}' already exists in the workspace, what do you want to do?"
|
||||||
|
|
||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_NO_RELATED_PROCESS
|
# LABEL/ID_NO_RELATED_PROCESS
|
||||||
@@ -18928,14 +18928,14 @@ msgstr "The related process does not exists"
|
|||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_OVERWRITE_RELATED_PROCESS
|
# LABEL/ID_OVERWRITE_RELATED_PROCESS
|
||||||
#: LABEL/ID_OVERWRITE_RELATED_PROCESS
|
#: LABEL/ID_OVERWRITE_RELATED_PROCESS
|
||||||
msgid "The related process does not exists, do you wish relate it with the current process?"
|
msgid "The report table '{0}' that you want to import is related to other process, what do you want to do?"
|
||||||
msgstr "The related process does not exists, do you wish relate it with the current process?"
|
msgstr "The report table '{0}' that you want to import is related to other process, what do you want to do?"
|
||||||
|
|
||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_ALREADY_RELATED_TABLE
|
# LABEL/ID_ALREADY_RELATED_TABLE
|
||||||
#: LABEL/ID_ALREADY_RELATED_TABLE
|
#: LABEL/ID_ALREADY_RELATED_TABLE
|
||||||
msgid "The table is already related to another process, it won't be imported"
|
msgid "The table is already related with the '{0}' process, do you want to continue? (Note: The table will be imported to the original process)."
|
||||||
msgstr "The table is already related to another process, it won't be imported"
|
msgstr "The table is already related with the '{0}' process, do you want to continue? (Note: The table will be imported to the original process)."
|
||||||
|
|
||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_DASH_COMPARE_INIT_PERIOD
|
# LABEL/ID_DASH_COMPARE_INIT_PERIOD
|
||||||
@@ -18958,8 +18958,8 @@ msgstr "Supervisor does not have a permission for Dynaform(s)."
|
|||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_NO_REPORT_TABLE
|
# LABEL/ID_NO_REPORT_TABLE
|
||||||
#: LABEL/ID_NO_REPORT_TABLE
|
#: LABEL/ID_NO_REPORT_TABLE
|
||||||
msgid "The table that you trying to import is not a report table"
|
msgid "The table '{0}' that you trying to import is not a report table."
|
||||||
msgstr "The table that you trying to import is not a report table"
|
msgstr "The table '{0}' that you trying to import is not a report table."
|
||||||
|
|
||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_TASK_OVERDUE
|
# LABEL/ID_TASK_OVERDUE
|
||||||
@@ -24136,14 +24136,14 @@ msgstr "Service Account Certificate"
|
|||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_PMG_TYPE_ACCEPT
|
# LABEL/ID_PMG_TYPE_ACCEPT
|
||||||
#: LABEL/ID_PMG_TYPE_ACCEPT
|
#: LABEL/ID_PMG_TYPE_ACCEPT
|
||||||
msgid "Only accepts files in format P12"
|
msgid "Only accepts files in format json"
|
||||||
msgstr "Only accepts files in format P12"
|
msgstr "Only accepts files in format json"
|
||||||
|
|
||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_PMG_SELECT_FILE
|
# LABEL/ID_PMG_SELECT_FILE
|
||||||
#: LABEL/ID_PMG_SELECT_FILE
|
#: LABEL/ID_PMG_SELECT_FILE
|
||||||
msgid "Please select a P12 file to upload"
|
msgid "Please select a json file to upload"
|
||||||
msgstr "Please select a P12 file to upload"
|
msgstr "Please select a json file to upload"
|
||||||
|
|
||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_PMGMAIL
|
# LABEL/ID_PMGMAIL
|
||||||
@@ -26755,6 +26755,418 @@ msgstr "There are problems removing task"
|
|||||||
msgid "Invalid operation, please delete elements individually"
|
msgid "Invalid operation, please delete elements individually"
|
||||||
msgstr "Invalid operation, please delete elements individually"
|
msgstr "Invalid operation, please delete elements individually"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_CASES1
|
||||||
|
#: LABEL/ID_CASES1
|
||||||
|
msgid "[LABEL/ID_CASES1] Cases"
|
||||||
|
msgstr "Cases"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_QUOTA_TYPE
|
||||||
|
#: LABEL/ID_QUOTA_TYPE
|
||||||
|
msgid "Quota type"
|
||||||
|
msgstr "Quota type"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_QUOTA_TOTAL
|
||||||
|
#: LABEL/ID_QUOTA_TOTAL
|
||||||
|
msgid "Quota total"
|
||||||
|
msgstr "Quota total"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_QUOTA_USED
|
||||||
|
#: LABEL/ID_QUOTA_USED
|
||||||
|
msgid "Quota used"
|
||||||
|
msgstr "Quota used"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_03de5d2d75b7dd914fbc5c775bf21b63
|
||||||
|
#: LABEL/ID_MAFE_03de5d2d75b7dd914fbc5c775bf21b63
|
||||||
|
msgid "Input Document<span style='color:red;'>*</span>:"
|
||||||
|
msgstr "Input Document<span style='color:red;'>*</span>:"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_99493c187e709deb387b6ee3ec6c8179
|
||||||
|
#: LABEL/ID_MAFE_99493c187e709deb387b6ee3ec6c8179
|
||||||
|
msgid "The input document is required, please select the value."
|
||||||
|
msgstr "The input document is required, please select the value."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_GOOGLEINTEGRATION
|
||||||
|
#: LABEL/ID_GOOGLEINTEGRATION
|
||||||
|
msgid "Google Integration"
|
||||||
|
msgstr "Google Integration"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_PMGMAIL_DISABLE
|
||||||
|
#: LABEL/ID_PMGMAIL_DISABLE
|
||||||
|
msgid "Are you sure to disable the Gmail Integration? If you do this, all the mails and relabelling sent to Gmail will be disabled."
|
||||||
|
msgstr "Are you sure to disable the Gmail Integration? If you do this, all the mails and relabelling sent to Gmail will be disabled."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_PMDRIVE_DISABLE
|
||||||
|
#: LABEL/ID_PMDRIVE_DISABLE
|
||||||
|
msgid "Are you sure to disable the Google Drive Integration? If you do this, the input, output and file documents will be stored only in your ProcessMaker server."
|
||||||
|
msgstr "Are you sure to disable the Google Drive Integration? If you do this, the input, output and file documents will be stored only in your ProcessMaker server."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_GMAIL_HELP_ENABLE
|
||||||
|
#: LABEL/ID_GMAIL_HELP_ENABLE
|
||||||
|
msgid "Enabling this option, users will be able to use the Gmail extension that allows to interact with Processamaker from the urser's Gmail web page."
|
||||||
|
msgstr "Enabling this option, users will be able to use the Gmail extension that allows to interact with Processamaker from the urser's Gmail web page."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_DRIVE_HELP_ENABLE
|
||||||
|
#: LABEL/ID_DRIVE_HELP_ENABLE
|
||||||
|
msgid "Enabling this option will allow to store all input, output and attached documents generated in your processes in Google Drive."
|
||||||
|
msgstr "Enabling this option will allow to store all input, output and attached documents generated in your processes in Google Drive."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_ENABLE_PMDRIVE
|
||||||
|
#: LABEL/ID_ENABLE_PMDRIVE
|
||||||
|
msgid "Enable Google Drive."
|
||||||
|
msgstr "Enable Google Drive."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_GOOGLE_CERTIFICATE_ERROR
|
||||||
|
#: LABEL/ID_GOOGLE_CERTIFICATE_ERROR
|
||||||
|
msgid "Google's JSON account certificate does not exist. Please contact the system administrator."
|
||||||
|
msgstr "Google's JSON account certificate does not exist. Please contact the system administrator."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_ACTIONS_BY_EMAIL_LOG
|
||||||
|
#: LABEL/ID_ACTIONS_BY_EMAIL_LOG
|
||||||
|
msgid "Actions By Email Log"
|
||||||
|
msgstr "Actions By Email Log"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_9bea7040abc67529a463697e233bcbe9
|
||||||
|
#: LABEL/ID_MAFE_9bea7040abc67529a463697e233bcbe9
|
||||||
|
msgid "The colspan change is going to remove columns and content fields. Do you want to continue?"
|
||||||
|
msgstr "The colspan change is going to remove columns and content fields. Do you want to continue?"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_DISPATCH_PARAMS_BODY
|
||||||
|
#: LABEL/ID_DISPATCH_PARAMS_BODY
|
||||||
|
msgid "Invalid Request, multipart without body."
|
||||||
|
msgstr "Invalid Request, multipart without body."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_DISPATCH_PARAMS_CALLS
|
||||||
|
#: LABEL/ID_DISPATCH_PARAMS_CALLS
|
||||||
|
msgid "Invalid Request, multipart body without calls."
|
||||||
|
msgstr "Invalid Request, multipart body without calls."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_VARIABLE_ASSOCIATED_WITH_REPORT_TABLE
|
||||||
|
#: LABEL/ID_VARIABLE_ASSOCIATED_WITH_REPORT_TABLE
|
||||||
|
msgid "The variable with \"{0}\", it is associated with a report table."
|
||||||
|
msgstr "The variable with \"{0}\", it is associated with a report table."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_USER_NOT_EXIST_DEPARTMENT
|
||||||
|
#: LABEL/ID_USER_NOT_EXIST_DEPARTMENT
|
||||||
|
msgid "The user with \"{0}\", does not exist in the Department"
|
||||||
|
msgstr "The user with \"{0}\", does not exist in the Department"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_fc4786f4974405965a4a00dde8d6e9f9
|
||||||
|
#: LABEL/ID_MAFE_fc4786f4974405965a4a00dde8d6e9f9
|
||||||
|
msgid "Create/Select Variable"
|
||||||
|
msgstr "Create/Select Variable"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_PMTABLE_NOT_IMPORT_HAS_ERRORS
|
||||||
|
#: LABEL/ID_PMTABLE_NOT_IMPORT_HAS_ERRORS
|
||||||
|
msgid "File \"{0}\" was not imported has errors:"
|
||||||
|
msgstr "File \"{0}\" was not imported has errors:"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_WARNING_PMTABLES
|
||||||
|
#: LABEL/ID_WARNING_PMTABLES
|
||||||
|
msgid "Error uploading the PM Table(s)"
|
||||||
|
msgstr "Error uploading the PM Table(s)"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_GRID_DOES_NOT_EXIST_IN_DYNAFORM
|
||||||
|
#: LABEL/ID_GRID_DOES_NOT_EXIST_IN_DYNAFORM
|
||||||
|
msgid "The Grid with {0}: \"{1}\" does not exist in DynaForm"
|
||||||
|
msgstr "The Grid with {0}: \"{1}\" does not exist in DynaForm"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_GRID_DOES_NOT_HAVE_FIELDS
|
||||||
|
#: LABEL/ID_GRID_DOES_NOT_HAVE_FIELDS
|
||||||
|
msgid "The Grid with {0}: \"{1}\" does not have fields defined"
|
||||||
|
msgstr "The Grid with {0}: \"{1}\" does not have fields defined"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_GRID_FIELD_DOES_NOT_EXIST
|
||||||
|
#: LABEL/ID_GRID_FIELD_DOES_NOT_EXIST
|
||||||
|
msgid "The Field with {0}: \"{1}\" does not exist"
|
||||||
|
msgstr "The Field with {0}: \"{1}\" does not exist"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_CASE_VARIABLE_DOES_NOT_EXIST
|
||||||
|
#: LABEL/ID_CASE_VARIABLE_DOES_NOT_EXIST
|
||||||
|
msgid "The Variable with {0}: \"{1}\" does not exist in Case"
|
||||||
|
msgstr "The Variable with {0}: \"{1}\" does not exist in Case"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_CASE_VARIABLE_ALREADY_EXISTS
|
||||||
|
#: LABEL/ID_CASE_VARIABLE_ALREADY_EXISTS
|
||||||
|
msgid "The Variable with {0}: \"{1}\" already exists in Case"
|
||||||
|
msgstr "The Variable with {0}: \"{1}\" already exists in Case"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_VARIABLE_NO_IS_GRID
|
||||||
|
#: LABEL/ID_VARIABLE_NO_IS_GRID
|
||||||
|
msgid "The Variable with {0}: \"{1}\" is not a grid"
|
||||||
|
msgstr "The Variable with {0}: \"{1}\" is not a grid"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_CAPTCHA_INPUT_CODE
|
||||||
|
#: LABEL/ID_CAPTCHA_INPUT_CODE
|
||||||
|
msgid "Security Code"
|
||||||
|
msgstr "Security Code"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_CAPTCHA_REFRESH_CODE
|
||||||
|
#: LABEL/ID_CAPTCHA_REFRESH_CODE
|
||||||
|
msgid "Click to refresh code"
|
||||||
|
msgstr "Click to refresh code"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_CAPTCHA_CODE
|
||||||
|
#: LABEL/ID_CAPTCHA_CODE
|
||||||
|
msgid "[LABEL/ID_CAPTCHA_CODE] Code"
|
||||||
|
msgstr "Code"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_CAPTCHA_CODE_INCORRECT
|
||||||
|
#: LABEL/ID_CAPTCHA_CODE_INCORRECT
|
||||||
|
msgid "The Captcha Code is incorrect"
|
||||||
|
msgstr "The Captcha Code is incorrect"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_AFFECTED_GROUPS
|
||||||
|
#: LABEL/ID_AFFECTED_GROUPS
|
||||||
|
msgid "Affected Groups"
|
||||||
|
msgstr "Affected Groups"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_SEE_FULL_LIST
|
||||||
|
#: LABEL/ID_SEE_FULL_LIST
|
||||||
|
msgid "See complete list"
|
||||||
|
msgstr "See complete list"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_BATCH_ROUTING
|
||||||
|
#: LABEL/ID_BATCH_ROUTING
|
||||||
|
msgid "Batch Routing"
|
||||||
|
msgstr "Batch Routing"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_CONFIRM_ROUTING
|
||||||
|
#: LABEL/ID_CONFIRM_ROUTING
|
||||||
|
msgid "Confirm Routing"
|
||||||
|
msgstr "Confirm Routing"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_ROUTE_BATCH_ROUTING
|
||||||
|
#: LABEL/ID_ROUTE_BATCH_ROUTING
|
||||||
|
msgid "Route cases per batch?"
|
||||||
|
msgstr "Route cases per batch?"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_SUMMARY_DERIVATION_BATCH_ROUTING
|
||||||
|
#: LABEL/ID_SUMMARY_DERIVATION_BATCH_ROUTING
|
||||||
|
msgid "Summary of Derivations"
|
||||||
|
msgstr "Summary of Derivations"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_DERIVATION_RESULT
|
||||||
|
#: LABEL/ID_DERIVATION_RESULT
|
||||||
|
msgid "Derivation Result"
|
||||||
|
msgstr "Derivation Result"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_CREATE_NEW_PROCESS_UID
|
||||||
|
#: LABEL/ID_CREATE_NEW_PROCESS_UID
|
||||||
|
msgid "Do you wish to create a new UID for this process?"
|
||||||
|
msgstr "Do you wish to create a new UID for this process?"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_KEEP_PROCESS_UID
|
||||||
|
#: LABEL/ID_KEEP_PROCESS_UID
|
||||||
|
msgid "Keep imported process UID"
|
||||||
|
msgstr "Keep imported process UID"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_OVERWRITE_RPTABLE
|
||||||
|
#: LABEL/ID_OVERWRITE_RPTABLE
|
||||||
|
msgid "The report table '{0}' already exist, what do you want to do?"
|
||||||
|
msgstr "The report table '{0}' already exist, what do you want to do?"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_BLOCKER_MSG
|
||||||
|
#: LABEL/ID_BLOCKER_MSG
|
||||||
|
msgid "Warning: Processmaker does not permit you to open multiple tabs in the same browser session because of security restrictions.\n"
|
||||||
|
"\n"
|
||||||
|
"This page will be closed."
|
||||||
|
msgstr "Warning: Processmaker does not permit you to open multiple tabs in the same browser session because of security restrictions.\n"
|
||||||
|
"\n"
|
||||||
|
"This page will be closed."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_THE
|
||||||
|
#: LABEL/ID_THE
|
||||||
|
msgid "The"
|
||||||
|
msgstr "The"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_FIELD_NOT_EMPTY_OR_SPECIAL_CHAR
|
||||||
|
#: LABEL/ID_FIELD_NOT_EMPTY_OR_SPECIAL_CHAR
|
||||||
|
msgid "cannot be empty or contain special characters"
|
||||||
|
msgstr "cannot be empty or contain special characters"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_DELETE_CASES
|
||||||
|
#: LABEL/ID_DELETE_CASES
|
||||||
|
msgid "Delete Cases"
|
||||||
|
msgstr "Delete Cases"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_DELETE_PROCESS_CASES
|
||||||
|
#: LABEL/ID_DELETE_PROCESS_CASES
|
||||||
|
msgid "Are you sure you want to delete all the cases of the selected process(es)?"
|
||||||
|
msgstr "Are you sure you want to delete all the cases of the selected process(es)?"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_RADIO_RELATED_PROCESS
|
||||||
|
#: LABEL/ID_RADIO_RELATED_PROCESS
|
||||||
|
msgid "Import and relate it to the current process"
|
||||||
|
msgstr "Import and relate it to the current process"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_RADIO_NOT_IMPORTED_RPT
|
||||||
|
#: LABEL/ID_RADIO_NOT_IMPORTED_RPT
|
||||||
|
msgid "Do not import the report table"
|
||||||
|
msgstr "Do not import the report table"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_RADIO_CREATE_NEW
|
||||||
|
#: LABEL/ID_RADIO_CREATE_NEW
|
||||||
|
msgid "Create a new copy of the Table"
|
||||||
|
msgstr "Create a new copy of the Table"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_RADIO_OVERWRITE
|
||||||
|
#: LABEL/ID_RADIO_OVERWRITE
|
||||||
|
msgid "Overwrite the existing Table"
|
||||||
|
msgstr "Overwrite the existing Table"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_RADIO_NOT_IMPORTED_PMT
|
||||||
|
#: LABEL/ID_RADIO_NOT_IMPORTED_PMT
|
||||||
|
msgid "Do not import the Table"
|
||||||
|
msgstr "Do not import the Table"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_RADIO_NOT_IMPORTED
|
||||||
|
#: LABEL/ID_RADIO_NOT_IMPORTED
|
||||||
|
msgid "[LABEL/ID_RADIO_NOT_IMPORTED] Do not import the Table"
|
||||||
|
msgstr "Do not import the Table"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_ERROR_CREATE_TABLE
|
||||||
|
#: LABEL/ID_ERROR_CREATE_TABLE
|
||||||
|
msgid "Error creating table:"
|
||||||
|
msgstr "Error creating table:"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_CHECK
|
||||||
|
#: LABEL/ID_CHECK
|
||||||
|
msgid "Check"
|
||||||
|
msgstr "Check"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_UNCHECK
|
||||||
|
#: LABEL/ID_UNCHECK
|
||||||
|
msgid "Uncheck"
|
||||||
|
msgstr "Uncheck"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_5896ecd1d83886eb157d9cbfb988f1da
|
||||||
|
#: LABEL/ID_MAFE_5896ecd1d83886eb157d9cbfb988f1da
|
||||||
|
msgid "protected value"
|
||||||
|
msgstr "protected value"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_1ea7e575defdf6bc3f26a3f127e98170
|
||||||
|
#: LABEL/ID_MAFE_1ea7e575defdf6bc3f26a3f127e98170
|
||||||
|
msgid "datasource"
|
||||||
|
msgstr "datasource"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_11e0eed8d3696c0a632f822df385ab3c
|
||||||
|
#: LABEL/ID_MAFE_11e0eed8d3696c0a632f822df385ab3c
|
||||||
|
msgid "database"
|
||||||
|
msgstr "database"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_c9838204ecea4595edd1ef4a76b66846
|
||||||
|
#: LABEL/ID_MAFE_c9838204ecea4595edd1ef4a76b66846
|
||||||
|
msgid "array variable"
|
||||||
|
msgstr "array variable"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_59d0ce20b062e00466be1ad296c22407
|
||||||
|
#: LABEL/ID_MAFE_59d0ce20b062e00466be1ad296c22407
|
||||||
|
msgid "data variable"
|
||||||
|
msgstr "data variable"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_e16d24cd68030dda478e6ca7151010e2
|
||||||
|
#: LABEL/ID_MAFE_e16d24cd68030dda478e6ca7151010e2
|
||||||
|
msgid "@@myData"
|
||||||
|
msgstr "@@myData"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_944b95760dc358a122162ce63974488a
|
||||||
|
#: LABEL/ID_MAFE_944b95760dc358a122162ce63974488a
|
||||||
|
msgid "Enter a regular expression which is a search pattern which matches the text entered in the field."
|
||||||
|
msgstr "Enter a regular expression which is a search pattern which matches the text entered in the field."
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_8bf8bd52a2df4f9292a3a9b7c469fada
|
||||||
|
#: LABEL/ID_MAFE_8bf8bd52a2df4f9292a3a9b7c469fada
|
||||||
|
msgid "To learn more about regular expressions, see the <a href=\"http://wiki.processmaker.com/3.0/Text_and_Textarea_Controls#Validate\" target=\"_blank\">wiki</a>.<br><br>"
|
||||||
|
msgstr "To learn more about regular expressions, see the <a href=\"http://wiki.processmaker.com/3.0/Text_and_Textarea_Controls#Validate\" target=\"_blank\">wiki</a>.<br><br>"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_e787b4cb0cdefd8881e38a4f54305701
|
||||||
|
#: LABEL/ID_MAFE_e787b4cb0cdefd8881e38a4f54305701
|
||||||
|
msgid "Examples:<br>"
|
||||||
|
msgstr "Examples:<br>"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_cf9f7adb0fd03f4072c4f44f8328433f
|
||||||
|
#: LABEL/ID_MAFE_cf9f7adb0fd03f4072c4f44f8328433f
|
||||||
|
msgid "An integer"
|
||||||
|
msgstr "An integer"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_a1d5cbaf61c018e7d8456c66df0332c3
|
||||||
|
#: LABEL/ID_MAFE_a1d5cbaf61c018e7d8456c66df0332c3
|
||||||
|
msgid "An integer or decimal number"
|
||||||
|
msgstr "An integer or decimal number"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_MAFE_33e7ca8872a98fe4b44833054a5ccc3e
|
||||||
|
#: LABEL/ID_MAFE_33e7ca8872a98fe4b44833054a5ccc3e
|
||||||
|
msgid "An email address"
|
||||||
|
msgstr "An email address"
|
||||||
|
|
||||||
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME
|
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME
|
||||||
# additionalTables/additionalTablesData.xml
|
# additionalTables/additionalTablesData.xml
|
||||||
#: text - ADD_TAB_NAME
|
#: text - ADD_TAB_NAME
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -2310,7 +2310,7 @@ CREATE TABLE `LIST_PARTICIPATED_LAST`
|
|||||||
(
|
(
|
||||||
`APP_UID` VARCHAR(32) default '' NOT NULL,
|
`APP_UID` VARCHAR(32) default '' NOT NULL,
|
||||||
`USR_UID` VARCHAR(32) default '' NOT NULL,
|
`USR_UID` VARCHAR(32) default '' NOT NULL,
|
||||||
`DEL_INDEX` INTEGER default NOT NULL,
|
`DEL_INDEX` INTEGER default 0 NOT NULL,
|
||||||
`TAS_UID` VARCHAR(32) default '' NOT NULL,
|
`TAS_UID` VARCHAR(32) default '' NOT NULL,
|
||||||
`PRO_UID` VARCHAR(32) default '' NOT NULL,
|
`PRO_UID` VARCHAR(32) default '' NOT NULL,
|
||||||
`APP_NUMBER` INTEGER default 0 NOT NULL,
|
`APP_NUMBER` INTEGER default 0 NOT NULL,
|
||||||
@@ -2943,7 +2943,7 @@ CREATE TABLE `GMAIL_RELABELING` (
|
|||||||
`CURRENT_LAST_INDEX` INT(11) NOT NULL DEFAULT '0',
|
`CURRENT_LAST_INDEX` INT(11) NOT NULL DEFAULT '0',
|
||||||
`UNASSIGNED` INT(11) NOT NULL DEFAULT '0',
|
`UNASSIGNED` INT(11) NOT NULL DEFAULT '0',
|
||||||
`STATUS` VARCHAR(32) NOT NULL DEFAULT 'pending',
|
`STATUS` VARCHAR(32) NOT NULL DEFAULT 'pending',
|
||||||
`MSG_ERROR` TEXT NULL,
|
`MSG_ERROR` MEDIUMTEXT NULL,
|
||||||
PRIMARY KEY (`LABELING_UID`),
|
PRIMARY KEY (`LABELING_UID`),
|
||||||
KEY `indexStatus` (`STATUS`)
|
KEY `indexStatus` (`STATUS`)
|
||||||
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Task to synchronize Gmail Labels';
|
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Task to synchronize Gmail Labels';
|
||||||
|
|||||||
@@ -15,35 +15,31 @@ if (!isset($_REQUEST['start'])) {
|
|||||||
//Initialize response object
|
//Initialize response object
|
||||||
$response = new stdclass();
|
$response = new stdclass();
|
||||||
$response->status = 'OK';
|
$response->status = 'OK';
|
||||||
|
|
||||||
//Main switch
|
//Main switch
|
||||||
try {
|
try {
|
||||||
$actionsByEmail = new \ProcessMaker\BusinessModel\ActionsByEmail();
|
$actionsByEmail = new \ProcessMaker\BusinessModel\ActionsByEmail();
|
||||||
|
|
||||||
switch ($_REQUEST['action']) {
|
switch ($_REQUEST['action']) {
|
||||||
case 'editTemplate':
|
case 'editTemplate':
|
||||||
$actionsByEmail->editTemplate($_REQUEST);
|
$response = $actionsByEmail->editTemplate($_REQUEST);
|
||||||
die();
|
|
||||||
break;
|
break;
|
||||||
case 'updateTemplate':
|
case 'updateTemplate':
|
||||||
$actionsByEmail->updateTemplate($_REQUEST);
|
$response = $actionsByEmail->updateTemplate($_REQUEST);
|
||||||
break;
|
break;
|
||||||
case 'loadFields':
|
case 'loadFields':
|
||||||
$actionsByEmail->loadFields($_REQUEST);
|
$response = $actionsByEmail->loadFields($_REQUEST);
|
||||||
break;
|
break;
|
||||||
case 'saveConfiguration':
|
case 'saveConfiguration':
|
||||||
$actionsByEmail->saveConfiguration2($_REQUEST);
|
$response = $actionsByEmail->saveConfiguration2($_REQUEST);
|
||||||
break;
|
break;
|
||||||
case 'loadActionByEmail':
|
case 'loadActionByEmail':
|
||||||
$actionsByEmail->loadActionByEmail($_REQUEST);
|
$response = $actionsByEmail->loadActionByEmail($_REQUEST);
|
||||||
break;
|
break;
|
||||||
case 'forwardMail':
|
case 'forwardMail':
|
||||||
$actionsByEmail->forwardMail($_REQUEST);
|
$response = $actionsByEmail->forwardMail($_REQUEST);
|
||||||
die;
|
|
||||||
break;
|
break;
|
||||||
case 'viewForm':
|
case 'viewForm':
|
||||||
$actionsByEmail->viewForm($_REQUEST);
|
$response = $actionsByEmail->viewForm($_REQUEST);
|
||||||
die;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} catch (Exception $error) {
|
} catch (Exception $error) {
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ $aFields = $oCase->loadCase( $sAppUid, $iDelIndex );
|
|||||||
$_SESSION['PROCESS'] = $aFields['PRO_UID'];
|
$_SESSION['PROCESS'] = $aFields['PRO_UID'];
|
||||||
$_SESSION['TASK'] = $aFields['TAS_UID'];
|
$_SESSION['TASK'] = $aFields['TAS_UID'];
|
||||||
$_SESSION['STEP_POSITION'] = 0;
|
$_SESSION['STEP_POSITION'] = 0;
|
||||||
|
$_SESSION['CURRENT_TASK'] = $aFields['TAS_UID'];
|
||||||
|
|
||||||
/* Redirect to next step */
|
/* Redirect to next step */
|
||||||
|
|
||||||
|
|||||||
@@ -296,7 +296,7 @@ switch ($request) {
|
|||||||
$passwd = $_POST['password'];
|
$passwd = $_POST['password'];
|
||||||
$server = $_POST['host'];
|
$server = $_POST['host'];
|
||||||
$code = $_POST['codeCaptcha'];
|
$code = $_POST['codeCaptcha'];
|
||||||
$aServer = split(":", $server);
|
$aServer = explode(':', $server);
|
||||||
$serverName = $aServer[0];
|
$serverName = $aServer[0];
|
||||||
$port = (count($aServer) > 1) ? $aServer[1] : "none";
|
$port = (count($aServer) > 1) ? $aServer[1] : "none";
|
||||||
|
|
||||||
|
|||||||
@@ -789,7 +789,7 @@ form.formDefault .content,
|
|||||||
}
|
}
|
||||||
@media screen\0 {
|
@media screen\0 {
|
||||||
form.formDefault .content, .pagedTableDefault {
|
form.formDefault .content, .pagedTableDefault {
|
||||||
width:450px;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.pagedTableDefault {
|
.pagedTableDefault {
|
||||||
|
|||||||
@@ -345,6 +345,12 @@ class ActionsByEmail
|
|||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Forward the Mail
|
||||||
|
* @param array $arrayData
|
||||||
|
*
|
||||||
|
* @return string $message
|
||||||
|
*/
|
||||||
public function forwardMail(array $arrayData)
|
public function forwardMail(array $arrayData)
|
||||||
{
|
{
|
||||||
if (!isset($arrayData['REQ_UID'])) {
|
if (!isset($arrayData['REQ_UID'])) {
|
||||||
@@ -371,7 +377,7 @@ class ActionsByEmail
|
|||||||
$criteria->addJoin(\AbeRequestsPeer::ABE_UID, \AbeConfigurationPeer::ABE_UID);
|
$criteria->addJoin(\AbeRequestsPeer::ABE_UID, \AbeConfigurationPeer::ABE_UID);
|
||||||
$criteria->addJoin(\AppDelegationPeer::APP_UID, \AbeRequestsPeer::APP_UID);
|
$criteria->addJoin(\AppDelegationPeer::APP_UID, \AbeRequestsPeer::APP_UID);
|
||||||
$criteria->addJoin(\AppDelegationPeer::DEL_INDEX, \AbeRequestsPeer::DEL_INDEX);
|
$criteria->addJoin(\AppDelegationPeer::DEL_INDEX, \AbeRequestsPeer::DEL_INDEX);
|
||||||
$resultRes = AbeRequestsPeer::doSelectRS($criteria);
|
$resultRes = \AbeRequestsPeer::doSelectRS($criteria);
|
||||||
$resultRes->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
$resultRes->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
||||||
|
|
||||||
$resultRes->next();
|
$resultRes->next();
|
||||||
@@ -381,37 +387,20 @@ class ActionsByEmail
|
|||||||
if (is_null($dataRes['DEL_FINISH_DATE'])) {
|
if (is_null($dataRes['DEL_FINISH_DATE'])) {
|
||||||
\G::LoadClass('spool');
|
\G::LoadClass('spool');
|
||||||
|
|
||||||
$configuration = new \Configuration();
|
$emailServer = new \ProcessMaker\BusinessModel\EmailServer();
|
||||||
$sDelimiter = \DBAdapter::getStringDelimiter();
|
$criteria = $emailServer->getEmailServerCriteria();
|
||||||
$criteria = new \Criteria('workflow');
|
$rsCriteria = \EmailServerPeer::doSelectRS($criteria);
|
||||||
$criteria->add(\ConfigurationPeer::CFG_UID, 'Emails');
|
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
||||||
$criteria->add(\ConfigurationPeer::OBJ_UID, '');
|
if ($rsCriteria->next()) {
|
||||||
$criteria->add(\ConfigurationPeer::PRO_UID, '');
|
$row = $rsCriteria->getRow();
|
||||||
$criteria->add(\ConfigurationPeer::USR_UID, '');
|
|
||||||
$criteria->add(\ConfigurationPeer::APP_UID, '');
|
|
||||||
|
|
||||||
if (\ConfigurationPeer::doCount($criteria) == 0) {
|
$arrayConfigAux = $row;
|
||||||
$configuration->create(array('CFG_UID' => 'Emails', 'OBJ_UID' => '', 'CFG_VALUE' => '', 'PRO_UID' => '', 'USR_UID' => '', 'APP_UID' => ''));
|
$arrayConfigAux["SMTPSecure"] = $row["SMTPSECURE"];
|
||||||
$newConfiguration = array();
|
|
||||||
} else {
|
|
||||||
$newConfiguration = $configuration->load('Emails', '', '', '', '');
|
|
||||||
|
|
||||||
if ($newConfiguration['CFG_VALUE'] != '') {
|
|
||||||
$newConfiguration = unserialize($newConfiguration['CFG_VALUE']);
|
|
||||||
} else {
|
|
||||||
$newConfiguration = array();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
$aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : \System::getEmailConfiguration();
|
||||||
|
|
||||||
$spool = new \spoolRun();
|
$spool = new \spoolRun();
|
||||||
$spool->setConfig(array(
|
$spool->setConfig($aSetup);
|
||||||
'MESS_ENGINE' => $newConfiguration['MESS_ENGINE'],
|
|
||||||
'MESS_SERVER' => $newConfiguration['MESS_SERVER'],
|
|
||||||
'MESS_PORT' => $newConfiguration['MESS_PORT'],
|
|
||||||
'MESS_ACCOUNT' => $newConfiguration['MESS_ACCOUNT'],
|
|
||||||
'MESS_PASSWORD' => $newConfiguration['MESS_PASSWORD'],
|
|
||||||
'SMTPAuth' => $newConfiguration['MESS_RAUTH']
|
|
||||||
));
|
|
||||||
|
|
||||||
$spool->create(array(
|
$spool->create(array(
|
||||||
'msg_uid' => '',
|
'msg_uid' => '',
|
||||||
@@ -419,7 +408,7 @@ class ActionsByEmail
|
|||||||
'del_index' => $dataRes['DEL_INDEX'],
|
'del_index' => $dataRes['DEL_INDEX'],
|
||||||
'app_msg_type' => 'TEST',
|
'app_msg_type' => 'TEST',
|
||||||
'app_msg_subject' => $dataRes['ABE_REQ_SUBJECT'],
|
'app_msg_subject' => $dataRes['ABE_REQ_SUBJECT'],
|
||||||
'app_msg_from' => $newConfiguration['MESS_ACCOUNT'],
|
'app_msg_from' => $aSetup['MESS_ACCOUNT'],
|
||||||
'app_msg_to' => $dataRes['ABE_REQ_SENT_TO'],
|
'app_msg_to' => $dataRes['ABE_REQ_SENT_TO'],
|
||||||
'app_msg_body' => $dataRes['ABE_REQ_BODY'],
|
'app_msg_body' => $dataRes['ABE_REQ_BODY'],
|
||||||
'app_msg_cc' => '',
|
'app_msg_cc' => '',
|
||||||
@@ -432,10 +421,10 @@ class ActionsByEmail
|
|||||||
if ($spool->sendMail()) {
|
if ($spool->sendMail()) {
|
||||||
$dataRes['ABE_REQ_STATUS'] = 'SENT';
|
$dataRes['ABE_REQ_STATUS'] = 'SENT';
|
||||||
|
|
||||||
$message = G::LoadTranslation('ID_EMAIL_RESENT_TO') . ': '. $dataRes['ABE_REQ_SENT_TO'];
|
$message = \G::LoadTranslation('ID_EMAIL_RESENT_TO') . ': '. $dataRes['ABE_REQ_SENT_TO'];
|
||||||
} else {
|
} else {
|
||||||
$dataRes['ABE_REQ_STATUS'] = 'ERROR';
|
$dataRes['ABE_REQ_STATUS'] = 'ERROR';
|
||||||
$message = G::LoadTranslation('ID_THERE_PROBLEM_SENDING_EMAIL') . ': '. $dataRes['ABE_REQ_SENT_TO'] . ', ' . G::LoadTranslation('ID_PLEASE_TRY_LATER');
|
$message = \G::LoadTranslation('ID_THERE_PROBLEM_SENDING_EMAIL') . ': '. $dataRes['ABE_REQ_SENT_TO'] . ', ' . G::LoadTranslation('ID_PLEASE_TRY_LATER');
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -455,6 +444,12 @@ class ActionsByEmail
|
|||||||
return $message;
|
return $message;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the decision from Actions By Email and check if is Bpmn Process
|
||||||
|
* @param array $arrayData
|
||||||
|
*
|
||||||
|
* @return string $message
|
||||||
|
*/
|
||||||
public function viewForm(array $arrayData)
|
public function viewForm(array $arrayData)
|
||||||
{
|
{
|
||||||
//coment
|
//coment
|
||||||
@@ -479,51 +474,148 @@ class ActionsByEmail
|
|||||||
$criteria->add(\AbeRequestsPeer::ABE_REQ_UID, $arrayData['REQ_UID']);
|
$criteria->add(\AbeRequestsPeer::ABE_REQ_UID, $arrayData['REQ_UID']);
|
||||||
$criteria->addJoin(\AbeRequestsPeer::ABE_UID, \AbeConfigurationPeer::ABE_UID);
|
$criteria->addJoin(\AbeRequestsPeer::ABE_UID, \AbeConfigurationPeer::ABE_UID);
|
||||||
$criteria->addJoin(\AbeResponsesPeer::ABE_REQ_UID, \AbeRequestsPeer::ABE_REQ_UID);
|
$criteria->addJoin(\AbeResponsesPeer::ABE_REQ_UID, \AbeRequestsPeer::ABE_REQ_UID);
|
||||||
$resultRes = AbeRequestsPeer::doSelectRS($criteria);
|
$resultRes = \AbeRequestsPeer::doSelectRS($criteria);
|
||||||
$resultRes->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
$resultRes->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
||||||
|
|
||||||
$resultRes->next();
|
$resultRes->next();
|
||||||
$dataRes = Array();
|
$dataRes = Array();
|
||||||
$message = \G::LoadTranslation('ID_USER_NOT_RESPONDED_REQUEST');
|
$message = \G::LoadTranslation('ID_USER_NOT_RESPONDED_REQUEST');
|
||||||
|
|
||||||
if ($dataRes = $resultRes->getRow()) {
|
if ($dataRes = $resultRes->getRow()) {
|
||||||
$_SESSION['CURRENT_DYN_UID'] = trim($dataRes['DYN_UID']);
|
$_SESSION['CURRENT_DYN_UID'] = trim($dataRes['DYN_UID']);
|
||||||
$dynaform = new \Form($dataRes['PRO_UID'] . PATH_SEP . trim($dataRes['DYN_UID']), PATH_DYNAFORM, SYS_LANG, false);
|
|
||||||
$dynaform->mode = 'view';
|
|
||||||
|
|
||||||
if ($dataRes['ABE_RES_DATA'] != '') {
|
$process = new \Process();
|
||||||
$value = unserialize($dataRes['ABE_RES_DATA']);
|
$isBpmn = $process->isBpmnProcess($dataRes['PRO_UID']);
|
||||||
|
if($isBpmn) {
|
||||||
|
$message = $this->viewFormBpmn($dataRes);
|
||||||
|
} else {
|
||||||
|
$message = $this->viewFormClassic($dataRes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (is_array($value)) {
|
return $message;
|
||||||
$dynaform->values = $value;
|
}
|
||||||
|
|
||||||
foreach ($dynaform->fields as $fieldName => $field) {
|
/**
|
||||||
if ($field->type == 'submit') {
|
* Get the decision from Actions By Email by Classic dynaform
|
||||||
unset($dynaform->fields[$fieldName]);
|
* @param array $dataRes
|
||||||
|
*
|
||||||
|
* @return string $message
|
||||||
|
*/
|
||||||
|
public function viewFormClassic(array $dataRes)
|
||||||
|
{
|
||||||
|
$dynaform = new \Form($dataRes['PRO_UID'] . PATH_SEP . trim($dataRes['DYN_UID']), PATH_DYNAFORM, SYS_LANG, false);
|
||||||
|
$dynaform->mode = 'view';
|
||||||
|
|
||||||
|
if ($dataRes['ABE_RES_DATA'] != '') {
|
||||||
|
$value = unserialize($dataRes['ABE_RES_DATA']);
|
||||||
|
|
||||||
|
if (is_array($value)) {
|
||||||
|
$dynaform->values = $value;
|
||||||
|
|
||||||
|
foreach ($dynaform->fields as $fieldName => $field) {
|
||||||
|
if ($field->type == 'submit') {
|
||||||
|
unset($dynaform->fields[$fieldName]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$message = $dynaform->render(PATH_CORE . 'templates/xmlform.html', $scriptCode);
|
||||||
|
} else {
|
||||||
|
$response = $dynaform->render(PATH_CORE . 'templates/xmlform.html', $scriptCode);
|
||||||
|
|
||||||
|
$field = $dynaform->fields[$dataRes['ABE_ACTION_FIELD']];
|
||||||
|
$message = '<b>Type: </b>' . $field->type . '<br>';
|
||||||
|
|
||||||
|
switch ($field->type) {
|
||||||
|
case 'dropdown':
|
||||||
|
case 'radiogroup':
|
||||||
|
$message .=$field->label . ' - ';
|
||||||
|
$message .= $field->options[$value];
|
||||||
|
break;
|
||||||
|
case 'yesno':
|
||||||
|
$message .= '<b>' . $field->label . ' </b>- ';
|
||||||
|
$message .= ($value == 1) ? G::loadTranslation('ID_YES') : G::loadTranslation('ID_NO');
|
||||||
|
break;
|
||||||
|
case 'checkbox':
|
||||||
|
$message .= '<b>' . $field->label . '</b> - ';
|
||||||
|
$message .= ($value == 'On') ? G::loadTranslation('ID_CHECK') : G::loadTranslation('ID_UNCHECK');
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Return
|
||||||
|
return $message;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the decision from Actions By Email by BPMN dynaform
|
||||||
|
* @param array $arrayData
|
||||||
|
*
|
||||||
|
* @return string $message
|
||||||
|
*/
|
||||||
|
public function viewFormBpmn(array $dataRes)
|
||||||
|
{
|
||||||
|
$_SESSION['CURRENT_DYN_UID'] = trim($dataRes['DYN_UID']);
|
||||||
|
$configuration['DYN_UID'] = trim($dataRes['DYN_UID']);
|
||||||
|
$configuration['CURRENT_DYNAFORM'] = trim($dataRes['DYN_UID']);
|
||||||
|
$configuration['PRO_UID'] = trim($dataRes['PRO_UID']);
|
||||||
|
|
||||||
|
$criteriaD = new \Criteria();
|
||||||
|
$criteriaD->addSelectColumn(\DynaformPeer::DYN_CONTENT);
|
||||||
|
$criteriaD->addSelectColumn(\DynaformPeer::PRO_UID);
|
||||||
|
$criteriaD->add(\DynaformPeer::DYN_UID, trim($dataRes['DYN_UID']));
|
||||||
|
$resultD = \DynaformPeer::doSelectRS($criteriaD);
|
||||||
|
$resultD->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
||||||
|
$resultD->next();
|
||||||
|
$configuration = $resultD->getRow();
|
||||||
|
|
||||||
|
\G::LoadClass('pmDynaform');
|
||||||
|
$field = new \stdClass();
|
||||||
|
$obj = new \pmDynaform($configuration);
|
||||||
|
|
||||||
|
if ($dataRes['ABE_RES_DATA'] !== '') {
|
||||||
|
$value = unserialize($dataRes['ABE_RES_DATA']);
|
||||||
|
$actionField = str_replace(array('@@','@#','@=','@%','@?','@$'), '', $dataRes['ABE_ACTION_FIELD']);
|
||||||
|
$variables = \G::json_decode($configuration['DYN_CONTENT'], true);
|
||||||
|
if (is_array($value)) {
|
||||||
|
if(isset($variables['items'][0]['items'])) {
|
||||||
|
$fields = $variables['items'][0]['items'];
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if(isset($variables['items'][0]['items'])) {
|
||||||
|
$fields = $variables['items'][0]['items'];
|
||||||
|
foreach ($fields as $key => $row) {
|
||||||
|
foreach($row as $var) {
|
||||||
|
if(isset($var['variable'])) {
|
||||||
|
if ($var['variable'] === $actionField) {
|
||||||
|
$field->label = isset($var['label']) ? $var['label'] : '';
|
||||||
|
$field->type = isset($var['type']) ? $var['type'] : '';
|
||||||
|
$values = $var['options'];
|
||||||
|
foreach ($values as $val){
|
||||||
|
$field->options[$val['value']] = $val['value'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$message = $dynaform->render(PATH_CORE . 'templates/xmlform.html', $scriptCode);
|
$message = '';
|
||||||
} else {
|
switch ($field->type) {
|
||||||
$response = $dynaform->render(PATH_CORE . 'templates/xmlform.html', $scriptCode);
|
case 'dropdown':
|
||||||
$field = $dynaform->fields[$dataRes['ABE_ACTION_FIELD']];
|
case 'radiogroup':
|
||||||
$message = '<b>Type: </b>' . $field->type . '<br>';
|
case 'radio':
|
||||||
|
$message .= $field->label . ': ';
|
||||||
switch ($field->type) {
|
$message .= $field->options[$value];
|
||||||
case 'dropdown':
|
break;
|
||||||
case 'radiogroup':
|
case 'yesno':
|
||||||
$message .=$field->label . ' - ';
|
$message .= $field->label . ': ';
|
||||||
$message .= $field->options[$value];
|
$message .= ($value == 1) ? G::loadTranslation('ID_YES') : G::loadTranslation('ID_NO');
|
||||||
break;
|
break;
|
||||||
case 'yesno':
|
case 'checkgroup':
|
||||||
$message .= '<b>' . $field->label . ' </b>- ';
|
case 'checkbox':
|
||||||
$message .= ($value == 1) ? 'Yes' : 'No';
|
$message .= $field->label . ': ';
|
||||||
break;
|
$message .= ($value == 'On') ? G::loadTranslation('ID_CHECK') : G::loadTranslation('ID_UNCHECK');
|
||||||
case 'checkbox':
|
break;
|
||||||
$message .= '<b>' . $field->label . '</b> - ';
|
|
||||||
$message .= ($value == 'On') ? 'Check' : 'Uncheck';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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);
|
||||||
|
|||||||
@@ -902,30 +902,29 @@ class Light
|
|||||||
public function postUidUploadFiles($userUid, $app_uid, $request_data)
|
public function postUidUploadFiles($userUid, $app_uid, $request_data)
|
||||||
{
|
{
|
||||||
$response = array();
|
$response = array();
|
||||||
if (count( $request_data ) > 0) {
|
if (is_array($request_data)) {
|
||||||
foreach ($request_data as $k => $file) {
|
foreach ($request_data as $k => $file) {
|
||||||
$indocUid = null;
|
|
||||||
$fieldName = null;
|
|
||||||
$oCase = new \Cases();
|
$oCase = new \Cases();
|
||||||
$DEL_INDEX = $oCase->getCurrentDelegation( $app_uid, $userUid );
|
$delIndex = $oCase->getCurrentDelegation($app_uid, $userUid);
|
||||||
|
$docUid = !empty($file['docUid']) ? $file['docUid'] : -1;
|
||||||
$aFields = array (
|
$appDocType = !empty($file['appDocType']) ? $file['appDocType'] : "ATTACHED";
|
||||||
"APP_UID" => $app_uid,
|
$fieldName = !empty($file['fieldName']) ? $file['fieldName'] : null;
|
||||||
"DEL_INDEX" => $DEL_INDEX,
|
$aFields = array(
|
||||||
"USR_UID" => $userUid,
|
"APP_UID" => $app_uid,
|
||||||
"DOC_UID" => - 1,
|
"DEL_INDEX" => $delIndex,
|
||||||
"APP_DOC_TYPE" => "ATTACHED",
|
"USR_UID" => $userUid,
|
||||||
"APP_DOC_CREATE_DATE" => date( "Y-m-d H:i:s" ),
|
"DOC_UID" => $docUid,
|
||||||
"APP_DOC_COMMENT" => "",
|
"APP_DOC_TYPE" => $appDocType,
|
||||||
"APP_DOC_TITLE" => "",
|
"APP_DOC_CREATE_DATE" => date("Y-m-d H:i:s"),
|
||||||
"APP_DOC_FILENAME" => $file['name'],
|
"APP_DOC_COMMENT" => "",
|
||||||
"APP_DOC_FIELDNAME" => $fieldName
|
"APP_DOC_TITLE" => "",
|
||||||
|
"APP_DOC_FILENAME" => $file['name'],
|
||||||
|
"APP_DOC_FIELDNAME" => $fieldName
|
||||||
);
|
);
|
||||||
|
|
||||||
$oAppDocument = new \AppDocument();
|
$oAppDocument = new \AppDocument();
|
||||||
$oAppDocument->create( $aFields );
|
$oAppDocument->create($aFields);
|
||||||
$response[$k]['docVersion'] = $iDocVersion = $oAppDocument->getDocVersion();
|
$response[$k]['docVersion'] = $iDocVersion = $oAppDocument->getDocVersion();
|
||||||
$response[$k]['appDocUid'] = $sAppDocUid = $oAppDocument->getAppDocUid();
|
$response[$k]['appDocUid'] = $sAppDocUid = $oAppDocument->getAppDocUid();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $response;
|
return $response;
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,11 @@ abstract class Importer
|
|||||||
protected $filename = "";
|
protected $filename = "";
|
||||||
protected $saveDir = "";
|
protected $saveDir = "";
|
||||||
protected $metadata = array();
|
protected $metadata = array();
|
||||||
|
/**
|
||||||
|
* Title of the process before being updated/deleted.
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $currentProcessTitle = "";
|
||||||
public static $affectedGroups = array();
|
public static $affectedGroups = array();
|
||||||
|
|
||||||
const IMPORT_OPTION_OVERWRITE = "project.import.override";
|
const IMPORT_OPTION_OVERWRITE = "project.import.override";
|
||||||
@@ -165,7 +170,7 @@ abstract class Importer
|
|||||||
case self::IMPORT_OPTION_OVERWRITE:
|
case self::IMPORT_OPTION_OVERWRITE:
|
||||||
//Shouldn't generate new UID for all objects
|
//Shouldn't generate new UID for all objects
|
||||||
$this->removeProject();
|
$this->removeProject();
|
||||||
|
$name = $this->currentProcessTitle;
|
||||||
$generateUid = false;
|
$generateUid = false;
|
||||||
break;
|
break;
|
||||||
case self::IMPORT_OPTION_DISABLE_AND_CREATE_NEW:
|
case self::IMPORT_OPTION_DISABLE_AND_CREATE_NEW:
|
||||||
@@ -278,6 +283,10 @@ abstract class Importer
|
|||||||
|
|
||||||
public function removeProject()
|
public function removeProject()
|
||||||
{
|
{
|
||||||
|
/* @var $process \Process */
|
||||||
|
$process = new \Process();
|
||||||
|
$process->load($this->metadata["uid"]);
|
||||||
|
$this->currentProcessTitle = $process->getProTitle();
|
||||||
$project = \ProcessMaker\Project\Adapter\BpmnWorkflow::load($this->metadata["uid"]);
|
$project = \ProcessMaker\Project\Adapter\BpmnWorkflow::load($this->metadata["uid"]);
|
||||||
$project->remove(true, false);
|
$project->remove(true, false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -189,6 +189,7 @@ class Light extends Api
|
|||||||
'DEL_TASK_DUE_DATE' => 'dueDate',
|
'DEL_TASK_DUE_DATE' => 'dueDate',
|
||||||
'DEL_INDEX' => 'delIndex',
|
'DEL_INDEX' => 'delIndex',
|
||||||
'DEL_DELEGATE_DATE' => 'delegateDate',
|
'DEL_DELEGATE_DATE' => 'delegateDate',
|
||||||
|
'DEL_RISK_DATE' => 'delRiskDate',
|
||||||
'user' => array(
|
'user' => array(
|
||||||
'USR_UID' => 'userId'
|
'USR_UID' => 'userId'
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -236,10 +236,14 @@ class Server implements iAuthenticate
|
|||||||
*
|
*
|
||||||
* @format JsonFormat,UploadFormat
|
* @format JsonFormat,UploadFormat
|
||||||
*/
|
*/
|
||||||
public function postAuthorize($authorize = null, $userId = null, $returnResponse = false)
|
public function postAuthorize($authorize = null, $userId = null, $returnResponse = false, $cacheSessionValue = array())
|
||||||
{
|
{
|
||||||
@session_start();
|
@session_start();
|
||||||
|
|
||||||
|
foreach ($cacheSessionValue as $key => $value) {
|
||||||
|
$_SESSION[$key] = $value;
|
||||||
|
}
|
||||||
|
|
||||||
if (! isset($_SESSION['USER_LOGGED'])) {
|
if (! isset($_SESSION['USER_LOGGED'])) {
|
||||||
throw new RestException(400, "Local Authentication Error, user session is not started.");
|
throw new RestException(400, "Local Authentication Error, user session is not started.");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -317,7 +317,7 @@ Ext.onReady(function () {
|
|||||||
data: [['left', _('ID_LEFT')], ['center', _('ID_CENTER')], ['right', _('ID_RIGHT')]]
|
data: [['left', _('ID_LEFT')], ['center', _('ID_CENTER')], ['right', _('ID_RIGHT')]]
|
||||||
}),
|
}),
|
||||||
valueField: 'id',
|
valueField: 'id',
|
||||||
displayField: 'label',
|
displayField: 'label'
|
||||||
});
|
});
|
||||||
|
|
||||||
var alignComboBoxLabel = new Ext.form.ComboBox ({
|
var alignComboBoxLabel = new Ext.form.ComboBox ({
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<div class="b"></div>
|
<div class="b"></div>
|
||||||
<div class="c"></div>
|
<div class="c"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" style="height: 100%;">
|
<div class="content" style="height: 100%;">
|
||||||
<table width="99%">
|
<table width="99%">
|
||||||
<tr>
|
<tr>
|
||||||
<td valign='top'>
|
<td valign='top'>
|
||||||
@@ -321,7 +321,7 @@
|
|||||||
|
|
||||||
{/literal}
|
{/literal}
|
||||||
setNestedProperty(this, Array('disabled'), 'true');
|
setNestedProperty(this, Array('disabled'), 'true');
|
||||||
setNestedProperty(this, Array('value'), '{$PROCESSING_MESSAGE}');
|
setNestedProperty(this, Array('value'), '{$PROCESSING_MESSAGE|escape:javascript}');
|
||||||
{literal}
|
{literal}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -198,8 +198,12 @@ Ext.onReady(function(){
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
validator: function(v) {
|
validator: function(v) {
|
||||||
return valueInputField= /^[0-9a-zA-Z\_|-]+$/.test(v)?true:false;
|
if (v != "") {
|
||||||
}
|
return (/^[0-9a-zA-Z\_|-]+$/.test(v))? true : false;
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
id: 'field_label',
|
id: 'field_label',
|
||||||
@@ -219,8 +223,12 @@ Ext.onReady(function(){
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
validator: function(v) {
|
validator: function(v) {
|
||||||
return valueInputField= /^[0-9a-zA-Z \|-]+$/.test(v)?true:_('ID_THE') + ' ' +_('ID_FIELD_LABEL') + ' ' + _('ID_FIELD_NOT_EMPTY_OR_SPECIAL_CHAR');
|
if (v != "") {
|
||||||
}
|
return (/^[0-9a-zA-Z \|-]+$/.test(v))? true : _('ID_THE') + ' ' +_('ID_FIELD_LABEL') + ' ' + _('ID_FIELD_NOT_EMPTY_OR_SPECIAL_CHAR');
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
id: 'field_type',
|
id: 'field_type',
|
||||||
@@ -416,7 +424,10 @@ Ext.onReady(function(){
|
|||||||
showTooltip: function (msg)
|
showTooltip: function (msg)
|
||||||
{
|
{
|
||||||
if (flagShowMessageError == 1) {
|
if (flagShowMessageError == 1) {
|
||||||
Ext.msgBoxSlider.msgTopCenter("error", _("ID_ERROR"), msg, 3);
|
if (msg != "" && msg != "<ul><li></li></ul>") {
|
||||||
|
Ext.msgBoxSlider.msgTopCenter("error", _("ID_ERROR"), msg, 3);
|
||||||
|
}
|
||||||
|
|
||||||
flagShowMessageError = 0;
|
flagShowMessageError = 0;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user