feat: compatibiliy with GLPI 9.4

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
flyve-mdm · Aug 31, 2018 · 2211039 · 2211039
1 parent d302dc1
commit 2211039
Show file tree

Hide file tree

Showing 13 changed files with 102 additions and 10 deletions.
diff --git a/inc/agent.class.php b/inc/agent.class.php
@@ -755,7 +755,15 @@ public function post_purgeItem() {
    }
 
    public function getSearchOptionsNew() {
-      $tab = parent::getSearchOptionsNew();
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
+      if (method_exists('CommonDBTM', 'rawSearchOptions')) {
+         $tab = parent::rawSearchOptions();
+      } else {
+         $tab = parent::getSearchOptionsNew();
+      }
 
       $tab[] = [
          'id'                 => '2',

diff --git a/inc/entityconfig.class.php b/inc/entityconfig.class.php
@@ -422,6 +422,10 @@ public function canAddAgent($entityId) {
     * @return array
     */
    public function getSearchOptionsNew() {
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
       $tab = [];
 
       $tab[] = [

diff --git a/inc/file.class.php b/inc/file.class.php
@@ -199,7 +199,15 @@ private function getUploadedFile($uploadMandatory = false) {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = parent::getSearchOptionsNew();
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
+      if (method_exists('CommonDBTM', 'rawSearchOptions')) {
+         $tab = parent::rawSearchOptions();
+      } else {
+         $tab = parent::getSearchOptionsNew();
+      }
 
       $tab[] = [
          'id'            => '2',

diff --git a/inc/fleet.class.php b/inc/fleet.class.php
@@ -234,7 +234,15 @@ public function pre_deleteItem() {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = parent::getSearchOptionsNew();
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
+      if (method_exists('CommonDBTM', 'rawSearchOptions')) {
+         $tab = parent::rawSearchOptions();
+      } else {
+         $tab = parent::getSearchOptionsNew();
+      }
 
       $tab[] = [
          'id'                 => '2',

diff --git a/inc/geolocation.class.php b/inc/geolocation.class.php
@@ -296,7 +296,15 @@ public static function showForAgent(CommonDBTM $item) {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = parent::getSearchOptionsNew();
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
+      if (method_exists('CommonDBTM', 'rawSearchOptions')) {
+         $tab = parent::rawSearchOptions();
+      } else {
+         $tab = parent::getSearchOptionsNew();
+      }
 
       $tab[] = [
          'id'            => '2',

diff --git a/inc/invitation.class.php b/inc/invitation.class.php
@@ -442,7 +442,15 @@ public function sendInvitation() {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = parent::getSearchOptionsNew();
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
+      if (method_exists('CommonDBTM', 'rawSearchOptions')) {
+         $tab = parent::rawSearchOptions();
+      } else {
+         $tab = parent::getSearchOptionsNew();
+      }
 
       $tab[] = [
          'id'            => '2',

diff --git a/inc/invitationlog.class.php b/inc/invitationlog.class.php
@@ -63,6 +63,10 @@ public function getRights($interface = 'central') {
     * @return array
     */
    public function getSearchOptionsNew() {
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
       $tab = [];
 
       $tab[] = [

diff --git a/inc/package.class.php b/inc/package.class.php
@@ -324,7 +324,15 @@ public function post_purgeItem() {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = parent::getSearchOptionsNew();
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
+      if (method_exists('CommonDBTM', 'rawSearchOptions')) {
+         $tab = parent::rawSearchOptions();
+      } else {
+         $tab = parent::getSearchOptionsNew();
+      }
 
       $tab[] = [
          'id'            => '2',

diff --git a/inc/policy.class.php b/inc/policy.class.php
@@ -91,7 +91,15 @@ static function getTypeName($nb = 0) {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = parent::getSearchOptionsNew();
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
+      if (method_exists('CommonDBTM', 'rawSearchOptions')) {
+         $tab = parent::rawSearchOptions();
+      } else {
+         $tab = parent::getSearchOptionsNew();
+      }
 
       $tab[0] = [
          'id'   => 'common',

diff --git a/inc/policycategory.class.php b/inc/policycategory.class.php
@@ -56,6 +56,10 @@ static function getTypeName($nb = 0) {
     * @return array
     */
    public function getSearchOptionsNew() {
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
       $tab = [];
 
       $tab[] = [

diff --git a/inc/task.class.php b/inc/task.class.php
@@ -509,7 +509,15 @@ public static function cleanupPolicies(PluginFlyvemdmNotifiableInterface $item,
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = parent::getSearchOptionsNew();
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
+      if (method_exists('CommonDBTM', 'rawSearchOptions')) {
+         $tab = parent::rawSearchOptions();
+      } else {
+         $tab = parent::getSearchOptionsNew();
+      }
 
       $tab[] = [
          'id'            => '3',

diff --git a/inc/taskstatus.class.php b/inc/taskstatus.class.php
@@ -324,7 +324,15 @@ public static function showForFleet(CommonDBTM $item, $withTemplate = '') {
    }
 
    public function getSearchOptionsNew() {
-      $tab = parent::getSearchOptionsNew();
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
+      if (method_exists('CommonDBTM', 'rawSearchOptions')) {
+         $tab = parent::rawSearchOptions();
+      } else {
+         $tab = parent::getSearchOptionsNew();
+      }
 
       $tab[] = [
          'id'            => '2',

diff --git a/inc/wellknownpath.class.php b/inc/wellknownpath.class.php
@@ -83,7 +83,15 @@ public function getFromDBByPath($path) {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = parent::getSearchOptionsNew();
+      return $this->rawSearchOptions();
+   }
+
+   public function rawSearchOptions() {
+      if (method_exists('CommonDBTM', 'rawSearchOptions')) {
+         $tab = parent::rawSearchOptions();
+      } else {
+         $tab = parent::getSearchOptionsNew();
+      }
 
       $tab[] = [
          'id'            => '2',