Merged colosa/processmaker into master

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

@@ -111,7 +111,7 @@ class Project extends Api
 
         $outputDir = PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "files" . PATH_SEP . "output" . PATH_SEP;
         $version = \ProcessMaker\Util\Common::getLastVersion($outputDir . $exporter->getProjectName() . "-*.pmx") + 1;
-        $outputFilename = $outputDir . sprintf("%s-%s.%s", $exporter->getProjectName(), $version, "pmx");
+        $outputFilename = $outputDir . sprintf("%s-%s.%s", str_replace(" ", "_", $exporter->getProjectName()), $version, "pmx");
 
         $exporter->setMetadata("export_version", $version);
         $exporter->saveExport($outputFilename);

workflow/engine/src/ProcessMaker/Services/Api/System.php

@@ -64,6 +64,7 @@ class System extends Api
     {
         try {
             $enabledFeatures = array();
+            /*----------------------------------********---------------------------------*/
             $keys = array ('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=');
             foreach ($keys as $key) {
                 if (\PMLicensedFeatures
@@ -72,6 +73,7 @@ class System extends Api
                     $enabledFeatures[] = $key;
                 }
             }
+            /*----------------------------------********---------------------------------*/
             return $enabledFeatures;
         } catch (\Exception $e) {
             throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));

workflow/public_html/Web.config

@@ -5,7 +5,7 @@
             <rules>
                 <rule name="ProcessMaker Rule" stopProcessing="true">
                     <match url="^.*/(.*)$" ignoreCase="true" />
-                    <action type="Rewrite" url="sysGeneric.php" />
+                    <action type="Rewrite" url="app.php" />
                 </rule>
             </rules>
         </rewrite>