From c48fe65e6f47c09762276baaee24c6b430195612 Mon Sep 17 00:00:00 2001
From: Sam Wilson <sam@samwilson.id.au>
Date: Sat, 2 May 2026 09:23:42 +0200
Subject: [PATCH] Fix user agent and a few other things

---
 admin.php          |  2 +-
 admin/oauth.php    |  2 +-
 admin/photo.php    |  2 --
 admin/settings.tpl | 12 ++++++------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/admin.php b/admin.php
index 15c2169..1fe5fe3 100644
--- a/admin.php
+++ b/admin.php
@@ -1,7 +1,7 @@
 <?php
 
 require_once __DIR__.'/vendor/autoload.php';
-include_once PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php';
+require_once PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php';
 
 defined('PHPWG_ROOT_PATH') or exit(1);
 
diff --git a/admin/oauth.php b/admin/oauth.php
index ff5d154..578049d 100644
--- a/admin/oauth.php
+++ b/admin/oauth.php
@@ -20,7 +20,7 @@
   $conf[WIKIMEDIACOMMONS_ID]['key'],
   $conf[WIKIMEDIACOMMONS_ID]['secret']
 ));
-$oauth_client_conf->setUserAgent(get_root_url());
+$oauth_client_conf->setUserAgent('piwigo/wikimedia-commons-plugin '.get_root_url());
 $client = new Client($oauth_client_conf);
 
 if (isset($_GET['logout'])) {
diff --git a/admin/photo.php b/admin/photo.php
index ab1a076..3019418 100644
--- a/admin/photo.php
+++ b/admin/photo.php
@@ -9,8 +9,6 @@
 
 check_status(ACCESS_ADMINISTRATOR);
 
-include_once(WIKIMEDIACOMMONS_PATH.'vendor/autoload.php');
-
 $_GET['image_id'] = $_GET['tab'];
 check_input_parameter(
   'image_id', $_GET, false, PATTERN_ID
diff --git a/admin/settings.tpl b/admin/settings.tpl
index 632d993..29a6001 100644
--- a/admin/settings.tpl
+++ b/admin/settings.tpl
@@ -5,14 +5,14 @@
   <p>
       {'To do this, first'|translate}
       <a href="https://meta.wikimedia.org/wiki/Special:OAuthConsumerRegistration/propose/oauth1a">
-          {'go to Meta Wiki to set up a new OAuth consumer'|translate}
-      </a> with the following permissions:
+          {'go to Meta Wiki to set up a new OAuth 1.0a consumer'|translate}
+      </a> with the following grants:
   </p>
   <ul>
-  <li>{'Edit existing pages'|translate}</li>
-  <li>{'Create, edit, and move pages'|translate}</li>
-  <li>{'Upload new files'|translate}</li>
-  <li>{'Upload, replace, and move files'|translate}</li>
+    <li>{'Edit existing pages'|translate}</li>
+    <li>{'Create, edit, and move pages'|translate}</li>
+    <li>{'Upload new files'|translate}</li>
+    <li>{'Upload, replace, and move files'|translate}</li>
   </ul>
   <p>{'Set the callback URL to:'|translate} <code>{$callback_url}</code></p>
   <p>{'Meta Wiki will give you a <em>key</em> and a <em>secret</em>; add these to the form below.'|translate}</p>