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

Merged in release/3.2.2 (pull request #6059)

Browse Source 
Updating branch release/3.2.3 with the last changes made on branch release/3.2.2

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2017-09-14 19:48:06 +00:00
parent 79ccedf5d2 81881de4c7
commit 9dec186a1a
8 changed files with 1191 additions and 1098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gulliver/system/class.headPublisher.php
View File

@@ -748,6 +748,7 @@ class headPublisher
*/
public function getExtJsViewState()
{
$json = new stdClass();
$views = array();
$keyState = "extJsViewState";
$prefixExtJs = "ys-";
@@ -772,7 +773,9 @@ class headPublisher
$views[$key] = $value[1];
}
}
if ((array)$json != $views) {
$oServerConf->setProperty($keyState, G::json_encode($views));
}
return $views;
}

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

@@ -389,6 +389,8 @@ class RBAC
"PER_NAME" => "Edit User profile Default Cases Menu Options"
), array("PER_UID" => "00000000000000000000000000000064", "PER_CODE" => "PM_REASSIGNCASE_SUPERVISOR",
"PER_NAME" => "Reassign case supervisor"
), array("PER_UID" => "00000000000000000000000000000065", "PER_CODE" => "PM_SETUP_CUSTOM_CASES_LIST",
"PER_NAME" => "Setup Custom Cases List"
)
);
return $permissionsAdmin;

63
workflow/engine/classes/PmDynaform.php
View File

@@ -1,6 +1,7 @@
<?php
use ProcessMaker\Core\System;
use ProcessMaker\BusinessModel\DynaForm\SuggestTrait;
/**
* Implementing pmDynaform library in the running case.
@@ -9,6 +10,7 @@ use ProcessMaker\Core\System;
*/
class PmDynaform
{
use SuggestTrait;
public static $instance = null;
public $fields = null;
@@ -256,66 +258,7 @@ class PmDynaform
}
$sql = G::replaceDataField($json->sql, $dtFields);
if ($value === "suggest") {
$sql = $this->sqlParse($sql, function($parsed, &$select, &$from, &$where, &$groupBy, &$having, &$orderBy, &$limit) use ($json) {
$dt = $parsed["SELECT"];
$isWhere = empty($where);
if ($isWhere === false) {
$where = substr_replace($where, " (", 5, 0) . ")";
}
if (!isset($json->queryField) && isset($dt[0]["base_expr"])) {
$col = $dt[0]["base_expr"];
$dv = str_replace("'", "''", $json->defaultValue);
if ($dv !== "") {
$where = $isWhere ? "WHERE " . $col . "='" . $dv . "'" : $where . " AND " . $col . "='" . $dv . "'";
}
}
if (isset($json->queryField) && isset($dt[0]["base_expr"])) {
$col = isset($dt[1]["base_expr"]) ? $dt[1]["base_expr"] : $dt[0]["base_expr"];
$qf = str_replace("'", "''", $json->queryFilter);
$where = $isWhere ? "WHERE " . $col . " LIKE '%" . $qf . "%'" : $where . " AND " . $col . " LIKE '%" . $qf . "%'";
}
$provider = $this->getDatabaseProvider($json->dbConnection);
$start = 0;
$end = 10;
if (isset($json->queryStart)) {
$start = $json->queryStart;
}
if (isset($json->queryLimit)) {
$end = $json->queryLimit;
}
if (empty($limit) && $provider === "mysql") {
$limit = "LIMIT " . $start . "," . $end . "";
}
if (empty($limit) && $provider === "pgsql") {
$limit = "OFFSET " . $start . " LIMIT " . $end . "";
}
if ($provider === "mssql") {
$limit = "";
if (strpos(strtoupper($select), "TOP") === false) {
$isDistinct = strpos(strtoupper($select), "DISTINCT");
$isAll = strpos(strtoupper($select), "ALL");
if ($isDistinct === false && $isAll === false) {
$select = preg_replace("/SELECT/", "SELECT TOP(" . $end . ")", strtoupper($select), 1);
}
if ($isDistinct !== false) {
$select = preg_replace("/DISTINCT/", "DISTINCT TOP(" . $end . ")", strtoupper($select), 1);
}
if ($isAll !== false) {
$select = preg_replace("/DISTINCT/", "DISTINCT TOP(" . $end . ")", strtoupper($select), 1);
}
}
}
if ($provider === "oracle") {
$limit = "";
$rowNumber = "";
if (strpos(strtoupper($where), "ROWNUM") === false) {
$rowNumber = " AND " . $start . " <= ROWNUM AND ROWNUM <= " . $end;
}
$where = empty($where) ? "WHERE " . $start . " <= ROWNUM AND ROWNUM <= " . $end : $where . $rowNumber;
}
});
$sql = $this->prepareSuggestSql($sql, $json);
}
$dt = $this->getCacheQueryData($json->dbConnection, $sql, $json->type);
foreach ($dt as $row) {

69
workflow/engine/classes/PmLicenseManager.php
View File

@@ -7,7 +7,6 @@ use Illuminate\Support\Facades\Cache;
* class.pmLicenseManager.php
*
*/
class PmLicenseManager
{
const CACHE_KEY = 'license';
@@ -17,20 +16,13 @@ class PmLicenseManager
public function __construct($flagActivatePlugins = true)
{
$oServerConf = &ServerConf::getSingleton();
if ($oServerConf->getProperty('LOGIN_NO_WS') === null || $oServerConf->getProperty('LOGIN_NO_WS') === false) {
$oServerConf->setProperty('LOGIN_NO_WS', true);
//to do: this files probably needs to be in core, since they are GPL2
//include_once (PATH_PLUGINS . 'enterprise' . PATH_SEP . 'classes' . PATH_SEP . 'class.license.lib.php');
//include_once (PATH_PLUGINS . 'enterprise' . PATH_SEP . 'classes' . PATH_SEP . 'class.license.app.php');
}
//searching .dat files in workspace folder
$server_array = $_SERVER;
$licfile = glob(PATH_DATA_SITE . "*.dat");
if (count($licfile) > 0 && is_file($licfile[0])) {
$oServerConf->setProperty('ACTIVE_LICENSE', array(SYS_SYS => ""));
}
$activeLicenseSetting = $oServerConf->getProperty('ACTIVE_LICENSE');
@@ -38,7 +30,7 @@ class PmLicenseManager
$licenseFile = $activeLicenseSetting[SYS_SYS];
} else {
$activeLicense = $this->getActiveLicense();
$oServerConf->setProperty('ACTIVE_LICENSE', array(SYS_SYS => $activeLicense ['LICENSE_PATH']));
$oServerConf->setProperty('ACTIVE_LICENSE', [SYS_SYS => $activeLicense['LICENSE_PATH']]);
$licenseFile = $activeLicense['LICENSE_PATH'];
}
@@ -46,18 +38,19 @@ class PmLicenseManager
$application->set_server_vars($server_array);
$application->DATE_STRING = 'Y-m-d H:i:s';
$results = $application->validate();
$validStatus = array(
$validStatus = [
'OK',
'EXPIRED',
'TMINUS'
);
];
$this->result = $results['RESULT'];
$this->features = array();
$this->licensedfeatures = array();
$this->licensedfeaturesList = array();
$this->features = [];
$this->licensedfeatures = [];
$this->licensedfeaturesList = [];
if (in_array($this->result, $validStatus)) {
$this->serial = "3ptta7Xko2prrptrZnSd356aqmPXvMrayNPFj6CLdaR1pWtrW6qPw9jV0OHjxrDGu8LVxtmSm9nP5kR23HRpdZWccpeui+bKkK°DoqCt2Kqgpq6Vg37s";
$info = [];
$info['FIRST_NAME'] = $results['DATA']['FIRST_NAME'];
$info['LAST_NAME'] = $results['DATA']['LAST_NAME'];
$info['DOMAIN_WORKSPACE'] = $results['DATA']['DOMAIN_WORKSPACE'];
@@ -67,8 +60,8 @@ class PmLicenseManager
$this->plan = isset($results ['DATA']['PLAN']) ? $results ['DATA']['PLAN'] : "";
$this->id = $results ['ID'];
$this->expireIn = $this->getExpireIn();
$this->features = $this->result!='TMINUS'?isset($results ['DATA']['CUSTOMER_PLUGIN'])? $results ['DATA']['CUSTOMER_PLUGIN'] : $this->getActiveFeatures() : array();
$this->licensedfeatures = $this->result != 'TMINUS' ? (isset($results ['DATA']['CUSTOMER_LICENSED_FEATURES']) && is_array($results ['DATA']['CUSTOMER_LICENSED_FEATURES'])) ? $results ['DATA']['CUSTOMER_LICENSED_FEATURES'] : array() : array();
$this->features = $this->result != 'TMINUS' ? isset($results ['DATA']['CUSTOMER_PLUGIN']) ? $results ['DATA']['CUSTOMER_PLUGIN'] : $this->getActiveFeatures() : [];
$this->licensedfeatures = $this->result != 'TMINUS' ? (isset($results ['DATA']['CUSTOMER_LICENSED_FEATURES']) && is_array($results ['DATA']['CUSTOMER_LICENSED_FEATURES'])) ? $results ['DATA']['CUSTOMER_LICENSED_FEATURES'] : [] : [];
$this->licensedfeaturesList = isset($results ['DATA']['LICENSED_FEATURES_LIST']) ? $results ['DATA']['LICENSED_FEATURES_LIST'] : null;
$this->status = $this->getCurrentLicenseStatus();
@@ -92,23 +85,35 @@ class PmLicenseManager
$this->supportEndDate = G::getformatedDate($this->supportEndDate, 'M d, yyyy', SYS_LANG);
}
} else {
$resultsRegister=array();
$resultsRegister = [];
$resultsRegister['ID'] = $results['DATA']['DOMAIN_WORKSPACE'];
$this->server = null;
$this->file = null;
}
// The HUMAN attribute varies according to the timezone configured in the server, therefore it does not need
// to be considered in the comparison if the value was changed or not, it is only comparing with te "timestamp"
if (isset($results['DATE']['HUMAN'])) {
unset($results['DATE']['HUMAN']);
}
$resultsRegister['date'] = $results ['DATE'];
$resultsRegister['info'] = $info;
$resultsRegister['type'] = $results ['DATA'] ['TYPE'];
if ($oServerConf->getProperty('LICENSE_INFO')) {
$licInfoA = $oServerConf->getProperty('LICENSE_INFO');
} else {
$licInfoA = array();
// The HUMAN attribute varies according to the timezone configured in the server, therefore it does not need
// to be considered in the comparison if the value was changed or not, it is only comparing with te "timestamp"
if (isset($licInfoA[SYS_SYS]['date']['HUMAN'])) {
unset($licInfoA[SYS_SYS]['date']['HUMAN']);
}
} else {
$licInfoA = [];
}
if (empty($licInfoA[SYS_SYS]) || ($licInfoA[SYS_SYS] != $resultsRegister)) {
$licInfoA[SYS_SYS] = $resultsRegister;
$oServerConf->setProperty('LICENSE_INFO', $licInfoA);
}
}
if ($flagActivatePlugins) {
$this->activateFeatures();
@@ -163,7 +168,7 @@ class PmLicenseManager
if (file_exists(PATH_DATA_SITE . "ee")) {
$aPlugins = unserialize(trim(file_get_contents(PATH_DATA_SITE . 'ee')));
$aDenied=array();
$aDenied = [];
foreach ($aPlugins as $aPlugin) {
$sClassName = substr($aPlugin ['sFilename'], 0, strpos($aPlugin ['sFilename'], '-'));
if (!(in_array($sClassName, $this->features))) {
@@ -178,7 +183,8 @@ class PmLicenseManager
}
if (!(empty($aDenied))) {
if ((SYS_COLLECTION == "enterprise") && (SYS_TARGET == "pluginsList")) {
G::SendMessageText("The following plugins were restricted due to your enterprise license: ".implode(", ",$aDenied),"INFO");
G::SendMessageText("The following plugins were restricted due to your enterprise license: " . implode(", ",
$aDenied), "INFO");
}
}
}
@@ -225,7 +231,7 @@ class PmLicenseManager
public function getCurrentLicenseStatus()
{
$result = array ();
$result = [];
switch ($this->result) {
case 'OK':
$result ['result'] = 'ok';
@@ -290,10 +296,10 @@ class PmLicenseManager
public function getLicenseInfo()
{
$validStatus = array (
$validStatus = [
'ok',
'expired'
);
];
$status = $this->getCurrentLicenseStatus();
$infoText = "";
if (in_array($status ['result'], $validStatus)) {
@@ -379,7 +385,7 @@ class PmLicenseManager
} else {
$oServerConf = &ServerConf::getSingleton();
$oServerConf->setProperty ( 'ACTIVE_LICENSE',array(SYS_SYS => $path));
$oServerConf->setProperty('ACTIVE_LICENSE', [SYS_SYS => $path]);
$this->saveDataLicense($results, $path, $redirect);
if ($redirect) {
G::Header('location: ../enterprise/addonsStore');
@@ -388,6 +394,7 @@ class PmLicenseManager
}
}
}
/*
get Active License
*/
@@ -395,7 +402,7 @@ class PmLicenseManager
{
//get license from database, table LICENSE_MANAGER
try {
$aRow = array();
$aRow = [];
require_once("classes/model/LicenseManager.php");
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(LicenseManagerPeer::LICENSE_USER);
@@ -497,7 +504,7 @@ class PmLicenseManager
$aRow = $oDataset->getRow();
} catch (Exception $e) {
G::pr($e);
$aRow = array ();
$aRow = [];
}
return $aRow;
}
@@ -505,7 +512,7 @@ class PmLicenseManager
public function getActiveFeatures()
{
if (file_exists(PATH_PLUGINS . 'enterprise/data/default')) {
return array();
return [];
}
return unserialize(G::decrypt($this->serial, file_get_contents(PATH_PLUGINS . 'enterprise/data/default')));
}

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

@@ -293,10 +293,6 @@ try {
unset($_SESSION['FAILED_LOGINS']);
// increment logins in heartbeat
$oServerConf =& ServerConf::getSingleton();
$oServerConf->sucessfulLogin();
// Assign the uid of user to userloggedobj
$RBAC->loadUserRolePermission($RBAC->sSystem, $uid);
$res = $RBAC->userCanAccess('PM_LOGIN');
@@ -324,15 +320,6 @@ try {
$weblog->create($aLog);
/**end log**/
//************** background processes, here we are putting some back office routines **********
$heartBeatNWIDate = $oServerConf->getHeartbeatProperty('HB_NEXT_GWI_DATE','HEART_BEAT_CONF');
if (is_null($heartBeatNWIDate)) {
$heartBeatNWIDate = time();
}
if (time() >= $heartBeatNWIDate) {
$oServerConf->setHeartbeatProperty('HB_NEXT_GWI_DATE', strtotime('+1 day'), 'HEART_BEAT_CONF');
}
//**** defining and saving server info, this file has the values of the global array $_SERVER ****
//this file is useful for command line environment (no Browser), I mean for triggers, crons and other executed over command line

99
workflow/engine/methods/setup/language_Ajax.php
View File

@@ -1,29 +1,6 @@
<?php
/**
* language_Ajax.php
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.23
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
try {
$filter = new InputFilter();
$_POST = $filter->xssFilterHard($_POST);
@@ -35,8 +12,7 @@ try {
switch ($_POST['function']) {
case 'savePredetermined':
$tranlationsList = Translation::getTranslationEnvironments();
g::pr( $tranlationsList );
die();
G::pr($tranlationsList);
if (isset($meta['LAN_ID']) && $meta['LAN_ID'] == $_POST['lang']) {
echo 'The Setting was saved successfully!';
} else {
@@ -44,18 +20,15 @@ try {
}
break;
case 'languagesList':
$isoCountry = new IsoCountry();
$translationRow = new Translation();
$response = new stdClass();
$translationsEnvList = $translationRow->getTranslationEnvironments();
//print_r($translationsEnvList); die;
$i = 0;
foreach ($translationsEnvList as $locale => $translationRow) {
$COUNTRY_ID = $translationRow['IC_UID'];
if ($COUNTRY_ID != '') {
$isoCountryRecord = $isoCountry->findById( strtoupper( $COUNTRY_ID ) );
$countryId = $translationRow['IC_UID'];
if ($countryId != '') {
$isoCountryRecord = $isoCountry->findById(strtoupper($countryId));
$flag = strtolower($isoCountryRecord['IC_UID']);
$countryName = $translationRow['HEADERS']['X-Poedit-Country'];
} else {
@@ -65,63 +38,63 @@ try {
$conf = new Configurations();
$confCasesList = $conf->getConfiguration('casesList', 'todo');
//echo date($confCasesList['dateformat'], '2010-01-01');
if (isset($confCasesList['dateformat'])) {
$datetime = explode(' ', $translationRow['DATE']);
$date = explode('-', $datetime[0]);
if (count( $datetime ) == 2)
if (count($datetime) == 2) {
$time = explode(':', $datetime[1]);
}
if (count($date) == 3) {
if (count($time) >= 2) {
$DATE = date( $confCasesList['dateformat'], mktime( $time[0], $time[1], 0, $date[1], $date[2], $date[0] ) );
$dateFormat = date($confCasesList['dateformat'],
mktime($time[0], $time[1], 0, $date[1], $date[2], $date[0]));
} else {
$DATE = date( $confCasesList['dateformat'], mktime( 0, 0, 0, $date[1], $date[2], $date[0] ) );
$dateFormat = date($confCasesList['dateformat'], mktime(0, 0, 0, $date[1], $date[2], $date[0]));
}
} else {
$DATE = $translationRow['DATE'];
$dateFormat = $translationRow['DATE'];
}
$datetime = explode(' ', $translationRow['HEADERS']['PO-Revision-Date']);
$date = explode('-', $datetime[0]);
if (count( $datetime ) == 2)
if (count($datetime) == 2) {
$time = explode(':', $datetime[1]);
}
if (count($date) == 3) {
if (count($time) >= 2) {
$REV_DATE = date( $confCasesList['dateformat'], mktime( $time[0], substr( $time[1], 0, 2 ), 0, $date[1], $date[2], $date[0] ) );
$revDate = date($confCasesList['dateformat'],
mktime($time[0], substr($time[1], 0, 2), 0, $date[1], $date[2], $date[0]));
} else {
$REV_DATE = date( $confCasesList['dateformat'], mktime( 0, 0, 0, $date[1], $date[2], $date[0] ) );
$revDate = date($confCasesList['dateformat'],
mktime(0, 0, 0, $date[1], $date[2], $date[0]));
}
} else {
$REV_DATE = $translationRow['HEADERS']['PO-Revision-Date'];
$revDate = $translationRow['HEADERS']['PO-Revision-Date'];
}
} else {
$DATE = $translationRow['DATE'];
$REV_DATE = $translationRow['HEADERS']['PO-Revision-Date'];
$dateFormat = $translationRow['DATE'];
$revDate = $translationRow['HEADERS']['PO-Revision-Date'];
}
$languagesList[$i]['LAN_ID'] = $translationRow['LAN_ID'];
$languagesList[$i]['LOCALE'] = $translationRow['LOCALE'];
$languagesList[$i]['LAN_FLAG'] = $flag;
$languagesList[$i]['NUM_RECORDS'] = $translationRow['NUM_RECORDS'];
$languagesList[$i]['DATE'] = $DATE;
$languagesList[$i]['DATE'] = $dateFormat;
$languagesList[$i]['LAN_NAME'] = $translationRow['HEADERS']['X-Poedit-Language'];
$languagesList[$i]['COUNTRY_NAME'] = $countryName;
$languagesList[$i]['TRANSLATOR'] = htmlentities($translationRow['HEADERS']['Last-Translator']);
$languagesList[$i]['REV_DATE'] = $REV_DATE;
$languagesList[$i]['REV_DATE'] = $revDate;
$languagesList[$i]['VERSION'] = $translationRow['HEADERS']['Project-Id-Version'];
$i++;
}
$translationRow = new Translation();
$response->data = $languagesList;
print (G::json_encode($response));
break;
case 'delete':
@@ -130,25 +103,14 @@ try {
$locale = $_POST['LOCALE'];
$trn = new Translation();
if (strpos( $locale, Translation::$localeSeparator ))
if (strpos($locale, Translation::$localeSeparator)) {
list ($LAN_ID, $IC_UID) = explode(Translation::$localeSeparator, $locale);
else {
$LAN_ID = $locale;
$LAN_ID = '';
}
$oCriteria = new Criteria( 'workflow' );
//$oCriteria->addSelectColumn('COUNT('.ContentPeer::CON_CATEGORY.')');
$oCriteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$oDataset = ApplicationPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$aRow = $oDataset->getRow();
if ($locale != "en") { //Default Language 'en'
if ($locale != SYS_LANG) { //Current Language
//THERE IS NO ANY CASE STARTED FROM THIS LANGUAGE
if (empty($aRow)) { //so we can delete this language
//Verify if is the default language 'en'
if ($locale != "en") {
//Verify if is the current language
if ($locale != SYS_LANG) {
try {
Content::removeLanguageContent($locale);
$trn->removeTranslationEnvironment($locale);
@@ -159,13 +121,10 @@ try {
G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)));
}
} else {
echo str_replace('{0}', $aRow['APP_TITLE'], G::LoadTranslation('ID_LANGUAGE_CANT_DELETE'));
echo G::LoadTranslation('ID_LANGUAGE_CANT_DELETE_CURRENTLY');
}
} else {
echo str_replace('{0}', $aRow['APP_TITLE'], G::LoadTranslation('ID_LANGUAGE_CANT_DELETE_CURRENTLY'));
}
} else {
echo str_replace('{0}', $aRow['APP_TITLE'], G::LoadTranslation('ID_LANGUAGE_CANT_DELETE_DEFAULT'));
echo G::LoadTranslation('ID_LANGUAGE_CANT_DELETE_DEFAULT');
}
break;
}

129
workflow/engine/skinEngine/skinEngine.php
View File

@@ -69,8 +69,7 @@ class SkinEngine
$this->forceTemplateCompile = true;
}
$_SESSION['currentSkin'] = SYS_SKIN;
}
else {
} else {
$_SESSION['currentSkin'] = SYS_SKIN;
$_SESSION['currentSkinVariant'] = $this->skin;
}
@@ -99,24 +98,26 @@ class SkinEngine
if (strtolower($this->mainSkin) != "classic") {
if (defined('PATH_CUSTOM_SKINS') && is_dir(PATH_CUSTOM_SKINS . $this->mainSkin)) { // check this skin on user skins path
$skinObject = PATH_CUSTOM_SKINS . $this->mainSkin;
}
else if (is_dir($this->skinsBasePath . $this->mainSkin)) { // check this skin on core skins path
} else {
if (is_dir($this->skinsBasePath . $this->mainSkin)) { // check this skin on core skins path
$skinObject = $this->skinsBasePath . $this->mainSkin;
}
else { //Skin doesn't exist
} else { //Skin doesn't exist
$this->mainSkin = $this->skinDefault;
if (defined('PATH_CUSTOM_SKINS') && is_dir(PATH_CUSTOM_SKINS . $this->mainSkin)) { // check this skin on user skins path
$skinObject = PATH_CUSTOM_SKINS . $this->mainSkin;
}
else if (is_dir($this->skinsBasePath . $this->mainSkin)) { // check this skin on core skins path
} else {
if (is_dir($this->skinsBasePath . $this->mainSkin)) { // check this skin on core skins path
$skinObject = $this->skinsBasePath . $this->mainSkin;
}
}
}
}
}
//This should have an XML definition and a layout html
if ($skinObject && file_exists($skinObject . PATH_SEP . 'config.xml')
&& file_exists($skinObject . PATH_SEP . 'layout.html')) {
&& file_exists($skinObject . PATH_SEP . 'layout.html')
) {
$configurationFile = $skinObject . PATH_SEP . 'config.xml';
$layoutFile = $skinObject . PATH_SEP . 'layout.html';
@@ -167,8 +168,7 @@ class SkinEngine
}
$this->$skinMethod();
}
catch (Exception $e) {
} catch (Exception $e) {
switch ($e->getCode()) {
case SE_LAYOUT_NOT_FOUND:
@@ -178,8 +178,7 @@ class SkinEngine
$data['exception_list'] = array();
if (substr($this->mainSkin, 0, 2) != 'ux') {
$url = '../login/login';
}
else {
} else {
$url = '../main/login';
}
@@ -251,8 +250,7 @@ class SkinEngine
if ($_SESSION['user_experience'] != 'NORMAL') {
$templateFile = (is_dir(PATH_CUSTOM_SKINS . 'uxs')) ? PATH_CUSTOM_SKINS . 'simplified' . PATH_SEP . 'extJsInitLoad.html' : $templateFile;
}
}
else {
} else {
$styles = "";
$header = $oHeadPublisher->getExtJsStylesheets($this->cssFileName);
$header .= $oHeadPublisher->includeExtJs();
@@ -271,10 +269,14 @@ class SkinEngine
$meta = null;
$dirBody = null;
if (isset($_SERVER["HTTP_USER_AGENT"]) && preg_match("/^.*\(.*Trident.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
if (isset($_SERVER["HTTP_USER_AGENT"]) && preg_match("/^.*\(.*Trident.(\d+)\..+\).*$/",
$_SERVER["HTTP_USER_AGENT"], $arrayMatch)
) {
//Get the IE version
if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){
if (preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"],
$arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)
) {
$ie = intval($arrayMatch[1]);
}
$isIE = Bootstrap::isIE();
@@ -339,7 +341,8 @@ class SkinEngine
$header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName);
}
$smarty->assign('username', (isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . SYS_SYS . ')' : '') );
$smarty->assign('username',
(isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . SYS_SYS . ')' : ''));
$smarty->assign('header', $header);
$smarty->force_compile = $this->forceTemplateCompile;
@@ -371,8 +374,7 @@ class SkinEngine
if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
$smarty->display($layoutFileBlank['basename']);
}
else {
} else {
$header = '';
if (isset($oHeadPublisher)) {
@@ -385,9 +387,12 @@ class SkinEngine
if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
$freeOfChargeText = "";
if (! defined('SKIP_FREE_OF_CHARGE_TEXT'))
if (!defined('SKIP_FREE_OF_CHARGE_TEXT')) {
$freeOfChargeText = "Supplied free of charge with no support, certification, warranty, <br>maintenance nor indemnity by Processmaker and its Certified Partners.";
if(file_exists(PATH_CLASSES."class.pmLicenseManager.php")) $freeOfChargeText="";
}
if (file_exists(PATH_CLASSES . "class.pmLicenseManager.php")) {
$freeOfChargeText = "";
}
$fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
@@ -408,7 +413,8 @@ class SkinEngine
}
$oMenu = new Menu();
$menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED, $G_ID_MENU_SELECTED);
$menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED,
$G_ID_MENU_SELECTED);
$smarty->assign('menus', $menus);
if (substr(SYS_SKIN, 0, 2) == 'ux') {
@@ -417,7 +423,8 @@ class SkinEngine
}
$oSubMenu = new Menu();
$subMenus = $oSubMenu->generateArrayForTemplate($G_SUB_MENU, 'selectedSubMenu', 'subMenu', $G_SUB_MENU_SELECTED, $G_ID_SUB_MENU_SELECTED);
$subMenus = $oSubMenu->generateArrayForTemplate($G_SUB_MENU, 'selectedSubMenu', 'subMenu',
$G_SUB_MENU_SELECTED, $G_ID_SUB_MENU_SELECTED);
$smarty->assign('subMenus', $subMenus);
if (!defined('NO_DISPLAY_USERNAME')) {
@@ -435,14 +442,15 @@ class SkinEngine
$conf = new Configurations();
$conf->getFormats();
$name = $conf->userNameFormat(isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME']: '', isset($_SESSION['USR_FULLNAME']) ? htmlentities($_SESSION['USR_FULLNAME'] , ENT_QUOTES, 'UTF-8'): '', isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '');
$name = $conf->userNameFormat(isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '',
isset($_SESSION['USR_FULLNAME']) ? htmlentities($_SESSION['USR_FULLNAME'], ENT_QUOTES,
'UTF-8') : '', isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '');
$smarty->assign('user', $name);
}
if (defined('SYS_SYS')) {
$logout = '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
}
else {
} else {
$logout = '/sys/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
}
@@ -455,8 +463,7 @@ class SkinEngine
if (class_exists('ProcessMaker\Plugins\PluginRegistry')) {
$oPluginRegistry = PluginRegistry::loadSingleton();
$sCompanyLogo = $oPluginRegistry->getCompanyLogo('/images/processmaker.logo.jpg');
}
else {
} else {
$sCompanyLogo = '/images/processmaker.logo.jpg';
}
@@ -483,8 +490,7 @@ class SkinEngine
if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
$smarty->force_compile = $this->forceTemplateCompile;
$smarty->display($this->layoutFileBlank['basename']);
}
else {
} else {
$header = '';
if (isset($oHeadPublisher)) {
@@ -522,11 +528,13 @@ class SkinEngine
global $G_ID_SUB_MENU_SELECTED;
$oMenu = new Menu();
$menus = $oMenu->generateArrayForTemplate ( $G_MAIN_MENU,'SelectedMenu', 'mainMenu',$G_MENU_SELECTED, $G_ID_MENU_SELECTED );
$menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED,
$G_ID_MENU_SELECTED);
$smarty->assign('menus', $menus);
$oSubMenu = new Menu();
$subMenus = $oSubMenu->generateArrayForTemplate ( $G_SUB_MENU,'selectedSubMenu', 'subMenu',$G_SUB_MENU_SELECTED, $G_ID_SUB_MENU_SELECTED );
$subMenus = $oSubMenu->generateArrayForTemplate($G_SUB_MENU, 'selectedSubMenu', 'subMenu',
$G_SUB_MENU_SELECTED, $G_ID_SUB_MENU_SELECTED);
$smarty->assign('subMenus', $subMenus);
$smarty->assign('user', isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '');
@@ -539,9 +547,9 @@ class SkinEngine
if (class_exists('ProcessMaker\Plugins\PluginRegistry')) {
$oPluginRegistry = PluginRegistry::loadSingleton();
$sCompanyLogo = $oPluginRegistry->getCompanyLogo('/images/processmaker.logo.jpg');
}
else
} else {
$sCompanyLogo = '/images/processmaker.logo.jpg';
}
$smarty->assign('logo_company', $sCompanyLogo);
$smarty->force_compile = $this->forceTemplateCompile;
@@ -578,8 +586,7 @@ class SkinEngine
if (empty($this->layout)) {
$smarty->template_dir = PATH_TPL;
$tpl = $viewFile . '.html';
}
else {
} else {
$smarty->template_dir = $this->layoutFile['dirname'];
$tpl = 'layout-' . $this->layout . '.html';
//die($smarty->template_dir.PATH_SEP.$tpl);
@@ -649,11 +656,13 @@ class SkinEngine
$extSkin = $oServerConf->getProperty("extSkin");
if (!$extSkin) {
$extSkin = array();
}
$extSkin = [SYS_SKIN => "xtheme-gray"];
$oServerConf->setProperty("extSkin", $extSkin);
} else if (empty($extSkin[SYS_SKIN])) {
$extSkin[SYS_SKIN] = "xtheme-gray";
$oServerConf->setProperty("extSkin", $extSkin);
}
//End of extJS Theme setup
if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
@@ -661,8 +670,7 @@ class SkinEngine
$smarty->force_compile = $this->forceTemplateCompile;
$smarty->display($layoutFileBlank['basename']);
}
else {
} else {
$smarty->template_dir = $this->layoutFile['dirname'];
$meta = null;
@@ -671,7 +679,10 @@ class SkinEngine
if (preg_match("/^.*\(.*Trident.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
//Get the IE version
if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){
if (preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"],
$arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"],
$arrayMatch)
) {
$ie = intval($arrayMatch[1]);
}
@@ -700,9 +711,12 @@ class SkinEngine
if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
$freeOfChargeText = "";
if (! defined('SKIP_FREE_OF_CHARGE_TEXT'))
if (!defined('SKIP_FREE_OF_CHARGE_TEXT')) {
$freeOfChargeText = "Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by ProcessMaker and its Certified Partners.";
if(file_exists(PATH_CLASSES."PmLicenseManager.php")) $freeOfChargeText="";
}
if (file_exists(PATH_CLASSES . "PmLicenseManager.php")) {
$freeOfChargeText = "";
}
$fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
@@ -723,11 +737,13 @@ class SkinEngine
}
$oMenu = new Menu();
$menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED, $G_ID_MENU_SELECTED);
$menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED,
$G_ID_MENU_SELECTED);
$smarty->assign('menus', $menus);
$oSubMenu = new Menu();
$subMenus = $oSubMenu->generateArrayForTemplate($G_SUB_MENU, 'selectedSubMenu', 'subMenu', $G_SUB_MENU_SELECTED, $G_ID_SUB_MENU_SELECTED);
$subMenus = $oSubMenu->generateArrayForTemplate($G_SUB_MENU, 'selectedSubMenu', 'subMenu',
$G_SUB_MENU_SELECTED, $G_ID_SUB_MENU_SELECTED);
$smarty->assign('subMenus', $subMenus);
if (!defined('NO_DISPLAY_USERNAME')) {
@@ -738,9 +754,11 @@ class SkinEngine
$smarty->assign('user_logged', (isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : ''));
if (SYS_SKIN == 'neoclassic') {
$smarty->assign('tracker', (SYS_COLLECTION == 'tracker') ? ( ($G_PUBLISH->Parts[0]['File'] != 'tracker/loginpm3' ) ? true : '') : '');
$smarty->assign('tracker',
(SYS_COLLECTION == 'tracker') ? (($G_PUBLISH->Parts[0]['File'] != 'tracker/loginpm3') ? true : '') : '');
} else {
$smarty->assign('tracker', (SYS_COLLECTION == 'tracker') ? ( ($G_PUBLISH->Parts[0]['File'] != 'tracker/login' ) ? true : '') : '');
$smarty->assign('tracker',
(SYS_COLLECTION == 'tracker') ? (($G_PUBLISH->Parts[0]['File'] != 'tracker/login') ? true : '') : '');
}
$smarty->assign('switch_interface', $switch_interface);
$smarty->assign('switch_interface_label', G::LoadTranslation('ID_SWITCH_INTERFACE'));
@@ -753,7 +771,9 @@ class SkinEngine
$conf = new Configurations();
$conf->getFormats();
$name = $conf->userNameFormat(isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME']: '', isset($_SESSION['USR_FULLNAME']) ? htmlentities($_SESSION['USR_FULLNAME'] , ENT_QUOTES, 'UTF-8'): '', isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '');
$name = $conf->userNameFormat(isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '',
isset($_SESSION['USR_FULLNAME']) ? htmlentities($_SESSION['USR_FULLNAME'], ENT_QUOTES,
'UTF-8') : '', isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '');
$smarty->assign('user', $name);
}
@@ -767,7 +787,8 @@ class SkinEngine
$RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'] == 'PROCESSMAKER_ADMIN'
) {
if ($expireInLabel != '') {
$smarty->assign('msgVer', '<label class="textBlack">' . $expireInLabel . '</label>&nbsp;&nbsp;');
$smarty->assign('msgVer',
'<label class="textBlack">' . $expireInLabel . '</label>&nbsp;&nbsp;');
}
}
}
@@ -798,12 +819,10 @@ class SkinEngine
if (isset($sFotoSelect) && $sFotoSelect != '' && !(strcmp($sWspaceSelect, SYS_SYS))) {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
$sCompanyLogo = "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/showLogoFile.php?id=" . base64_encode($sCompanyLogo);
}
else {
} else {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo('/images/processmaker.logo.jpg');
}
}
else {
} else {
$sCompanyLogo = '/images/processmaker.logo.jpg';
}

173
workflow/engine/src/ProcessMaker/BusinessModel/DynaForm/SuggestTrait.php Normal file
View File

@@ -0,0 +1,173 @@
<?php
namespace ProcessMaker\BusinessModel\DynaForm;
/**
* SuggestTrait
* Methods required to prepare the query for the suggest fields.
*/
trait SuggestTrait
{
/**
* Get field current value.
*
* @param type $json
* @return type
*/
private function getSuggestValue($json)
{
$value = "";
if ($json->defaultValue !== "") {
$value = $json->defaultValue;
}
if (isset($this->fields["APP_DATA"][$json->name])) {
$value = $this->fields["APP_DATA"][$json->name];
}
return $value;
}
/**
* Prepare the query for the suggest field.
*
* @param type $sql
* @param type $json
* @return type
*/
private function prepareSuggestSql($sql, $json)
{
//If 0 find an specific row by the first column.
$optionsLimit = empty($json->queryLimit) ? 0 : $json->queryLimit;
return $this->sqlParse(
$sql,
function ($parsed, &$select, &$from, &$where, &$groupBy, &$having, &$orderBy, &$limit) use ($json, $optionsLimit)
{
$dt = $parsed["SELECT"];
$isWhere = empty($where);
if ($isWhere === false) {
$where = substr_replace($where, " (", 5, 0) . ")";
}
if (!isset($json->queryField) && isset($dt[0]["base_expr"])) {
$col = $dt[0]["base_expr"];
$dv = str_replace("'", "''", $json->defaultValue);
if ($dv !== "") {
$where = $isWhere ? "WHERE " . $col . "='" . $dv . "'" : $where . " AND " . $col . "='" . $dv . "'";
}
}
if (isset($json->queryField) && isset($dt[0]["base_expr"])) {
$col = isset($dt[1]["base_expr"]) ? $dt[1]["base_expr"] : $dt[0]["base_expr"];
$qf = str_replace("'", "''", $json->queryFilter);
$where = $isWhere ? "WHERE " . $col . " LIKE '%" . $qf . "%'" : $where . " AND " . $col . " LIKE '%" . $qf . "%'";
}
if ($optionsLimit > 0) {
$this->addSuggestLimit($json, $select, $limit, $where);
} else {
$this->addSuggestWhere($json, $parsed, $select, $where, $having);
}
}
);
}
/**
* Add the limit sentence to the suggest query.
*
* @param type $json
* @param type $select
* @param type $limit
* @param type $where
*/
private function addSuggestLimit($json, &$select, &$limit, &$where)
{
$start = 0;
$end = 10;
$provider = $this->getDatabaseProvider($json->dbConnection);
if (isset($json->queryStart)) {
$start = $json->queryStart;
}
if (isset($json->queryLimit)) {
$end = $json->queryLimit;
}
if (empty($limit) && $provider === "mysql") {
$limit = "LIMIT " . $start . "," . $end . "";
}
if (empty($limit) && $provider === "pgsql") {
$limit = "OFFSET " . $start . " LIMIT " . $end . "";
}
if ($provider === "mssql") {
$limit = "";
if (strpos(strtoupper($select), "TOP") === false) {
$isDistinct = strpos(strtoupper($select), "DISTINCT");
$isAll = strpos(strtoupper($select), "ALL");
if ($isDistinct === false && $isAll === false) {
$select = preg_replace("/SELECT/",
"SELECT TOP(" . $end . ")",
strtoupper($select), 1);
}
if ($isDistinct !== false) {
$select = preg_replace("/DISTINCT/",
"DISTINCT TOP(" . $end . ")",
strtoupper($select), 1);
}
if ($isAll !== false) {
$select = preg_replace("/DISTINCT/",
"DISTINCT TOP(" . $end . ")",
strtoupper($select), 1);
}
}
}
if ($provider === "oracle") {
$limit = "";
$rowNumber = "";
if (strpos(strtoupper($where), "ROWNUM") === false) {
$rowNumber = " AND " . $start . " <= ROWNUM AND ROWNUM <= " . $end;
}
$where = empty($where)
? "WHERE " . $start . " <= ROWNUM AND ROWNUM <= " . $end
: $where . $rowNumber;
}
}
/**
* If possible, add a where to get the current label.
*
* @param type $json
* @param type $parsed
* @param type $select
* @param type $where
* @param type $having
* @return boolean
*/
private function addSuggestWhere($json, $parsed, &$select, &$where, &$having)
{
$value = $this->escapeQuote($this->getSuggestValue($json));
switch ($parsed['SELECT'][0]['expr_type']) {
case 'colref':
case 'expression':
if (
is_array($parsed['SELECT'][0]['sub_tree'])
&& $parsed['SELECT'][0]['sub_tree'][0]['expr_type']==='aggregate_function'
) {
return false;
} else {
$where = empty($where)
? "WHERE (" . $parsed['SELECT'][0]['base_expr'] . "='$value')"
: "$where and (" . $parsed['SELECT'][0]['base_expr'] . "='$value')";
}
return true;
}
return false;
}
/**
* Escape a sql string.
*
* @param type $text
* @return type
*/
private function escapeQuote($text)
{
return str_replace("'", "''", $text);
}
}