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

Merged in bugfix/HOR-3670-MN3 (pull request #5938)

Browse Source 
HOR-3670-MN3

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Marco Antonio Nina Mena
2017-08-14 16:10:03 +00:00
committed by Julio Cesar Laura Avendaño
parent b61a431717 1f782c19a0
commit c1434868b8
3 changed files with 14 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
workflow/engine/classes/DynaFormField.php
View File

@@ -1,38 +1,6 @@
<?php
/**
* class.dynaFormField.php
*
* @package workflow.engine.classes
*
* 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.
*
*/
/**
* Dynaform Field - DynaformField
/**
* Dynaform Field - DynaformField class
*
* @package workflow.engine.classes
*/class DynaFormField extends DBTable
class DynaFormField extends DBTable
{
private $fileName;

2
workflow/engine/classes/P11835.php
View File

@@ -1,6 +1,6 @@
<?php
class P11835 extends patch
class P11835 extends Patch
{
/*
* Note.- Use before upgrade DB.

24
workflow/engine/classes/triggers/class.pmSharepointFunctions.php
View File

@@ -48,7 +48,7 @@ function createDWS ($sharepointServer, $auth, $name = "", $users = "", $title =
{
//print "Trigger: createDWS";
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$beforeResult = $pmTrSharepoint->createDWS( $name, $users, $title, $documents );
return $beforeResult;
}
@@ -72,7 +72,7 @@ function createDWS ($sharepointServer, $auth, $name = "", $users = "", $title =
function deleteDWS ($sharepointServer, $auth, $dwsname)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$beforeResult = $pmTrSharepoint->deleteDWS( $dwsname );
$newResult = $beforeResult->DeleteDwsResult;
if ($newResult == '<Result/>') {
@@ -103,7 +103,7 @@ function deleteDWS ($sharepointServer, $auth, $dwsname)
function createFolderDWS ($sharepointServer, $auth, $dwsname, $dwsFolderName)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$result = $pmTrSharepoint->createFolderDWS( $dwsname, $dwsFolderName );
var_dump( $result );
$newResult = $result->CreateFolderResult;
@@ -138,7 +138,7 @@ function createFolderDWS ($sharepointServer, $auth, $dwsname, $dwsFolderName)
function deleteFolderDWS ($sharepointServer, $auth, $dwsname, $folderName)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$result = $pmTrSharepoint->deleteFolderDWS( $dwsname, $folderName );
$newResult = $result->DeleteFolderResult;
if (isset( $newResult )) {
@@ -171,7 +171,7 @@ function deleteFolderDWS ($sharepointServer, $auth, $dwsname, $folderName)
function getDWSData ($sharepointServer, $auth, $newFileName, $dwsname, $lastUpdate)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$resultDWSData = $pmTrSharepoint->getDWSData( $newFileName, $dwsname, $lastUpdate );
if ($resultDWSData) {
return $resultDWSData;
@@ -202,7 +202,7 @@ function getDWSData ($sharepointServer, $auth, $newFileName, $dwsname, $lastUpda
function getDWSMetaData ($sharepointServer, $auth, $newFileName, $dwsname, $id)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$result = $pmTrSharepoint->getDWSMetaData( $newFileName, $dwsname, $id );
//$newResult = $result->GetDwsMetaDataResult;
if (isset( $result )) {
@@ -235,7 +235,7 @@ function getDWSMetaData ($sharepointServer, $auth, $newFileName, $dwsname, $id)
function uploadDocumentDWS ($sharepointServer, $auth, $dwsname, $folderName, $sourceUrl, $filename)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$beforeResult = $pmTrSharepoint->uploadDocumentDWS( $dwsname, $folderName, $sourceUrl, $filename );
return $beforeResult;
@@ -262,7 +262,7 @@ function uploadDocumentDWS ($sharepointServer, $auth, $dwsname, $folderName, $so
function downloadDocumentDWS ($sharepointServer, $auth, $dwsname, $fileName, $fileLocation)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$result = $pmTrSharepoint->downloadDocumentDWS( $dwsname, $fileName, $fileLocation );
if (isset( $result )) {
return "Document downloaded";
@@ -291,7 +291,7 @@ function downloadDocumentDWS ($sharepointServer, $auth, $dwsname, $fileName, $fi
function getDWSFolderItems ($sharepointServer, $auth, $dwsname, $strFolderUrl)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$result = $pmTrSharepoint->getDWSFolderItems( $dwsname, $strFolderUrl );
if (isset( $result )) {
return $result;
@@ -320,7 +320,7 @@ function getDWSFolderItems ($sharepointServer, $auth, $dwsname, $strFolderUrl)
function getDWSDocumentVersions ($sharepointServer, $auth, $newFileName, $dwsname)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$result = $pmTrSharepoint->getDWSDocumentVersions( $newFileName, $dwsname );
if (isset( $result->GetVersionsResult )) {
/*
@@ -361,7 +361,7 @@ function getDWSDocumentVersions ($sharepointServer, $auth, $newFileName, $dwsnam
function deleteDWSDocumentVersion ($sharepointServer, $auth, $newFileName, $dwsname, $versionNum)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$result = $pmTrSharepoint->deleteDWSDocVersion( $newFileName, $dwsname, $versionNum );
return $result;
}
@@ -386,7 +386,7 @@ function deleteDWSDocumentVersion ($sharepointServer, $auth, $newFileName, $dwsn
function deleteDWSAllDocumentVersion ($sharepointServer, $auth, $newFileName, $dwsname)
{
require_once (PATH_CORE . 'classes' . PATH_SEP . 'triggers' . PATH_SEP . 'class.pmTrSharepoint.php');
$pmTrSharepoint = new pmTrSharepointClass( $sharepointServer, $auth );
$pmTrSharepoint = new PmTrSharepointClass( $sharepointServer, $auth );
$result = $pmTrSharepoint->deleteAllDWSDocVersion( $newFileName, $dwsname );
return $result;
}