PM-2835 "Adicionar los siguientes features..." SOLVED

Issue:
    Adicionar los siguientes features la posibilidad de seleccionarse en la licencia (features):
    - Code Scanner
    - Multiple Email Servers
    - Mobile Fields
Cause:
    Nuevo validacion de licencia para features
Solution:
    Se agrego validacion de licencia para los features especificados

gulliver/bin/tasks/pakeGulliver.php

@@ -2736,7 +2736,7 @@ function run_check_plugin_disabled_code($task, $args)
 
                         $arrayFoundDisabledCode = array_merge($cs->checkDisabledCode("FILE", PATH_PLUGINS . $pluginName . ".php"), $cs->checkDisabledCode("PATH", PATH_PLUGINS . $pluginName));
 
-                        if (count($arrayFoundDisabledCode) > 0) {
+                        if (!empty($arrayFoundDisabledCode)) {
                             $strFoundDisabledCode .= (($strFoundDisabledCode != "")? "\n\n" : "") . "> " . $pluginName;
 
                             foreach ($arrayFoundDisabledCode as $key2 => $value2) {

gulliver/system/class.codeScanner.php

@@ -80,7 +80,7 @@ class CodeScanner
     public function existsDisabledCode()
     {
         try {
-            return count($this->arrayDisabledCode) > 0;
+            return !empty($this->arrayDisabledCode);
         } catch (Exception $e) {
             throw $e;
         }
@@ -174,7 +174,7 @@ class CodeScanner
 
                     $arrayAux = $this->checkDisabledCodeInSource($source);
 
-                    if (count($arrayAux) > 0) {
+                    if (!empty($arrayAux)) {
                         $arrayFoundCode["source"] = $arrayAux;
                     }
                     break;
@@ -202,7 +202,7 @@ class CodeScanner
 
                             $arrayAux = $this->checkDisabledCodeInSource($source);
 
-                            if (count($arrayAux) > 0) {
+                            if (!empty($arrayAux)) {
                                 $arrayFoundCode[$path] = $arrayAux;
                             }
                         }

workflow/engine/bin/tasks/cliWorkspaces.php

@@ -595,12 +595,24 @@ function run_check_workspace_disabled_code($args, $opts)
         foreach ($arrayWorkspace as $value) {
             $workspace = $value;
 
+            if (!defined("SYS_SYS")) {
+                define("SYS_SYS", $workspace->name);
+            }
+
+            if (!defined("PATH_DATA_SITE")) {
+                define("PATH_DATA_SITE", PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP);
+            }
+
+            if (!$workspace->pmLicensedFeaturesVerifyFeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=")) {
+                throw new Exception("Error: This command cannot be used because your license does not include it.");
+            }
+
             echo "> Workspace: " . $workspace->name . "\n";
 
             try {
                 $arrayFoundDisabledCode = $workspace->getDisabledCode();
 
-                if (count($arrayFoundDisabledCode) > 0) {
+                if (!empty($arrayFoundDisabledCode)) {
                     $strFoundDisabledCode = "";
 
                     foreach ($arrayFoundDisabledCode as $value2) {
@@ -630,6 +642,8 @@ function run_check_workspace_disabled_code($args, $opts)
             } catch (Exception $e) {
                 echo "Errors to check disabled code: " . CLI::error($e->getMessage()) . "\n\n";
             }
+
+            $workspace->close();
         }
 
         echo "Done!\n";

workflow/engine/classes/class.case.php

@@ -3373,15 +3373,17 @@ class Cases
 
             /*----------------------------------********---------------------------------*/
             $cs = new CodeScanner((isset($arraySystemConfiguration["enable_blacklist"]) && (int)($arraySystemConfiguration["enable_blacklist"]) == 1)? "DISABLED_CODE" : "");
+
             $strFoundDisabledCode = "";
             /*----------------------------------********---------------------------------*/
 
             foreach ($aTriggers as $aTrigger) {
-                //Check disabled code
                 /*----------------------------------********---------------------------------*/
+                if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=")) {
+                    //Check disabled code
                     $arrayFoundDisabledCode = $cs->checkDisabledCode("SOURCE", $aTrigger["TRI_WEBBOT"]);
 
-                if (count($arrayFoundDisabledCode) > 0) {
+                    if (!empty($arrayFoundDisabledCode)) {
                         $strCodeAndLine = "";
 
                         foreach ($arrayFoundDisabledCode["source"] as $key => $value) {
@@ -3391,7 +3393,9 @@ class Cases
                         $strFoundDisabledCode .= "<br />- " . $aTrigger["TRI_TITLE"] . ": " . $strCodeAndLine;
                         continue;
                     }
+                }
                 /*----------------------------------********---------------------------------*/
+
                 //Execute
                 $bExecute = true;
 

workflow/engine/classes/class.processes.php

@@ -5085,10 +5085,15 @@ class Processes
 
             $arrayDisabledCode = array();
 
+            /*----------------------------------********---------------------------------*/
+            if (!PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=")) {
+                //Return
+                return $arrayDisabledCode;
+            }
+
             //Set variables
-            /*----------------------------------********---------------------------------*/
             $cs = new CodeScanner("DISABLED_CODE");
-            /*----------------------------------********---------------------------------*/
+
             $delimiter = DBAdapter::getStringDelimiter();
 
             //Processes
@@ -5144,7 +5149,7 @@ class Processes
                     //Check disabled code
                     $arrayFoundDisabledCode = $cs->checkDisabledCode("SOURCE", $triggerWebbot);
 
-                    if (count($arrayFoundDisabledCode) > 0) {
+                    if (!empty($arrayFoundDisabledCode)) {
                         if (!isset($arrayDisabledCode[$processUid])) {
                             $arrayDisabledCode[$processUid] = array(
                                 "processUid"   => $processUid,
@@ -5161,6 +5166,7 @@ class Processes
                     }
                 }
             }
+            /*----------------------------------********---------------------------------*/
 
             //Return
             return $arrayDisabledCode;

workflow/engine/classes/class.wsBase.php

@@ -920,25 +920,35 @@ class wsBase
             if (!class_exists('System')) {
                 G::LoadClass('system');
             }
-            $licensedFeatures = & PMLicensedFeatures::getSingleton();
+
             /*----------------------------------********---------------------------------*/
-            if (!empty($config) && $licensedFeatures->verifyfeature('nKaNTNuT1MzK0RsMEtXTnYzR09ucHF2WGNuS0hRdDBBak42WXJhNVVOOG1INEVoaU1EaTllbjBBeEJNeG9wRVJ6NmxQelhyVTBvdThzPQ==')) {
+            if (PMLicensedFeatures::getSingleton()->verifyfeature("zIKRGpDM3pjcHFsWGplNDN0dTl5bGN3UTNiOWdQU0E5Q05QTksrU1ladWQ0VT0=")) {
-                if(!is_array($config)){
+                $arrayConfigAux = array();
-                    $emailServer = new EmailServer();
+
-                    $criteria = $emailServer->getSelAllColumns();
+                if (is_array($config)) {
-                    $criteria->add(EmailServerPeer::MESS_UID, $config, CRITERIA::EQUAL);
+                    $arrayConfigAux = $config;
-                    $criteria = EmailServerPeer::doSelectRS($criteria);
+                } else {
-                    $criteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                    $emailServer = new \ProcessMaker\BusinessModel\EmailServer();
-                    while ($criteria->next()) {
+
-                      $row = $criteria->getRow();
+                    $criteria = $emailServer->getEmailServerCriteria();
-                      $config = $row;
+
-                      $config['SMTPSecure'] = $row['SMTPSECURE'];
+                    $criteria->add(EmailServerPeer::MESS_UID, $config, Criteria::EQUAL);
+
+                    $rsCriteria = EmailServerPeer::doSelectRS($criteria);
+                    $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+                    if ($rsCriteria->next()) {
+                        $row = $rsCriteria->getRow();
+
+                        $arrayConfigAux = $row;
+                        $arrayConfigAux["SMTPSecure"] = $row["SMTPSECURE"];
                     }
                 }
-                $aSetup = $config;
+
+                $aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : System::getEmailConfiguration();
             } else {
             /*----------------------------------********---------------------------------*/
-                $aSetup = System::getEmailConfiguration();
+                $aSetup = (is_array($config) && !empty($config))? $config : System::getEmailConfiguration();
             /*----------------------------------********---------------------------------*/
             }
             /*----------------------------------********---------------------------------*/

workflow/engine/classes/class.wsTools.php

@@ -796,9 +796,10 @@ class workspaceTools
             $arrayData = array();
 
             $emailSever = new \ProcessMaker\BusinessModel\EmailServer();
+
             $emailConfiguration = System::getEmailConfiguration();
 
-            if (count($emailConfiguration) > 0) {
+            if (!empty($emailConfiguration)) {
                 $arrayData["MESS_ENGINE"] = $emailConfiguration["MESS_ENGINE"];
 
                 switch ($emailConfiguration["MESS_ENGINE"]) {
@@ -830,9 +831,7 @@ class workspaceTools
                 $arrayData = $emailSever->create($arrayData);
             } else {
                 /*----------------------------------********---------------------------------*/
-                if (true) {
+                if (!PMLicensedFeatures::getSingleton()->verifyfeature("zIKRGpDM3pjcHFsWGplNDN0dTl5bGN3UTNiOWdQU0E5Q05QTksrU1ladWQ0VT0=")) {
-                   //
-                } else {
                 /*----------------------------------********---------------------------------*/
                     $arrayData["MESS_ENGINE"]   = "MAIL";
                     $arrayData["MESS_SERVER"]   = "";
@@ -2202,5 +2201,28 @@ class workspaceTools
                 return true;
        }
     }
+
+    /**
+     * Verify feature
+     *
+     * @param string $featureName Feature name
+     *
+     * return bool Return true if is valid the feature, false otherwise
+     */
+    public function pmLicensedFeaturesVerifyFeature($featureName)
+    {
+        try {
+            $this->initPropel(true);
+
+            $flag = PMLicensedFeatures::getSingleton()->verifyfeature($featureName);
+
+            $this->close();
+
+            //Return
+            return $flag;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
 }
 

workflow/engine/classes/model/EmailServer.php

@@ -1,27 +1,5 @@
 <?php
 class EmailServer extends BaseEmailServer
 {
-    /**
-     * Get all columns by EMAIL_SERVER
-     *
-     * @return object criteria 
-     */
-    public function getSelAllColumns(){
-        $criteria = new Criteria("workflow");
-        $criteria->addSelectColumn( EmailServerPeer::MESS_UID);
-        $criteria->addSelectColumn( EmailServerPeer::MESS_ENGINE);
-        $criteria->addSelectColumn( EmailServerPeer::MESS_SERVER);
-        $criteria->addSelectColumn( EmailServerPeer::MESS_PORT);
-        $criteria->addSelectColumn( EmailServerPeer::MESS_RAUTH);
-        $criteria->addSelectColumn( EmailServerPeer::MESS_ACCOUNT);
-        $criteria->addSelectColumn( EmailServerPeer::MESS_PASSWORD);
-        $criteria->addSelectColumn( EmailServerPeer::MESS_FROM_MAIL);
-        $criteria->addSelectColumn( EmailServerPeer::MESS_FROM_NAME);
-        $criteria->addSelectColumn( EmailServerPeer::SMTPSECURE);
-        $criteria->addSelectColumn( EmailServerPeer::MESS_TRY_SEND_INMEDIATLY);
-        $criteria->addSelectColumn( EmailServerPeer::MAIL_TO);
-        $criteria->addSelectColumn( EmailServerPeer::MESS_DEFAULT);
-        return $criteria;
-    }
 }
 

workflow/engine/controllers/designer.php

@@ -66,7 +66,7 @@ class Designer extends Controller
         if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
             $consolidated = 1;
         }
-        $enterprise = 1;
+        $enterprise = ($licensedFeatures->verifyfeature("Jb0N3dSZHVhZ1JNOEFZaElqdm15Y050Wmh5S0FEVEI0ckQ="))? 1 : 0;
         /*----------------------------------********---------------------------------*/
 
         $this->setVar('prj_uid', $proUid);

workflow/engine/methods/emailServer/emailServer.php

@@ -18,5 +18,9 @@ $headPublisher->addContent("emailServer/emailServer"); //Adding a HTML file
 $headPublisher->addExtJsScript("emailServer/emailServer", false); //Adding a JavaScript file
 $headPublisher->assign("CONFIG", $arrayConfig);
 
+/*----------------------------------********---------------------------------*/
+$headPublisher->assign("EMAILSERVER_LICENSED", (PMLicensedFeatures::getSingleton()->verifyfeature("zIKRGpDM3pjcHFsWGplNDN0dTl5bGN3UTNiOWdQU0E5Q05QTksrU1ladWQ0VT0="))? 1 : 0);
+/*----------------------------------********---------------------------------*/
+
 G::RenderPage("publish", "extJs");
 

workflow/engine/methods/processes/processes_Import_Ajax.php

@@ -26,7 +26,9 @@ use \ProcessMaker\Importer\XmlImporter;
 
 ini_set("max_execution_time", 0);
 
-if (isset($_FILES["PROCESS_FILENAME"]) &&
+/*----------------------------------********---------------------------------*/
+if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=") &&
+    isset($_FILES["PROCESS_FILENAME"]) &&
     pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION) == "pm" &&
     $_FILES["PROCESS_FILENAME"]["error"] == 0
 ) {
@@ -39,12 +41,13 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
         $data = unserialize($content);
         fclose($fh);
 
-        if (is_object($data) && isset($data->triggers) && is_array($data->triggers) && count($data->triggers) > 0) {
+        if (is_object($data) && isset($data->triggers) && is_array($data->triggers) && !empty($data->triggers)) {
-            /*----------------------------------********---------------------------------*/
             G::LoadClass("codeScanner");
 
             $arraySystemConfiguration = System::getSystemConfiguration(PATH_CONFIG . "env.ini");
+
             $cs = new CodeScanner((isset($arraySystemConfiguration["enable_blacklist"]) && (int)($arraySystemConfiguration["enable_blacklist"]) == 1)? "DISABLED_CODE" : "");
+
             $strFoundDisabledCode = "";
 
             foreach ($data->triggers as $value) {
@@ -52,7 +55,7 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
 
                 $arrayFoundDisabledCode = $cs->checkDisabledCode("SOURCE", $arrayTriggerData["TRI_WEBBOT"]);
 
-                if (count($arrayFoundDisabledCode) > 0) {
+                if (!empty($arrayFoundDisabledCode)) {
                     $strCodeAndLine = "";
 
                     foreach ($arrayFoundDisabledCode["source"] as $key2 => $value2) {
@@ -71,7 +74,6 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
                 echo G::json_encode($response);
                 exit(0);
             }
-            /*----------------------------------********---------------------------------*/
         }
     } catch (Exception $e) {
         $response["status"]       = "ERROR";
@@ -82,6 +84,7 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
         exit(0);
     }
 }
+/*----------------------------------********---------------------------------*/
 
 if (isset($_FILES["PROCESS_FILENAME"]) &&
     pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION) == "pmx"

workflow/engine/methods/setup/pluginsChange.php

@@ -52,17 +52,17 @@ if ($handle = opendir( PATH_PLUGINS )) {
 
                 if (is_file(PATH_PLUGINS . $pluginName . ".php") && is_dir(PATH_PLUGINS . $pluginName)) {
                     /*----------------------------------********---------------------------------*/
+                    if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=")) {
                         //Check disabled code
                         G::LoadClass("codeScanner");
-                    /*----------------------------------********---------------------------------*/
 
                         $arraySystemConfiguration = System::getSystemConfiguration(PATH_CONFIG . "env.ini");
-                    /*----------------------------------********---------------------------------*/
+
                         $cs = new CodeScanner((isset($arraySystemConfiguration["enable_blacklist"]) && (int)($arraySystemConfiguration["enable_blacklist"]) == 1)? "DISABLED_CODE" : "");
 
                         $arrayFoundDisabledCode = array_merge($cs->checkDisabledCode("FILE", PATH_PLUGINS . $pluginName . ".php"), $cs->checkDisabledCode("PATH", PATH_PLUGINS . $pluginName));
 
-                    if (count($arrayFoundDisabledCode) > 0) {
+                        if (!empty($arrayFoundDisabledCode)) {
                             $response = array();
                             $response["status"]  = "DISABLED-CODE";
                             $response["message"] = G::LoadTranslation("ID_DISABLED_CODE_PLUGIN");
@@ -70,7 +70,9 @@ if ($handle = opendir( PATH_PLUGINS )) {
                             echo G::json_encode($response);
                             exit(0);
                         }
+                    }
                     /*----------------------------------********---------------------------------*/
+
                     //print "change to ENABLED";
                     require_once($path);
                     $details = $oPluginRegistry->getPluginDetails($pluginFile);

workflow/engine/methods/setup/pluginsImportFile.php

@@ -238,18 +238,22 @@ try {
             unset( $oClass );
         }
         $res = $tar->extract( $path );
+
         /*----------------------------------********---------------------------------*/
+        if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=")) {
             //Check disabled code
             G::LoadClass("codeScanner");
 
             $arraySystemConfiguration = System::getSystemConfiguration(PATH_CONFIG . "env.ini");
+
             $cs = new CodeScanner((isset($arraySystemConfiguration["enable_blacklist"]) && (int)($arraySystemConfiguration["enable_blacklist"]) == 1)? "DISABLED_CODE" : "");
 
             $arrayFoundDisabledCode = array_merge($cs->checkDisabledCode("FILE", $path . $pluginFile), $cs->checkDisabledCode("PATH", $path . $sClassName));
 
-        if (count($arrayFoundDisabledCode) > 0) {
+            if (!empty($arrayFoundDisabledCode)) {
                 throw new Exception(G::LoadTranslation("ID_DISABLED_CODE_PLUGIN"));
             }
+        }
         /*----------------------------------********---------------------------------*/
 
         //Check if is enterprise plugin

workflow/engine/methods/triggers/triggers_Save.php

@@ -67,9 +67,7 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameTrigger') {
     echo $flag;
 } else {
     G::LoadClass("processMap");
-    /*----------------------------------********---------------------------------*/
+
-    G::LoadClass("codeScanner");
-    /*----------------------------------********---------------------------------*/
     $response = array();
 
     try {
@@ -82,15 +80,20 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameTrigger') {
             $value = $_POST;
         }
 
-        if (isset($value["TRI_WEBBOT"])) {
         /*----------------------------------********---------------------------------*/
+        if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=") &&
+            isset($value["TRI_WEBBOT"])
+        ) {
             //Check disabled code
+            G::LoadClass("codeScanner");
+
             $arraySystemConfiguration = System::getSystemConfiguration(PATH_CONFIG . "env.ini");
+
             $cs = new CodeScanner((isset($arraySystemConfiguration["enable_blacklist"]) && (int)($arraySystemConfiguration["enable_blacklist"]) == 1)? "DISABLED_CODE" : "");
 
             $arrayFoundDisabledCode = $cs->checkDisabledCode("SOURCE", $value["TRI_WEBBOT"]);
 
-            if (count($arrayFoundDisabledCode) > 0) {
+            if (!empty($arrayFoundDisabledCode)) {
                 $strCodeAndLine = "";
 
                 foreach ($arrayFoundDisabledCode["source"] as $key => $value) {
@@ -99,8 +102,9 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameTrigger') {
 
                 throw new Exception(G::LoadTranslation("ID_DISABLED_CODE_TRIGGER", array($strCodeAndLine)));
             }
-            /*----------------------------------********---------------------------------*/
         }
+        /*----------------------------------********---------------------------------*/
+
         $swCreate = true;
         if ($value['TRI_UID'] != '') {
             $oTrigger->load( $value['TRI_UID'] );

workflow/engine/templates/emailServer/emailServer.js

@@ -49,7 +49,6 @@ emailServer.application = {
             /*----------------------------------********---------------------------------*/
 
             switch (option) {
-
                 case "INS":
                     var typeEmailEngine = Ext.getCmp("cboEmailEngine").getValue();
 
@@ -1049,10 +1048,14 @@ emailServer.application = {
         var arrayAux1 = [];
 
         /*----------------------------------********---------------------------------*/
+        if (EMAILSERVER_LICENSED) {
             arrayAux1.push(btnNew);
             arrayAux1.push("-");
+        }
         /*----------------------------------********---------------------------------*/
+
         arrayAux1.push(btnEdit);
+
         /*----------------------------------********---------------------------------*/
         arrayAux1.push(btnDelete);
         arrayAux1.push("->");
@@ -1102,6 +1105,7 @@ emailServer.application = {
         var arrayAux2 = [];
 
         arrayAux2.push(btnEdit);
+
         /*----------------------------------********---------------------------------*/
         arrayAux2.push(btnDelete);
         /*----------------------------------********---------------------------------*/