Merged in jennydmz/processmaker/PM-4472 (pull request #3404)

PM-4472
This commit is contained in:
Julio Cesar Laura Avendaño
2015-12-18 09:15:40 -04:00

View File

@@ -1,6 +1,7 @@
<script> <script>
if (typeof window.parent != 'undefined') { if (typeof window.parent != 'undefined') {
<?php <?php
/*----------------------------------********---------------------------------*/
$enablePMGmail = false; $enablePMGmail = false;
$licensedFeatures = &PMLicensedFeatures::getSingleton(); $licensedFeatures = &PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) { if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
@@ -8,6 +9,7 @@ if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
$pmDrive = new PMDrive(); $pmDrive = new PMDrive();
$enablePMGmail = $pmDrive->getStatusService(); $enablePMGmail = $pmDrive->getStatusService();
} }
/*----------------------------------********---------------------------------*/
if (isset( $_GET['ux'] )) { if (isset( $_GET['ux'] )) {
switch ($_GET['ux']) { switch ($_GET['ux']) {
case 'SIMPLIFIED': case 'SIMPLIFIED':
@@ -28,11 +30,15 @@ if (isset( $_GET['ux'] )) {
} }
echo " window.parent.location.href = '$url';"; echo " window.parent.location.href = '$url';";
if (isset( $_GET['ux'] )) { if (isset( $_GET['ux'] )) {
/*----------------------------------********---------------------------------*/
if(PMLicensedFeatures::getSingleton()->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') && !empty($enablePMGmail) && $enablePMGmail==1){ if(PMLicensedFeatures::getSingleton()->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') && !empty($enablePMGmail) && $enablePMGmail==1){
echo '} else { window.parent.location.href = \'derivatedGmail\'; }'; echo '} else { window.parent.location.href = \'derivatedGmail\'; }';
} else { } else {
/*----------------------------------********---------------------------------*/
echo '} else { window.parent.location.href = \'casesListExtJs\'; }'; echo '} else { window.parent.location.href = \'casesListExtJs\'; }';
/*----------------------------------********---------------------------------*/
} }
/*----------------------------------********---------------------------------*/
} }
?> ?>
} }