[Noalyss-commit] [noalyss] 01/04: Plugin : new tag to place properly the new plugin

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit b99740d1e6189ac0b732f340761b4b99b0c75809
Author: Dany De Bontridder <address@hidden>
Date:   Tue Feb 28 22:23:57 2017 +0100

    Plugin : new tag to place properly the new plugin
---
 include/class/class_extension.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/class/class_extension.php 
b/include/class/class_extension.php
index 54c6931..6e8168c 100644
--- a/include/class/class_extension.php
+++ b/include/class/class_extension.php
@@ -142,9 +142,9 @@ class Extension extends Menu_Ref_sql
             $profil_menu->p_id=$p_id;
             $profil_menu->pm_id_dep=$dep_id[$i]['pm_id'];
             $profil_menu->pm_default=0;
-            $profil_menu->p_order=9000;
+            $profil_menu->p_order=$this->order;
 
-            $cnt=$profil_menu->count(' where p_id=$1 and me_code = 
$2',array($p_id,$this->me_code));
+            $cnt=$profil_menu->count(' where pm_id_dep=$3 and p_id=$1 and 
me_code = $2',array($p_id,$this->me_code,$dep_id[$i]['pm_id']));
             if ( $cnt==0) {
                 $profil_menu->insert();
             }
@@ -271,6 +271,7 @@ class Extension extends Menu_Ref_sql
                     if ( !isset ($xml->plugin[$i]->root)) throw new 
Exception(_('Manque répertoire racine'),1);
                     if ( !isset ($xml->plugin[$i]->file)) throw new 
Exception(_('Manque fichier à inclure'),1);
                     if ( !isset ($xml->plugin[$i]->depend)) 
$xml->plugin[$i]->depend="EXT";
+                    if ( !isset ($xml->plugin[$i]->order)) 
$xml->plugin[$i]->order=9000;
                 }
             } catch (Exception $ex) {
                 throw $ex;
@@ -311,6 +312,7 @@ class Extension extends Menu_Ref_sql
                 $extension->me_menu=trim($xml->plugin[$i]->name);
                 
$extension->me_parameter='plugin_code='.trim($xml->plugin[$i]->code);
                 
$extension->depend=(isset($xml->plugin[$i]->depend))?trim($xml->plugin[$i]->depend):"";
+                
$extension->order=(isset($xml->plugin[$i]->order))?trim($xml->plugin[$i]->order):9000;
                 $a_extension[]=clone $extension;
             }
             return $a_extension;