From bfd06a7dabc0c7b785c614936d37f37431aa5a11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 12 Sep 2010 21:07:45 +0000
Subject: [PATCH] Qual: Uniformize code
---
htdocs/comm/action/fiche.php | 4 ++--
htdocs/lib/agenda.lib.php | 17 +++++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 5227c1883e4..168ade3ae8b 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -301,7 +301,7 @@ if (GETPOST("action") == 'update')
//if ($_POST["admin"] == -1) $_POST["admin"]='0';
$actioncomm = new Actioncomm($db);
- $actioncomm->fetch($_POST["id"]);
+ $actioncomm->fetch($id);
$datep=dol_mktime($_POST["aphour"],
$_POST["apmin"],
@@ -629,7 +629,7 @@ if ($id)
* Affichage onglets
*/
- $head=actions_prepare_head();
+ $head=actions_prepare_head($act);
dol_fiche_head($head, 'card', $langs->trans("Action"),0,'task');
$now=dol_now();
diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php
index 7c0d940019e..60b15acd9f7 100644
--- a/htdocs/lib/agenda.lib.php
+++ b/htdocs/lib/agenda.lib.php
@@ -291,8 +291,8 @@ function show_array_last_actions_done($max=5)
/**
- * \brief Define head array for tabs of agenda setup pages
- * \return Array of head
+ * Define head array for tabs of agenda setup pages
+ * @return Array of head
*/
function agenda_prepare_head()
{
@@ -314,27 +314,28 @@ function agenda_prepare_head()
}
/**
- * \brief Define head array for tabs of agenda setup pages
- * \return Array of head
+ * Define head array for tabs of agenda setup pages
+ * @param action Object action
+ * @return Array of head
*/
-function actions_prepare_head()
+function actions_prepare_head($action)
{
global $langs, $conf, $user;
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT.'/comm/action/fiche.php?id='.$_GET["id"];
+ $head[$h][0] = DOL_URL_ROOT.'/comm/action/fiche.php?id='.$action->id;
$head[$h][1] = $langs->trans("CardAction");
$head[$h][2] = 'card';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$_GET["id"];
+ $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$action->id;
$head[$h][1] = $langs->trans('Documents');
$head[$h][2] = 'documents';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/comm/action/info.php?id='.$_GET["id"];
+ $head[$h][0] = DOL_URL_ROOT.'/comm/action/info.php?id='.$action->id;
$head[$h][1] = $langs->trans('Info');
$head[$h][2] = 'info';
$h++;
--
GitLab