Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Becker <fabian.becker@uni-tuebingen.de>2013-07-18 13:45:02 +0400
committerFabian Becker <fabian.becker@uni-tuebingen.de>2013-07-18 13:45:02 +0400
commit03b4953f008c1063e6d7166143ba844e8c6e89cc (patch)
tree7b9f0fef13d75417c551f813c98dba1a22f2fff3 /plugins/LanguagesManager
parent9b2c0a7a450fff3b634f8119c8003ae1d20b97d0 (diff)
Refactor class Piwik_Common to \Piwik\Core\Common
Notice that auto refactoring has created a nested namespace. Not sure this is what we want - so we might have to edit those nested namespaces afterwards (I think they don't look so good)
Diffstat (limited to 'plugins/LanguagesManager')
-rw-r--r--plugins/LanguagesManager/API.php8
-rw-r--r--plugins/LanguagesManager/Controller.php4
-rw-r--r--plugins/LanguagesManager/LanguagesManager.php10
3 files changed, 11 insertions, 11 deletions
diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php
index a4048e99b5..14fb3ea7f5 100644
--- a/plugins/LanguagesManager/API.php
+++ b/plugins/LanguagesManager/API.php
@@ -10,7 +10,7 @@
*
*/
use Piwik\Core\Piwik;
-use Piwik\Core\Piwik_Common;
+use Piwik\Core\Common;
/**
* The LanguagesManager API lets you access existing Piwik translations, and change Users languages preferences.
@@ -51,7 +51,7 @@ class Piwik_LanguagesManager_API
public function isLanguageAvailable($languageCode)
{
return $languageCode !== false
- && Piwik_Common::isValidFilename($languageCode)
+ && Common::isValidFilename($languageCode)
&& in_array($languageCode, $this->getAvailableLanguages());
}
@@ -161,7 +161,7 @@ class Piwik_LanguagesManager_API
{
Piwik::checkUserIsSuperUserOrTheUser($login);
Piwik::checkUserIsNotAnonymous();
- return Piwik_FetchOne('SELECT language FROM ' . Piwik_Common::prefixTable('user_language') .
+ return Piwik_FetchOne('SELECT language FROM ' . Common::prefixTable('user_language') .
' WHERE login = ? ', array($login));
}
@@ -180,7 +180,7 @@ class Piwik_LanguagesManager_API
return false;
}
$paramsBind = array($login, $languageCode, $languageCode);
- Piwik_Query('INSERT INTO ' . Piwik_Common::prefixTable('user_language') .
+ Piwik_Query('INSERT INTO ' . Common::prefixTable('user_language') .
' (login, language)
VALUES (?,?)
ON DUPLICATE KEY UPDATE language=?',
diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php
index 2fbc094382..53dd6494c5 100644
--- a/plugins/LanguagesManager/Controller.php
+++ b/plugins/LanguagesManager/Controller.php
@@ -10,7 +10,7 @@
*
*/
use Piwik\Core\Piwik;
-use Piwik\Core\Piwik_Common;
+use Piwik\Core\Common;
/**
* @package Piwik_LanguagesManager
@@ -23,7 +23,7 @@ class Piwik_LanguagesManager_Controller extends Piwik_Controller
*/
public function saveLanguage()
{
- $language = Piwik_Common::getRequestVar('language');
+ $language = Common::getRequestVar('language');
// Prevent CSRF only when piwik is not installed yet (During install user can change language)
if (Piwik::isInstalled()) {
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index 5d8f6a3a72..073e7a1231 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -11,7 +11,7 @@
*/
use Piwik\Core\Config;
use Piwik\Core\Piwik;
-use Piwik\Core\Piwik_Common;
+use Piwik\Core\Common;
/**
*
@@ -88,7 +88,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
public function deleteUserLanguage($userLogin)
{
- Piwik_Query('DELETE FROM ' . Piwik_Common::prefixTable('user_language') . ' WHERE login = ?', $userLogin);
+ Piwik_Query('DELETE FROM ' . Common::prefixTable('user_language') . ' WHERE login = ?', $userLogin);
}
/**
@@ -98,7 +98,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
{
// we catch the exception
try {
- $sql = "CREATE TABLE " . Piwik_Common::prefixTable('user_language') . " (
+ $sql = "CREATE TABLE " . Common::prefixTable('user_language') . " (
login VARCHAR( 100 ) NOT NULL ,
language VARCHAR( 10 ) NOT NULL ,
PRIMARY KEY ( login )
@@ -118,7 +118,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
*/
public function uninstall()
{
- Piwik_DropTables(Piwik_Common::prefixTable('user_language'));
+ Piwik_DropTables(Common::prefixTable('user_language'));
}
/**
@@ -128,7 +128,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
{
$languageCode = self::getLanguageFromPreferences();
if (!Piwik_LanguagesManager_API::getInstance()->isLanguageAvailable($languageCode)) {
- $languageCode = Piwik_Common::extractLanguageCodeFromBrowserLanguage(Piwik_Common::getBrowserLanguage(), Piwik_LanguagesManager_API::getInstance()->getAvailableLanguages());
+ $languageCode = Common::extractLanguageCodeFromBrowserLanguage(Common::getBrowserLanguage(), Piwik_LanguagesManager_API::getInstance()->getAvailableLanguages());
}
if (!Piwik_LanguagesManager_API::getInstance()->isLanguageAvailable($languageCode)) {
$languageCode = Piwik_Translate::getInstance()->getLanguageDefault();