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

HOR-3620

Browse Source 
Fix PMSystem -> PmSystem since Processmaker is one word.
This commit is contained in:
davidcallizaya
2017-08-04 11:49:43 -04:00
parent bce594fe24
commit 44d60e96d9
86 changed files with 1332 additions and 1359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/cases/caseMessageHistory_Ajax.php
View File

@@ -192,7 +192,7 @@ if ($actionAjax == 'sendMailMessage_JXP') {
$oCase = new Cases();
$data = $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] );
$aSetup = PMSystem::getEmailConfiguration();
$aSetup = PmSystem::getEmailConfiguration();
$oSpool = new spoolRun();

2
workflow/engine/methods/cases/casesConsolidatedListExtJs.php
View File

@@ -69,7 +69,7 @@ while ($rsSql->next()) {
}
if (count($arrayTabItem) > 0) {
$urlProxy = PMSystem::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/consolidated/';
$urlProxy = PmSystem::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/consolidated/';
$clientId = 'x-pm-local-client';
$client = getClientCredentials($clientId);
$authCode = getAuthorizationCode($client);

2
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -118,7 +118,7 @@ $oAppCache->confCasesList = $confCasesList;
$solrEnabled = 0;
if ($action == "todo" || $action == "draft" || $action == "sent" || $action == "selfservice" ||
$action == "unassigned" || $action == "search") {
$solrConfigured = ($solrConf = PMSystem::solrEnv()) !== false ? 1 : 0;
$solrConfigured = ($solrConf = PmSystem::solrEnv()) !== false ? 1 : 0;
if ($solrConfigured == 1) {
$applicationSolrIndex = new AppSolr(
$solrConf['solr_enabled'],

2
workflow/engine/methods/cases/cases_Ajax.php
View File

@@ -785,7 +785,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
$data = $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] );
//print_r($data);
$aSetup = PMSystem::getEmailConfiguration();
$aSetup = PmSystem::getEmailConfiguration();
$passwd = $aSetup['MESS_PASSWORD'];
$passwdDec = G::decrypt( $passwd, 'EMAILENCRYPT' );

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

@@ -64,7 +64,7 @@ $oHeadPublisher->assign("SUPPORT_FLAG", ((isset($licenseManager->supportStartDat
$oHeadPublisher->assign("supportStartDate", (isset($licenseManager->supportStartDate))? $licenseManager->supportStartDate : '');
$oHeadPublisher->assign("supportEndDate", (isset($licenseManager->supportEndDate))? $licenseManager->supportEndDate : '');
$oHeadPublisher->assign("PROCESSMAKER_VERSION", PMSystem::getVersion());
$oHeadPublisher->assign("PROCESSMAKER_VERSION", PmSystem::getVersion());
$oHeadPublisher->assign("PROCESSMAKER_URL", "/sys" . SYS_SYS . "/" . 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"));

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

@@ -285,7 +285,7 @@ try {
);
// Proxy settings
$sysConf = PMSystem::getSystemConfiguration();
$sysConf = PmSystem::getSystemConfiguration();
if ($sysConf['proxy_host'] != '') {
if (!is_array($option['http'])) {
$option['http'] = array();

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

@@ -16,7 +16,7 @@ class enterprisePlugin extends PMPlugin
{
$pathPluginTrunk = PATH_CORE . "enterprise";
$VERSION = PMSystem::getVersion();
$VERSION = PmSystem::getVersion();
$res = parent::PMPlugin($sNamespace, $sFilename);
$this->sFriendlyName = "ProcessMaker Enterprise Core Edition";

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

@@ -43,7 +43,7 @@ function install($file)
);
// Proxy settings
$sysConf = PMSystem::getSystemConfiguration();
$sysConf = PmSystem::getSystemConfiguration();
if (isset($sysConf['proxy_host'])) {
if ($sysConf['proxy_host'] != '') {
if (!is_array($option['http'])) {
@@ -150,7 +150,7 @@ switch ($option) {
);
// Proxy settings
$sysConf = PMSystem::getSystemConfiguration();
$sysConf = PmSystem::getSystemConfiguration();
if (isset($sysConf['proxy_host'])) {
if ($sysConf['proxy_host'] != '') {
if (!is_array($option['http'])) {
@@ -319,7 +319,7 @@ switch ($option) {
);
// Proxy settings
$sysConf = PMSystem::getSystemConfiguration();
$sysConf = PmSystem::getSystemConfiguration();
if (isset($sysConf['proxy_host'])) {
if ($sysConf['proxy_host'] != '') {
if (!is_array($option['http'])) {

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

@@ -245,7 +245,7 @@ try {
$userTimeZone = $user->getUsrTimeZone();
if (trim($userTimeZone) == '') {
$arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', SYS_SYS);
$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
$userTimeZone = $arraySystemConfiguration['time_zone'];
}
@@ -419,7 +419,7 @@ try {
die;
}
$configS = PMSystem::getSystemConfiguration('', '', SYS_SYS);
$configS = PmSystem::getSystemConfiguration('', '', SYS_SYS);
$activeSession = isset($configS['session_block']) ? !(int)$configS['session_block']:true;
if ($activeSession){
setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/');

2
workflow/engine/methods/login/authenticationSso.php
View File

@@ -38,7 +38,7 @@ try {
}
/*----------------------------------********---------------------------------*/
$arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', SYS_SYS);
$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
//Set User Time Zone
$user = UsersPeer::retrieveByPK($userUid);

2
workflow/engine/methods/login/login.php
View File

@@ -344,7 +344,7 @@ $flagForgotPassword = isset($oConf->aConfig['login_enableForgotPassword'])
setcookie('PM-Warning', trim(G::LoadTranslation('ID_BLOCKER_MSG'), '*'), time() + (24 * 60 * 60), SYS_URI);
$configS = PMSystem::getSystemConfiguration('', '', SYS_SYS);
$configS = PmSystem::getSystemConfiguration('', '', SYS_SYS);
$activeSession = isset($configS['session_block']) ? !(int)$configS['session_block'] : true;
if ($activeSession) {
setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/');

4
workflow/engine/methods/login/retrivePassword.php
View File

@@ -8,7 +8,7 @@ $data['USR_USERNAME'] = strip_tags($data['USR_USERNAME']);
$userData = $rbacUser->getByUsername($data['USR_USERNAME']);
if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'] && ($userData['USR_AUTH_TYPE'] === '' || $userData['USR_AUTH_TYPE'] == 'MYSQL') ) {
$aSetup = PMSystem::getEmailConfiguration();
$aSetup = PmSystem::getEmailConfiguration();
if (count($aSetup) == 0 || !isset($aSetup['MESS_ENGINE'])) {
G::SendTemporalMessage ('ID_EMAIL_ENGINE_IS_NOT_ENABLED', "warning");
G::header('location: forgotPassword');
@@ -53,7 +53,7 @@ if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'
<tbody><tr><td><img id='logo' src='http://".$_SERVER['SERVER_NAME']."/images/processmaker.logo.jpg' /></td></tr>
<tr><td style='font-size: 14px;'>$msg</td></tr>
<tr><td style='vertical-align:middel;'>
<br /><hr><b>This Business Process is powered by ProcessMaker ver. ".PMSystem::getVersion().".<b><br />
<br /><hr><b>This Business Process is powered by ProcessMaker ver. ".PmSystem::getVersion().".<b><br />
<a href='http://www.processmaker.com' style='color:#c40000;'>www.processmaker.com</a><br /></td>
</tr></tbody></table>";

2
workflow/engine/methods/processes/mainInit.php
View File

@@ -28,7 +28,7 @@ $RBAC->requirePermissions( 'PM_FACTORY' );
$conf = new Configurations();
$pmVersion = (preg_match("/^([\d\.]+).*$/", PMSystem::getVersion(), $arrayMatch))? $arrayMatch[1] : ""; //Otherwise: Branch master
$pmVersion = (preg_match("/^([\d\.]+).*$/", PmSystem::getVersion(), $arrayMatch))? $arrayMatch[1] : ""; //Otherwise: Branch master
/*----------------------------------********---------------------------------*/
if (true) {

2
workflow/engine/methods/processes/processes_webEntryGenerate.php
View File

@@ -86,7 +86,7 @@ try {
$template->assign( 'dynaform', $dynTitle );
$template->assign( 'timestamp', date( 'l jS \of F Y h:i:s A' ) );
$template->assign( 'ws', SYS_SYS );
$template->assign( 'version', PMSystem::getVersion() );
$template->assign( 'version', PmSystem::getVersion() );
$fileName = $pathProcess . $dynTitle . 'Post.php';
file_put_contents( $fileName, $template->getOutputContent() );

2
workflow/engine/methods/setup/cron.php
View File

@@ -62,7 +62,7 @@ $cronInfo["fileLogSize"] = $fileLogSize;
$cronInfo["fileLogPath"] = $fileLog;
//Workspaces
$workspaces = PMSystem::listWorkspaces();
$workspaces = PmSystem::listWorkspaces();
$arrayAux = array ();
foreach ($workspaces as $index => $workspace) {

2
workflow/engine/methods/setup/emails_Ajax.php
View File

@@ -252,7 +252,7 @@ function sendTestMail ()
<tbody><tr><td><img id='logo' src='http://" . $_SERVER['SERVER_NAME'] . "/images/processmaker.logo.jpg' /></td></tr>
<tr><td style='font-size: 14px;'>$msg [" . date( 'H:i:s' ) . "] - $engine</td></tr>
<tr><td style='vertical-align:middel;'>
<br /><hr><b>This Business Process is powered by ProcessMaker ver. " . PMSystem::getVersion() . ".<b><br />
<br /><hr><b>This Business Process is powered by ProcessMaker ver. " . PmSystem::getVersion() . ".<b><br />
<a href='http://www.processmaker.com' style='color:#c40000;'>www.processmaker.com</a><br /></td>
</tr></tbody></table>";

4
workflow/engine/methods/setup/pluginsImportFile.php
View File

@@ -280,8 +280,8 @@ try {
$oClass->iPMVersion = 0;
}
if ($oClass->iPMVersion > 0) {
if (PMSystem::getVersion() > 0) {
if ($oClass->iPMVersion > PMSystem::getVersion()) {
if (PmSystem::getVersion() > 0) {
if ($oClass->iPMVersion > PmSystem::getVersion()) {
//throw new Exception('This plugin needs version ' . $oClass->iPMVersion . ' or higher of ProcessMaker');
}
}

2
workflow/engine/methods/setup/skin_Ajax.php
View File

@@ -46,7 +46,7 @@ function skinList ()
$textFilter = '';
}
$skinList = PMSystem::getSkingList();
$skinList = PmSystem::getSkingList();
$wildcard = '';
if (isset( $_REQUEST['activeskin'] )) {
$wildcard = '@';

2
workflow/engine/methods/setup/skinsExport.php
View File

@@ -150,7 +150,7 @@ G::mk_dir( $pathPublic . 'images' );
$fields['className'] = $id;
$fields['version'] = $oConf->version;
$fields['description'] = $oConf->description;
$fields['PMversion'] = PMSystem::getVersion();
$fields['PMversion'] = PmSystem::getVersion();
savePluginFile( 'skinPluginMainClass', $pathHome . $id . '.php', $fields );
savePluginFile( 'skinPluginClass', $pathBase . 'class.' . $id . '.php', $fields );

2
workflow/engine/methods/setup/upgrade.php
View File

@@ -61,7 +61,7 @@ $G_SUB_MENU = 'setup';
$G_ID_MENU_SELECTED = 'SETUP';
$G_ID_SUB_MENU_SELECTED = 'UPGRADE';
$Fields['PM_VERSION'] = PMSystem::getVersion();
$Fields['PM_VERSION'] = PmSystem::getVersion();
$Fields['MAX_FILE_SIZE'] = $uploadMaxSize . " (" . $UPLOAD_MAX_SIZE . ") ";
$G_PUBLISH = new Publisher();

2
workflow/engine/methods/setup/upgrade_System.php
View File

@@ -49,7 +49,7 @@ $G_ID_MENU_SELECTED = 'SETUP';
$G_ID_SUB_MENU_SELECTED = 'UPGRADE';
require_once "classes/class.system.php";
$oSystem = new PMSystem();
$oSystem = new PmSystem();
try {
if (! $oSystem->verifyFileForUpgrade()) {

2
workflow/engine/methods/setup/webServicesAjax.php
View File

@@ -149,7 +149,7 @@ try {
//Apply proxy settings
$proxy = array ();
$sysConf = PMSystem::getSystemConfiguration();
$sysConf = PmSystem::getSystemConfiguration();
if ($sysConf['proxy_host'] != '') {
$proxy['proxy_host'] = $sysConf['proxy_host'];
if ($sysConf['proxy_port'] != '') {

4
workflow/engine/methods/users/usersEdit.php
View File

@@ -17,7 +17,7 @@ if ($postMaxSize < $uploadMaxSize) {
$expirationDate = 1;
$envFile = PATH_CONFIG . 'env.ini';
if (file_exists($envFile) ) {
$sysConf = PMSystem::getSystemConfiguration($envFile);
$sysConf = PmSystem::getSystemConfiguration($envFile);
if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
$expirationDate = abs($sysConf['expiration_year']);
}
@@ -31,7 +31,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
}
/*----------------------------------********---------------------------------*/
$arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', SYS_SYS);
$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
$oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js

4
workflow/engine/methods/users/usersInit.php
View File

@@ -32,7 +32,7 @@ if ($postMaxSize < $uploadMaxSize) {
$expirationDate = 1;
$envFile = PATH_CONFIG . 'env.ini';
if (file_exists($envFile) ) {
$sysConf = PMSystem::getSystemConfiguration($envFile);
$sysConf = PmSystem::getSystemConfiguration($envFile);
if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
$expirationDate = abs($sysConf['expiration_year']);
}
@@ -46,7 +46,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
}
/*----------------------------------********---------------------------------*/
$arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', SYS_SYS);
$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
$oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js

4
workflow/engine/methods/users/usersNew.php
View File

@@ -20,7 +20,7 @@ if ($postMaxSize < $uploadMaxSize) {
$expirationDate = 1;
$envFile = PATH_CONFIG . 'env.ini';
if (file_exists($envFile) ) {
$sysConf = PMSystem::getSystemConfiguration($envFile);
$sysConf = PmSystem::getSystemConfiguration($envFile);
if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
$expirationDate = abs($sysConf['expiration_year']);
}
@@ -35,7 +35,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
}
/*----------------------------------********---------------------------------*/
$arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', SYS_SYS);
$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
$oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js