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
@ -8,8 +8,8 @@
*/
namespace Piwik\Plugins\MobileMessaging;
use Piwik\Menu\MenuAdmin;
use Piwik\Option;
use Piwik\Period;
use Piwik\Piwik;
use Piwik\Plugins\API\API as APIPlugins;
use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging;
@ -37,19 +37,19 @@ class MobileMessaging extends \Piwik\Plugin
const MOBILE_TYPE = 'mobile';
const SMS_FORMAT = 'sms';
static private $availableParameters = array(
private static $availableParameters = array(
self::PHONE_NUMBERS_PARAMETER => true,
);
static private $managedReportTypes = array(
private static $managedReportTypes = array(
self::MOBILE_TYPE => 'plugins/MobileMessaging/images/phone.png'
);
static private $managedReportFormats = array(
private static $managedReportFormats = array(
self::SMS_FORMAT => 'plugins/MobileMessaging/images/phone.png'
);
static private $availableReports = array(
private static $availableReports = array(
array(
'module' => 'MultiSites',
'action' => 'getAll',
@ -61,12 +61,11 @@ class MobileMessaging extends \Piwik\Plugin
);
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'Menu.Admin.addItems' => 'addMenu',
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'ScheduledReports.getReportParameters' => 'getReportParameters',
@ -82,15 +81,6 @@ class MobileMessaging extends \Piwik\Plugin
);
}
function addMenu()
{
MenuAdmin::addEntry('MobileMessaging_SettingsMenu',
array('module' => 'MobileMessaging', 'action' => 'index'),
true,
$order = 12
);
}
/**
* Get JavaScript files
*/
@ -188,7 +178,7 @@ class MobileMessaging extends \Piwik\Plugin
}
public function sendReport($reportType, $report, $contents, $filename, $prettyDate, $reportSubject, $reportTitle,
$additionalFiles)
$additionalFiles, Period $period = null, $force)
{
if (self::manageEvent($reportType)) {
$parameters = $report['parameters'];
@ -210,7 +200,7 @@ class MobileMessaging extends \Piwik\Plugin
}
}
static public function template_reportParametersScheduledReports(&$out)
public static function template_reportParametersScheduledReports(&$out)
{
if (Piwik::isUserIsAnonymous()) {
return;