Skip to content
Extraits de code Groupes Projets
Valider 64c7aa1b rédigé par mattab's avatar mattab
Parcourir les fichiers

Making sure at least WARNING messages are written on screen

parent 30968907
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -470,7 +470,7 @@ password = ; Proxy password: optional; if specified, username is mandatory
[log]
; possible values for log: screen, database, file
log_writers[] = file
log_writers[] = screen
; log level, everything logged w/ this level or one of greater severity
; will be logged. everything else will be ignored. possible values are:
......
......@@ -368,10 +368,15 @@ class IP
*/
public static function getNonProxyIpFromHeader($default, $proxyHeaders)
{
$proxyIps = @Config::getInstance()->General['proxy_ips'];
$proxyIps = array();
$config = Config::getInstance()->General;
if(isset($config['proxy_ips'])) {
$proxyIps = $config['proxy_ips'];
}
if (!is_array($proxyIps)) {
$proxyIps = array();
}
$proxyIps[] = $default;
// examine proxy headers
......
......@@ -456,8 +456,9 @@ abstract class Controller
$view->logoSVG = \Piwik\Plugins\API\API::getInstance()->getSVGLogoUrl();
$view->hasSVGLogo = \Piwik\Plugins\API\API::getInstance()->hasSVGLogo();
$view->enableFrames = PiwikConfig::getInstance()->General['enable_framed_pages']
|| @PiwikConfig::getInstance()->General['enable_framed_logins'];
$general = PiwikConfig::getInstance()->General;
$view->enableFrames = $general['enable_framed_pages']
|| (isset($general['enable_framed_logins']) && $general['enable_framed_logins']);
if (!$view->enableFrames) {
$view->setXFrameOptions('sameorigin');
}
......
......@@ -563,6 +563,26 @@ class Manager extends Singleton
}
/**
* Returns the name of all plugins found in this Piwik instance
* (including those not enabled)
*
* Used in tests
*
* @return array
*/
public static function getAllPluginsNames()
{
$pluginsToLoad = array_merge(
PiwikConfig::getInstance()->Plugins['Plugins'],
self::getInstance()->readPluginsDirectory(),
self::getInstance()->getCorePluginsDisabledByDefault()
);
$pluginsToLoad = array_values(array_unique($pluginsToLoad));
return $pluginsToLoad;
}
/**
* Loads the plugin filename and instantiates the plugin with the given name, eg. UserCountry
* Do NOT give the class name ie. UserCountry, but give the plugin name ie. UserCountry
......
......@@ -806,7 +806,8 @@ class Tracker
self::setPluginsNotToLoad($pluginsDisabled);
// we load 'DevicesDetection' in tests only (disabled by default)
self::setPluginsToLoad(array('DevicesDetection'));
$allPluginsFound = \Piwik\Plugin\Manager::getInstance()->getAllPluginsNames();
self::setPluginsToLoad( $allPluginsFound );
}
/**
......
......@@ -289,7 +289,13 @@ class Url
*/
static public function getCurrentHost($default = 'unknown', $checkTrustedHost = true)
{
$hostHeaders = @Config::getInstance()->General['proxy_host_headers'];
$hostHeaders = array();
$config = Config::getInstance()->General;
if(isset($config['proxy_host_headers'])) {
$hostHeaders = $config['proxy_host_headers'];
}
if (!is_array($hostHeaders)) {
$hostHeaders = array();
}
......
......@@ -50,7 +50,6 @@ if (!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER) {
ExceptionHandler::setUp();
}
if (!defined('PIWIK_ENABLE_DISPATCH') || PIWIK_ENABLE_DISPATCH) {
$controller = FrontController::getInstance();
$controller->init();
......
......@@ -101,13 +101,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
public static function loadAllPlugins()
{
$pluginsManager = \Piwik\Plugin\Manager::getInstance();
$pluginsToLoad = array_merge(
Config::getInstance()->Plugins['Plugins'],
$pluginsManager->readPluginsDirectory(),
$pluginsManager->getCorePluginsDisabledByDefault()
);
$pluginsToLoad = array_values(array_unique($pluginsToLoad));
$pluginsToLoad = $pluginsManager->getAllPluginsNames();
$pluginsManager->loadPlugins($pluginsToLoad);
}
......
......@@ -22,6 +22,10 @@ define('PIWIK_ENABLE_DISPATCH', false);
include PIWIK_INCLUDE_PATH . '/index.php';
$controller = \Piwik\FrontController::getInstance();
// Load all plugins that are found so UI tests are really testing real world use case
\Piwik\Config::getInstance()->Plugins['Plugins'] = \Piwik\Plugin\Manager::getInstance()->getAllPluginsNames();
$controller->init();
$controller->dispatch();
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter