@@ -1732,39 +1732,39 @@ public static function countAvailableForm() {
1732
1732
if ($ DB ->tableExists ($ formTable )
1733
1733
&& $ DB ->tableExists ($ formProfileTable )
1734
1734
&& isset ($ _SESSION ['glpiactiveprofile ' ]['id ' ])) {
1735
- $ nb = (new DBUtils ())->countElementsInTableForMyEntities (
1736
- $ formTable ,
1737
- [
1738
- 'LEFT JOIN ' => [
1739
- $ formLanguage => [
1740
- 'FKEY ' => [
1741
- $ formLanguage => $ formFk ,
1742
- $ formTable => 'id ' ,
1743
- ],
1735
+ $ nb = $ DB ->request ([
1736
+ 'COUNT ' => 'c ' ,
1737
+ 'FROM ' => $ formTable ,
1738
+ 'LEFT JOIN ' => [
1739
+ $ formLanguage => [
1740
+ 'FKEY ' => [
1741
+ $ formLanguage => $ formFk ,
1742
+ $ formTable => 'id ' ,
1744
1743
],
1745
1744
],
1746
- 'WHERE ' => [
1747
- "$ formTable.is_active " => '1 ' ,
1748
- "$ formTable.is_deleted " => '0 ' ,
1745
+ ],
1746
+ 'WHERE ' => [
1747
+ "$ formTable.is_active " => '1 ' ,
1748
+ "$ formTable.is_deleted " => '0 ' ,
1749
+ 'OR ' => [
1750
+ "$ formTable.language " => [$ _SESSION ['glpilanguage ' ], '0 ' , '' , null ],
1751
+ "$ formLanguage.name " => $ _SESSION ['glpilanguage ' ],
1752
+ ],
1753
+ [
1749
1754
'OR ' => [
1750
- "$ formTable.language " => [$ _SESSION ['glpilanguage ' ], '0 ' , '' , null ],
1751
- "$ formLanguage.name " => $ _SESSION ['glpilanguage ' ],
1752
- ],
1753
- [
1754
- 'OR ' => [
1755
- "$ formTable.access_rights " => ['<> ' , PluginFormcreatorForm::ACCESS_RESTRICTED ],
1756
- "$ formTable.id " => new QuerySubQuery ([
1757
- 'SELECT ' => $ formFk ,
1758
- 'FROM ' => $ formProfileTable ,
1759
- 'WHERE ' => [
1760
- 'profiles_id ' => $ _SESSION ['glpiactiveprofile ' ]['id ' ]
1761
- ]
1762
- ]),
1763
- ],
1755
+ "$ formTable.access_rights " => ['<> ' , PluginFormcreatorForm::ACCESS_RESTRICTED ],
1756
+ "$ formTable.id " => new QuerySubQuery ([
1757
+ 'SELECT ' => $ formFk ,
1758
+ 'FROM ' => $ formProfileTable ,
1759
+ 'WHERE ' => [
1760
+ 'profiles_id ' => $ _SESSION ['glpiactiveprofile ' ]['id ' ]
1761
+ ]
1762
+ ]),
1764
1763
],
1765
1764
],
1766
- ]
1767
- );
1765
+ ] + (new DbUtils ())->getEntitiesRestrictCriteria ($ formTable , '' , '' , (new self ())->maybeRecursive ()),
1766
+
1767
+ ])->next ()['c ' ];
1768
1768
}
1769
1769
1770
1770
return $ nb ;
0 commit comments