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

Qual: First change to remove pre.inc.php

Browse Source
This commit is contained in:
Regis Houssin 2010-03-01 09:37:12 +00:00
parent 00524039b2
commit ed44821987
10 changed files with 39 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/categories/categorie.php
View File

@ -27,7 +27,7 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
$langs->load("categories"); $langs->load("categories");

19
htdocs/categories/docreate.php
View File

@ -20,13 +20,14 @@
*/ */
/** /**
\file htdocs/categories/docreate.php * \file htdocs/categories/docreate.php
\ingroup category * \ingroup category
\brief Page de creation categorie * \brief Page de creation categorie
\version $Revision$ * \version $Revision$
*/ */
require "./pre.inc.php"; require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
$langs->load("categories"); $langs->load("categories");
@ -58,11 +59,11 @@ $res = $categorie->create();
if ($res < 0) if ($res < 0)
{ {
print "<p>Impossible d'ajouter la catégorie ".$categorie->label.".</p>"; print "<p>Impossible d'ajouter la cat<EFBFBD>gorie ".$categorie->label.".</p>";
} }
else else
{ {
print "<p>La catégorie ".$categorie->label." a été ajoutée avec succès.</p>"; print "<p>La cat<EFBFBD>gorie ".$categorie->label." a <EFBFBD>t<EFBFBD> ajout<75>e avec succ<63>s.</p>";
foreach ($cats_meres as $id) foreach ($cats_meres as $id)
{ {
@ -71,7 +72,7 @@ $res = $categorie->create();
if ($res < 0) if ($res < 0)
{ {
print "<p>Impossible d'associer la catégorie à \"".$mere->label."\" ($res).</p>"; print "<p>Impossible d'associer la cat<EFBFBD>gorie <20> \"".$mere->label."\" ($res).</p>";
} }
} }
} }

23
htdocs/categories/domodif.php
View File

@ -23,7 +23,8 @@
\version $Revision$ \version $Revision$
*/ */
require "./pre.inc.php"; require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
if (!isset ($_REQUEST["id"]) || !isset ($_REQUEST["nom"]) || !isset ($_REQUEST["description"])) if (!isset ($_REQUEST["id"]) || !isset ($_REQUEST["nom"]) || !isset ($_REQUEST["description"]))
accessforbidden(); accessforbidden();
@ -47,10 +48,10 @@ $cat->label = $_REQUEST["nom"];
$cat->description = $_REQUEST["description"]; $cat->description = $_REQUEST["description"];
$new_cats_meres = isset ($_REQUEST['cats_meres']) ? $_REQUEST['cats_meres'] : array (); $new_cats_meres = isset ($_REQUEST['cats_meres']) ? $_REQUEST['cats_meres'] : array ();
// tableau d'id de catégories // tableau d'id de categories
$old_objs_meres = $cat->get_meres (); $old_objs_meres = $cat->get_meres ();
// tableau d'objets catégorie // tableau d'objets categorie
$old_cats_meres = array (); $old_cats_meres = array ();
foreach ($old_objs_meres as $old_obj_mere) foreach ($old_objs_meres as $old_obj_mere)
@ -58,8 +59,8 @@ foreach ($old_objs_meres as $old_obj_mere)
$old_cats_meres[] = $old_obj_mere->id; $old_cats_meres[] = $old_obj_mere->id;
} }
$asupprimer = array (); // tableaux des catégories mères $asupprimer = array (); // tableaux des categories meres
$aajouter = array (); // à ajouter ou à supprimer $aajouter = array (); // a ajouter ou a supprimer
foreach ($old_cats_meres as $old_cat) foreach ($old_cats_meres as $old_cat)
{ {
@ -80,22 +81,22 @@ foreach ($new_cats_meres as $new_cat)
$res = $cat->update (); $res = $cat->update ();
if ($res < 0) if ($res < 0)
{ {
print "<p>Impossible de modifier la catégorie ".$cat->label.".</p>"; print "<p>Impossible de modifier la categorie ".$cat->label.".</p>";
} }
else else
{ {
print "<p>La catégorie ".$cat->label." a été modifiée avec succès.</p>"; print "<p>La categorie ".$cat->label." a ete modifiee avec succes.</p>";
foreach ($asupprimer as $old_mere) foreach ($asupprimer as $old_mere)
{ {
$res = $old_mere->del_fille ($cat); $res = $old_mere->del_fille ($cat);
if ($res < 0) if ($res < 0)
{ {
print "<p>Impossible d'enlever la catégorie de \"".$old_mere->label."\" ($res).</p>\n"; print "<p>Impossible d'enlever la categorie de \"".$old_mere->label."\" ($res).</p>\n";
} }
else else
{ {
print "<p>La catégorie ne fait plus partie de ".$old_mere->label.".</p>\n"; print "<p>La categorie ne fait plus partie de ".$old_mere->label.".</p>\n";
} }
} }
@ -104,11 +105,11 @@ else
$res = $new_mere->add_fille ($cat); $res = $new_mere->add_fille ($cat);
if ($res < 0) if ($res < 0)
{ {
print "<p>Impossible d'ajouter la catégorie à \"".$new_mere->label."\" ($res).</p>"; print "<p>Impossible d'ajouter la categorie a \"".$new_mere->label."\" ($res).</p>";
} }
else else
{ {
print "<p>La catégorie fait maintenant partie de ".$new_mere->label.".</p>\n"; print "<p>La categorie fait maintenant partie de ".$new_mere->label.".</p>\n";
} }
} }
} }

3
htdocs/categories/edit.php
View File

@ -26,7 +26,8 @@
* \version $Id$ * \version $Id$
*/ */
require "./pre.inc.php"; require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
// If socid provided by ajax company selector // If socid provided by ajax company selector
if (! empty($_REQUEST['socid_id'])) if (! empty($_REQUEST['socid_id']))

2
htdocs/categories/fiche.php
View File

@ -26,7 +26,7 @@
* \version $Id$ * \version $Id$
*/ */
require "./pre.inc.php"; require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
// If socid provided by ajax company selector // If socid provided by ajax company selector

3
htdocs/categories/index.php
View File

@ -27,7 +27,8 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php");
$type=isset($_GET['type'])?$_GET['type']:$_POST['type']; $type=isset($_GET['type'])?$_GET['type']:$_POST['type'];

13
htdocs/categories/liste.php
View File

@ -18,13 +18,14 @@
*/ */
/** /**
\file htdocs/categories/liste.php * \file htdocs/categories/liste.php
\ingroup category * \ingroup category
\brief Page liste des categories * \brief Page liste des categories
\version $Id$ * \version $Id$
*/ */
require "./pre.inc.php"; require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
if (!$user->rights->categorie->lire) accessforbidden(); if (!$user->rights->categorie->lire) accessforbidden();

4
htdocs/categories/photos.php
View File

@ -26,8 +26,8 @@
* \version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
$langs->load("category"); $langs->load("category");

68
htdocs/categories/pre.inc.php
View File

@ -1,68 +0,0 @@
<?php
/* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org>
* Copyright (C) 2005 Davoleau Brice <brice.davoleau@gmail.com>
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
*
* 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/categories/pre.inc.php
\ingroup product,service
\brief Fichier gestionnaire du menu gauche des produits et services
\version $Id$
*/
require "../main.inc.php";
require_once DOL_DOCUMENT_ROOT."/categories/categorie.class.php";
$langs->load("categories");
function llxHeader ($head = "", $urlp = "", $title="")
{
global $user, $conf, $langs;
top_menu($head, $title);
$menu = new Menu();
if ($conf->categorie->enabled)
{
$langs->load("customers");
$langs->load("suppliers");
$menu->add(DOL_URL_ROOT."/categories/index.php?type=0", $langs->trans("ProductsCategoriesShort"));
$menu->add_submenu(DOL_URL_ROOT."/categories/liste.php?type=0", $langs->trans("List"));
if ($user->rights->categorie->creer)
{
$menu->add_submenu(DOL_URL_ROOT."/categories/fiche.php?action=create&amp;type=0", $langs->trans("NewCat"));
}
$menu->add(DOL_URL_ROOT."/categories/index.php?type=1", $langs->trans("SuppliersCategoriesShort"));
$menu->add_submenu(DOL_URL_ROOT."/categories/liste.php?type=1", $langs->trans("List"));
if ($user->rights->categorie->creer)
{
$menu->add_submenu(DOL_URL_ROOT."/categories/fiche.php?action=create&amp;type=1", $langs->trans("NewCat"));
}
$menu->add(DOL_URL_ROOT."/categories/index.php?type=2", $langs->trans("CustomersProspectsCategoriesShort"));
$menu->add_submenu(DOL_URL_ROOT."/categories/liste.php?type=2", $langs->trans("List"));
if ($user->rights->categorie->creer)
{
$menu->add_submenu(DOL_URL_ROOT."/categories/fiche.php?action=create&amp;type=2", $langs->trans("NewCat"));
}
}
left_menu($menu->liste);
}
?>

3
htdocs/categories/viewcat.php
View File

@ -26,7 +26,8 @@
* \version $Revision$ * \version $Revision$
*/ */
require("./pre.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
// Security check // Security check
if (! $user->rights->categorie->lire) if (! $user->rights->categorie->lire)