composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 22:39:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Missing parts of the previous merge

Browse Source
This commit is contained in:
Molkobain
2020-10-07 15:32:18 +02:00
parent ad59e81144
commit ff3ade7d62
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
datamodels/2.x/itop-structure/datamodel.itop-structure.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
<classes>
<classes>
<class id="Organization" _delta="define">
<parent>cmdbAbstractObject</parent>
<properties>
@@ -1647,7 +1647,8 @@
</list>
</presentation>
</class>
</classes><menus>
</classes>
<menus>
<menu id="DataAdministration" xsi:type="MenuGroup" _delta="define">
<rank>70</rank>
<enable_class>Organization</enable_class>

5
sources/application/WebPage/AjaxPage.php
View File

@@ -34,7 +34,10 @@ class AjaxPage extends WebPage implements iTabbedPage
parent::__construct($s_title, $bPrintable);
$this->m_aReadyScripts = [];
//$this->add_header("Content-type: text/html; charset=utf-8");
$this->add_header("Cache-control: no-cache");
$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
$this->add_header('Pragma: no-cache');
$this->add_header('Expires: 0');
$this->add_header('X-Frame-Options: deny');
$this->m_oTabs = new TabManager();
$this->sContentType = 'text/html';
$this->sContentDisposition = 'inline';

7
sources/application/WebPage/CSVPage.php
View File

@@ -33,8 +33,11 @@ class CSVPage extends WebPage
{
parent::__construct($s_title);
$this->add_header("Content-type: text/plain; charset=".self::PAGES_CHARSET);
$this->add_header("Cache-control: no-cache");
//$this->add_header("Content-Transfer-Encoding: binary");
$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
$this->add_header('Pragma: no-cache');
$this->add_header('Expires: 0');
$this->add_header('X-Frame-Options: deny');
//$this->add_header("Content-Transfer-Encoding: binary");
}
public function output()

6
sources/application/WebPage/WebPage.php
View File

@@ -473,8 +473,10 @@ class WebPage implements Page
*/
public function no_cache()
{
$this->add_header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
$this->add_header("Expires: Fri, 17 Jul 1970 05:00:00 GMT"); // Date in the past
$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
$this->add_header('Pragma: no-cache');
$this->add_header('Expires: 0');
$this->add_header('X-Frame-Options: deny');
}
/**

5
sources/application/WebPage/XMLPage.php
View File

@@ -43,7 +43,10 @@ class XMLPage extends WebPage
$this->m_bPassThrough = $bPassThrough;
$this->m_bHeaderSent = false;
$this->add_header("Content-type: text/xml; charset=".self::PAGES_CHARSET);
$this->add_header("Cache-control: no-cache");
$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
$this->add_header('Pragma: no-cache');
$this->add_header('Expires: 0');
$this->add_header('X-Frame-Options: deny');
$this->add_header("Content-location: export.xml");
}

6
sources/application/WebPage/iTopWebPage.php
View File

@@ -93,8 +93,10 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
$this->m_aMessages = array();
$this->SetRootUrl(utils::GetAbsoluteUrlAppRoot());
$this->add_header("Content-type: text/html; charset=".self::PAGES_CHARSET);
// TODO 2.8.0: Should we keep this? Makes no sense
//$this->add_header("Cache-control: no-cache");
$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
$this->add_header('Pragma: no-cache');
$this->add_header('Expires: 0');
$this->add_header('X-Frame-Options: deny');
// TODO 2.8.0: Add only what's necessary
$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/jquery.treeview.css');
$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/jquery-ui-timepicker-addon.css');