diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index fff4bab9491..8b2a12a7217 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -24,8 +24,8 @@
require("../main.inc.php");
include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/infobox.class.php");
include_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/boxes.php");
$langs->load("admin");
@@ -198,7 +198,7 @@ if ($action == 'switch')
$form=new Form($db);
$emptyuser=new User($db);
-$infobox=new InfoBox($db);
+//$infobox=new InfoBox($db);
llxHeader('',$langs->trans("Boxes"));
@@ -301,7 +301,7 @@ if ($resql)
// Available boxes
-$boxtoadd=$infobox->listboxes('available',-1,$emptyuser,$actives);
+$boxtoadd=InfoBox::listboxes($db,'available',-1,$emptyuser,$actives);
print "
\n";
print_titre($langs->trans("BoxesAvailable"));
@@ -351,7 +351,7 @@ print '';
// Activated boxes
-$boxactivated=$infobox->listboxes('activated',-1,$emptyuser);
+$boxactivated=InfoBox::listboxes($db,'activated',-1,$emptyuser);
print "
\n\n";
print_titre($langs->trans("BoxesActivated"));
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index e4c5a86c338..1c8eaf513f0 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -29,7 +29,7 @@ if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
require('../../main.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/boxes.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/infobox.class.php");
$boxid=GETPOST('boxid','int');
$boxorder=GETPOST('boxorder');
@@ -63,8 +63,8 @@ if ($boxorder && $zone != '' && $userid > 0)
// boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
- $infobox=new InfoBox($db);
- $result=$infobox->saveboxorder($zone,$boxorder,$userid);
+ //$infobox=new InfoBox($db);
+ $result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
}
?>
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 5d53a352b68..e2d7ed35ea8 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -734,7 +734,7 @@ class FormOther
{
global $langs,$conf;
global $form;
-
+
if ($htmlname != "none")
{
print '