Merged in darojas/processmaker (pull request #177)

Fix notice CASE SCHEDULER. Fix notice OUTPUTDOCUMENT. Add download FILESMANAGER. Fix standard date CASE SCHEDULER

workflow/engine/src/BusinessModel/CaseScheduler.php

@@ -462,6 +462,12 @@ class CaseScheduler
                 $sDateTmp = '';
                 if ($sStartDay == '') {
                     $sStartDay = date('Y-m-d');
+                } else {
+                    $aaStartDay = explode( "|", $aData['SCH_START_DAY'] );
+                    $aaStartDay[0] = $aaStartDay[0];
+                    $aaStartDay[1] = $aaStartDay[1];
+                    $aaStartDay[2]= ($aaStartDay[2] == 7 ? 1 : $aaStartDay[2]);
+                    $sStartDay = $aaStartDay[0].'|'.$aaStartDay[1].'|'.$aaStartDay[2];
                 }
                 $dCurrentDay = date("d");
                 $dCurrentMonth = date("m");
@@ -743,6 +749,12 @@ class CaseScheduler
             if (($sOption != '1') && ($sOption != '4') && ($sOption != '5')) {
                 if ($sStartDay == '') {
                     $sStartDay = date('Y-m-d');
+                } else {
+                    $aaStartDay = explode( "|", $aData['SCH_START_DAY'] );
+                    $aaStartDay[0] = $aaStartDay[0];
+                    $aaStartDay[1] = $aaStartDay[1];
+                    $aaStartDay[2]= ($aaStartDay[2] == 7 ? 1 : $aaStartDay[2]);
+                    $sStartDay = $aaStartDay[0].'|'.$aaStartDay[1].'|'.$aaStartDay[2];
                 }
                 $dCurrentDay = date("d");
                 $dCurrentMonth = date("m");

workflow/engine/src/BusinessModel/FilesManager.php

@@ -309,5 +309,28 @@ class FilesManager
             throw $e;
         }
     }
+
+    /**
+     *
+     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $path
+     *
+     *
+     * @access public
+     */
+    public function downloadProcessFilesManager($sProcessUID, $path)
+    {
+        try {
+            $arrayTaskUid = $this->getFileManagerUid($path);
+            $sPath = explode("/", $path);
+            $sfile = end(explode("/",$path));
+            $main = implode(array_slice($sPath, -3, 1));
+            if (file_exists(PATH_SEP.$path)) {
+                \G::streamFile($path, true);
+            }
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
 }
 

workflow/engine/src/BusinessModel/OutputDocument.php

@@ -260,12 +260,14 @@ class OutputDocument
                     $aData['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'] = "";
                     $aData['OUT_DOC_PDF_SECURITY_PERMISSIONS'] = "";
                 }
-                if (isset( $aData['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'] ) && $aData['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'] != "") {
-                    $aData['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'] = \G::encrypt( $aData['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'], $aData['OUT_DOC_UID'] );
-                    $aData['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'] = \G::encrypt( $aData['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'], $aData['OUT_DOC_UID'] );
-                }
             }
             $outDocUid = $oOutputDocument->create($aData);
+            $aData = array_change_key_case($aData, CASE_LOWER);
+            if (isset( $aData['out_doc_pdf_security_open_password'] ) && $aData['out_doc_pdf_security_open_password'] != "") {
+                $aData['out_doc_pdf_security_open_password'] = \G::encrypt( $aData['out_doc_pdf_security_open_password'], $outDocUid );
+                $aData['out_doc_pdf_security_owner_password'] = \G::encrypt( $aData['out_doc_pdf_security_owner_password'], $outDocUid );
+            }
+            $this->updateOutputDocument($sProcessUID, $aData, $outDocUid);
             //Return
             unset($aData["PRO_UID"]);
             $aData = array_change_key_case($aData, CASE_LOWER);

workflow/engine/src/Services/Api/ProcessMaker/Project/FilesManager.php

@@ -125,6 +125,7 @@ class FilesManager extends Api
         }
         return $response;
     }
+
     /**
      * @param string $prjUid {@min 32} {@max 32}
      * @param string $path
@@ -135,15 +136,30 @@ class FilesManager extends Api
     {
         try {
             $filesManager = new \BusinessModel\FilesManager();
-            $arrayData = $filesManager->deleteProcessFilesManager($prjUid, $path);
+            $filesManager->deleteProcessFilesManager($prjUid, $path);
-            //Response
-            $response = $arrayData;
         } catch (\Exception $e) {
             //response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
         return $response;
     }
+
+    /**
+     * @param string $prjUid {@min 32} {@max 32}
+     * @param string $path
+     *
+     * @url GET /:prjUid/process-file-manager/download
+     */
+    public function doDownloadProcessFilesManager($prjUid, $path)
+    {
+        try {
+            $filesManager = new \BusinessModel\FilesManager();
+            $filesManager->downloadProcessFilesManager($prjUid, $path);
+        } catch (\Exception $e) {
+            //response
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+    }
 }
 
 class ProcessFilesManagerStructure