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

Fix: Uniformize code

Browse Source
This commit is contained in:
Juanjo Menent 2011-05-17 18:58:59 +00:00
parent 1dca5104e2
commit aea3a6ab5b
4 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/fichinter/document.php
View File

@ -4,6 +4,7 @@
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com> * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com> * Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* *
* 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
@ -37,7 +38,8 @@ $langs->load("other");
$langs->load("fichinter"); $langs->load("fichinter");
$langs->load("companies"); $langs->load("companies");
$fichinterid = isset($_GET["id"])?$_GET["id"]:''; $fichinterid = GETPOST("id");
$action = GETPOST("action");
// Security check // Security check
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
@ -57,7 +59,7 @@ if (! $sortfield) $sortfield="name";
$object = new Fichinter($db); $object = new Fichinter($db);
$object->fetch($_GET["id"]); $object->fetch($fichinterid);
$upload_dir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($object->ref); $upload_dir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($object->ref);
$modulepart='fichinter'; $modulepart='fichinter';
@ -66,7 +68,7 @@ $modulepart='fichinter';
/* /*
* Action envoie fichier * Action envoie fichier
*/ */
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
@ -118,9 +120,9 @@ if ($object->id)
echo '<div class="error">'.$error_msg.'</div><br>'; echo '<div class="error">'.$error_msg.'</div><br>';
} }
if ($_GET["action"] == 'delete') if ($action == 'delete')
{ {
$file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). $file = $upload_dir . '/' . GETPOST("urlfile"); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
$result=dol_delete_file($file); $result=dol_delete_file($file);
//if ($result >= 0) $mesg=$langs->trans("FileWasRemoced"); //if ($result >= 0) $mesg=$langs->trans("FileWasRemoced");
} }

13
htdocs/fichinter/index.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* *
* 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
@ -41,11 +42,11 @@ $offset = $conf->liste_limit * $page;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
$socid=$_GET["socid"]?$_GET["socid"]:$_POST["socid"]; $socid=GETPOST("socid");
$page=$_GET["page"]?$_GET["page"]:$_POST["page"]; $page=GETPOST("page");
// Security check // Security check
$fichinterid = isset($_GET["id"])?$_GET["id"]:''; $fichinterid = GETPOST("id");
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'ficheinter', $fichinterid,'fichinter'); $result = restrictedArea($user, 'ficheinter', $fichinterid,'fichinter');
@ -58,9 +59,9 @@ $offset = $limit * $page ;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
$search_ref=isset($_GET["search_ref"])?$_GET["search_ref"]:$_POST["search_ref"]; $search_ref=GETPOST("search_ref");
$search_company=isset($_GET["search_company"])?$_GET["search_company"]:$_POST["search_company"]; $search_company=GETPOST("search_company");
$search_desc=isset($_GET["search_desc"])?$_GET["search_desc"]:$_POST["search_desc"]; $search_desc=getpost("search_desc");
/* /*

5
htdocs/fichinter/info.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2009-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2009-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* *
* 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
@ -31,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
$langs->load('companies'); $langs->load('companies');
$fichinterid = isset($_GET["id"])?$_GET["id"]:''; $fichinterid = GETPOST("id");
// Security check // Security check
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
@ -45,7 +46,7 @@ $result = restrictedArea($user, 'ficheinter', $fichinterid, 'fichinter');
llxHeader(); llxHeader();
$fichinter = new Fichinter($db); $fichinter = new Fichinter($db);
$fichinter->fetch($_GET['id']); $fichinter->fetch($fichinterid);
$societe = new Societe($db); $societe = new Societe($db);
$societe->fetch($fichinter->socid); $societe->fetch($fichinter->socid);

26
htdocs/fichinter/note.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* *
* 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
@ -29,7 +30,8 @@ require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
$langs->load('companies'); $langs->load('companies');
$fichinterid = isset($_GET["id"])?$_GET["id"]:''; $fichinterid = GETPOST("id");
$action=GETPOST("action");
// Security check // Security check
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
@ -40,14 +42,14 @@ $result = restrictedArea($user, 'ficheinter', $fichinterid, 'fichinter');
/* Actions */ /* Actions */
/******************************************************************************/ /******************************************************************************/
if ($_POST["action"] == 'update_public' && $user->rights->ficheinter->creer) if ($action == 'update_public' && $user->rights->ficheinter->creer)
{ {
$fichinter = new Fichinter($db); $fichinter = new Fichinter($db);
$fichinter->fetch($_GET['id']); $fichinter->fetch($fichinterid);
$db->begin(); $db->begin();
$res=$fichinter->update_note_public($_POST["note_public"],$user); $res=$fichinter->update_note_public(GETPOST("note_public"),$user);
if ($res < 0) if ($res < 0)
{ {
$mesg='<div class="error">'.$fichinter->error.'</div>'; $mesg='<div class="error">'.$fichinter->error.'</div>';
@ -59,14 +61,14 @@ if ($_POST["action"] == 'update_public' && $user->rights->ficheinter->creer)
} }
} }
if ($_POST['action'] == 'update' && $user->rights->ficheinter->creer) if ($action == 'update' && $user->rights->ficheinter->creer)
{ {
$fichinter = new Fichinter($db); $fichinter = new Fichinter($db);
$fichinter->fetch($_GET['id']); $fichinter->fetch($fichinterid);
$db->begin(); $db->begin();
$res=$fichinter->update_note($_POST["note_private"],$user); $res=$fichinter->update_note(GETPOST("note_private"),$user);
if ($res < 0) if ($res < 0)
{ {
$mesg='<div class="error">'.$fichinter->error.'</div>'; $mesg='<div class="error">'.$fichinter->error.'</div>';
@ -88,12 +90,12 @@ llxHeader();
$html = new Form($db); $html = new Form($db);
if ($_GET['id']) if ($fichinterid)
{ {
if ($mesg) print $mesg; if ($mesg) print $mesg;
$fichinter = new Fichinter($db); $fichinter = new Fichinter($db);
if ( $fichinter->fetch($_GET['id']) ) if ( $fichinter->fetch($fichinterid) )
{ {
$societe = new Societe($db); $societe = new Societe($db);
if ( $societe->fetch($fichinter->socid) ) if ( $societe->fetch($fichinter->socid) )
@ -111,7 +113,7 @@ if ($_GET['id'])
// Note publique // Note publique
print '<tr><td valign="top">'.$langs->trans("NotePublic").' :</td>'; print '<tr><td valign="top">'.$langs->trans("NotePublic").' :</td>';
print '<td valign="top" colspan="3">'; print '<td valign="top" colspan="3">';
if ($_GET["action"] == 'edit') if ($action == 'edit')
{ {
print '<form method="post" action="note.php?id='.$fichinter->id.'">'; print '<form method="post" action="note.php?id='.$fichinter->id.'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -131,7 +133,7 @@ if ($_GET['id'])
{ {
print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
print '<td valign="top" colspan="3">'; print '<td valign="top" colspan="3">';
if ($_GET["action"] == 'edit') if ($action == 'edit')
{ {
print '<form method="post" action="note.php?id='.$fichinter->id.'">'; print '<form method="post" action="note.php?id='.$fichinter->id.'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -156,7 +158,7 @@ if ($_GET['id'])
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($user->rights->ficheinter->creer && $_GET['action'] <> 'edit') if ($user->rights->ficheinter->creer && GETPOST("action") <> 'edit')
{ {
print '<a class="butAction" href="note.php?id='.$fichinter->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>'; print '<a class="butAction" href="note.php?id='.$fichinter->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
} }