MDL-74567 core: re-factor flickr libraries to use shared user-agent.

This commit is contained in:
Paul Holden
2022-04-29 13:31:55 +01:00
parent 2972e66008
commit 9ff112ea3d
2 changed files with 23 additions and 7 deletions
+6 -2
View File
@@ -32,6 +32,11 @@
* @subpackage 3rd-party
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once("{$CFG->libdir}/flickrclient.php");
/**
* Flickr Class
* @package moodlecore
@@ -81,9 +86,8 @@ class phpFlickr {
// Initialize curl helper, set custom user agent as Flickr blocks our "MoodleBot" agent string.
$this->curl = new curl(array('cache'=>true, 'module_cache'=>'repository'));
$version = moodle_major_version();
$this->curl->setopt([
'CURLOPT_USERAGENT' => "MoodleSite/$version (+{$CFG->wwwroot})"
'CURLOPT_USERAGENT' => flickr_client::user_agent(),
]);
}