coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update Piwik to version 2.16 (fixes #91)

Browse source
This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
Download patch file Download diff file Expand all files Collapse all files

16
www/analytics/core/View/OneClickDone.php
View file

@ -1,6 +1,6 @@
<?php
/**
* Piwik - Open source web analytics
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -30,13 +30,20 @@ class OneClickDone
/**
* @var string
*/
public $coreError;
public $error;
/**
* @var array
*/
public $feedbackMessages;
/**
* Did the download over HTTPS fail?
*
* @var bool
*/
public $httpsFail = false;
public function __construct($tokenAuth)
{
$this->tokenAuth = $tokenAuth;
@ -56,15 +63,17 @@ class OneClickDone
@header('Cache-Control: must-revalidate');
@header('X-Frame-Options: deny');
$error = htmlspecialchars($this->coreError, ENT_QUOTES, 'UTF-8');
$error = htmlspecialchars($this->error, ENT_QUOTES, 'UTF-8');
$messages = htmlspecialchars(serialize($this->feedbackMessages), ENT_QUOTES, 'UTF-8');
$tokenAuth = $this->tokenAuth;
$httpsFail = (int) $this->httpsFail;
// use a heredoc instead of an external file
echo <<<END_OF_TEMPLATE
<!DOCTYPE html>
<html>
<head>
<meta name="robots" content="noindex,nofollow">
<meta charset="utf-8">
<title></title>
</head>
@ -73,6 +82,7 @@ class OneClickDone
<input type="hidden" name="token_auth" value="$tokenAuth" />
<input type="hidden" name="error" value="$error" />
<input type="hidden" name="messages" value="$messages" />
<input type="hidden" name="httpsFail" value="$httpsFail" />
<noscript>
<button type="submit">Continue</button>
</noscript>