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

Qual: Simplification code declaration boites

Browse Source
This commit is contained in:
Laurent Destailleur 2008-01-08 19:54:54 +00:00
parent 31d6a7662c
commit 1d48f0f231
15 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/admin/boxes.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -56,8 +56,8 @@ if ($_POST["action"] == 'add')
{
$db->begin();
// Si la boite n'est pas deja active
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id, position, fk_user) values (".$_POST["boxid"].",".$_POST["pos"].", 0)";
// Si la boite n'est pas deja active, insert with box_order=''
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id, position, box_order, fk_user) values (".$_POST["boxid"].",".$_POST["pos"].", '', 0)";
dolibarr_syslog("boxes.php activate box sql=".$sql);
$resql = $db->query($sql);
@ -143,10 +143,11 @@ print $langs->trans("BoxesDesc")."<br>\n";
$actives = array();
$sql = "SELECT b.rowid, b.box_id, b.position, b.box_order, d.name, d.rowid as boxid";
$sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
$sql .= " WHERE b.box_id = d.rowid AND fk_user=0";
$sql .= " ORDER by position, box_order";
$sql = "SELECT b.rowid, b.box_id, b.position, b.box_order,";
$sql.= " d.rowid as boxid";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
$sql.= " WHERE b.box_id = d.rowid AND fk_user=0";
$sql.= " ORDER by position, box_order";
$resql = $db->query($sql);
if ($resql)
@ -164,7 +165,8 @@ if ($resql)
array_push($actives,$obj->box_id);
if ($obj->box_order == '' || $obj->box_order == '0' || $decalage) $decalage++;
// On renumérote l'ordre des boites si l'une d'elle est à 0 (Ne doit arriver que sur des anciennes versions)
// On renumérote l'ordre des boites si l'une d'elle est à ''
// This occurs just after an insert.
if ($decalage)
{
$sql="UPDATE ".MAIN_DB_PREFIX."boxes set box_order=".$decalage." WHERE rowid=".$obj->rowid;
@ -174,7 +176,8 @@ if ($resql)
if ($decalage)
{
// Si on a renumerote, on corrige champ box_order (Ne doit arriver que sur des anciennes versions)
// Si on a renumerote, on corrige champ box_order
// This occurs just after an insert.
$sql = "SELECT box_order";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes";
$sql.= " WHERE length(box_order) <= 2";
@ -235,7 +238,7 @@ print '<td>'.$langs->trans("SourceFile").'</td>';
print '<td align="center" width="160">'.$langs->trans("ActivateOn").'</td>';
print "</tr>\n";
$sql = "SELECT rowid, name, file, note";
$sql = "SELECT rowid, file, note, tms";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes_def";
$resql = $db->query($sql);
$var=True;
@ -310,11 +313,11 @@ print '<td align="center" width="80">'.$langs->trans("Disable").'</td>';
print "</tr>\n";
$sql = "SELECT b.rowid, b.box_id, b.position,";
$sql.= " d.name, d.file, d.note";
$sql.= " d.file, d.note, d.tms";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
$sql.= " WHERE b.box_id = d.rowid";
$sql.= " AND b.fk_user=0";
$sql.= " ORDER by position, box_order";
$sql.= " ORDER by position, box_order"; // Note box_order return A01,A03...,B02,B04...
$resql = $db->query($sql);

11
htdocs/includes/modules/DolibarrModules.class.php
View File

@ -396,7 +396,7 @@ class DolibarrModules
{
foreach ($this->boxes as $key => $value)
{
$titre = $this->boxes[$key][0];
//$titre = $this->boxes[$key][0];
$file = $this->boxes[$key][1];
$note = $this->boxes[$key][2];
@ -410,10 +410,11 @@ class DolibarrModules
$row = $this->db->fetch_row($result);
if ($row[0] == 0)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (name, file, note)";
$sql.= " VALUES ('".$titre."','".$file."',";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file,note)";
$sql.= " VALUES ('".addslashes($file)."',";
$sql.= $note?"'".addslashes($note)."'":"null";
$sql.= ")";
//print $sql;
if (! $this->db->query($sql))
{
$err++;
@ -480,12 +481,12 @@ class DolibarrModules
$sql = "DELETE ".MAIN_DB_PREFIX."boxes";
$sql.= " FROM ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
$sql.= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
$sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$file."'";
$sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".addslashes($file)."'";
dolibarr_syslog("DolibarrModules::delete_boxes sql=".$sql);
$this->db->query($sql);
$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
$sql.= " WHERE file = '".$file."'";
$sql.= " WHERE file = '".addslashes($file)."'";
dolibarr_syslog("DolibarrModules::delete_boxes sql=".$sql);
if (! $this->db->query($sql))
{

2
htdocs/includes/modules/modBanque.class.php
View File

@ -75,8 +75,6 @@ class modBanque extends DolibarrModules
// Boites
$this->boxes = array();
$this->boxes[0][0] = "Soldes Comptes Bancaires";
$this->boxes[0][1] = "box_comptes.php";
// Permissions

1
htdocs/includes/modules/modBookmark.class.php
View File

@ -76,7 +76,6 @@ class modBookmark extends DolibarrModules
// Boites
$this->boxes = array();
$this->boxes[0][0] = "Mes derniers marque-pages";
$this->boxes[0][1] = "box_bookmarks.php";
// Permissions

1
htdocs/includes/modules/modCommande.class.php
View File

@ -89,7 +89,6 @@ class modCommande extends DolibarrModules
// Boites
$this->boxes = array();
$this->boxes[0][0] = "Commandes";
$this->boxes[0][1] = "box_commandes.php";
// Permissions

11
htdocs/includes/modules/modEnergie.class.php
View File

@ -76,12 +76,11 @@ class modEnergie extends DolibarrModules
// Boxes
$this->boxes = array();
$this->boxes[0][0] = '<a href="energie">Energie</a>';
$this->boxes[0][1] = "box_energie_releve.php";
$this->boxes[1][0] = '<a href="energie">Energie Graph</a>';
$this->boxes[1][1] = "box_energie_graph.php";
$r=0;
$this->boxes[$r][1] = "box_energie_releve.php";
$r++;
$this->boxes[$r][1] = "box_energie_graph.php";
$r++;
// Permissions
$this->rights = array();

2
htdocs/includes/modules/modExpedition.class.php
View File

@ -71,7 +71,7 @@ class modExpedition extends DolibarrModules
// Constantes
$this->const = array();
$this->const[0][0] = "LIVRAISON_ADDON_PDF";
$this->const[0][0] = "LIVRAISON_ADDON_PDF";
$this->const[0][1] = "chaine";
$this->const[0][2] = "typhon";
$this->const[0][3] = 'Nom du gestionnaire de génération des commandes en PDF';

4
htdocs/includes/modules/modFacture.class.php
View File

@ -97,12 +97,8 @@ class modFacture extends DolibarrModules
// Boites
$this->boxes = array();
$r=0;
$this->boxes[$r][0] = "Factures clients récentes impayées";
$this->boxes[$r][1] = "box_factures_imp.php";
$r++;
$this->boxes[$r][0] = "Dernières factures clients saisies";
$this->boxes[$r][1] = "box_factures.php";
$r++;

3
htdocs/includes/modules/modFournisseur.class.php
View File

@ -87,15 +87,12 @@ class modFournisseur extends DolibarrModules
$this->boxes = array();
$r=0;
$this->boxes[$r][0] = "Derniers founisseurs";
$this->boxes[$r][1] = "box_fournisseurs.php";
$r++;
$this->boxes[$r][0] = "Factures fournisseurs récentes impayées";
$this->boxes[$r][1] = "box_factures_fourn_imp.php";
$r++;
$this->boxes[$r][0] = "Dernières factures fournisseurs saisies";
$this->boxes[$r][1] = "box_factures_fourn.php";
$r++;

1
htdocs/includes/modules/modProduit.class.php
View File

@ -90,7 +90,6 @@ class modProduit extends DolibarrModules
// Boxes
$this->boxes = array();
$this->boxes[0][0] = "Derniers produits/services enregistrés";
$this->boxes[0][1] = "box_produits.php";
// Permissions

1
htdocs/includes/modules/modPropale.class.php
View File

@ -86,7 +86,6 @@ class modPropale extends DolibarrModules
// Boxes
$this->boxes = array();
$this->boxes[0][0] = "Proposition commerciales";
$this->boxes[0][1] = "box_propales.php";
// Permissions

1
htdocs/includes/modules/modService.class.php
View File

@ -72,7 +72,6 @@ class modService extends DolibarrModules
// Boites
$this->boxes = array();
$this->boxes[0][0] = "Derniers services contractés";
$this->boxes[0][1] = "box_services_vendus.php";
// Permissions

8
htdocs/includes/modules/modWebcalendar.class.php
View File

@ -88,11 +88,11 @@ class modWebcalendar extends DolibarrModules
$this->boxes = array(); // List of boxes
$r=0;
// Add here list of default box name and php file stored in includes/boxes that
// contains class to show a box.
// Add here list of php file(s) stored in includes/boxes that contains class to show a box.
// Example:
//$this->boxes[$r][0] = "My box";
//$this->boxes[$r][1] = "mybox.php";
//$this->boxes[$r][1] = "myboxa.php";
//$r++;
//$this->boxes[$r][1] = "myboxb.php";
//$r++;
// Permissions

6
mysql/migration/2.2.0-2.4.0.sql
View File

@ -20,4 +20,8 @@ update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_TIME' and
alter table llx_document_model modify type varchar(20) NOT NULL;
DELETE FROM llx_rights_def WHERE module = 'menudb';
DELETE FROM llx_rights_def WHERE module = 'menudb';
ALTER table llx_boxes_def drop column name;
ALTER table llx_boxes_def add column tms timestamp;

2
mysql/tables/llx_boxes_def.sql
View File

@ -21,7 +21,7 @@
create table llx_boxes_def
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
name varchar(255) NOT NULL,
file varchar(255) NOT NULL,
tms timestamp,
note text
)type=innodb;