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

82
www/analytics/plugins/MobileMessaging/Controller.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
@ -10,20 +10,38 @@
namespace Piwik\Plugins\MobileMessaging;
use Piwik\Common;
use Piwik\Intl\Data\Provider\RegionDataProvider;
use Piwik\IP;
use Piwik\Piwik;
use Piwik\Plugin\ControllerAdmin;
use Piwik\Plugins\LanguagesManager\LanguagesManager;
use Piwik\Plugins\MobileMessaging\SMSProvider;
use Piwik\Translation\Translator;
use Piwik\View;
require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
/**
*
*/
class Controller extends \Piwik\Plugin\ControllerAdmin
class Controller extends ControllerAdmin
{
/*
/**
* @var RegionDataProvider
*/
private $regionDataProvider;
/**
* @var Translator
*/
private $translator;
public function __construct(RegionDataProvider $regionDataProvider, Translator $translator)
{
$this->regionDataProvider = $regionDataProvider;
$this->translator = $translator;
parent::__construct();
}
/**
* Mobile Messaging Settings tab :
* - set delegated management
* - provide & validate SMS API credential
@ -32,33 +50,65 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
*/
public function index()
{
Piwik::checkUserIsNotAnonymous();
Piwik::checkUserHasSuperUserAccess();
$view = new View('@MobileMessaging/index');
$this->setManageVariables($view);
return $view->render();
}
/**
* Mobile Messaging Settings tab :
* - set delegated management
* - provide & validate SMS API credential
* - add & activate phone numbers
* - check remaining credits
*/
public function userSettings()
{
Piwik::checkUserIsNotAnonymous();
$view = new View('@MobileMessaging/userSettings');
$this->setManageVariables($view);
return $view->render();
}
private function setManageVariables(View $view)
{
$view->isSuperUser = Piwik::hasUserSuperUserAccess();
$mobileMessagingAPI = API::getInstance();
$view->delegatedManagement = $mobileMessagingAPI->getDelegatedManagement();
$view->credentialSupplied = $mobileMessagingAPI->areSMSAPICredentialProvided();
$view->accountManagedByCurrentUser = $view->isSuperUser || $view->delegatedManagement;
$view->strHelpAddPhone = Piwik::translate('MobileMessaging_Settings_PhoneNumbers_HelpAdd', array(Piwik::translate('General_Settings'), Piwik::translate('MobileMessaging_SettingsMenu')));
$view->strHelpAddPhone = $this->translator->translate('MobileMessaging_Settings_PhoneNumbers_HelpAdd', array(
$this->translator->translate('General_Settings'),
$this->translator->translate('MobileMessaging_SettingsMenu')
));
$view->creditLeft = 0;
$view->provider = '';
if ($view->credentialSupplied && $view->accountManagedByCurrentUser) {
$view->provider = $mobileMessagingAPI->getSMSProvider();
$view->creditLeft = $mobileMessagingAPI->getCreditLeft();
}
$view->smsProviders = SMSProvider::$availableSMSProviders;
$providers = array();
foreach (SMSProvider::findAvailableSmsProviders() as $provider) {
$providers[$provider->getId()] = $provider->getDescription();
}
$view->smsProviders = $providers;
// construct the list of countries from the lang files
$countries = array();
foreach (Common::getCountriesList() as $countryCode => $continentCode) {
foreach ($this->regionDataProvider->getCountryList() as $countryCode => $continentCode) {
if (isset(CountryCallingCodes::$countryCallingCodes[$countryCode])) {
$countries[$countryCode] =
array(
'countryName' => \Piwik\Plugins\UserCountry\countryTranslate($countryCode),
'countryCallingCode' => CountryCallingCodes::$countryCallingCodes[$countryCode],
);
$countries[$countryCode] = array(
'countryName' => \Piwik\Plugins\UserCountry\countryTranslate($countryCode),
'countryCallingCode' => CountryCallingCodes::$countryCallingCodes[$countryCode],
);
}
}
$view->countries = $countries;
@ -72,7 +122,5 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
$view->phoneNumbers = $mobileMessagingAPI->getPhoneNumbers();
$this->setBasicVariablesView($view);
return $view->render();
}
}