Merge pull request #111 from tomolimo/3.6/bugfixes

Cherry pick fix for generic user from 3.5.11
tomolimo · Oct 12, 2020 · 6ada191 · 6ada191
2 parents b37f6f6 + c895643
commit 6ada191
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/inc/task.class.php b/inc/task.class.php
@@ -405,15 +405,11 @@ static function displayTabContentForItem(CommonGLPI $case, $tabnum = 1, $withtem
             $used_users = [];
             $used_users[] = $current_assigned_user;
             if (array_key_exists($currentUser->taskId, $prevent_assign)) {
-               if (is_array($prevent_assign[$currentUser->taskId])) {
-                  foreach ($prevent_assign[$currentUser->taskId] as $pmuser) {
-                     $usr_id = PluginProcessmakerUser::getGlpiIdFromAny($pmuser);
-                     if ($usr_id) {
-                        $used_users[] = $usr_id;
-                     }
-                  }
-               } else {
-                  $usr_id = PluginProcessmakerUser::getGlpiIdFromAny($prevent_assign[$currentUser->taskId]);
+               if (!is_array($prevent_assign[$currentUser->taskId])) {
+                  $prevent_assign[$currentUser->taskId] = [$prevent_assign[$currentUser->taskId]];
+               }
+               foreach ($prevent_assign[$currentUser->taskId] as $pmuser) {
+                  $usr_id = PluginProcessmakerUser::getGlpiIdFromAny($pmuser);
                   if ($usr_id) {
                      $used_users[] = $usr_id;
                   }

diff --git a/inc/user.class.php b/inc/user.class.php
@@ -303,9 +303,11 @@ public static function getGLPIUserId($pmUserId) {
      * @return string which is the uid of user in Processmaker database, or false if not found
      */
    public static function getPMUserId($glpiUserId) {
-      $obj = new self;
-      if ($obj->getFromDB( Toolbox::cleanInteger($glpiUserId) )) {
-         return $obj->fields['pm_users_id'];
+      if (is_numeric($glpiUserId)) {
+         $obj = new self;
+         if ($obj->getFromDB($glpiUserId)) {
+            return $obj->fields['pm_users_id'];
+         }
       }
       return false;
    }
@@ -316,7 +318,7 @@ public static function getPMUserId($glpiUserId) {
     * Returns the GLPI id of the user or false if not found
     * Accept either PM GUID, GLPI logon, or GLPI ID
     * @param  $any 
-    * @return mixed GLPI ID of the user or fasle if not found
+    * @return mixed GLPI ID of the user or false if not found
     */
    public static function getGlpiIdFromAny($any) {
       $ret = self::getGLPIUserId($any);

diff --git a/processmaker.xml b/processmaker.xml
@@ -29,15 +29,15 @@
        <compatibility>9.1</compatibility>
      </version>
      <version>
-       <num>3.4.25</num>
+       <num>3.4.26</num>
        <compatibility>9.2</compatibility>
      </version>
       <version>
-         <num>3.5.10</num>
+         <num>3.5.11</num>
          <compatibility>9.3</compatibility>
       </version>
      <version>
-       <num>3.6.16</num>
+       <num>3.6.17</num>
        <compatibility>9.4</compatibility>
      </version>
    </versions>

diff --git a/setup.php b/setup.php
@@ -1,6 +1,6 @@
 <?php
 
-define('PROCESSMAKER_VERSION', '3.6.16');
+define('PROCESSMAKER_VERSION', '3.6.17');
 
 // used for case cancellation
 define("CANCEL", 256);