update Piwik to version 2.16 (fixes #91)
This commit is contained in:
oliver
parent
296343bf3b
commit
d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
|
|
@ -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,16 +10,18 @@
|
|||
namespace Piwik;
|
||||
|
||||
use Exception;
|
||||
use Piwik\Application\Kernel\GlobalSettingsProvider;
|
||||
use Piwik\Container\StaticContainer;
|
||||
|
||||
/**
|
||||
* Singleton that provides read & write access to Piwik's INI configuration.
|
||||
*
|
||||
*
|
||||
* This class reads and writes to the `config/config.ini.php` file. If config
|
||||
* options are missing from that file, this class will look for their default
|
||||
* values in `config/global.ini.php`.
|
||||
*
|
||||
*
|
||||
* ### Examples
|
||||
*
|
||||
*
|
||||
* **Getting a value:**
|
||||
*
|
||||
* // read the minimum_memory_limit option under the [General] section
|
||||
|
|
@ -30,47 +32,39 @@ use Exception;
|
|||
* // set the minimum_memory_limit option
|
||||
* Config::getInstance()->General['minimum_memory_limit'] = 256;
|
||||
* Config::getInstance()->forceSave();
|
||||
*
|
||||
*
|
||||
* **Setting an entire section:**
|
||||
*
|
||||
*
|
||||
* Config::getInstance()->MySection = array('myoption' => 1);
|
||||
* Config::getInstance()->forceSave();
|
||||
*
|
||||
* @method static \Piwik\Config getInstance()
|
||||
*/
|
||||
class Config extends Singleton
|
||||
class Config
|
||||
{
|
||||
const DEFAULT_LOCAL_CONFIG_PATH = '/config/config.ini.php';
|
||||
const DEFAULT_COMMON_CONFIG_PATH = '/config/common.config.ini.php';
|
||||
const DEFAULT_GLOBAL_CONFIG_PATH = '/config/global.ini.php';
|
||||
|
||||
/**
|
||||
* Contains configuration files values
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $initialized = false;
|
||||
protected $configGlobal = array();
|
||||
protected $configLocal = array();
|
||||
protected $configCommon = array();
|
||||
protected $configCache = array();
|
||||
protected $pathGlobal = null;
|
||||
protected $pathCommon = null;
|
||||
protected $pathLocal = null;
|
||||
|
||||
/**
|
||||
* @var boolean
|
||||
*/
|
||||
protected $isTest = false;
|
||||
protected $doNotWriteConfigInTests = false;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
* @var GlobalSettingsProvider
|
||||
*/
|
||||
public function __construct($pathGlobal = null, $pathLocal = null, $pathCommon = null)
|
||||
protected $settings;
|
||||
|
||||
/**
|
||||
* @return Config
|
||||
*/
|
||||
public static function getInstance()
|
||||
{
|
||||
$this->pathGlobal = $pathGlobal ?: self::getGlobalConfigPath();
|
||||
$this->pathCommon = $pathCommon ?: self::getCommonConfigPath();
|
||||
$this->pathLocal = $pathLocal ?: self::getLocalConfigPath();
|
||||
return StaticContainer::get('Piwik\Config');
|
||||
}
|
||||
|
||||
public function __construct(GlobalSettingsProvider $settings)
|
||||
{
|
||||
$this->settings = $settings;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -80,7 +74,7 @@ class Config extends Singleton
|
|||
*/
|
||||
public function getLocalPath()
|
||||
{
|
||||
return $this->pathLocal;
|
||||
return $this->settings->getPathLocal();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -90,7 +84,7 @@ class Config extends Singleton
|
|||
*/
|
||||
public function getGlobalPath()
|
||||
{
|
||||
return $this->pathGlobal;
|
||||
return $this->settings->getPathGlobal();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -100,72 +94,7 @@ class Config extends Singleton
|
|||
*/
|
||||
public function getCommonPath()
|
||||
{
|
||||
return $this->pathCommon;
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable test environment
|
||||
*
|
||||
* @param string $pathLocal
|
||||
* @param string $pathGlobal
|
||||
* @param string $pathCommon
|
||||
*/
|
||||
public function setTestEnvironment($pathLocal = null, $pathGlobal = null, $pathCommon = null, $allowSaving = false)
|
||||
{
|
||||
if (!$allowSaving) {
|
||||
$this->isTest = true;
|
||||
}
|
||||
|
||||
$this->clear();
|
||||
|
||||
$this->pathLocal = $pathLocal ?: Config::getLocalConfigPath();
|
||||
$this->pathGlobal = $pathGlobal ?: Config::getGlobalConfigPath();
|
||||
$this->pathCommon = $pathCommon ?: Config::getCommonConfigPath();
|
||||
|
||||
$this->init();
|
||||
|
||||
// this proxy will not record any data in the production database.
|
||||
// this provides security for Piwik installs and tests were setup.
|
||||
if (isset($this->configGlobal['database_tests'])
|
||||
|| isset($this->configLocal['database_tests'])
|
||||
) {
|
||||
$this->__get('database_tests');
|
||||
$this->configCache['database'] = $this->configCache['database_tests'];
|
||||
}
|
||||
|
||||
// Ensure local mods do not affect tests
|
||||
if (empty($pathGlobal)) {
|
||||
$this->configCache['log'] = $this->configGlobal['log'];
|
||||
$this->configCache['Debug'] = $this->configGlobal['Debug'];
|
||||
$this->configCache['mail'] = $this->configGlobal['mail'];
|
||||
$this->configCache['General'] = $this->configGlobal['General'];
|
||||
$this->configCache['Segments'] = $this->configGlobal['Segments'];
|
||||
$this->configCache['Tracker'] = $this->configGlobal['Tracker'];
|
||||
$this->configCache['Deletelogs'] = $this->configGlobal['Deletelogs'];
|
||||
$this->configCache['Deletereports'] = $this->configGlobal['Deletereports'];
|
||||
}
|
||||
|
||||
// for unit tests, we set that no plugin is installed. This will force
|
||||
// the test initialization to create the plugins tables, execute ALTER queries, etc.
|
||||
$this->configCache['PluginsInstalled'] = array('PluginsInstalled' => array());
|
||||
|
||||
// DevicesDetection plugin is not yet enabled by default
|
||||
if (isset($configGlobal['Plugins'])) {
|
||||
$this->configCache['Plugins'] = $this->configGlobal['Plugins'];
|
||||
$this->configCache['Plugins']['Plugins'][] = 'DevicesDetection';
|
||||
}
|
||||
if (isset($configGlobal['Plugins_Tracker'])) {
|
||||
$this->configCache['Plugins_Tracker'] = $this->configGlobal['Plugins_Tracker'];
|
||||
$this->configCache['Plugins_Tracker']['Plugins_Tracker'][] = 'DevicesDetection';
|
||||
}
|
||||
|
||||
// to avoid weird session error in travis
|
||||
if (empty($pathGlobal)) {
|
||||
$configArray = &$this->configCache;
|
||||
} else {
|
||||
$configArray = &$this->configLocal;
|
||||
}
|
||||
$configArray['General']['session_save_handler'] = 'dbtables';
|
||||
return $this->settings->getPathCommon();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -173,7 +102,7 @@ class Config extends Singleton
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
protected static function getGlobalConfigPath()
|
||||
public static function getGlobalConfigPath()
|
||||
{
|
||||
return PIWIK_USER_PATH . self::DEFAULT_GLOBAL_CONFIG_PATH;
|
||||
}
|
||||
|
|
@ -204,6 +133,8 @@ class Config extends Singleton
|
|||
|
||||
private static function getLocalConfigInfoForHostname($hostname)
|
||||
{
|
||||
// Remove any port number to get actual hostname
|
||||
$hostname = Url::getHostSanitized($hostname);
|
||||
$perHostFilename = $hostname . '.config.ini.php';
|
||||
$pathDomainConfig = PIWIK_USER_PATH . '/config/' . $perHostFilename;
|
||||
|
||||
|
|
@ -225,11 +156,25 @@ class Config extends Singleton
|
|||
return array(
|
||||
'action_url_category_delimiter' => $general['action_url_category_delimiter'],
|
||||
'autocomplete_min_sites' => $general['autocomplete_min_sites'],
|
||||
'datatable_export_range_as_day' => $general['datatable_export_range_as_day']
|
||||
'datatable_export_range_as_day' => $general['datatable_export_range_as_day'],
|
||||
'datatable_row_limits' => $this->getDatatableRowLimits(),
|
||||
'are_ads_enabled' => $general['piwik_pro_ads_enabled']
|
||||
);
|
||||
}
|
||||
|
||||
protected static function getByDomainConfigPath()
|
||||
/**
|
||||
* @param $general
|
||||
* @return mixed
|
||||
*/
|
||||
private function getDatatableRowLimits()
|
||||
{
|
||||
$limits = $this->General['datatable_row_limits'];
|
||||
$limits = explode(",", $limits);
|
||||
$limits = array_map('trim', $limits);
|
||||
return $limits;
|
||||
}
|
||||
|
||||
public static function getByDomainConfigPath()
|
||||
{
|
||||
$host = self::getHostname();
|
||||
$hostConfig = self::getLocalConfigInfoForHostname($host);
|
||||
|
|
@ -242,9 +187,19 @@ class Config extends Singleton
|
|||
return false;
|
||||
}
|
||||
|
||||
protected static function getHostname()
|
||||
/**
|
||||
* Returns the hostname of the current request (without port number)
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function getHostname()
|
||||
{
|
||||
$host = Url::getHost($checkIfTrusted = false); // Check trusted requires config file which is not ready yet
|
||||
// Check trusted requires config file which is not ready yet
|
||||
$host = Url::getHost($checkIfTrusted = false);
|
||||
|
||||
// Remove any port number to get actual hostname
|
||||
$host = Url::getHostSanitized($host);
|
||||
|
||||
return $host;
|
||||
}
|
||||
|
||||
|
|
@ -259,19 +214,26 @@ class Config extends Singleton
|
|||
* @param string $hostname eg piwik.example.com
|
||||
* @return string
|
||||
* @throws \Exception In case the domain contains not allowed characters
|
||||
* @internal
|
||||
*/
|
||||
public function forceUsageOfLocalHostnameConfig($hostname)
|
||||
{
|
||||
$hostConfig = static::getLocalConfigInfoForHostname($hostname);
|
||||
$hostConfig = self::getLocalConfigInfoForHostname($hostname);
|
||||
|
||||
if (!Filesystem::isValidFilename($hostConfig['file'])) {
|
||||
throw new Exception('Hostname is not valid');
|
||||
$filename = $hostConfig['file'];
|
||||
if (!Filesystem::isValidFilename($filename)) {
|
||||
throw new Exception('Piwik domain is not a valid looking hostname (' . $filename . ').');
|
||||
}
|
||||
|
||||
$this->pathLocal = $hostConfig['path'];
|
||||
$this->configLocal = array();
|
||||
$this->initialized = false;
|
||||
return $this->pathLocal;
|
||||
$pathLocal = $hostConfig['path'];
|
||||
|
||||
try {
|
||||
$this->reload($pathLocal);
|
||||
} catch (Exception $ex) {
|
||||
// pass (not required for local file to exist at this point)
|
||||
}
|
||||
|
||||
return $pathLocal;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -281,99 +243,57 @@ class Config extends Singleton
|
|||
*/
|
||||
public function isFileWritable()
|
||||
{
|
||||
return is_writable($this->pathLocal);
|
||||
return is_writable($this->settings->getPathLocal());
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear in-memory configuration so it can be reloaded
|
||||
* @deprecated since v2.12.0
|
||||
*/
|
||||
public function clear()
|
||||
{
|
||||
$this->configGlobal = array();
|
||||
$this->configLocal = array();
|
||||
$this->configCache = array();
|
||||
$this->initialized = false;
|
||||
$this->reload();
|
||||
}
|
||||
|
||||
/**
|
||||
* Read configuration from files into memory
|
||||
*
|
||||
* @throws Exception if local config file is not readable; exits for other errors
|
||||
* @deprecated since v2.12.0
|
||||
*/
|
||||
public function init()
|
||||
{
|
||||
$this->initialized = true;
|
||||
$reportError = SettingsServer::isTrackerApiRequest();
|
||||
|
||||
// read defaults from global.ini.php
|
||||
if (!is_readable($this->pathGlobal) && $reportError) {
|
||||
Piwik_ExitWithMessage(Piwik::translate('General_ExceptionConfigurationFileNotFound', array($this->pathGlobal)));
|
||||
}
|
||||
|
||||
$this->configGlobal = _parse_ini_file($this->pathGlobal, true);
|
||||
|
||||
if (empty($this->configGlobal) && $reportError) {
|
||||
Piwik_ExitWithMessage(Piwik::translate('General_ExceptionUnreadableFileDisabledMethod', array($this->pathGlobal, "parse_ini_file()")));
|
||||
}
|
||||
|
||||
$this->configCommon = _parse_ini_file($this->pathCommon, true);
|
||||
|
||||
// Check config.ini.php last
|
||||
$this->checkLocalConfigFound();
|
||||
|
||||
$this->configLocal = _parse_ini_file($this->pathLocal, true);
|
||||
if (empty($this->configLocal) && $reportError) {
|
||||
Piwik_ExitWithMessage(Piwik::translate('General_ExceptionUnreadableFileDisabledMethod', array($this->pathLocal, "parse_ini_file()")));
|
||||
}
|
||||
$this->reload();
|
||||
}
|
||||
|
||||
/**
|
||||
* Reloads config data from disk.
|
||||
*
|
||||
* @throws \Exception if the global config file is not found and this is a tracker request, or
|
||||
* if the local config file is not found and this is NOT a tracker request.
|
||||
*/
|
||||
protected function reload($pathLocal = null, $pathGlobal = null, $pathCommon = null)
|
||||
{
|
||||
$this->settings->reload($pathGlobal, $pathLocal, $pathCommon);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
public function existsLocalConfig()
|
||||
{
|
||||
return is_readable($this->pathLocal);
|
||||
return is_readable($this->getLocalPath());
|
||||
}
|
||||
|
||||
public function checkLocalConfigFound()
|
||||
public function deleteLocalConfig()
|
||||
{
|
||||
if (!$this->existsLocalConfig()) {
|
||||
throw new Exception(Piwik::translate('General_ExceptionConfigurationFileNotFound', array($this->pathLocal)));
|
||||
$configLocal = $this->getLocalPath();
|
||||
|
||||
if(file_exists($configLocal)){
|
||||
@unlink($configLocal);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Decode HTML entities
|
||||
*
|
||||
* @param mixed $values
|
||||
* @return mixed
|
||||
*/
|
||||
protected function decodeValues($values)
|
||||
{
|
||||
if (is_array($values)) {
|
||||
foreach ($values as &$value) {
|
||||
$value = $this->decodeValues($value);
|
||||
}
|
||||
return $values;
|
||||
}
|
||||
return html_entity_decode($values, ENT_COMPAT, 'UTF-8');
|
||||
}
|
||||
|
||||
/**
|
||||
* Encode HTML entities
|
||||
*
|
||||
* @param mixed $values
|
||||
* @return mixed
|
||||
*/
|
||||
protected function encodeValues($values)
|
||||
{
|
||||
if (is_array($values)) {
|
||||
foreach ($values as &$value) {
|
||||
$value = $this->encodeValues($value);
|
||||
}
|
||||
} else {
|
||||
$values = htmlentities($values, ENT_COMPAT, 'UTF-8');
|
||||
}
|
||||
return $values;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a configuration value or section by name.
|
||||
*
|
||||
|
|
@ -385,85 +305,32 @@ class Config extends Singleton
|
|||
*/
|
||||
public function &__get($name)
|
||||
{
|
||||
if (!$this->initialized) {
|
||||
$this->init();
|
||||
|
||||
// must be called here, not in init(), since setTestEnvironment() calls init(). (this avoids
|
||||
// infinite recursion)
|
||||
Piwik::postTestEvent('Config.createConfigSingleton',
|
||||
array($this, &$this->configCache, &$this->configLocal));
|
||||
}
|
||||
|
||||
// check cache for merged section
|
||||
if (isset($this->configCache[$name])) {
|
||||
$tmp =& $this->configCache[$name];
|
||||
return $tmp;
|
||||
}
|
||||
|
||||
$section = $this->getFromGlobalConfig($name);
|
||||
$sectionCommon = $this->getFromCommonConfig($name);
|
||||
if(empty($section) && !empty($sectionCommon)) {
|
||||
$section = $sectionCommon;
|
||||
} elseif(!empty($section) && !empty($sectionCommon)) {
|
||||
$section = $this->array_merge_recursive_distinct($section, $sectionCommon);
|
||||
}
|
||||
|
||||
if (isset($this->configLocal[$name])) {
|
||||
// local settings override the global defaults
|
||||
$section = $section
|
||||
? array_merge($section, $this->configLocal[$name])
|
||||
: $this->configLocal[$name];
|
||||
}
|
||||
|
||||
if ($section === null && $name = 'superuser') {
|
||||
$user = $this->getConfigSuperUserForBackwardCompatibility();
|
||||
return $user;
|
||||
} else if ($section === null) {
|
||||
throw new Exception("Error while trying to read a specific config file entry <strong>'$name'</strong> from your configuration files.</b>If you just completed a Piwik upgrade, please check that the file config/global.ini.php was overwritten by the latest Piwik version.");
|
||||
}
|
||||
|
||||
// cache merged section for later
|
||||
$this->configCache[$name] = $this->decodeValues($section);
|
||||
$tmp =& $this->configCache[$name];
|
||||
|
||||
return $tmp;
|
||||
$section =& $this->settings->getIniFileChain()->get($name);
|
||||
return $section;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated since version 2.0.4
|
||||
* @api
|
||||
*/
|
||||
public function getConfigSuperUserForBackwardCompatibility()
|
||||
{
|
||||
try {
|
||||
$db = Db::get();
|
||||
$user = $db->fetchRow("SELECT login, email, password
|
||||
FROM " . Common::prefixTable("user") . "
|
||||
WHERE superuser_access = 1
|
||||
ORDER BY date_registered ASC LIMIT 1");
|
||||
|
||||
if (!empty($user)) {
|
||||
$user['bridge'] = 1;
|
||||
return $user;
|
||||
}
|
||||
} catch (Exception $e) {}
|
||||
|
||||
return array();
|
||||
}
|
||||
|
||||
public function getFromGlobalConfig($name)
|
||||
{
|
||||
if (isset($this->configGlobal[$name])) {
|
||||
return $this->configGlobal[$name];
|
||||
}
|
||||
return null;
|
||||
return $this->settings->getIniFileChain()->getFrom($this->getGlobalPath(), $name);
|
||||
}
|
||||
|
||||
/**
|
||||
* @api
|
||||
*/
|
||||
public function getFromCommonConfig($name)
|
||||
{
|
||||
if (isset($this->configCommon[$name])) {
|
||||
return $this->configCommon[$name];
|
||||
}
|
||||
return null;
|
||||
return $this->settings->getIniFileChain()->getFrom($this->getCommonPath(), $name);
|
||||
}
|
||||
|
||||
/**
|
||||
* @api
|
||||
*/
|
||||
public function getFromLocalConfig($name)
|
||||
{
|
||||
return $this->settings->getIniFileChain()->getFrom($this->getLocalPath(), $name);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -475,154 +342,24 @@ class Config extends Singleton
|
|||
*/
|
||||
public function __set($name, $value)
|
||||
{
|
||||
$this->configCache[$name] = $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Comparison function
|
||||
*
|
||||
* @param mixed $elem1
|
||||
* @param mixed $elem2
|
||||
* @return int;
|
||||
*/
|
||||
public static function compareElements($elem1, $elem2)
|
||||
{
|
||||
if (is_array($elem1)) {
|
||||
if (is_array($elem2)) {
|
||||
return strcmp(serialize($elem1), serialize($elem2));
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (is_array($elem2)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ((string)$elem1 === (string)$elem2) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return ((string)$elem1 > (string)$elem2) ? 1 : -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare arrays and return difference, such that:
|
||||
*
|
||||
* $modified = array_merge($original, $difference);
|
||||
*
|
||||
* @param array $original original array
|
||||
* @param array $modified modified array
|
||||
* @return array differences between original and modified
|
||||
*/
|
||||
public function array_unmerge($original, $modified)
|
||||
{
|
||||
// return key/value pairs for keys in $modified but not in $original
|
||||
// return key/value pairs for keys in both $modified and $original, but values differ
|
||||
// ignore keys that are in $original but not in $modified
|
||||
|
||||
return array_udiff_assoc($modified, $original, array(__CLASS__, 'compareElements'));
|
||||
$this->settings->getIniFileChain()->set($name, $value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Dump config
|
||||
*
|
||||
* @param array $configLocal
|
||||
* @param array $configGlobal
|
||||
* @param array $configCommon
|
||||
* @param array $configCache
|
||||
* @return string
|
||||
* @return string|null
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function dumpConfig($configLocal, $configGlobal, $configCommon, $configCache)
|
||||
public function dumpConfig()
|
||||
{
|
||||
$dirty = false;
|
||||
$chain = $this->settings->getIniFileChain();
|
||||
|
||||
$output = "; <?php exit; ?> DO NOT REMOVE THIS LINE\n";
|
||||
$output .= "; file automatically generated or modified by Piwik; you can manually override the default values in global.ini.php by redefining them in this file.\n";
|
||||
|
||||
if (!$configCache) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// If there is a common.config.ini.php, this will ensure config.ini.php does not duplicate its values
|
||||
if(!empty($configCommon)) {
|
||||
$configGlobal = $this->array_merge_recursive_distinct($configGlobal, $configCommon);
|
||||
}
|
||||
|
||||
if ($configLocal) {
|
||||
foreach ($configLocal as $name => $section) {
|
||||
if (!isset($configCache[$name])) {
|
||||
$configCache[$name] = $this->decodeValues($section);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$sectionNames = array_unique(array_merge(array_keys($configGlobal), array_keys($configCache)));
|
||||
|
||||
foreach ($sectionNames as $section) {
|
||||
if (!isset($configCache[$section])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Only merge if the section exists in global.ini.php (in case a section only lives in config.ini.php)
|
||||
|
||||
// get local and cached config
|
||||
$local = isset($configLocal[$section]) ? $configLocal[$section] : array();
|
||||
$config = $configCache[$section];
|
||||
|
||||
// remove default values from both (they should not get written to local)
|
||||
if (isset($configGlobal[$section])) {
|
||||
$config = $this->array_unmerge($configGlobal[$section], $configCache[$section]);
|
||||
$local = $this->array_unmerge($configGlobal[$section], $local);
|
||||
}
|
||||
|
||||
// if either local/config have non-default values and the other doesn't,
|
||||
// OR both have values, but different values, we must write to config.ini.php
|
||||
if (empty($local) xor empty($config)
|
||||
|| (!empty($local)
|
||||
&& !empty($config)
|
||||
&& self::compareElements($config, $configLocal[$section]))
|
||||
) {
|
||||
$dirty = true;
|
||||
}
|
||||
|
||||
// no point in writing empty sections, so skip if the cached section is empty
|
||||
if (empty($config)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$output .= "[$section]\n";
|
||||
|
||||
foreach ($config as $name => $value) {
|
||||
$value = $this->encodeValues($value);
|
||||
|
||||
if (is_numeric($name)) {
|
||||
$name = $section;
|
||||
$value = array($value);
|
||||
}
|
||||
|
||||
if (is_array($value)) {
|
||||
foreach ($value as $currentValue) {
|
||||
$output .= $name . "[] = \"$currentValue\"\n";
|
||||
}
|
||||
} else {
|
||||
if (!is_numeric($value)) {
|
||||
$value = "\"$value\"";
|
||||
}
|
||||
$output .= $name . ' = ' . $value . "\n";
|
||||
}
|
||||
}
|
||||
|
||||
$output .= "\n";
|
||||
}
|
||||
|
||||
if ($dirty) {
|
||||
return $output;
|
||||
}
|
||||
return false;
|
||||
$header = "; <?php exit; ?> DO NOT REMOVE THIS LINE\n";
|
||||
$header .= "; file automatically generated or modified by Piwik; you can manually override the default values in global.ini.php by redefining them in this file.\n";
|
||||
return $chain->dumpChanges($header);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Write user configuration file
|
||||
*
|
||||
|
|
@ -635,22 +372,24 @@ class Config extends Singleton
|
|||
*
|
||||
* @throws \Exception if config file not writable
|
||||
*/
|
||||
protected function writeConfig($configLocal, $configGlobal, $configCommon, $configCache, $pathLocal, $clear = true)
|
||||
protected function writeConfig($clear = true)
|
||||
{
|
||||
if ($this->isTest) {
|
||||
if ($this->doNotWriteConfigInTests) {
|
||||
return;
|
||||
}
|
||||
|
||||
$output = $this->dumpConfig($configLocal, $configGlobal, $configCommon, $configCache);
|
||||
if ($output !== false) {
|
||||
$success = @file_put_contents($pathLocal, $output);
|
||||
if (!$success) {
|
||||
$output = $this->dumpConfig();
|
||||
if ($output !== null
|
||||
&& $output !== false
|
||||
) {
|
||||
$success = @file_put_contents($this->getLocalPath(), $output);
|
||||
if ($success === false) {
|
||||
throw $this->getConfigNotWritableException();
|
||||
}
|
||||
}
|
||||
|
||||
if ($clear) {
|
||||
$this->clear();
|
||||
$this->reload();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -662,7 +401,7 @@ class Config extends Singleton
|
|||
*/
|
||||
public function forceSave()
|
||||
{
|
||||
$this->writeConfig($this->configLocal, $this->configGlobal, $this->configCommon, $this->configCache, $this->pathLocal);
|
||||
$this->writeConfig();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -670,45 +409,7 @@ class Config extends Singleton
|
|||
*/
|
||||
public function getConfigNotWritableException()
|
||||
{
|
||||
$path = "config/" . basename($this->pathLocal);
|
||||
$path = "config/" . basename($this->getLocalPath());
|
||||
return new Exception(Piwik::translate('General_ConfigFileIsNotWritable', array("(" . $path . ")", "")));
|
||||
}
|
||||
|
||||
/**
|
||||
* array_merge_recursive does indeed merge arrays, but it converts values with duplicate
|
||||
* keys to arrays rather than overwriting the value in the first array with the duplicate
|
||||
* value in the second array, as array_merge does. I.e., with array_merge_recursive,
|
||||
* this happens (documented behavior):
|
||||
*
|
||||
* array_merge_recursive(array('key' => 'org value'), array('key' => 'new value'));
|
||||
* => array('key' => array('org value', 'new value'));
|
||||
*
|
||||
* array_merge_recursive_distinct does not change the datatypes of the values in the arrays.
|
||||
* Matching keys' values in the second array overwrite those in the first array, as is the
|
||||
* case with array_merge, i.e.:
|
||||
*
|
||||
* array_merge_recursive_distinct(array('key' => 'org value'), array('key' => 'new value'));
|
||||
* => array('key' => array('new value'));
|
||||
*
|
||||
* Parameters are passed by reference, though only for performance reasons. They're not
|
||||
* altered by this function.
|
||||
*
|
||||
* @param array $array1
|
||||
* @param array $array2
|
||||
* @return array
|
||||
* @author Daniel <daniel (at) danielsmedegaardbuus (dot) dk>
|
||||
* @author Gabriel Sobrinho <gabriel (dot) sobrinho (at) gmail (dot) com>
|
||||
*/
|
||||
function array_merge_recursive_distinct ( array &$array1, array &$array2 )
|
||||
{
|
||||
$merged = $array1;
|
||||
foreach ( $array2 as $key => &$value ) {
|
||||
if ( is_array ( $value ) && isset ( $merged [$key] ) && is_array ( $merged [$key] ) ) {
|
||||
$merged [$key] = $this->array_merge_recursive_distinct ( $merged [$key], $value );
|
||||
} else {
|
||||
$merged [$key] = $value;
|
||||
}
|
||||
}
|
||||
return $merged;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue