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

Minor code clean in ECM module.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-03-08 23:57:28 +00:00
parent 9f6dff142b
commit e15a67f6c9
7 changed files with 198 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
htdocs/ecm/index.php
View File

@ -223,10 +223,8 @@ if ($_GET['action'] == 'delete')
if ($mesg) { print $mesg."<br>"; } if ($mesg) { print $mesg."<br>"; }
// Tool bar // Tool bar
$selected='file_manager';
if (eregi('search',$action)) $selected='search_form';
$head = ecm_prepare_head_fm($fac); $head = ecm_prepare_head_fm($fac);
dol_fiche_head($head, $selected, '', 1); dol_fiche_head($head, 'file_manager', '', 1);
print '<table class="border" width="100%"><tr><td width="40%" valign="top">'; print '<table class="border" width="100%"><tr><td width="40%" valign="top">';
@ -234,54 +232,6 @@ print '<table class="border" width="100%"><tr><td width="40%" valign="top">';
// Left area // Left area
print '<table class="nobordernopadding" width="100%"><tr><td valign="top">'; print '<table class="nobordernopadding" width="100%"><tr><td valign="top">';
if (eregi('search',$action))
{
//print_fiche_titre($langs->trans("ECMSectionsManual"));
print '<form method="post" action="'.DOL_URL_ROOT.'/ecm/search.php">';
print '<table class="nobordernopadding" width="100%">';
print "<tr class=\"liste_titre\">";
print '<td colspan="2">'.$langs->trans("ECMSearchByKeywords").'</td></tr>';
print "<tr ".$bc[false]."><td>".$langs->trans("Ref").':</td><td align="right"><input type="text" name="search_ref" class="flat" size="14"></td></tr>';
print "<tr ".$bc[false]."><td>".$langs->trans("Title").':</td><td align="right"><input type="text" name="search_title" class="flat" size="14"></td></tr>';
print "<tr ".$bc[false]."><td>".$langs->trans("Keyword").':</td><td align="right"><input type="text" name="search_keyword" class="flat" size="14"></td></tr>';
print "<tr ".$bc[false].'><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
print "</table></form>";
//print $langs->trans("ECMSectionManualDesc");
//print_fiche_titre($langs->trans("ECMSectionAuto"));
print '<form method="post" action="'.DOL_URL_ROOT.'/ecm/search.php">';
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">";
print '<td colspan="4">'.$langs->trans("ECMSearchByEntity").'</td></tr>';
$buthtml='<td rowspan="'.$rowspan.'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
$butshown=0;
foreach($sectionauto as $sectioncur)
{
if (! $sectioncur['test']) continue;
//if ($butshown % 2 == 0)
print '<tr '. $bc[false].'>';
print "<td>".$sectioncur['label'].':</td>';
print '<td';
//if ($butshown % 2 == 1)
print ' align="right"';
print '>';
print '<input type="text" name="search_'.$sectioncur['module'].'" class="flat" size="14">';
print '</td>';
//if ($butshown % 2 == 1)
print '</tr>';
$butshown++;
}
//if ($butshown % 2 == 1)
// print '<td>&nbsp;</td><td>&nbsp;</td></tr>';
print '<tr '. $bc[false].'><td colspan="4" align="center"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
print "</table></form>";
//print $langs->trans("ECMSectionAutoDesc");
}
if (empty($action) || $action == 'file_manager' || eregi('refresh',$action) || $action == 'delete') if (empty($action) || $action == 'file_manager' || eregi('refresh',$action) || $action == 'delete')
{ {

12
htdocs/ecm/pre.inc.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2008 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2008-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -17,10 +17,10 @@
*/ */
/** /**
\file htdocs/ecm/pre.inc.php * \file htdocs/ecm/pre.inc.php
\ingroup ecm * \ingroup ecm
\brief File to manage left menu for ecm module * \brief File to manage left menu for ecm module
\version $Id$ * \version $Id$
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
@ -42,7 +42,7 @@ function llxHeader($head = "", $title="", $help_url='', $morehtml='')
$menu->add_submenu(DOL_URL_ROOT."/ecm/index.php?mainmenu=ecm&idmenu=".$_SESSION["idmenu"], $langs->trans("List"),1,$user->rights->ecm->download); $menu->add_submenu(DOL_URL_ROOT."/ecm/index.php?mainmenu=ecm&idmenu=".$_SESSION["idmenu"], $langs->trans("List"),1,$user->rights->ecm->download);
//$menu->add_submenu(DOL_URL_ROOT."/ecm/index?mainmenu=ecm&action=create&idmenu=".$_SESSION["idmenu"], $langs->trans("ECMNewDocument"),1,$user->rights->ecm->upload); //$menu->add_submenu(DOL_URL_ROOT."/ecm/index?mainmenu=ecm&action=create&idmenu=".$_SESSION["idmenu"], $langs->trans("ECMNewDocument"),1,$user->rights->ecm->upload);
$menu->add_submenu(DOL_URL_ROOT."/ecm/docdir.php?mainmenu=ecm&action=create&idmenu=".$_SESSION["idmenu"], $langs->trans("ECMNewSection"),1,$user->rights->ecm->setup); $menu->add_submenu(DOL_URL_ROOT."/ecm/search.php?mainmenu=ecm&idmenu=".$_SESSION["idmenu"], $langs->trans("Search"),1,$user->rights->ecm->download);
/* if ($conf->societe->enabled) $menu->add_submenu(DOL_URL_ROOT."/ecm/docother.php?mainmenu=ecm&idmenu=".$_SESSION["idmenu"], $langs->trans("DocsThirdParties"),2); /* if ($conf->societe->enabled) $menu->add_submenu(DOL_URL_ROOT."/ecm/docother.php?mainmenu=ecm&idmenu=".$_SESSION["idmenu"], $langs->trans("DocsThirdParties"),2);
if ($conf->contrat->enabled) $menu->add_submenu(DOL_URL_ROOT."/ecm/docother.php?mainmenu=ecm&idmenu=".$_SESSION["idmenu"], $langs->trans("DocsContracts"),2); if ($conf->contrat->enabled) $menu->add_submenu(DOL_URL_ROOT."/ecm/docother.php?mainmenu=ecm&idmenu=".$_SESSION["idmenu"], $langs->trans("DocsContracts"),2);

171
htdocs/ecm/search.php
View File

@ -1,40 +1,76 @@
<?php <?php
/* Copyright (C) 2008 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2008-2009 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/ecm/search.php * \file htdocs/ecm/index.php
* \ingroup ecm * \ingroup ecm
* \brief Page for search results * \brief Main page for ECM section area
* \version $Id$ * \version $Id$
* \author Laurent Destailleur * \author Laurent Destailleur
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/ecmdirectory.class.php");
// Load traductions files // Load traductions files
$langs->load("ecm"); $langs->load("ecm");
$langs->load("companies"); $langs->load("companies");
$langs->load("other"); $langs->load("other");
$langs->load("users");
$langs->load("orders");
$langs->load("propal");
$langs->load("bills");
$langs->load("contracts");
// Load permissions // Load permissions
$user->getrights('ecm'); $user->getrights('ecm');
// Get parameters // Get parameters
$socid = isset($_GET["socid"])?$_GET["socid"]:''; $socid = isset($_GET["socid"])?$_GET["socid"]:'';
$action = isset($_GET["action"])?$_GET["action"]:$_POST['action'];
$section=isset($_GET["section"])?$_GET["section"]:$_POST['section'];
if (! $section) $section=0;
// Permissions
if ($user->societe_id > 0)
{
$action = '';
$socid = $user->societe_id;
}
$section=$_GET["section"];
if (! $section) $section='misc';
$upload_dir = $conf->ecm->dir_output.'/'.$section; $upload_dir = $conf->ecm->dir_output.'/'.$section;
$page=$_GET["page"];
$sortorder=$_GET["sortorder"];
$sortfield=$_GET["sortfield"];
$limit = $conf->liste_limit;
$offset = $limit * $page ;
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="label";
$ecmdir = new ECMDirectory($db);
if (! empty($_REQUEST["section"]))
{
$result=$ecmdir->fetch($_REQUEST["section"]);
if (! $result > 0)
{
dol_print_error($db,$ecmdir->error);
exit;
}
}
/******************************************************************* /*******************************************************************
@ -56,20 +92,119 @@ $upload_dir = $conf->ecm->dir_output.'/'.$section;
llxHeader(); llxHeader();
$form=new Form($db); $form=new Form($db);
$ecmdirstatic = new ECMDirectory($db);
print_fiche_titre($langs->trans("Search")); $userstatic = new User($db);
//$head = societe_prepare_head($societe);
//dol_fiche_head($head, 'document', $societe->nom); // Ajout rubriques automatiques
$rowspan=0;
$sectionauto=array();
if ($conf->produit->enabled) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'product', 'test'=>$conf->produit->enabled, 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
if ($conf->societe->enabled) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsByThirdParties")); }
if ($conf->propal->enabled) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Prop"), 'desc'=>$langs->trans("ECMDocsByProposals")); }
if ($conf->contrat->enabled) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'contract','test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsByContracts")); }
if ($conf->commande->enabled) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled,'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
if ($conf->fournisseur->enabled) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'supplier_order', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
if ($conf->facture->enabled) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
if ($conf->fournisseur->enabled) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'supplier_invoice', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
//***********************
// List
//***********************
print_fiche_titre($langs->trans("ECMArea"));
print $langs->trans("ECMAreaDesc")."<br>";
print $langs->trans("ECMAreaDesc2")."<br>";
print "<br>\n";
if ($mesg) { print $mesg."<br>"; } if ($mesg) { print $mesg."<br>"; }
// Tool bar
$head = ecm_prepare_head_fm($fac);
dol_fiche_head($head, 'search_form', '', 1);
print $langs->trans("FeatureNotYetAvailable");
print '<table class="border" width="100%"><tr><td width="40%" valign="top">';
// Left area
print '<table class="nobordernopadding" width="100%"><tr><td valign="top">';
//print_fiche_titre($langs->trans("ECMSectionsManual"));
print '<form method="post" action="'.DOL_URL_ROOT.'/ecm/search.php">';
print '<table class="nobordernopadding" width="100%">';
print "<tr class=\"liste_titre\">";
print '<td colspan="2">'.$langs->trans("ECMSearchByKeywords").'</td></tr>';
print "<tr ".$bc[false]."><td>".$langs->trans("Ref").':</td><td align="right"><input type="text" name="search_ref" class="flat" size="14"></td></tr>';
print "<tr ".$bc[false]."><td>".$langs->trans("Title").':</td><td align="right"><input type="text" name="search_title" class="flat" size="14"></td></tr>';
print "<tr ".$bc[false]."><td>".$langs->trans("Keyword").':</td><td align="right"><input type="text" name="search_keyword" class="flat" size="14"></td></tr>';
print "<tr ".$bc[false].'><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
print "</table></form>";
//print $langs->trans("ECMSectionManualDesc");
//print_fiche_titre($langs->trans("ECMSectionAuto"));
print '<form method="post" action="'.DOL_URL_ROOT.'/ecm/search.php">';
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">";
print '<td colspan="4">'.$langs->trans("ECMSearchByEntity").'</td></tr>';
$buthtml='<td rowspan="'.$rowspan.'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
$butshown=0;
foreach($sectionauto as $sectioncur)
{
if (! $sectioncur['test']) continue;
//if ($butshown % 2 == 0)
print '<tr '. $bc[false].'>';
print "<td>".$sectioncur['label'].':</td>';
print '<td';
//if ($butshown % 2 == 1)
print ' align="right"';
print '>';
print '<input type="text" name="search_'.$sectioncur['module'].'" class="flat" size="14">';
print '</td>';
//if ($butshown % 2 == 1)
print '</tr>';
$butshown++;
}
//if ($butshown % 2 == 1)
// print '<td>&nbsp;</td><td>&nbsp;</td></tr>';
print '<tr '. $bc[false].'><td colspan="4" align="center"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
print "</table></form>";
//print $langs->trans("ECMSectionAutoDesc");
print '</td></tr></table>';
print '</td><td valign="top">';
// Right area
$relativepath=$ecmdir->getRelativePath();
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
$filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_ASC:SORT_DESC),1);
$formfile=new FormFile($db);
$param='&amp;section='.$section;
$textifempty=($section?$langs->trans("NoFileFound"):$langs->trans("ECMSelectASection"));
$formfile->list_of_documents($filearray,'','ecm',$param,1,$relativepath,$user->rights->ecm->upload,1,$textifempty);
// print '<table width="100%" class="border">';
// print '<tr><td> </td></tr></table>';
print '</td></tr>';
print '</table>';
print '<br>';
// End of page // End of page
$db->close(); $db->close();

39
htdocs/includes/modules/modECM.class.php
View File

@ -18,23 +18,22 @@
*/ */
/** \defgroup ecm Module ECM /** \defgroup ecm Module ECM
\brief Module for ECM (Electronic Content Management) * \brief Module for ECM (Electronic Content Management)
\version $Id$ * \version $Id$
*/ */
/** /**
\file htdocs/includes/modules/modECM.class.php * \file htdocs/includes/modules/modECM.class.php
\ingroup ecm * \ingroup ecm
\brief Description and activation file for module ECM * \brief Description and activation file for module ECM
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** \class modECM /** \class modECM
\brief Description and activation class for module ECM * \brief Description and activation class for module ECM
*/ */
class modECM extends DolibarrModules class modECM extends DolibarrModules
{ {
@ -149,6 +148,18 @@ class modECM extends DolibarrModules
'user'=>0); 'user'=>0);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=1',
'type'=>'left',
'titre'=>'ECMNewSection',
'mainmenu'=>'ecm',
'url'=>'/ecm/docdir.php?action=create',
'langs'=>'ecm',
'position'=>100,
'perms'=>'$user->rights->ecm->setup',
'target'=>'',
'user'=>0);
$r++;
$this->menu[$r]=array('fk_menu'=>'r=1', $this->menu[$r]=array('fk_menu'=>'r=1',
'type'=>'left', 'type'=>'left',
'titre'=>'ECMFileManager', 'titre'=>'ECMFileManager',
@ -165,7 +176,7 @@ class modECM extends DolibarrModules
'type'=>'left', 'type'=>'left',
'titre'=>'Search', 'titre'=>'Search',
'mainmenu'=>'ecm', 'mainmenu'=>'ecm',
'url'=>'/ecm/index.php?action=search_form', 'url'=>'/ecm/search.php',
'langs'=>'ecm', 'langs'=>'ecm',
'position'=>103, 'position'=>103,
'perms'=>'$user->rights->ecm->download', 'perms'=>'$user->rights->ecm->download',
@ -173,18 +184,6 @@ class modECM extends DolibarrModules
'user'=>0); 'user'=>0);
$r++; $r++;
$this->menu[$r]=array('fk_menu'=>'r=1',
'type'=>'left',
'titre'=>'ECMNewSection',
'mainmenu'=>'ecm',
'url'=>'/ecm/docdir.php?action=create',
'langs'=>'ecm',
'position'=>100,
'perms'=>'$user->rights->ecm->setup',
'target'=>'',
'user'=>0);
$r++;
} }
/** /**

4
htdocs/langs/en_US/ecm.lang
View File

@ -14,8 +14,8 @@ ECMNbOfDocsSmall=Nb of doc.
ECMSection=Directory ECMSection=Directory
ECMSectionManual=Manual directory ECMSectionManual=Manual directory
ECMSectionAuto=Automatic directory ECMSectionAuto=Automatic directory
ECMSectionsManual=Manual directories ECMSectionsManual=Manual tree
ECMSectionsAuto=Automatic directories ECMSectionsAuto=Automatic tree
ECMSections=Directories ECMSections=Directories
ECMRoot=Root ECMRoot=Root
ECMNewSection=New directory ECMNewSection=New directory

4
htdocs/langs/fr_FR/ecm.lang
View File

@ -14,8 +14,8 @@ ECMNbOfDocsSmall=Nb de doc.
ECMSection=Répertoire ECMSection=Répertoire
ECMSectionManual=Répertoire manuel ECMSectionManual=Répertoire manuel
ECMSectionAuto=Répertoire automatique ECMSectionAuto=Répertoire automatique
ECMSectionsManual=Répertoires manuels ECMSectionsManual=Arborescence manuelle
ECMSectionsAuto=Répertoires automatiques ECMSectionsAuto=Arborescence automatique
ECMSections=Répertoires ECMSections=Répertoires
ECMRoot=Racine ECMRoot=Racine
ECMNewSection=Nouveau répertoire ECMNewSection=Nouveau répertoire

2
htdocs/lib/ecm.lib.php
View File

@ -57,7 +57,7 @@ function ecm_prepare_head_fm($fac)
$head[$h][2] = 'file_manager'; $head[$h][2] = 'file_manager';
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/ecm/index.php?action=search_form'; $head[$h][0] = DOL_URL_ROOT.'/ecm/search.php';
$head[$h][1] = $langs->trans('Search'); $head[$h][1] = $langs->trans('Search');
$head[$h][2] = 'search_form'; $head[$h][2] = 'search_form';
$h++; $h++;