diff --git a/include/ajax_mod_menu.php b/include/ajax_mod_menu.php index 044c977a8..4252d7ecc 100644 --- a/include/ajax_mod_menu.php +++ b/include/ajax_mod_menu.php @@ -1,7 +1,7 @@ me_code.h($m->menu); +$msg="Modification ".$m->me_code.' '.h($m->me_menu); echo '
'; require_once 'template/menu_detail.php'; diff --git a/include/class_menu_ref.php b/include/class_menu_ref.php index b894427ed..e41ab0a35 100644 --- a/include/class_menu_ref.php +++ b/include/class_menu_ref.php @@ -21,20 +21,27 @@ class Menu_Ref extends Menu_Ref_sql } function verify() { + try + { parent::verify(); if ( $this->me_code == -1) { $this->format_code(); if ( $this->cn->get_value("select count(*) from menu_ref where me_code=$1",array($this->me_code)) > 0) - return -1; + throw new Exception ('Doublon'); if (trim($this->me_code)=='') - return -2; + throw new Exception ('Ce menu existe déjà'); } - if ( ! file_exists('../include/'.$this->me_file)) return -3; - + if ( ! file_exists('../include/'.$this->me_file)) throw new Exception ('Ce menu fichier '.$this->me_file." n'existe pas"); + return 0; + } catch (Exception $e) + { + alert($e->getMessage()); + return -1; + } } - + } ?> diff --git a/include/menu.inc.php b/include/menu.inc.php index 157402f1c..03f36eb99 100644 --- a/include/menu.inc.php +++ b/include/menu.inc.php @@ -84,32 +84,19 @@ if ( isset($_POST['create_menu'])|| isset($_POST['mod_menu'])) $menu_ref->me_javascript=$me_javascript; $menu_ref->me_type='ME'; $check=$menu_ref->verify(); - if ( $check == 0) - { - if ( isset($_POST['create_menu'])) - { - $menu_ref->insert(); - }elseif (isset ($_POST['mod_menu'])) + if ($check == 0) + { + if (isset($_POST['create_menu'])) { - if ( $menu_ref->verify() == 0)$menu_ref->update(); + $menu_ref->insert(); } - } - else - { - switch($check) - { - case -1: - echo '
Doublon : ce menu existe déjà '.h($menu_ref->me_code).'
'; - break; - case -2: - echo '
Le code ne peut pas être vide
'; - break; - case -3: - echo '
Ce fichier n\'existe pas '.h($menu_ref->me_file).'
'; - break; - } - } -} + elseif (isset($_POST['mod_menu'])) + { + if ($menu_ref->verify() == 0) + $menu_ref->update(); + } + } +} /** * if delete then delete */