From 3a73a96f51a65dc0f9a1f94c9fb94dce53266df2 Mon Sep 17 00:00:00 2001
From: Ronald Quenta <ronald.quenta@colosa.com>
Date: Fri, 25 Sep 2015 16:34:54 -0400
Subject: [PATCH] PM-3671 Process Permission>AL configurar un permiso y querer
 guardar nos  visualiza un error

---
 framework/src/Maveriks/WebApplication.php     |  1 +
 .../Api/Project/ProcessPermissions.php        |  5 ----
 .../ProcessMaker/Services/OAuth2/PmPdo.php    |  9 -------
 .../ProcessMaker/Services/OAuth2/Server.php   | 27 ++++++++++++++++---
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index 71324a893..7fcd99d6f 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -378,6 +378,7 @@ class WebApplication
         }
 
         Services\OAuth2\Server::setWorkspace(SYS_SYS);
+        Services\OAuth2\Server::loadPostEnvironment();
         $this->rest->addAPIClass('\ProcessMaker\\Services\\OAuth2\\Server', 'oauth2');
 
         return $uri;
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php
index 46922b2e2..e73247e51 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php
@@ -17,7 +17,6 @@ class ProcessPermissions extends Api
     /**
      * @param string $prj_uid {@min 1} {@max 32}
      *
-     * @access public
      * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
      * @copyright Colosa - Bolivia
      *
@@ -40,7 +39,6 @@ class ProcessPermissions extends Api
      * @param string $prj_uid {@min 1} {@max 32}
      * @param string $ob_uid {@min 1} {@max 32}
      *
-     * @access public
      * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
      * @copyright Colosa - Bolivia
      *
@@ -75,7 +73,6 @@ class ProcessPermissions extends Api
      * @param string $inputs {@from body}
      * @param string $outputs {@from body}
      *
-     * @access public
      * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
      * @copyright Colosa - Bolivia
      *
@@ -134,7 +131,6 @@ class ProcessPermissions extends Api
      * @param string $inputs {@from body}
      * @param string $outputs {@from body}
      *
-     * @access public
      * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
      * @copyright Colosa - Bolivia
      *
@@ -172,7 +168,6 @@ class ProcessPermissions extends Api
      * @param string $prj_uid {@min 1} {@max 32}
      * @param string $ob_uid {@min 1} {@max 32}
      *
-     * @access public
      * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
      * @copyright Colosa - Bolivia
      *
diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
index 9bb70b8fd..4e610f8ad 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
@@ -296,14 +296,5 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
         return array_merge($a, array_change_key_case($a, $case));
     }
 
-    public function loadPostEnvironment($request = null)
-    {
-        if (!defined('SYS_LANG')) {
-            $acceptLanguage =$request->headers('ACCEPT_LANGUAGE');
-            $lang = (!is_null($acceptLanguage) && strlen($acceptLanguage)<=2)?$acceptLanguage:'en';
-            define("SYS_LANG", $lang);
-        }
-        return true;
-    }
 }
 
diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
index 5fd8216b4..5fc811618 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
@@ -285,8 +285,6 @@ class Server implements iAuthenticate
             $request = \OAuth2\Request::createFromGlobals();
         }
 
-        $this->storage->loadPostEnvironment($request);
-
         $response = $this->server->handleTokenRequest($request); //Set/Get token //PmPdo->setAccessToken()
 
         $token = $response->getParameters();
@@ -334,7 +332,6 @@ class Server implements iAuthenticate
     public function __isAllowed()
     {
         $request = \OAuth2\Request::createFromGlobals();
-        $this->storage->loadPostEnvironment($request);
         $allowed = $this->server->verifyResourceRequest($request);
         $token = $this->server->getAccessTokenData($request);
         self::$userId = $token['user_id'];
@@ -394,5 +391,29 @@ class Server implements iAuthenticate
     {
         return "";
     }
+
+    public static function loadPostEnvironment($request = null)
+    {
+        $acceptLanguage = 'en';
+        if ($request == null) {
+            $request = \OAuth2\Request::createFromGlobals();
+            $acceptLanguage = $request->headers('ACCEPT_LANGUAGE');
+        }
+
+        if (!defined('SYS_LANG')) {
+            $Translations = new \Translation;
+            $translationsTable = $Translations->getTranslationEnvironments();
+            $inLang = false;
+            foreach ($translationsTable as $locale) {
+                if ($locale['LOCALE'] == $acceptLanguage){
+                    $inLang = true;
+                    break;
+                }
+            }
+            $lang = $inLang?$acceptLanguage:'en';
+            define("SYS_LANG", $lang);
+        }
+
+    }
 }