From b309cd13808c53e9f5ed81adf725d6a46baa5cfe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 May 2009 14:32:19 +0000 Subject: [PATCH] Fix: W3C --- ChangeLog | 3 +- htdocs/admin/menus/edit.php | 166 ------------------ htdocs/admin/menus/index.php | 31 +--- htdocs/bookmarks/bookmarks.lib.php | 2 +- htdocs/includes/boxes/modules_boxes.php | 6 +- .../menus/barre_top/eldy_backoffice.php | 2 +- .../menus/barre_top/eldy_frontoffice.php | 2 +- htdocs/includes/menus/barre_top/empty.php | 2 +- htdocs/includes/menus/barre_top/rodolphe.php | 2 +- htdocs/main.inc.php | 4 +- 10 files changed, 14 insertions(+), 206 deletions(-) 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 ''; - if ($num) - { - print ''; - print ''; - print ''; - print "\n"; - } - $var=true; - - $var = true; - while ($i < $num) - { - $objc = $db->fetch_object($resql); - - $var = !$var; - print ''; - print ''; - print ''; - - $i++; - } - - print ''; - print ''; - print ''; - print "\n"; - - - // Ajout de contraintes personalisees - print ''; - print ''; - print ''; - print ''; - - $var=true; - print ''; - print ' '; - print ' '; - print ''; - print ''; - - - // Ajout de contraintes predefinis - print ''; - print ''; - print ''; - print ''; - - $var=!$var; - print ''; - print ''; - print ''; - print ''; - - print ''; - - print '
'.$langs->trans('ConstraintsToShowOrNotEntry').' ('.$langs->trans("AllMustBeOk").') 
'.$objc->action.''.img_delete().'
'.$langs->trans('ConstraintsToShowOrNotEntry').' 
'; - print ''; - print '
'; - $db->free($resql); - } - */ - } diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index 63865c076e3..9f197f109bd 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -156,34 +156,6 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes') { $db->begin(); - /* - $sql = "SELECT c.rowid, c.fk_constraint"; - $sql.= " FROM ".MAIN_DB_PREFIX."menu_const as c"; - $sql.= " 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"; - $sql.= " WHERE rowid = ".$obj->rowid; - $db->query($sql); // Do not test error since table can does not exists - - $sql = "SELECT count(rowid) as countId"; - $sql.= " FROM ".MAIN_DB_PREFIX."menu_const"; - $sql.= " 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"; $sql.= " WHERE rowid = ".$_GET['menuId']; $resql=$db->query($sql); @@ -205,8 +177,9 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes') /* - * Affichage page + * View */ + $html=new Form($db); $htmladmin=new FormAdmin($db); diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index 7c2d5b81999..02aa3dba228 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -49,7 +49,7 @@ function printBookmarksList ($aDb, $aLangs) $ret = ''; // Menu bookmark $ret.= '
'; - $ret.= '
'; + $ret.= '
'; $ret.= ''.$langs->trans('Bookm').''; $ret.= ''; if ($user->rights->bookmark->creer) diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/includes/boxes/modules_boxes.php index 8d2d3df55b0..a35fa1daaf4 100644 --- a/htdocs/includes/boxes/modules_boxes.php +++ b/htdocs/includes/boxes/modules_boxes.php @@ -117,14 +117,14 @@ class ModeleBoxes if (! empty($head['text']) || ! empty($head['sublink'])) { print '
'."\n"; - print ''."\n"; + print '
'."\n"; print ''; print ' 0) { print ' colspan="'.$nbcol.'"'; } print '>'; if ($conf->use_javascript_ajax) { - print '
'; + print '
'; } if (! empty($head['text'])) { @@ -151,7 +151,7 @@ class ModeleBoxes // Show box lines if ($nblines) { - print ''."\n"; + print '
'."\n"; // Loop on each record for ($i=0, $n=$nblines; $i < $n; $i++) { diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php index 94482c3a4b2..d9735aea88e 100644 --- a/htdocs/includes/menus/barre_top/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php @@ -64,7 +64,7 @@ class MenuTop { $_SESSION["leftmenuopened"]=""; - print '
'; + print '
'; // Home $class=""; diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php index a2e5dcc510f..a4f3dbd8f19 100644 --- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php @@ -64,7 +64,7 @@ class MenuTop { $_SESSION["leftmenuopened"]=""; - print '
'; + print '
'; // Home $class=""; diff --git a/htdocs/includes/menus/barre_top/empty.php b/htdocs/includes/menus/barre_top/empty.php index 382ab0138a6..3edd17eb539 100644 --- a/htdocs/includes/menus/barre_top/empty.php +++ b/htdocs/includes/menus/barre_top/empty.php @@ -51,7 +51,7 @@ class MenuTop { { global $user,$conf,$langs,$dolibarr_main_db_name;; - print '
'; + print '
'; // Menu Home print ''; diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php index 63fcab829dd..407eb7c5771 100644 --- a/htdocs/includes/menus/barre_top/rodolphe.php +++ b/htdocs/includes/menus/barre_top/rodolphe.php @@ -64,7 +64,7 @@ class MenuTop { $_SESSION["leftmenuopened"]=""; - print '
'.$langs->trans("Home").'
'; + print '
'; // Home $class=""; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 071b80eeabd..8937b91e462 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -808,7 +808,7 @@ function top_menu($head, $title='', $target='') { $langs->load("admin"); print '
'."\n"; - print '
'; + print '
'; print ''; @@ -905,7 +905,7 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') $bookmarks=''; // print '
'."\n"; - print '
'; print $langs->trans("UpdateRequired",DOL_URL_ROOT.'/install/index.php'); print '
'; + print '
'; print "\n";