Skip to content

Fix user agent and a few other things #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samwilson merged 1 commit into from
May 2, 2026
Merged

Fix user agent and a few other things #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);

Expand Down
2 changes: 1 addition & 1 deletion admin/oauth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])) {
Expand Down
2 changes: 0 additions & 2 deletions admin/photo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions admin/settings.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading