Merged in marcoAntonioNina/processmaker/GI-244 (pull request #3463)

GI-244
This commit is contained in:
Dante Loayza
2016-01-08 14:32:29 -04:00

View File

@@ -962,25 +962,24 @@ function fillReportByProcess ()
function synchronizeDrive () function synchronizeDrive ()
{ {
try try {
{
global $argvx; global $argvx;
if (strpos($argvx, "synchronize-documents-drive") === false) { if (strpos($argvx, "synchronize-documents-drive") === false) {
return false; return false;
} }
$licensedFeatures = &PMLicensedFeatures::getSingleton(); $licensedFeatures = &PMLicensedFeatures::getSingleton();
if (!$licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) { if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
G::LoadClass('AppDocumentDrive'); G::LoadClass('AppDocumentDrive');
$drive = new AppDocumentDrive(); $drive = new AppDocumentDrive();
if($drive->getStatusDrive()) { if ($drive->getStatusDrive()) {
setExecutionMessage("Synchronize documents to Drive"); setExecutionMessage("Synchronize documents to Drive");
$drive->synchronizeDrive(true); $drive->synchronizeDrive(true);
} else { } else {
setExecutionMessage("It has not enabled Feature Drive"); setExecutionMessage("It has not enabled Feature Drive");
} }
} else { } else {
setExecutionMessage("The Drive license is not enabled"); setExecutionMessage("The Drive license is not enabled");
} }
setExecutionResultMessage("DONE"); setExecutionResultMessage("DONE");
@@ -993,27 +992,26 @@ function synchronizeDrive ()
function synchronizeGmailLabels() function synchronizeGmailLabels()
{ {
try try {
{
global $argvx; global $argvx;
if (strpos($argvx, "synchronize-gmail-labels") === false) { if (strpos($argvx, "synchronize-gmail-labels") === false) {
return false; return false;
} }
$licensedFeatures = &PMLicensedFeatures::getSingleton(); $licensedFeatures = &PMLicensedFeatures::getSingleton();
if (!$licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) { if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
G::LoadClass( "pmGoogleApi" ); G::LoadClass("pmGoogleApi");
$pmGoogle = new PMGoogleApi(); $pmGoogle = new PMGoogleApi();
if($pmGoogle->getServiceGmailStatus()) { if ($pmGoogle->getServiceGmailStatus()) {
setExecutionMessage("Synchronize labels in Gmail"); setExecutionMessage("Synchronize labels in Gmail");
G::LoadClass('labelsGmail'); G::LoadClass('labelsGmail');
$labGmail = new labelsGmail(); $labGmail = new labelsGmail();
$labGmail->processPendingRelabelingInQueue(); $labGmail->processPendingRelabelingInQueue();
} else { } else {
setExecutionMessage("It has not enabled Feature Gmail"); setExecutionMessage("It has not enabled Feature Gmail");
} }
} else { } else {
setExecutionMessage("The Gmail license is not enabled"); setExecutionMessage("The Gmail license is not enabled");
} }
setExecutionResultMessage("DONE"); setExecutionResultMessage("DONE");