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

Fix the follow/nofollow was not propagated

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-07 12:47:42 +01:00
parent 2da6fc1ef0
commit 62ba731823
7 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/ticket.lib.php
View File

@ -208,7 +208,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
{ {
global $user, $conf, $langs, $mysoc; global $user, $conf, $langs, $mysoc;
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, 1); // Show html headers
print '<body id="mainbody" class="publicnewticketform">'; print '<body id="mainbody" class="publicnewticketform">';
print '<div class="center">'; print '<div class="center">';

8
htdocs/main.inc.php
View File

@ -1092,14 +1092,15 @@ if (!function_exists("llxHeader"))
* @param string $morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails) * @param string $morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails)
* @param string $morecssonbody More CSS on body tag. * @param string $morecssonbody More CSS on body tag.
* @param string $replacemainareaby Replace call to main_area() by a print of this string * @param string $replacemainareaby Replace call to main_area() by a print of this string
* @param int $disablenofollow Disable the "nofollow" on page
* @return void * @return void
*/ */
function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '') function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '', $disablenofollow = 0)
{ {
global $conf; global $conf;
// html header // html header
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, $disablenofollow);
$tmpcsstouse = 'sidebar-collapse'.($morecssonbody ? ' '.$morecssonbody : ''); $tmpcsstouse = 'sidebar-collapse'.($morecssonbody ? ' '.$morecssonbody : '');
// If theme MD and classic layer, we open the menulayer by default. // If theme MD and classic layer, we open the menulayer by default.
@ -1557,7 +1558,8 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
// For backward compatibility with old modules // For backward compatibility with old modules
if (empty($conf->headerdone)) if (empty($conf->headerdone))
{ {
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); $disablenofollow = 0;
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, $disablenofollow);
print '<body id="mainbody">'; print '<body id="mainbody">';
} }

5
htdocs/opensurvey/fonctions.php
View File

@ -77,11 +77,10 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
//$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>'; //$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, 1); // Show html headers
print '<body id="mainbody" class="publicnewmemberform">'; print '<body id="mainbody" class="publicnewmemberform">';
print '<span id="dolpaymentspan"></span>'."\n"; print '<span id="dolpaymentspan"></span>'."\n";
print '<div class="center">'."\n"; print '<div class="center">'."\n";
print '<form name="formulaire" action="studs.php?sondage='.urlencode($numsondage).'#bas" method="POST">'."\n"; print '<form name="formulaire" action="studs.php?sondage='.urlencode($numsondage).'#bas" method="POST">'."\n";

4
htdocs/public/demo/index.php
View File

@ -447,11 +447,9 @@ $db->close();
*/ */
function llxHeaderVierge($title, $head = "") function llxHeaderVierge($title, $head = "")
{ {
global $user, $conf, $langs;
top_httphead(); top_httphead();
top_htmlhead($head, $title, 0, 0, array(), array('public/demo/demo.css')); top_htmlhead($head, $title, 0, 0, array(), array('public/demo/demo.css'), 0, 1);
print '<body class="demobody"><div class="demobackgrounddiv">'."\n"; print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
} }

2
htdocs/public/donations/donateurs_code.php
View File

@ -35,7 +35,7 @@ if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined
*/ */
function llxHeaderVierge() function llxHeaderVierge()
{ {
print '<html><title>Export agenda cal</title><body>'; print '<html><title>List of donators</title><body>';
} }
/** /**
* Header function * Header function

2
htdocs/public/onlinesign/newonlinesign.php
View File

@ -129,7 +129,7 @@ $conf->dol_hide_topmenu = 1;
$conf->dol_hide_leftmenu = 1; $conf->dol_hide_leftmenu = 1;
$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>'; $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea); llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
// Check link validity for param 'source' // Check link validity for param 'source'
if (!empty($source) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', ''))) if (!empty($source) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))

2
htdocs/public/recruitment/view.php
View File

@ -165,7 +165,7 @@ $arrayofjs = array();
$arrayofcss = array(); $arrayofcss = array();
$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>'; $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
llxHeader($head, $langs->trans("PositionToBeFilled"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea); llxHeader($head, $langs->trans("PositionToBeFilled"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
print '<span id="dolpaymentspan"></span>'."\n"; print '<span id="dolpaymentspan"></span>'."\n";