diff --git a/ChangeLog b/ChangeLog
index 1b43305a135..efab71f873f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,7 +32,8 @@ For developers:
sources on two repositories.
- Removed useless code of old commercial module.
- Updated wiki documentation.
-
+- Better W3C standard
+
***** Changelog for 2.6 compared to 2.5 *****
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index e4d4bc94f90..1cc2093652d 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -181,82 +181,11 @@ if (isset($_GET["action"]) && $_GET["action"] == 'add')
}
}
-/*
-if (isset($_GET["action"]) && $_GET["action"] == 'add_const')
-{
-
- if($_POST['type'] == 'prede')
- {
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu_const(fk_menu, fk_constraint) VALUES(".$_POST['menuId'].",".$_POST['constraint'].")";
- }
- else
- {
-
- $sql = "SELECT max(rowid) as maxId FROM ".MAIN_DB_PREFIX."menu_constraint";
- $result = $db->query($sql);
- $objc = $db->fetch_object($result);
- $constraint = ($objc->maxId) + 1;
-
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu_constraint(rowid,action) VALUES(".$constraint.",'".$_POST['constraint']."')";
- $db->query($sql);
-
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu_const(fk_menu, fk_constraint) VALUES(".$_POST['menuId'].",".$constraint.")";
- }
-
- $db->query($sql);
-
- header("location:edit.php?action=edit&menuId=".$_POST['menuId']);
- exit;
-}
-
-if (isset($_GET["action"]) && $_GET["action"] == 'del_const')
-{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu_const WHERE fk_menu = ".$_GET['menuId']." AND fk_constraint = ".$_GET['constId'];
- $db->query($sql);
-
- $sql = "SELECT count(rowid) as countId FROM ".MAIN_DB_PREFIX."menu_const WHERE fk_constraint = ".$_GET['constId'];
- $result = $db->query($sql);
- $objc = $db->fetch_object($result);
- if($objc->countId == 0)
- {
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu_constraint WHERE rowid = ".$_GET['constId'];
- $db->query($sql);
- }
-
- header("location:edit.php?action=edit&menuId=".$_GET['menuId']);
- exit;
-}
-*/
-
// Suppression
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
{
$this->db->begin();
- /*
- $sql = "SELECT c.rowid, c.fk_constraint FROM ".MAIN_DB_PREFIX."menu_const as c WHERE c.fk_menu = ".$_GET['menuId'];
- $res = $db->query($sql);
- if ($res)
- {
-
- while ($obj = $db->fetch_object($res))
- {
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu_const WHERE rowid = ".$obj->rowid;
- $result = $db->query($sql);
-
- $sql = "SELECT count(rowid) as countId FROM ".MAIN_DB_PREFIX."menu_const WHERE fk_constraint = ".$obj->fk_constraint;
- $result = $db->query($sql);
- $objc = $db->fetch_object($result);
-
- if($objc->countId == 0)
- {
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu_constraint WHERE rowid = ".$obj->fk_constraint;
- $db->query($sql);
- }
- }
- }
- */
-
$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".$_GET['menuId'];
$db->query($sql);
@@ -481,101 +410,6 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
print '
';
if ($mesg) print $mesg.'
';
-
- /*
- * Lignes de contraintes
- */
- /*
- $sql = 'SELECT c.rowid, c.action';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'menu_constraint as c, '.MAIN_DB_PREFIX.'menu_const as mc';
- $sql.= ' WHERE c.rowid = mc.fk_constraint';
- $sql.= ' AND mc.fk_menu = '.$_GET['menuId'];
-
- dol_syslog("Edit: sql=".$sql, LOG_DEBUG);
- $resql = $db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
- $i = 0;
-
- print '
| '.$langs->trans('ConstraintsToShowOrNotEntry').' ('.$langs->trans("AllMustBeOk").') | '; - print ''; - print " |
| '.$objc->action.' | '; - print ''.img_delete().' | '; - - $i++; - } - - print '
| '.$langs->trans('ConstraintsToShowOrNotEntry').' | '; - print ''; - print " |