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

HOR-4676

Browse Source
This commit is contained in:
Paula Quispe
2018-06-15 16:11:33 -04:00
parent d1f6fd03f1 18aca9dbae
commit dbe3c698b1
428 changed files with 30586 additions and 48953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
workflow/engine/methods/enterprise/addonsStore.php
View File

@@ -4,49 +4,53 @@ use ProcessMaker\Core\System;
AddonsStore::checkLicenseStore();
$licenseManager = &PmLicenseManager::getSingleton();
$oHeadPublisher = &headPublisher::getSingleton();
$licenseManager = PmLicenseManager::getSingleton();
$oHeadPublisher = headPublisher::getSingleton();
if (isset($licenseManager->date) && is_array($licenseManager->date)) {
$conf = new Configurations();
if (!empty(config("system.workspace")) && $conf->exists("ENVIRONMENT_SETTINGS")) {
$licenseManager->date['START'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['START']));
$licenseManager->date['END'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['END']));
$licenseManager->date['START'] = $conf->getSystemDate($licenseManager->date['START']);
$licenseManager->date['END'] = $conf->getSystemDate($licenseManager->date['END']);
$licenseManager->date['START'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['START']));
$licenseManager->date['END'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['END']));
$licenseManager->date['START'] = $conf->getSystemDate($licenseManager->date['START']);
$licenseManager->date['END'] = $conf->getSystemDate($licenseManager->date['END']);
} else {
$licenseManager->date['START'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['START']));
$licenseManager->date['END'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['END']));
$licenseManager->date['START'] = G::getformatedDate($licenseManager->date['START'], 'M d, yyyy', SYS_LANG);
$licenseManager->date['END'] = G::getformatedDate($licenseManager->date['END'], 'M d, yyyy', SYS_LANG);
$licenseManager->date['START'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['START']));
$licenseManager->date['END'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['END']));
$licenseManager->date['START'] = G::getformatedDate($licenseManager->date['START'], 'M d, yyyy', SYS_LANG);
$licenseManager->date['END'] = G::getformatedDate($licenseManager->date['END'], 'M d, yyyy', SYS_LANG);
}
}
if (isset($licenseManager->result) && $licenseManager->result == "OK") {
$oHeadPublisher->assign("license_start_date",$licenseManager->date["START"]);
$oHeadPublisher->assign("license_end_date", $licenseManager->expireIn!="NEVER" ? $licenseManager->date["END"]:"NA" );
$oHeadPublisher->assign("license_user", $licenseManager->info["FIRST_NAME"] . " " . $licenseManager->info["LAST_NAME"] . " (" . $licenseManager->info["DOMAIN_WORKSPACE"] . ")");
$oHeadPublisher->assign("license_span", $licenseManager->expireIn != "NEVER" ? ceil($licenseManager->date["SPAN"]/60/60/24) : "~");
$oHeadPublisher->assign("license_name", $licenseManager->type);
$oHeadPublisher->assign("license_server", $licenseManager->server);
$oHeadPublisher->assign("license_expires", $licenseManager->expireIn);
$oHeadPublisher->assign("license_message", $licenseManager->status["message"]);
$oHeadPublisher->assign("license_start_date", $licenseManager->date["START"]);
$oHeadPublisher->assign("license_end_date",
$licenseManager->expireIn != "NEVER" ? $licenseManager->date["END"] : "NA");
$oHeadPublisher->assign("license_user",
$licenseManager->info["FIRST_NAME"] . " " . $licenseManager->info["LAST_NAME"] . " (" . $licenseManager->info["DOMAIN_WORKSPACE"] . ")");
$oHeadPublisher->assign("license_span",
$licenseManager->expireIn != "NEVER" ? ceil($licenseManager->date["SPAN"] / 60 / 60 / 24) : "~");
$oHeadPublisher->assign("license_name", $licenseManager->type);
$oHeadPublisher->assign("license_server", $licenseManager->server);
$oHeadPublisher->assign("license_expires", $licenseManager->expireIn);
$oHeadPublisher->assign("license_message", $licenseManager->status["message"]);
$oHeadPublisher->assign("licensed", true);
}
elseif (isset($licenseManager->info)) {
} elseif (isset($licenseManager->info)) {
$oHeadPublisher->assign("license_start_date", $licenseManager->date["START"]);
$oHeadPublisher->assign("license_end_date", $licenseManager->date["END"]);
$oHeadPublisher->assign("license_span", $licenseManager->expireIn != "NEVER" ? ceil($licenseManager->date["SPAN"]/60/60/24) : "~");
$oHeadPublisher->assign("license_user", $licenseManager->info["FIRST_NAME"] . " " . $licenseManager->info["LAST_NAME"] . " (" . $licenseManager->info["DOMAIN_WORKSPACE"] . ")");
$oHeadPublisher->assign("license_span",
$licenseManager->expireIn != "NEVER" ? ceil($licenseManager->date["SPAN"] / 60 / 60 / 24) : "~");
$oHeadPublisher->assign("license_user",
$licenseManager->info["FIRST_NAME"] . " " . $licenseManager->info["LAST_NAME"] . " (" . $licenseManager->info["DOMAIN_WORKSPACE"] . ")");
$oHeadPublisher->assign("license_name", $licenseManager->type);
$oHeadPublisher->assign("license_server", $licenseManager->server);
$oHeadPublisher->assign("license_server", $licenseManager->server);
$oHeadPublisher->assign("license_expires", $licenseManager->expireIn);
$oHeadPublisher->assign("license_message", $licenseManager->status["message"]);
$oHeadPublisher->assign("licensed", false);
} else {
$oHeadPublisher->assign("license_user", "");
$oHeadPublisher->assign("license_name", "<b>Unlicensed</b>");
$oHeadPublisher->assign("license_server", "<b>no server</b>");
$oHeadPublisher->assign("license_server", "<b>no server</b>");
$oHeadPublisher->assign("license_expires", "");
$currentLicenseStatus = $licenseManager->getCurrentLicenseStatus();
@@ -57,21 +61,25 @@ elseif (isset($licenseManager->info)) {
$oHeadPublisher->assign("license_span", "");
$oHeadPublisher->assign("licensed", false);
}
$oHeadPublisher->assign("license_serial", (isset($licenseManager->licenseSerial))? $licenseManager->licenseSerial : '');
$oHeadPublisher->assign("SUPPORT_FLAG", ((isset($licenseManager->supportStartDate) && $licenseManager->supportStartDate == '') || !isset($licenseManager->supportStartDate)) ? true : false );
$oHeadPublisher->assign("supportStartDate", (isset($licenseManager->supportStartDate))? $licenseManager->supportStartDate : '');
$oHeadPublisher->assign("supportEndDate", (isset($licenseManager->supportEndDate))? $licenseManager->supportEndDate : '');
$oHeadPublisher->assign("license_serial",
(isset($licenseManager->licenseSerial)) ? $licenseManager->licenseSerial : '');
$oHeadPublisher->assign("SUPPORT_FLAG",
((isset($licenseManager->supportStartDate) && $licenseManager->supportStartDate == '') || !isset($licenseManager->supportStartDate)) ? true : false);
$oHeadPublisher->assign("supportStartDate",
(isset($licenseManager->supportStartDate)) ? $licenseManager->supportStartDate : '');
$oHeadPublisher->assign("supportEndDate",
(isset($licenseManager->supportEndDate)) ? $licenseManager->supportEndDate : '');
$oHeadPublisher->assign("PROCESSMAKER_VERSION", System::getVersion());
$oHeadPublisher->assign("PROCESSMAKER_URL", "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN );
$oHeadPublisher->assign("PROCESSMAKER_URL", "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN);
$oHeadPublisher->assign("SYS_SKIN", SYS_SKIN);
$oHeadPublisher->assign("URL_PART_LOGIN", ((substr(SYS_SKIN, 0, 2) == "ux" && SYS_SKIN != "uxs")? "main/login" : "login/login"));
$oHeadPublisher->assign("URL_PART_LOGIN",
((substr(SYS_SKIN, 0, 2) == "ux" && SYS_SKIN != "uxs") ? "main/login" : "login/login"));
$oHeadPublisher->assign("URL_PART_SETUP", EnterpriseUtils::getUrlPartSetup());
$oHeadPublisher->assign("PATH_PLUGINS_WRITABLE", ((is_writable(PATH_PLUGINS))? 1 : 0));
$oHeadPublisher->assign("PATH_PLUGINS_WRITABLE", ((is_writable(PATH_PLUGINS)) ? 1 : 0));
$oHeadPublisher->assign("PATH_PLUGINS_WRITABLE_MESSAGE", "The directory " . PATH_PLUGINS . " have not writable.");
$oHeadPublisher->assign("SKIN_IS_UX", EnterpriseUtils::skinIsUx());
$oHeadPublisher->assign("INTERNET_CONNECTION", EnterpriseUtils::getInternetConnection());
$oHeadPublisher->addExtJsScript("enterprise/addonsStore", true);
G::RenderPage("publish", "extJs");

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

@@ -5,7 +5,7 @@ use ProcessMaker\Plugins\PluginRegistry;
function runBgProcessmaker($task, $log)
{
require_once (PATH_CORE . "bin/tasks/cliAddons.php");
require_once(PATH_CORE . "bin/tasks/cliAddons.php");
$task = str_replace("\"", null, $task);
$data = explode(" ", $task);
@@ -23,7 +23,7 @@ try {
}
if (isset($_REQUEST['addon']) && isset($_REQUEST['store'])) {
require_once (PATH_CORE . 'classes/model/AddonsManagerPeer.php');
require_once(PATH_CORE . 'classes/model/AddonsManagerPeer.php');
$addon = AddonsManagerPeer::retrieveByPK($_REQUEST['addon'], $_REQUEST['store']);
$addonId = $_REQUEST['addon'];
@@ -53,12 +53,12 @@ try {
$dir = PATH_DATA_SITE;
G::uploadFile($aInfoLoadFile["tmp_name"], $dir, $aInfoLoadFile["name"]);
//reading the file that was uploaded
$oPmLicenseManager = &PmLicenseManager::getSingleton();
$oPmLicenseManager = PmLicenseManager::getSingleton();
$response = $oPmLicenseManager->installLicense($dir . $aInfoLoadFile["name"]);
///////
//This command also find the following file "AddonsStore.php"
$licenseManager = &PmLicenseManager::getSingleton();
$licenseManager = PmLicenseManager::getSingleton();
preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
$realId = urlencode($matches[1]);
@@ -214,7 +214,7 @@ try {
}
///////
$licenseManager = &PmLicenseManager::getSingleton();
$licenseManager = PmLicenseManager::getSingleton();
$server = $licenseManager->server;
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$url = "http://$server/sys".$workspace."/en/green/services/rest";
@@ -234,7 +234,7 @@ try {
$data = $data . "--$boundary\n";
///////
//$licenseManager = &pmLicenseManager::getSingleton();
//$licenseManager = PmLicenseManager::getSingleton();
$activeLicense = $licenseManager->getActiveLicense();
$data = $data . "Content-Disposition: form-data; name=\"licenseFile\"; filename=\"" . $licenseManager->file . "\"\n";
@@ -311,8 +311,7 @@ try {
} else {
$result["addons"] = array();
}
G::outRes( G::json_encode($result) );
G::outRes(G::json_encode($result));
} catch (Exception $e) {
$token = strtotime("now");
PMException::registerErrorLog($e, $token);

9
workflow/engine/methods/enterprise/enterprise.php
View File

@@ -130,9 +130,9 @@ class enterprisePlugin extends PMPlugin
{
$this->setConfiguration();
require_once (PATH_CORE . 'classes/model/AddonsStore.php');
require_once(PATH_CORE . 'classes/model/AddonsStore.php');
AddonsStore::checkLicenseStore();
$licenseManager = &PmLicenseManager::getSingleton();
$licenseManager = PmLicenseManager::getSingleton();
AddonsStore::updateAll(false);
}
@@ -175,7 +175,7 @@ class enterprisePlugin extends PMPlugin
//define("PATH_PLUGINS", PATH_CORE . "plugins" . PATH_SEP);
if (file_exists(PATH_CORE . "plugins" . PATH_SEP . $pluginName . ".php")) {
require_once (PATH_CORE . "plugins" . PATH_SEP . $pluginName . ".php");
require_once(PATH_CORE . "plugins" . PATH_SEP . $pluginName . ".php");
$pluginRegistry = PluginRegistry::loadSingleton();
@@ -278,7 +278,7 @@ class enterprisePlugin extends PMPlugin
$strTable = str_replace("_", " ", strtolower($table));
$strTable = str_replace(" ", null, ucwords($strTable));
require_once (PATH_PLUGINS . "enterprise" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "$strTable.php");
require_once(PATH_PLUGINS . "enterprise" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "$strTable.php");
while ($rsSelectTablebak->next()) {
$row = $rsSelectTablebak->getRow();
@@ -336,4 +336,3 @@ $oPluginRegistry->registerPlugin('enterprise', __FILE__); //<- enterprise string
// PATH_PM_LICENSE_MANAGER.PATH_SEPARATOR.
// get_include_path()
//);

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

@@ -6,7 +6,7 @@ ini_set("max_execution_time", 0);
if (!defined("PM_VERSION")) {
if (file_exists(PATH_METHODS . "login/version-pmos.php")) {
include (PATH_METHODS . "login/version-pmos.php");
include(PATH_METHODS . "login/version-pmos.php");
} else {
define("PM_VERSION", "2.0.0");
}
@@ -19,8 +19,6 @@ if (!defined("BUFSIZE")) {
function install($file)
{
$result = array();
$status = 1;
@@ -119,7 +117,7 @@ switch ($option) {
}
///////
$licenseManager = &PmLicenseManager::getSingleton();
$licenseManager = PmLicenseManager::getSingleton();
$server = isset($licenseManager->server) ? $licenseManager->server : '';
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
@@ -295,7 +293,7 @@ switch ($option) {
}
///////
$licenseManager = &PmLicenseManager::getSingleton();
$licenseManager = PmLicenseManager::getSingleton();
$server = (isset($licenseManager->server)) ? $licenseManager->server : '';
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
@@ -371,4 +369,3 @@ switch ($option) {
echo G::json_encode($response);
break;
}