fernando/luos
1
0
Fork 0
Code Releases Activity

Merged colosa/processmaker into master

Browse Source
This commit is contained in:
jonathan quispe
2015-05-11 09:12:43 -04:00
parent bc81ffe85f 94b98fe61f
commit a43502463b
11 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gulliver/js/maborak/core/maborak.loader.js
View File

File diff suppressed because one or more lines are too long

3
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -275,7 +275,7 @@ function run_cacheview_upgrade($args, $opts) {
echo "Upgrading cache view for " . pakeColor::colorize($workspace->name, "INFO") . "\n";
$workspace->upgradeCacheView(true, false, $lang);
} catch (Exception $e) {
echo "Errors upgrading translation of workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n";
echo "Errors upgrading cache view of workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n";
}
}
}
@@ -579,7 +579,6 @@ function run_workspace_restore($args, $opts) {
return;
}
workspaceTools::restore($filename, $workspace, $dstWorkspace, $overwrite, $lang);
run_cacheview_upgrade($workspace, '');
}
}
}

4
workflow/engine/classes/class.cli.php
View File

@@ -274,6 +274,10 @@ EOT;
call_user_func( $taskData['function'], $arguments, $taskOpts );
} catch (Exception $e) {
echo self::error( "\n Error executing '$taskName':\n\n {$e->getMessage()}\n" ) . "\n";
global $tempDirectory;
if (!empty($tempDirectory)) {
G::rm_dir($tempDirectory);
}
}
}

3
workflow/engine/classes/class.pmLicenseManager.php
View File

@@ -56,7 +56,7 @@ class pmLicenseManager
$this->licensedfeatures = array();
$this->licensedfeaturesList = array();
if (in_array($this->result, $validStatus)) {
$this->serial="3ptta7Xko2prrptrZnSd356aqmPXvMrayNPFj6CLdaR1pWtrW6qPw9jV0OHjxrDGu8LVxtmSm9nP5kR23HRpdZWccpeui+bKkK<EFBFBD>DoqCt2Kqgpq6Vg37s";
$this->serial="3ptta7Xko2prrptrZnSd356aqmPXvMrayNPFj6CLdaR1pWtrW6qPw9jV0OHjxrDGu8LVxtmSm9nP5kR23HRpdZWccpeui+bKkK°DoqCt2Kqgpq6Vg37s";
$info['FIRST_NAME'] = $results['DATA']['FIRST_NAME'];
$info['LAST_NAME'] = $results['DATA']['LAST_NAME'];
$info['DOMAIN_WORKSPACE'] = $results['DATA']['DOMAIN_WORKSPACE'];
@@ -75,6 +75,7 @@ class pmLicenseManager
$resultsRegister = $results['LIC'];
$this->server = $results['LIC']['SRV'];
$this->file = $results['LIC']['FILE'];
$this->workspace = isset($results['LIC']['WORKSPACE']) ? $results['LIC']['WORKSPACE'] : 'pmLicenseSrv';
$this->licenseSerial = (isset($results['LIC']['SERIAL'])) ? $results['LIC']['SERIAL'] : '';
$this->supportStartDate = (isset($results['DATA']['SUPPORT_START_DATE'])) ? $results['DATA']['SUPPORT_START_DATE'] : '';
$this->supportEndDate = (isset($results['DATA']['SUPPORT_END_DATE'])) ? $results['DATA']['SUPPORT_END_DATE'] : '';

13
workflow/engine/classes/class.wsTools.php
View File

@@ -1608,12 +1608,14 @@ class workspaceTools
$final = $stop - $start;
CLI::logging("<*> Verify took $final seconds.\n");
/*$start = microtime(true);
$workspace->checkMafeRequirements($workspaceName, $lang);
$start = microtime(true);
CLI::logging("> Updating cache view...\n");
$workspace->upgradeCacheView(true, false, $lang);
$stop = microtime(true);
$final = $stop - $start;
CLI::logging("<*> Updating cache view Process took $final seconds.\n");*/
CLI::logging("<*> Updating cache view Process took $final seconds.\n");
mysql_close($link);
}
@@ -1695,6 +1697,13 @@ class workspaceTools
$this->initPropel(true);
$pmRestClient = OauthClientsPeer::retrieveByPK('x-pm-local-client');
if (empty($pmRestClient)) {
if (!is_file(PATH_DATA . 'sites/' . $workspace . '/' . '.server_info')) {
$_CSERVER = $_SERVER;
unset($_CSERVER['REQUEST_TIME']);
unset($_CSERVER['REMOTE_PORT']);
$cput = serialize($_CSERVER);
file_put_contents(PATH_DATA . 'sites/' . $workspace . '/' . '.server_info', $cput);
}
if (is_file(PATH_DATA . 'sites/' . $workspace . '/' . '.server_info')) {
$SERVER_INFO = file_get_contents(PATH_DATA . 'sites/' . $workspace . '/'.'.server_info');
$SERVER_INFO = unserialize($SERVER_INFO);

8
workflow/engine/classes/model/AddonsStore.php
View File

@@ -41,7 +41,7 @@ class AddonsStore extends BaseAddonsStore
$criteria = new Criteria(AddonsStorePeer::DATABASE_NAME);
$criteria->addSelectColumn("*");
$criteria->add(AddonsStorePeer::STORE_TYPE, "license", Criteria::EQUAL);
$criteria->add(AddonsStorePeer::STORE_ID, $licenseManager->id, Criteria::NOT_EQUAL);
//$criteria->add(AddonsStorePeer::STORE_ID, $licenseManager->id, Criteria::NOT_EQUAL);
foreach (AddonsStorePeer::doSelect($criteria) as $store) {
$store->clear();
@@ -53,7 +53,8 @@ class AddonsStore extends BaseAddonsStore
if (AddonsStorePeer::retrieveByPK($licenseManager->id) === null) {
preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
$realId = urlencode($matches[1]);
$addonLocation = "http://{$licenseManager->server}/syspmLicenseSrv/en/green/services/addonsStore?action=getInfo&licId=$realId";
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$addonLocation = "http://{$licenseManager->server}/sys".$workspace."/en/green/services/addonsStore?action=getInfo&licId=$realId";
self::addStore($licenseManager->id, $addonLocation);
@@ -547,7 +548,8 @@ class AddonsStore extends BaseAddonsStore
$addon->setAddonStatus(isset($addonInfo->status)? $addonInfo->status : "");
$addon->setAddonType(isset($addonInfo->type)? $addonInfo->type : "");
$addon->setAddonPublisher(isset($addonInfo->publisher)? $addonInfo->publisher : "");
$addon->setAddonDownloadUrl(isset($addonInfo->download_url)? $addonInfo->download_url : "http://" . $pmLicenseManagerO->server . "/syspmLicenseSrv/en/green/services/rest?action=getPlugin&OBJ_UID=" . $addonInfo->guid);
$workspace = (isset($pmLicenseManagerO->workspace)) ? $pmLicenseManagerO->workspace : 'pmLicenseSrv';
$addon->setAddonDownloadUrl(isset($addonInfo->download_url)? $addonInfo->download_url : "http://" . $pmLicenseManagerO->server . "/sys".$workspace."/en/green/services/rest?action=getPlugin&OBJ_UID=" . $addonInfo->guid);
$addon->setAddonDownloadMd5(isset($addonInfo->download_md5)? $addonInfo->download_md5 : "");
$addon->setAddonReleaseDate(isset($addonInfo->release_date)? $addonInfo->release_date : "");
$addon->setAddonReleaseType(isset($addonInfo->release_type)? $addonInfo->release_type : '');

7
workflow/engine/methods/enterprise/addonsStoreAction.php
View File

@@ -78,7 +78,8 @@ try {
preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
$realId = urlencode($matches[1]);
$addonLocation = "http://{$licenseManager->server}/syspmLicenseSrv/en/green/services/addonsStore?action=getInfo&licId=$realId";
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$addonLocation = "http://{$licenseManager->server}/sys".$workspace."/en/green/services/addonsStore?action=getInfo&licId=$realId";
///////
$cnn = Propel::getConnection("workflow");
@@ -261,8 +262,8 @@ try {
///////
$licenseManager = &pmLicenseManager::getSingleton();
$server = $licenseManager->server;
$url = "http://$server/syspmLicenseSrv/en/green/services/rest";
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$url = "http://$server/sys".$workspace."/en/green/services/rest";
if (EnterpriseUtils::checkConnectivity($url) == false) {
throw (new Exception("Server \"$server\" not available."));

8
workflow/engine/methods/enterprise/processMakerAjax.php
View File

@@ -121,8 +121,9 @@ switch ($option) {
///////
$licenseManager = &pmLicenseManager::getSingleton();
$server = isset($licenseManager->server) ? $licenseManager->server : '';
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$url = "http://$server/syspmLicenseSrv/en/green/services/rest";
$url = "http://$server/sys".$workspace."/en/green/services/rest";
if (EnterpriseUtils::checkConnectivity($url) == false) {
throw (new Exception("Server '$server' not available."));
@@ -296,8 +297,9 @@ switch ($option) {
///////
$licenseManager = &pmLicenseManager::getSingleton();
$server = (isset($licenseManager->server)) ? $licenseManager->server : '';
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$url = "http://$server/syspmLicenseSrv/en/green/services/rest";
$url = "http://$server/sys".$workspace."/en/green/services/rest";
if (EnterpriseUtils::checkConnectivity($url) == false) {
throw (new Exception("Server '$server' not available."));
@@ -338,7 +340,7 @@ switch ($option) {
$results = file_get_contents($url, false, $context);
$results = G::json_decode($results);
$results = $results[0];
$results = isset($results[0]) ? $results[0] :array();
$pmVersion = EnterpriseUtils::pmVersion(PM_VERSION);
$versions = array();

8
workflow/engine/methods/login/authentication.php
View File

@@ -249,12 +249,12 @@ try {
unset($_CSERVER['REQUEST_TIME']);
unset($_CSERVER['REMOTE_PORT']);
$cput = serialize($_CSERVER);
if (!is_file(PATH_DATA_SITE . PATH_SEP . '.server_info')) {
file_put_contents(PATH_DATA_SITE . PATH_SEP . '.server_info', $cput);
if (!is_file(PATH_DATA_SITE . '.server_info')) {
file_put_contents(PATH_DATA_SITE . '.server_info', $cput);
} else {
$c = file_get_contents(PATH_DATA_SITE . PATH_SEP . '.server_info');
$c = file_get_contents(PATH_DATA_SITE . '.server_info');
if (G::encryptOld($c) != G::encryptOld($cput)) {
file_put_contents(PATH_DATA_SITE . PATH_SEP . '.server_info', $cput);
file_put_contents(PATH_DATA_SITE . '.server_info', $cput);
}
}

3
workflow/engine/methods/login/licenseUpdate.php
View File

@@ -22,8 +22,9 @@ if ($aux['extension'] != 'dat') {
$licenseManager = new pmLicenseManager();
preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
$realId = urlencode($matches[1]);
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$addonLocation = "http://{$licenseManager->server}/syspmLicenseSrv/en/green/services/addonsStore?action=getInfo&licId=$realId";
$addonLocation = "http://{$licenseManager->server}/sys".$workspace."/en/green/services/addonsStore?action=getInfo&licId=$realId";
///////
$cnn = Propel::getConnection("workflow");

2
workflow/engine/templates/users/users.js
View File

@@ -1175,11 +1175,13 @@ function saveUser()
return false;
}
}
/*----------------------------------********---------------------------------*/
if (!Ext.getCmp('USR_COST_BY_HOUR').isValid()) {
PMExt.warning(_('ID_ERROR'), _('ID_INVALID_VALUE_EXPECTING_POSITIVE_DECIMAL', _('ID_COST_BY_HOUR')));
Ext.getCmp('USR_COST_BY_HOUR').focus(true,10);
return false;
}
/*----------------------------------********---------------------------------*/
if (USR_UID == '00000000000000000000000000000001') {
if (Ext.getCmp('USR_ROLE').getValue() != PROCESSMAKER_ADMIN) {