update Piwik to version 2.16 (fixes #91)

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

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
@ -20,12 +20,9 @@ use Piwik\Piwik;
*/
function getHostnameName($in)
{
if (empty($in)) {
if (empty($in) || strtolower($in) === 'ip') {
return Piwik::translate('General_Unknown');
}
if (strtolower($in) === 'ip') {
return "IP";
}
if (($positionDot = strpos($in, '.')) !== false) {
return ucfirst(substr($in, 0, $positionDot));
}
@ -40,14 +37,8 @@ function getHostnameName($in)
*/
function getHostnameUrl($in)
{
if ($in == DataTable::LABEL_SUMMARY_ROW) {
return false;
}
if (empty($in)
|| strtolower($in) === 'ip'
) {
// link to "what does 'IP' mean?"
return "http://piwik.org/faq/general/#faq_52";
if ($in == DataTable::LABEL_SUMMARY_ROW || empty($in) || strtolower($in) === 'ip') {
return null;
}
// if the name looks like it can be used in a URL, use it in one, otherwise link to startpage