removing PMGmail
This commit is contained in:
@@ -1,11 +1,7 @@
|
||||
<script>
|
||||
if (typeof window.parent != 'undefined') {
|
||||
<?php
|
||||
$pathDerivateGmail = 'derivatedGmail';
|
||||
$statusPMGmail = false;
|
||||
|
||||
$pmGoogle = new PmGoogleApi();
|
||||
$statusPMGmail = $pmGoogle->getServiceGmailStatus();
|
||||
|
||||
if (isset($_GET['ux'])) {
|
||||
switch ($_GET['ux']) {
|
||||
@@ -17,9 +13,6 @@ if (isset($_GET['ux'])) {
|
||||
default:
|
||||
$url = 'casesListExtJs';
|
||||
}
|
||||
} elseif ($statusPMGmail) {
|
||||
$url = $pathDerivateGmail;
|
||||
} else {
|
||||
$url = 'casesListExtJs';
|
||||
}
|
||||
if (isset($_GET['ux'])) {
|
||||
@@ -27,17 +20,13 @@ if (isset($_GET['ux'])) {
|
||||
}
|
||||
echo ' parent.parent.postMessage("redirect=todo","*");';
|
||||
if (isset($_GET['ux'])) {
|
||||
if ($statusPMGmail) {
|
||||
echo '} else { window.parent.location.href = \''.$pathDerivateGmail.'\'; }';
|
||||
} else {
|
||||
echo '} else {
|
||||
if (parent.parent.postMessage) {
|
||||
parent.parent.postMessage("redirect=todo","*");
|
||||
} else {
|
||||
window.parent.location.href = \'casesListExtJs\';
|
||||
}
|
||||
}';
|
||||
}
|
||||
echo '} else {
|
||||
if (parent.parent.postMessage) {
|
||||
parent.parent.postMessage("redirect=todo","*");
|
||||
} else {
|
||||
window.parent.location.href = \'casesListExtJs\';
|
||||
}
|
||||
}';
|
||||
}
|
||||
echo "try {parent.parent.updateCasesTree();parent.parent.highlightCasesTree();} catch(e) {}";
|
||||
?>
|
||||
|
||||
@@ -12,7 +12,6 @@ use ProcessMaker\Model\Process;
|
||||
* @see cases/open.php
|
||||
* @see controllers/Home::indexSingle()
|
||||
* @see controllers/Home::startCase()
|
||||
* @see pmGmail/sso.php
|
||||
* @see webentry/access.php
|
||||
*
|
||||
* @link https://wiki.processmaker.com/3.2/Cases/Cases#Search_Criteria
|
||||
|
||||
@@ -523,64 +523,6 @@ try {
|
||||
$aProperties['report_generator'] = $aOD['OUT_DOC_REPORT_GENERATOR'];
|
||||
}
|
||||
$oOutputDocument->generate($_GET['UID'], $Fields['APP_DATA'], $pathOutput, $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean)$aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'], $aProperties);
|
||||
break;
|
||||
case 'JRXML':
|
||||
//creating the xml with the application data;
|
||||
$xmlData = "<dynaform>\n";
|
||||
foreach ($Fields['APP_DATA'] as $key => $val) {
|
||||
$xmlData .= " <$key>$val</$key>\n";
|
||||
}
|
||||
$xmlData .= "</dynaform>\n";
|
||||
$iSize = file_put_contents($javaOutput . 'addressBook.xml', $xmlData);
|
||||
|
||||
$JBPM = new JavaBridgePM();
|
||||
$JBPM->checkJavaExtension();
|
||||
|
||||
$util = new Java("com.processmaker.util.pmutils");
|
||||
$util->setInputPath($javaInput);
|
||||
$util->setOutputPath($javaOutput);
|
||||
|
||||
|
||||
$filter = new InputFilter();
|
||||
|
||||
$locationFrom = PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.jrxml';
|
||||
$locationFrom = $filter->validateInput($locationFrom, "path");
|
||||
copy($locationFrom, $javaInput . $aOD['OUT_DOC_UID'] . '.jrxml');
|
||||
|
||||
$outputFile = $javaOutput . $sFilename . '.pdf';
|
||||
print $util->jrxml2pdf($aOD['OUT_DOC_UID'] . '.jrxml', basename($outputFile));
|
||||
|
||||
$outputFile = $filter->validateInput($outputFile, "path");
|
||||
copy($outputFile, $pathOutput . $sFilename . '.pdf');
|
||||
break;
|
||||
case 'ACROFORM':
|
||||
//creating the xml with the application data;
|
||||
$xmlData = "<dynaform>\n";
|
||||
foreach ($Fields['APP_DATA'] as $key => $val) {
|
||||
$xmlData .= " <$key>$val</$key>\n";
|
||||
}
|
||||
$xmlData .= "</dynaform>\n";
|
||||
|
||||
$JBPM = new JavaBridgePM();
|
||||
$JBPM->checkJavaExtension();
|
||||
|
||||
$util = new Java("com.processmaker.util.pmutils");
|
||||
$util->setInputPath($javaInput);
|
||||
$util->setOutputPath($javaOutput);
|
||||
|
||||
$filter = new InputFilter();
|
||||
|
||||
$locationFrom = PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.pdf';
|
||||
$locationFrom = $filter->validateInput($locationFrom, "path");
|
||||
copy($locationFrom, $javaInput . $aOD['OUT_DOC_UID'] . '.pdf');
|
||||
|
||||
$outputFile = $javaOutput . $sFilename . '.pdf';
|
||||
print $util->writeVarsToAcroFields($aOD['OUT_DOC_UID'] . '.pdf', $xmlData);
|
||||
|
||||
$locationFrom = $javaOutput . $aOD['OUT_DOC_UID'] . '.pdf';
|
||||
$locationFrom = $filter->validateInput($locationFrom, "path");
|
||||
copy($locationFrom, $pathOutput . $sFilename . '.pdf');
|
||||
|
||||
break;
|
||||
default:
|
||||
throw (new Exception('invalid output document'));
|
||||
|
||||
@@ -44,16 +44,10 @@ try {
|
||||
$aFields['PRO_UID'] = $_GET['PRO_UID'];
|
||||
}
|
||||
$aFields['OUT_DOC_TYPE'] = 'HTML';
|
||||
$enabledJavaBridge = false;
|
||||
|
||||
$G_PUBLISH = new Publisher();
|
||||
if (! $enabledJavaBridge) {
|
||||
$xmlform = 'outputdocs/outputdocs_Properties';
|
||||
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', $xmlform, '', $aFields, '../outputdocs/outputdocs_Save' );
|
||||
} else {
|
||||
$xmlform = 'outputdocs/outputdocs_New';
|
||||
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', $xmlform, '', $aFields, '../outputdocs/outputdocs_Save' );
|
||||
}
|
||||
$xmlform = 'outputdocs/outputdocs_New';
|
||||
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', $xmlform, '', $aFields, '../outputdocs/outputdocs_Save' );
|
||||
G::RenderPage( 'publish', 'raw' );
|
||||
} catch (Exception $oException) {
|
||||
$token = strtotime("now");
|
||||
@@ -61,4 +55,3 @@ try {
|
||||
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
|
||||
die;
|
||||
}
|
||||
|
||||
|
||||
@@ -61,16 +61,7 @@ try {
|
||||
}
|
||||
}
|
||||
if ($aData['OUT_DOC_UID'] == '') {
|
||||
|
||||
if ((isset( $aData['OUT_DOC_TYPE'] )) && ($aData['OUT_DOC_TYPE'] == 'JRXML')) {
|
||||
$dynaformUid = $aData['DYN_UID'];
|
||||
$outDocUid = $oOutputDocument->create( $aData );
|
||||
|
||||
$jbpm = new JavaBridgePM();
|
||||
print $jbpm->generateJrxmlFromDynaform( $outDocUid, $dynaformUid, 'classic' );
|
||||
} else {
|
||||
$outDocUid = $oOutputDocument->create( $aData );
|
||||
}
|
||||
$outDocUid = $oOutputDocument->create( $aData );
|
||||
} else {
|
||||
$oOutputDocument->update( $aData );
|
||||
}
|
||||
@@ -87,4 +78,3 @@ try {
|
||||
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
|
||||
die;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user