From 58e1c4b2db9b2ae71b246c5e5804fce90934d40d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jan 2010 20:56:22 +0000 Subject: [PATCH] Fix: add DOL_URL_ROOT in extra tabs --- htdocs/lib/company.lib.php | 2 +- htdocs/lib/contract.lib.php | 8 ++++---- htdocs/lib/fichinter.lib.php | 4 ++-- htdocs/lib/fourn.lib.php | 8 ++++---- htdocs/lib/invoice.lib.php | 4 ++-- htdocs/lib/member.lib.php | 4 ++-- htdocs/lib/order.lib.php | 4 ++-- htdocs/lib/product.lib.php | 4 ++-- htdocs/lib/project.lib.php | 10 +++++----- htdocs/lib/propal.lib.php | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index 6ec3fb983c4..43cac6c0da5 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -124,7 +124,7 @@ function societe_prepare_head($objsoc) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['thirdparty'])) { $i=0; diff --git a/htdocs/lib/contract.lib.php b/htdocs/lib/contract.lib.php index 848f013d075..8c88bfc3744 100644 --- a/htdocs/lib/contract.lib.php +++ b/htdocs/lib/contract.lib.php @@ -29,7 +29,7 @@ function contract_prepare_head($contrat) global $langs, $conf; $h = 0; $head = array(); - + $head[$h][0] = DOL_URL_ROOT.'/contrat/fiche.php?id='.$contrat->id; $head[$h][1] = $langs->trans("ContractCard"); $head[$h][2] = 'card'; @@ -54,10 +54,10 @@ function contract_prepare_head($contrat) $head[$h][1] = $langs->trans("Info"); $head[$h][2] = 'info'; $h++; - + // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['contract'])) { $i=0; @@ -65,7 +65,7 @@ function contract_prepare_head($contrat) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$contrat->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$contrat->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++; diff --git a/htdocs/lib/fichinter.lib.php b/htdocs/lib/fichinter.lib.php index 76f71ecb35f..4a5bddc17e9 100644 --- a/htdocs/lib/fichinter.lib.php +++ b/htdocs/lib/fichinter.lib.php @@ -70,7 +70,7 @@ function fichinter_prepare_head($fichinter) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['intervention'])) { $i=0; @@ -78,7 +78,7 @@ function fichinter_prepare_head($fichinter) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$fichinter->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$fichinter->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++; diff --git a/htdocs/lib/fourn.lib.php b/htdocs/lib/fourn.lib.php index 00a52b5ac95..dbdc25cc3e5 100644 --- a/htdocs/lib/fourn.lib.php +++ b/htdocs/lib/fourn.lib.php @@ -61,7 +61,7 @@ function facturefourn_prepare_head($fac) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['supplier_invoice'])) { $i=0; @@ -69,7 +69,7 @@ function facturefourn_prepare_head($fac) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$fac->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$fac->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++; @@ -126,7 +126,7 @@ function ordersupplier_prepare_head($commande) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['supplier_order'])) { $i=0; @@ -134,7 +134,7 @@ function ordersupplier_prepare_head($commande) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$commande->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$commande->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++; diff --git a/htdocs/lib/invoice.lib.php b/htdocs/lib/invoice.lib.php index 3b2076ad43c..04556933e2c 100644 --- a/htdocs/lib/invoice.lib.php +++ b/htdocs/lib/invoice.lib.php @@ -79,7 +79,7 @@ function facture_prepare_head($fac) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['invoice'])) { $i=0; @@ -87,7 +87,7 @@ function facture_prepare_head($fac) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$fac->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$fac->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++; diff --git a/htdocs/lib/member.lib.php b/htdocs/lib/member.lib.php index 843069b4b0e..22cc751584a 100644 --- a/htdocs/lib/member.lib.php +++ b/htdocs/lib/member.lib.php @@ -67,7 +67,7 @@ function member_prepare_head($member) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['member'])) { $i=0; @@ -75,7 +75,7 @@ function member_prepare_head($member) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$member->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$member->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++; diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php index 3f366e0c27d..fd3e95b87cd 100644 --- a/htdocs/lib/order.lib.php +++ b/htdocs/lib/order.lib.php @@ -96,7 +96,7 @@ function commande_prepare_head($commande) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['order'])) { $i=0; @@ -104,7 +104,7 @@ function commande_prepare_head($commande) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$commande->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$commande->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++; diff --git a/htdocs/lib/product.lib.php b/htdocs/lib/product.lib.php index 39114c97805..020f3361c8d 100644 --- a/htdocs/lib/product.lib.php +++ b/htdocs/lib/product.lib.php @@ -121,7 +121,7 @@ function product_prepare_head($product, $user) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['product'])) { $i=0; @@ -129,7 +129,7 @@ function product_prepare_head($product, $user) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$product->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$product->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++; diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php index 9417a7cec59..c57a6eb3388 100644 --- a/htdocs/lib/project.lib.php +++ b/htdocs/lib/project.lib.php @@ -34,7 +34,7 @@ function project_prepare_head($object) $head[$h][1] = $langs->trans("Project"); $head[$h][2] = 'project'; $h++; - + $head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id; $head[$h][1] = $langs->trans("ProjectContact"); $head[$h][2] = 'contact'; @@ -60,7 +60,7 @@ function project_prepare_head($object) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['project'])) { $i=0; @@ -68,7 +68,7 @@ function project_prepare_head($object) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$object->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$object->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++; @@ -108,7 +108,7 @@ function task_prepare_head($object) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['task'])) { $i=0; @@ -116,7 +116,7 @@ function task_prepare_head($object) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$objsoc->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$objsoc->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++; diff --git a/htdocs/lib/propal.lib.php b/htdocs/lib/propal.lib.php index 3fc747e60de..b25ad7e4e5b 100644 --- a/htdocs/lib/propal.lib.php +++ b/htdocs/lib/propal.lib.php @@ -92,7 +92,7 @@ function propal_prepare_head($propal) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:MyModule:@mymodule:/dolibarr/mymodule/mypage.php?id=__ID__'); + // $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__'); if (is_array($conf->tabs_modules['propal'])) { $i=0; @@ -100,7 +100,7 @@ function propal_prepare_head($propal) { $values=explode(':',$value); if ($values[2]) $langs->load($values[2]); - $head[$h][0] = preg_replace('/__ID__/i',$propal->id,$values[3]); + $head[$h][0] = DOL_URL_ROOT . preg_replace('/__ID__/i',$propal->id,$values[3]); $head[$h][1] = $langs->trans($values[1]); $head[$h][2] = 'tab'.$values[1]; $h++;