Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

NEW Web pages of websites are protected by the WAF

Browse Source
This commit is contained in:
Laurent Destailleur
2025-03-21 13:01:23 +01:00
parent 71516d2f7a
commit 7011d01bde
2 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/website2.lib.php
View File

@@ -183,7 +183,10 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
$tplcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {\n";
$tplcontent .= ' $pathdepth = count(explode(\'/\', $_SERVER[\'SCRIPT_NAME\'])) - 2;'."\n";
$tplcontent .= ' require_once ($pathdepth ? str_repeat(\'../\', $pathdepth) : \'./\').\'master.inc.php\';'."\n";
$tplcontent .= "} // Not already loaded\n";
if (empty($objectpage->disable_waf)) {
$tplcontent .= ' require_once DOL_DOCUMENT_ROOT.\'/waf.inc.php\';'."\n";
}
$tplcontent .= "}\n";
$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
if (in_array($objectpage->type_container, array('page', 'blogpost', 'service'))) {
@@ -375,7 +378,10 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
$tplcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {\n";
$tplcontent .= ' $pathdepth = count(explode(\'/\', $_SERVER[\'SCRIPT_NAME\'])) - 2;'."\n";
$tplcontent .= ' require_once ($pathdepth ? str_repeat(\'../\', $pathdepth) : \'./\').\'master.inc.php\';'."\n";
$tplcontent .= "} // Not already loaded\n";
if (empty($objectpage->disable_waf)) {
$tplcontent .= ' require_once DOL_DOCUMENT_ROOT.\'/waf.inc.php\';'."\n";
}
$tplcontent .= "}\n";
$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
if (in_array($objectpage->type_container, array('page', 'blogpost', 'service'))) {

45
htdocs/website/class/websitepage.class.php
View File

@@ -38,22 +38,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
class WebsitePage extends CommonObject
{
/**
* @var string Id to identify managed objects
* @var string Id to identify managed objects
*/
public $element = 'websitepage';
/**
* @var string Name of table without prefix where object is stored
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'website_page';
/**
* @var string String with name of icon for websitepage. Must be the part after the 'object_' into object_myobject.png
* @var string String with name of icon for websitepage. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'file-code';
/**
* @var string Field with ID of parent key if this field has a parent or for child tables
* @var string Field with ID of parent key if this field has a parent or for child tables
*/
public $fk_element = 'fk_website_page';
@@ -63,72 +63,77 @@ class WebsitePage extends CommonObject
protected $childtablesoncascade = array('categorie_website_page');
/**
* @var int Website ID
* @var int Website ID
*/
public $fk_website;
/**
* @var ?int Page ID
* @var ?int Page ID
*/
public $fk_page; // If translation of another page
/**
* @var string Page url
* @var string Page url
*/
public $pageurl;
/**
* @var string Alias alt
* @var string Alias alt
*/
public $aliasalt;
/**
* @var string Container type
* @var string Container type
*/
public $type_container;
/**
* @var string title
* @var string Title
*/
public $title;
/**
* @var string description
* @var string Description
*/
public $description;
/**
* @var string image
* @var string Image (deprecated)
*/
public $image;
/**
* @var string keywords
* @var string Keywords
*/
public $keywords;
/**
* @var string language code ('en', 'fr', 'en-gb', ..)
* @var string Language code ('en', 'fr', 'en-gb', ..)
*/
public $lang;
/**
* @var int allowed in frames
* @var int Page allowed in frames
*/
public $allowed_in_frames;
/**
* @var string html header
* @var int<0,1> Disable WAF
*/
public $disable_waf = 0;
/**
* @var string Page html header
*/
public $htmlheader;
/**
* @var string content
* @var string Page content
*/
public $content;
/**
* @var string grabbed from
* @var string Url page was grabbed from
*/
public $grabbed_from;
@@ -138,12 +143,12 @@ class WebsitePage extends CommonObject
public $status;
/**
* @var int ID
* @var int ID use of creation
*/
public $fk_user_creat;
/**
* @var int ID
* @var int ID user of last modification
*/
public $fk_user_modif;