From aa3426f24a8a9d3e58c69322c05d9d6b1b04d5a9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 2 Sep 2011 16:25:07 +0000 Subject: [PATCH] Qual: Uniformize code --- htdocs/admin/menus/edit.php | 601 +++++++++++++++++++----------------- 1 file changed, 311 insertions(+), 290 deletions(-) diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index c945ae30f0c..d9487e658de 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -1,6 +1,6 @@ - * Copyright (C) 2007-2010 Laurent Destailleur + * Copyright (C) 2007-2011 Laurent Destailleur * Copyright (C) 2009-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); $langs->load("admin"); if (! $user->admin) - accessforbidden(); +accessforbidden(); $dirtop = "/includes/menus/standard"; $dirleft = "/includes/menus/standard"; @@ -39,7 +39,8 @@ $dirsmartphone = "/includes/menus/smartphone"; $dirmenu = array($dirleft,$dirsmartphone); -$mesg=$_GET["mesg"]; +$action=GETPOST('action'); +$mesg=GETPOST('mesg'); $menu_handler_top=$conf->global->MAIN_MENU_STANDARD; $menu_handler_smartphone=$conf->global->MAIN_MENU_SMARTPHONE; @@ -56,157 +57,157 @@ if ($_REQUEST["menu_handler"]) $menu_handler=$_REQUEST["menu_handler"]; /* -* Actions -*/ + * Actions + */ -if (isset($_GET["action"]) && $_GET["action"] == 'update') +if ($action == 'update') { - if (! $_POST['cancel']) - { - $menu = new Menubase($db); - $result=$menu->fetch($_POST['menuId']); - if ($result > 0) - { - $menu->titre=$_POST['titre']; - $menu->leftmenu=$_POST['leftmenu']; - $menu->url=$_POST['url']; - $menu->langs=$_POST['langs']; - $menu->position=$_POST['position']; - $menu->enabled=$_POST['enabled']; - $menu->perms=$_POST['perms']; - $menu->target=$_POST['target']; - $menu->user=$_POST['user']; - $result=$menu->update($user); - if ($result > 0) - { - $mesg='
'.$langs->trans("RecordModifiedSuccessfully").'
'; - } - else - { - $mesg='
'.$menu->error.'
'; - } - } - else - { - $mesg='
'.$menu->error.'
'; - } - $_GET["menuId"]=$_POST['menuId']; - $_GET["action"]="edit"; - } - else - { - header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler); - exit; - } + if (! $_POST['cancel']) + { + $menu = new Menubase($db); + $result=$menu->fetch($_POST['menuId']); + if ($result > 0) + { + $menu->titre=$_POST['titre']; + $menu->leftmenu=$_POST['leftmenu']; + $menu->url=$_POST['url']; + $menu->langs=$_POST['langs']; + $menu->position=$_POST['position']; + $menu->enabled=$_POST['enabled']; + $menu->perms=$_POST['perms']; + $menu->target=$_POST['target']; + $menu->user=$_POST['user']; + $result=$menu->update($user); + if ($result > 0) + { + $mesg='
'.$langs->trans("RecordModifiedSuccessfully").'
'; + } + else + { + $mesg='
'.$menu->error.'
'; + } + } + else + { + $mesg='
'.$menu->error.'
'; + } + $_GET["menuId"] = $_POST['menuId']; + $action = "edit"; + } + else + { + header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler); + exit; + } - if ($_GET['return']) - { - header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler); - exit; - } + if ($_GET['return']) + { + header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler); + exit; + } } -if (isset($_GET["action"]) && $_GET["action"] == 'add') +if ($action == 'add') { - if ($_POST['cancel']) - { - header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler); - exit; - } + if ($_POST['cancel']) + { + header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler); + exit; + } - $langs->load("errors"); + $langs->load("errors"); - $error=0; - if (! $error && ! $_POST['menu_handler']) - { - $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("MenuHandler")).'
'; - $_GET["action"] = 'create'; - $error++; - } - if (! $error && ! $_POST['type']) - { - $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")).'
'; - $_GET["action"] = 'create'; - $error++; - } - if (! $error && ! $_POST['url']) - { - $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->trans("Url")).'
'; - $_GET["action"] = 'create'; - $error++; - } - if (! $error && ! $_POST['titre']) - { - $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->trans("Title")).'
'; - $_GET["action"] = 'create'; - $error++; - } - if (! $error && $_POST['menuId'] && $_POST['type'] == 'top') - { - $mesg='
'.$langs->trans("ErrorTopMenuMustHaveAParentWithId0").'
'; - $_GET["action"] = 'create'; - $error++; - } - if (! $error && ! $_POST['menuId'] && $_POST['type'] == 'left') - { - $mesg='
'.$langs->trans("ErrorLeftMenuMustHaveAParentId").'
'; - $_GET["action"] = 'create'; - $error++; - } + $error=0; + if (! $error && ! $_POST['menu_handler']) + { + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("MenuHandler")).'
'; + $action = 'create'; + $error++; + } + if (! $error && ! $_POST['type']) + { + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")).'
'; + $action = 'create'; + $error++; + } + if (! $error && ! $_POST['url']) + { + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->trans("Url")).'
'; + $action = 'create'; + $error++; + } + if (! $error && ! $_POST['titre']) + { + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->trans("Title")).'
'; + $action = 'create'; + $error++; + } + if (! $error && $_POST['menuId'] && $_POST['type'] == 'top') + { + $mesg='
'.$langs->trans("ErrorTopMenuMustHaveAParentWithId0").'
'; + $action = 'create'; + $error++; + } + if (! $error && ! $_POST['menuId'] && $_POST['type'] == 'left') + { + $mesg='
'.$langs->trans("ErrorLeftMenuMustHaveAParentId").'
'; + $action = 'create'; + $error++; + } - if (! $error) - { - $menu = new Menubase($db); - $menu->fk_menu=$_POST['menuId']; - $menu->menu_handler=$_POST['menu_handler']; - $menu->type=$_POST['type']; - $menu->titre=$_POST['titre']; - $menu->leftmenu=$_POST['leftmenu']; - $menu->url=$_POST['url']; - $menu->langs=$_POST['langs']; - $menu->position=$_POST['position']; - $menu->enabled=$_POST['enabled']; - $menu->perms=$_POST['perms']; - $menu->target=$_POST['target']; - $menu->user=$_POST['user']; - $result=$menu->create($user); - if ($result > 0) - { - header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$_POST['menu_handler']); - exit; - } - else - { - $_GET["action"] = 'create'; - $mesg='
'.$menu->error.'
'; - } - } + if (! $error) + { + $menu = new Menubase($db); + $menu->fk_menu=$_POST['menuId']; + $menu->menu_handler=$_POST['menu_handler']; + $menu->type=$_POST['type']; + $menu->titre=$_POST['titre']; + $menu->leftmenu=$_POST['leftmenu']; + $menu->url=$_POST['url']; + $menu->langs=$_POST['langs']; + $menu->position=$_POST['position']; + $menu->enabled=$_POST['enabled']; + $menu->perms=$_POST['perms']; + $menu->target=$_POST['target']; + $menu->user=$_POST['user']; + $result=$menu->create($user); + if ($result > 0) + { + header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$_POST['menu_handler']); + exit; + } + else + { + $action = 'create'; + $mesg='
'.$menu->error.'
'; + } + } } -// Suppression -if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes') +// delete +if ($action == 'confirm_delete' && $_POST["confirm"] == 'yes') { - $this->db->begin(); + $this->db->begin(); - $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".$_GET['menuId']; - $db->query($sql); + $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".$_GET['menuId']; + $db->query($sql); - if ($result == 0) - { - $this->db->commit(); + if ($result == 0) + { + $this->db->commit(); - llxHeader(); - print '
'.$langs->trans("MenuDeleted").'
'; - llxFooter(); - exit ; - } - else - { - $this->db->rollback(); + llxHeader(); + print '
'.$langs->trans("MenuDeleted").'
'; + llxFooter(); + exit ; + } + else + { + $this->db->rollback(); - $reload = 0; - $_GET["action"]=''; - } + $reload = 0; + $_GET["action"]=''; + } } @@ -218,200 +219,220 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes') $html=new Form($db); $htmladmin=new FormAdmin($db); -llxHeader(); +llxHeader('',$langs->trans("Menu")); -if (isset($_GET["action"]) && $_GET["action"] == 'create') +if ($action == 'create') { - print_fiche_titre($langs->trans("NewMenu"),'','setup'); - - if ($mesg) print $mesg; - else print '
'; - - print '
'; - print ''; - - print ''; - - // Id - $parent_rowid = $_GET['menuId']; - if ($_GET['menuId']) - { - $sql = "SELECT m.rowid, m.mainmenu, m.level, m.langs FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".$_GET['menuId']; - $res = $db->query($sql); - if ($res) - { - - while ($menu = $db->fetch_array ($res)) - { - $parent_rowid = $menu['rowid']; - $parent_mainmenu = $menu['mainmenu']; - $parent_langs = $menu['langs']; - $parent_level = $menu['level']; + print ''; - // MenuId Parent - print ''; - if ($parent_rowid) - { - print ''; - } - else - { - print ''; - } - print ''; + print_fiche_titre($langs->trans("NewMenu"),'','setup'); - // Handler - print ''; - print ''; - print ''; + print ''; + print ''; - //User - print ''; - print ''; - print ''; + print '
'.$langs->trans('MenuIdParent').''.$parent_rowid.''.$langs->trans('DetailMenuIdParent').'
'.$langs->trans('MenuHandler').''; - print $htmladmin->select_menu_families($menu_handler,'menu_handler',$dirmenu); - print ''.$langs->trans('DetailMenuHandler').'
'.$langs->trans('MenuForUsers').''.$langs->trans('DetailUser').'
'; - // Type - print ''; + // Id + $parent_rowid = $_GET['menuId']; + if ($_GET['menuId']) + { + $sql = "SELECT m.rowid, m.mainmenu, m.level, m.langs FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".$_GET['menuId']; + $res = $db->query($sql); + if ($res) + { - //Titre - print ''; + while ($menu = $db->fetch_array ($res)) + { + $parent_rowid = $menu['rowid']; + $parent_mainmenu = $menu['mainmenu']; + $parent_langs = $menu['langs']; + $parent_level = $menu['level']; + } + } + } - //Langs - print ''; + // Handler + print ''; + print ''; + print ''; - //Position - print ''; + //User + print ''; + print ''; + print ''; - //URL - print ''; + // Type + print ''; - //Target - print ''; + // MenuId Parent + print ''; + if ($parent_rowid) + { + print ''; + } + else + { + print ''; + } + print ''; - //Enabled - print ''; + // Title + print ''; - //Perms - print ''; + // Langs + print ''; - // Boutons - print ''; + // Position + print ''; - print '
'.$langs->trans('Type').''; - if ($parent_rowid) - { - print 'Left'; - print ''; - } - else - { - print ''; - } - // print ''; - print ''.$langs->trans('DetailType').'
'.$langs->trans('Title').''.$langs->trans('DetailTitre').'
'.$langs->trans('LangFile').''.$langs->trans('DetailLangs').'
'.$langs->trans('MenuHandler').''; + print $htmladmin->select_menu_families($menu_handler,'menu_handler',$dirmenu); + print ''.$langs->trans('DetailMenuHandler').'
'.$langs->trans('Position').''.$langs->trans('DetailPosition').'
'.$langs->trans('MenuForUsers').''.$langs->trans('DetailUser').'
'.$langs->trans('URL').''.$langs->trans('DetailUrl').'
'.$langs->trans('Type').''; + if ($parent_rowid) + { + print 'Left'; + print ''; + } + else + { + print ''; + } + // print ''; + print ''.$langs->trans('DetailType').'
'.$langs->trans('Target').''.$langs->trans('DetailTarget').'
'.$langs->trans('MenuIdParent').''.$parent_rowid.''.$langs->trans('DetailMenuIdParent').'
'.$langs->trans('Enabled').''.$langs->trans('DetailEnabled').'
'.$langs->trans('Title').''.$langs->trans('DetailTitre').'
'.$langs->trans('Rights').''.$langs->trans('DetailRight').'
'.$langs->trans('LangFile').''.$langs->trans('DetailLangs').'
'; - print '     '; - print '
'.$langs->trans('Position').''.$langs->trans('DetailPosition').'
'; + // URL + print ''.$langs->trans('URL').''.$langs->trans('DetailUrl').''; - print '
'; + // Target + print ''.$langs->trans('Target').''.$langs->trans('DetailTarget').''; + + // Enabled + print ''.$langs->trans('Enabled').''.$langs->trans('DetailEnabled').''; + + // Perms + print ''.$langs->trans('Rights').''.$langs->trans('DetailRight').''; + + print ''; + + // Boutons + print '

'; + print '     '; + print '
'; + + print ''; + + dol_htmloutput_mesg($mesg); } -elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') +elseif ($action == 'edit') { - print_fiche_titre($langs->trans("ModifMenu"),'','setup'); - print '
'; + print_fiche_titre($langs->trans("ModifMenu"),'','setup'); + print '
'; - print '
'; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; - print ''; + print '
'; - $menu = new Menubase($db); - $result=$menu->fetch($_GET['menuId']); - //var_dump($menu); + $menu = new Menubase($db); + $result=$menu->fetch($_GET['menuId']); + //var_dump($menu); - // MenuId Parent - print ''; - //$menu_handler - //print ''; - print ''; - print ''; + // Id + print ''; - // Id - print ''; + // Module + print ''; - // Handler - print ''; + // Handler + print ''; - // Module - print ''; + // User + print ''; - // Type - print ''; + // Type + print ''; - // User - print ''; + // MenuId Parent + print ''; + //$menu_handler + //print ''; + print ''; + print ''; - // Niveau - //print ''; + // Niveau + //print ''; - // Titre - print ''; + // Titre + print ''; - // Langs - print ''; + // Langs + print ''; - // Position - print ''; + // Position + print ''; - // Url - print ''; + // Url + print ''; - // Target - print ''; + // Target + print ''; - // Enabled - print ''; + // Enabled + print ''; - // Perms - print ''; + // Perms + print ''; - // Bouton - print ''; + print '
'.$langs->trans('MenuIdParent').''.$menu->fk_menu.''.$langs->trans('DetailMenuIdParent').'
'.$langs->trans('Id').''.$menu->id.''.$langs->trans('DetailId').'
'.$langs->trans('Id').''.$menu->id.''.$langs->trans('DetailId').'
'.$langs->trans('MenuModule').''.$menu->module.''.$langs->trans('DetailMenuModule').'
'.$langs->trans('MenuHandler').''.$menu->menu_handler.''.$langs->trans('DetailMenuHandler').'
'.$langs->trans('MenuHandler').''.$menu->menu_handler.''.$langs->trans('DetailMenuHandler').'
'.$langs->trans('MenuModule').''.$menu->module.''.$langs->trans('DetailMenuModule').'
'.$langs->trans('MenuForUsers').''.$langs->trans('DetailUser').'
'.$langs->trans('Type').''.$menu->type.''.$langs->trans('DetailType').'
'.$langs->trans('Type').''.$menu->type.''.$langs->trans('DetailType').'
'.$langs->trans('MenuForUsers').''.$langs->trans('DetailUser').'
'.$langs->trans('MenuIdParent').''.$menu->fk_menu.''.$langs->trans('DetailMenuIdParent').'
'.$langs->trans('Level').''.$menu->level.''.$langs->trans('DetailLevel').'
'.$langs->trans('Level').''.$menu->level.''.$langs->trans('DetailLevel').'
'.$langs->trans('Title').''.$langs->trans('DetailTitre').'
'.$langs->trans('Title').''.$langs->trans('DetailTitre').'
'.$langs->trans('LangFile').''.$langs->trans('DetailLangs').'
'.$langs->trans('LangFile').''.$langs->trans('DetailLangs').'
'.$langs->trans('Position').''.$langs->trans('DetailPosition').'
'.$langs->trans('Position').''.$langs->trans('DetailPosition').'
'.$langs->trans('URL').''.$langs->trans('DetailUrl').'
'.$langs->trans('URL').''.$langs->trans('DetailUrl').'
'.$langs->trans('Target').''.$langs->trans('DetailTarget').'
'.$langs->trans('Target').''.$langs->trans('DetailTarget').'
'.$langs->trans('Enabled').''.$langs->trans('DetailEnabled').'
'.$langs->trans('Enabled').''.$langs->trans('DetailEnabled').'
'.$langs->trans('Rights').''.$langs->trans('DetailRight').'
'.$langs->trans('Rights').''.$langs->trans('DetailRight').'
'; - print '     '; - print '
'; - print ''; + // Bouton + print '

'; + print '     '; + print '
'; - print '
'; + print ''; - print '
'; + print '
'; - if ($mesg) print $mesg.'
'; + dol_htmloutput_mesg($mesg); }