lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Perf: Reduce quantity of code for boxes.

Browse Source
This commit is contained in:
Laurent Destailleur 2012-03-17 14:04:16 +01:00
parent 88a1a0f06d
commit 1d51ee3aab
3 changed files with 392 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
htdocs/admin/boxes.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -25,6 +25,7 @@
require("../main.inc.php"); require("../main.inc.php");
include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php");
include_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); include_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/boxes.php");
$langs->load("admin"); $langs->load("admin");
@ -82,7 +83,7 @@ if ($action == 'add')
dol_syslog("boxes.php activate box sql=".$sql); dol_syslog("boxes.php activate box sql=".$sql);
$resql = $db->query($sql); $resql = $db->query($sql);
// Remove all personalized setup when a box is activated or disabled // Remove all personalized setup when a box is activated or disabled (to be sure user see new box)
$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
$sql.= " WHERE param LIKE 'MAIN_BOXES_%'"; $sql.= " WHERE param LIKE 'MAIN_BOXES_%'";
dol_syslog("boxes.php delete user_param sql=".$sql); dol_syslog("boxes.php delete user_param sql=".$sql);
@ -102,19 +103,27 @@ if ($action == 'add')
if ($action == 'delete') if ($action == 'delete')
{ {
$db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes"; $sql = "SELECT box_id FROM ".MAIN_DB_PREFIX."boxes";
$sql.= " WHERE rowid=".$rowid; $sql.= " WHERE rowid=".$rowid;
$resql = $db->query($sql); $resql = $db->query($sql);
$obj=$db->fetch_object($resql);
if (! empty($obj->box_id))
{
$db->begin();
// Remove all personalized setup when a box is activated or disabled // Remove all personalized setup when a box is activated or disabled (why removing all ? We removed only removed boxes)
$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param"; // $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
$sql.= " WHERE param LIKE 'MAIN_BOXES_%'"; // $sql.= " WHERE param LIKE 'MAIN_BOXES_%'";
// $resql = $db->query($sql);
$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
$sql.= " WHERE box_id=".$obj->box_id;
$resql = $db->query($sql); $resql = $db->query($sql);
$db->commit(); $db->commit();
} }
}
if ($action == 'switch') if ($action == 'switch')
{ {
@ -154,12 +163,17 @@ if ($action == 'switch')
* View * View
*/ */
$form=new Form($db);
$emptyuser=new User($db);
$infobox=new InfoBox($db);
llxHeader('',$langs->trans("Boxes")); llxHeader('',$langs->trans("Boxes"));
print_fiche_titre($langs->trans("Boxes"),'','setup'); print_fiche_titre($langs->trans("Boxes"),'','setup');
print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n"; print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
/* /*
* Recherche des boites actives par defaut pour chaque position possible * Recherche des boites actives par defaut pour chaque position possible
* On stocke les boites actives par defaut dans $boxes[position][id_boite]=1 * On stocke les boites actives par defaut dans $boxes[position][id_boite]=1
@ -207,8 +221,9 @@ if ($resql)
$sql = "SELECT box_order"; $sql = "SELECT box_order";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes"; $sql.= " FROM ".MAIN_DB_PREFIX."boxes";
$sql.= " WHERE length(box_order) <= 2"; $sql.= " WHERE length(box_order) <= 2";
$result = $db->query($sql);
dol_syslog("Execute requests to renumber box order sql=".$sql);
$result = $db->query($sql);
if ($result) if ($result)
{ {
while ($record = $db->fetch_array($result)) while ($record = $db->fetch_array($result))
@ -251,6 +266,7 @@ if ($resql)
// Available boxes // Available boxes
$boxtoadd=$infobox->listboxes('available',-1,$emptyuser,$actives);
print "<br>\n"; print "<br>\n";
print_titre($langs->trans("BoxesAvailable")); print_titre($langs->trans("BoxesAvailable"));
@ -262,59 +278,8 @@ print '<td>'.$langs->trans("Note").'/'.$langs->trans("Parameters").'</td>';
print '<td>'.$langs->trans("SourceFile").'</td>'; print '<td>'.$langs->trans("SourceFile").'</td>';
print '<td width="160">'.$langs->trans("ActivateOn").'</td>'; print '<td width="160">'.$langs->trans("ActivateOn").'</td>';
print "</tr>\n"; print "</tr>\n";
$sql = "SELECT rowid, file, note, tms";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes_def";
$sql.= " WHERE entity = ".$conf->entity;
$resql = $db->query($sql);
$var=true; $var=true;
foreach($boxtoadd as $box)
if ($resql)
{
$form=new Form($db);
$num = $db->num_rows($resql);
$i = 0;
// Boucle sur toutes les boites
while ($i < $num)
{
$obj = $db->fetch_object($resql);
if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs))
{
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = "/".$module."/core/boxes/".$boxname.".php";
}
else
{
$boxname=preg_replace('/.php$/i','',$obj->file);
$sourcefile = "/core/boxes/".$boxname.".php";
}
dol_include_once($sourcefile);
if (class_exists($boxname))
{
$box=new $boxname($db,$obj->note);
$enabled=true;
if ($box->depends && count($box->depends) > 0)
{
foreach($box->depends as $module)
{
if (empty($conf->$module->enabled)) $enabled=false;
}
}
if ($enabled)
{
//if (in_array($obj->rowid, $actives) && $box->box_multiple <> 1)
if (in_array($obj->rowid, $actives))
{
// La boite est deja activee
}
else
{ {
$var=!$var; $var=!$var;
@ -332,33 +297,26 @@ if ($resql)
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td>'.img_object("",$logo).' '.$box->boxlabel.'</td>'; print '<td>'.img_object("",$logo).' '.$box->boxlabel.'</td>';
print '<td>' . ($obj->note?$obj->note:'&nbsp;') . '</td>'; print '<td>' . ($box->note?$box->note:'&nbsp;') . '</td>';
print '<td>' . $sourcefile . '</td>'; print '<td>' . $box->sourcefile . '</td>';
// Pour chaque position possible, on affiche un lien // Pour chaque position possible, on affiche un lien d'activation si boite non deja active pour cette position
// d'activation si boite non deja active pour cette position
print '<td>'; print '<td>';
print $form->selectarray("pos",$pos_name); print $form->selectarray("pos",$pos_name);
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="boxid" value="'.$obj->rowid.'">'; print '<input type="hidden" name="boxid" value="'.$box->box_id.'">';
print ' <input type="submit" class="button" name="button" value="'.$langs->trans("Activate").'">'; print ' <input type="submit" class="button" name="button" value="'.$langs->trans("Activate").'">';
print '</td>'; print '</td>';
print '</tr></form>'; print '</tr>';
} print '</form>';
}
}
$i++;
}
$db->free($resql);
} }
print '</table>'; print '</table>';
// Activated boxes // Activated boxes
$boxactivated=$infobox->listboxes('activated',-1,$emptyuser);
print "<br>\n\n"; print "<br>\n\n";
print_titre($langs->trans("BoxesActivated")); print_titre($langs->trans("BoxesActivated"));
@ -372,49 +330,12 @@ print '<td align="center" width="60" colspan="2">'.$langs->trans("PositionByDefa
print '<td align="center" width="80">'.$langs->trans("Disable").'</td>'; print '<td align="center" width="80">'.$langs->trans("Disable").'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
$sql = "SELECT b.rowid, b.box_id, b.position,";
$sql.= " bd.file, bd.note, bd.tms";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as bd";
$sql.= " WHERE b.box_id = bd.rowid";
$sql.= " AND bd.entity = ".$conf->entity;
$sql.= " AND b.fk_user=0";
$sql.= " ORDER by b.position, b.box_order"; // Note box_order return A01,A03...,B02,B04...
$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
$var=true; $var=true;
$box_order=1; $box_order=1;
$foundrupture=1; $foundrupture=1;
foreach($boxactivated as $key => $box)
// On lit avec un coup d'avance
$obj = $db->fetch_object($resql);
while ($obj && $i < $num)
{ {
$var = ! $var; $var = ! $var;
$objnext = $db->fetch_object($resql);
if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs))
{
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = "/".$module."/core/boxes/".$boxname.".php";
}
else
{
$boxname=preg_replace('/.php$/i','',$obj->file);
$sourcefile = "/core/boxes/".$boxname.".php";
}
dol_include_once($sourcefile);
if (class_exists($boxname))
{
$box=new $boxname($db,$obj->note);
if (preg_match('/^([^@]+)@([^@]+)$/i',$box->boximg)) if (preg_match('/^([^@]+)@([^@]+)$/i',$box->boximg))
{ {
@ -428,34 +349,21 @@ if ($resql)
print "\n".'<!-- Box '.$box->boxcode.' -->'."\n"; print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td>'.img_object("",$logo).' '.$box->boxlabel.'</td>'; print '<td>'.img_object("",$logo).' '.$box->boxlabel.'</td>';
print '<td>' . ($obj->note?$obj->note:'&nbsp;') . '</td>'; print '<td>' . ($box->note?$box->note:'&nbsp;') . '</td>';
print '<td align="center">' . $pos_name[$obj->position] . '</td>'; print '<td align="center">' . $pos_name[$box->position] . '</td>';
$hasnext=true; $hasnext=($key < (count($boxactivated)-1));
$hasprevious=true; $hasprevious=($key != 0);
if ($foundrupture) { $hasprevious=false; $foundrupture=0; } print '<td align="center">'.($key+1).'</td>';
if (! $objnext || $obj->position != $objnext->position) { $hasnext=false; $foundrupture=1; }
print '<td align="center">'.$box_order.'</td>';
print '<td align="center">'; print '<td align="center">';
print ($hasnext?'<a href="boxes.php?action=switch&switchfrom='.$obj->rowid.'&switchto='.$objnext->rowid.'">'.img_down().'</a>&nbsp;':''); print ($hasnext?'<a href="boxes.php?action=switch&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key+1]->rowid.'">'.img_down().'</a>&nbsp;':'');
print ($hasprevious?'<a href="boxes.php?action=switch&switchfrom='.$obj->rowid.'&switchto='.$objprevious->rowid.'">'.img_up().'</a>':''); print ($hasprevious?'<a href="boxes.php?action=switch&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key-1]->rowid.'">'.img_up().'</a>':'');
print '</td>'; print '</td>';
print '<td align="center">'; print '<td align="center">';
print '<a href="boxes.php?rowid='.$obj->rowid.'&amp;action=delete">'.img_delete().'</a>'; print '<a href="boxes.php?rowid='.$box->rowid.'&amp;action=delete">'.img_delete().'</a>';
print '</td>'; print '</td>';
print '</tr>'."\n"; print '</tr>'."\n";
} }
$i++;
$box_order++;
if (! $foundrupture) $objprevious = $obj;
else $box_order=1;
$obj=$objnext;
}
$db->free($resql);
}
print '</table><br>'; print '</table><br>';
@ -490,7 +398,7 @@ print '</form>';
print '</table>'; print '</table>';
$db->close();
llxFooter(); llxFooter();
$db->close();
?> ?>

160
htdocs/boxes.php
View File

@ -38,11 +38,38 @@ function printBoxesArea($user,$areacode)
global $conf,$langs,$db; global $conf,$langs,$db;
$infobox=new InfoBox($db); $infobox=new InfoBox($db);
$boxarray=$infobox->listboxes($areacode,$user); $boxarray=$infobox->listboxes('activated',$areacode,$user);
$selectboxlist='';
/*
if ($conf->use_javascript_ajax)
{
$sql = "SELECT rowid, file, note, tms";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes_def";
$sql.= " WHERE entity = ".$conf->entity;
$resql = $db->query($sql);
$var=true;
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
// Boucle sur toutes les boites
while ($i < $num)
{
$obj = $db->fetch_object($resql);
}
}
}*/
if (count($boxarray)) if (count($boxarray))
{ {
print load_fiche_titre($langs->trans("OtherInformationsBoxes"),'','','','otherboxes'); print load_fiche_titre($langs->trans("OtherInformationsBoxes"),$selectboxlist,'','','otherboxes');
print '<table width="100%" class="notopnoleftnoright">'; print '<table width="100%" class="notopnoleftnoright">';
print '<tr><td class="notopnoleftnoright">'."\n"; print '<tr><td class="notopnoleftnoright">'."\n";
@ -169,104 +196,50 @@ class InfoBox
/** /**
* Return array of boxes qualified for area and user * Return array of boxes qualified for area and user
* *
* @param string $zone Name or area (0 for Homepage, ...) * @param string $mode 'available' or 'activated'
* @param User $user Objet user * @param string $zone Name or area (-1 for all, 0 for Homepage, 1 for xxx, ...)
* @param User $user Objet user to filter (used only if $zone >= 0)
* @param array $excludelist Array of box.box_id = boxes_def.rowid to exclude
* @return array Array of boxes * @return array Array of boxes
*/ */
function listBoxes($zone,$user) function listBoxes($mode,$zone,$user,$excludelist=array())
{ {
global $conf; global $conf;
$boxes=array(); $boxes=array();
$confuserzone='MAIN_BOXES_'.$zone; $confuserzone='MAIN_BOXES_'.$zone;
if ($user->id && $user->conf->$confuserzone) if ($mode == 'activated')
{ {
// Get list of boxes of a particular user (if this one has its own list) $sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
$sql = "SELECT b.rowid, b.box_id, b.position, b.box_order, b.fk_user,"; $sql.= " d.rowid as box_id, d.file, d.note, d.tms";
$sql.= " d.file, d.note";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d"; $sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
$sql.= " WHERE b.box_id = d.rowid"; $sql.= " WHERE b.box_id = d.rowid";
$sql.= " AND d.entity = ".$conf->entity; $sql.= " AND d.entity = ".$conf->entity;
$sql.= " AND b.position = ".$zone; if ($zone >= 0) $sql.= " AND b.position = ".$zone;
$sql.= " AND b.fk_user = ".$user->id; if ($user->id && $user->conf->$confuserzone) $sql.= " AND b.fk_user = ".$user->id;
else $sql.= " AND b.fk_user = 0";
$sql.= " ORDER BY b.box_order"; $sql.= " ORDER BY b.box_order";
}
dol_syslog("InfoBox::listBoxes get user box list sql=".$sql, LOG_DEBUG); else
$result = $this->db->query($sql);
if ($result)
{ {
$num = $this->db->num_rows($result); $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
$sql.= " WHERE entity = ".$conf->entity;
}
dol_syslog(get_class($this)."::listBoxes get default box list sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
$j = 0; $j = 0;
while ($j < $num) while ($j < $num)
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($resql);
if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs)) if (! in_array($obj->box_id, $excludelist))
{ {
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = dol_buildpath("/".$module."/core/boxes/".$boxname.".php");
}
else
{
$boxname=preg_replace('/\.php$/i','',$obj->file);
$sourcefile = "/core/boxes/".$boxname.".php";
}
dol_include_once($sourcefile); // Do not use dol_include_once here because sourcefile is already good fullpath
if (class_exists($boxname))
{
$box=new $boxname($this->db,$obj->note);
$box->rowid=$obj->rowid;
$box->box_id=$obj->box_id;
$box->position=$obj->position;
$box->box_order=$obj->box_order;
$box->fk_user=$obj->fk_user;
$enabled=true;
if ($box->depends && count($box->depends) > 0)
{
foreach($box->depends as $module)
{
//print $module.'<br>';
if (empty($conf->$module->enabled)) $enabled=false;
}
}
if ($enabled) $boxes[]=$box;
}
$j++;
}
}
else
{
$this->error=$this->db->error();
dol_syslog("InfoBox::listBoxes Error ".$this->error, LOG_ERR);
return array();
}
}
else
{
// Recupere liste des boites active par defaut pour tous
$sql = "SELECT b.rowid, b.box_id, b.position, b.box_order, b.fk_user,";
$sql.= " d.file, d.note";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
$sql.= " WHERE b.box_id = d.rowid";
$sql.= " AND d.entity = ".$conf->entity;
$sql.= " AND b.position = ".$zone;
$sql.= " AND b.fk_user = 0";
$sql.= " ORDER BY b.box_order";
dol_syslog("InfoBox::listBoxes get default box list sql=".$sql, LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
$num = $this->db->num_rows($result);
$j = 0;
while ($j < $num)
{
$obj = $this->db->fetch_object($result);
if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs)) if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs))
{ {
$boxname = $regs[1]; $boxname = $regs[1];
@ -284,16 +257,24 @@ class InfoBox
{ {
$box=new $boxname($this->db,$obj->note); $box=new $boxname($this->db,$obj->note);
// box properties
$box->rowid=$obj->rowid; $box->rowid=$obj->rowid;
$box->box_id=$obj->box_id;
$box->position=$obj->position; $box->position=$obj->position;
$box->box_order=$obj->box_order; $box->box_order=$obj->box_order;
$box->fk_user=$obj->fk_user;
$box->sourcefile=$relsourcefile;
if ($mode == 'activated' && (! $user->id || ! $user->conf->$confuserzone))
{
if (is_numeric($box->box_order)) if (is_numeric($box->box_order))
{ {
if ($box->box_order % 2 == 1) $box->box_order='A'.$box->box_order; if ($box->box_order % 2 == 1) $box->box_order='A'.$box->box_order;
elseif ($box->box_order % 2 == 0) $box->box_order='B'.$box->box_order; elseif ($box->box_order % 2 == 0) $box->box_order='B'.$box->box_order;
} }
$box->fk_user=$obj->fk_user; }
// box_def properties
$box->box_id=$obj->box_id;
$box->note=$obj->note;
$enabled=true; $enabled=true;
if ($box->depends && count($box->depends) > 0) if ($box->depends && count($box->depends) > 0)
{ {
@ -305,16 +286,17 @@ class InfoBox
} }
if ($enabled) $boxes[]=$box; if ($enabled) $boxes[]=$box;
} }
}
$j++; $j++;
} }
} }
else else
{ {
//dol_print_error($this->db);
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog("InfoBox::listBoxes Error ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::listBoxes Error ".$this->error, LOG_ERR);
return array(); return array();
} }
}
return $boxes; return $boxes;
} }
@ -337,7 +319,7 @@ class InfoBox
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
dol_syslog("InfoBoxes::saveboxorder zone=".$zone." user=".$userid); dol_syslog(get_class($this)."::saveboxorder zone=".$zone." user=".$userid);
if (! $userid || $userid == 0) return 0; if (! $userid || $userid == 0) return 0;
@ -363,7 +345,7 @@ class InfoBox
$sql.= " AND ".MAIN_DB_PREFIX."boxes.fk_user = ".$userid; $sql.= " AND ".MAIN_DB_PREFIX."boxes.fk_user = ".$userid;
$sql.= " AND ".MAIN_DB_PREFIX."boxes.position = ".$zone; $sql.= " AND ".MAIN_DB_PREFIX."boxes.position = ".$zone;
dol_syslog("InfoBox::saveboxorder sql=".$sql); dol_syslog(get_class($this)."::saveboxorder sql=".$sql);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
@ -393,7 +375,7 @@ class InfoBox
$sql.= " ".$userid; $sql.= " ".$userid;
$sql.= ")"; $sql.= ")";
dol_syslog("InfoBox::saveboxorder sql=".$sql); dol_syslog(get_class($this)."::saveboxorder sql=".$sql);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result < 0) if ($result < 0)
{ {
@ -419,7 +401,7 @@ class InfoBox
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
$this->db->rollback(); $this->db->rollback();
dol_syslog("InfoBox::saveboxorder ".$this->error); dol_syslog(get_class($this)."::saveboxorder ".$this->error);
return -1; return -1;
} }
} }