Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Extension tests (phpBB 3.3.x)
uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
with:
EXTNAME: tas2580/wiki
EXTNAME: phpbbmodders/wiki
PHPBB_BRANCH: '3.3.x'
RUN_FUNCTIONAL_TESTS: 0

Expand All @@ -26,7 +26,7 @@ jobs:
name: Extension tests (phpBB master / 4.0)
uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@master
with:
EXTNAME: tas2580/wiki
EXTNAME: phpbbmodders/wiki
PHPBB_BRANCH: 'master'
RUN_FUNCTIONAL_TESTS: 0
PRIMARY_PHP_VERSION: '8.2'
Expand Down
20 changes: 19 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,28 @@ an active article offline or deleting it entirely:
INSTALLATION
----------
To install this extension, download it and upload the files to your forum
under <b>/ext/tas2580/wiki</b>. Then go to the Admin panel of your forum and
under <b>/ext/phpbbmodders/wiki</b>. Then go to the Admin panel of your forum and
navigate to Customise -> Extension Management -> Extensions. Find this
extension in the list and click Enable.

UPGRADING FROM tas2580/wiki
----------
This extension used to be installed as `tas2580/wiki`. It is now
`phpbbmodders/wiki`. To switch an existing board without losing any
articles, versions, permissions or notification settings:

1. Disable the old **tas2580 Wiki** extension in the ACP. Do **not** delete its data.
2. Delete the `/ext/tas2580/wiki` folder.
3. Upload this version to `/ext/phpbbmodders/wiki` and enable it. The old
install's migration history, notification type and users' notification
settings are moved to the new name automatically; the wiki tables
themselves never included the old name, so they are used as they are.
4. Purge the board cache.

If you disable the old extension from the command line (`bin/phpbbcli.php`)
instead of the ACP, run `bin/phpbbcli.php cache:purge` before enabling the
new one; the command-line disable doesn't clear the cache.

COMPATIBILITY
-------
Verified working, end to end (create/edit/versioning/compare/approve-reject/
Expand Down
36 changes: 25 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,45 @@
{
"name": "tas2580/wiki",
"name": "phpbbmodders/wiki",
"type": "phpbb-extension",
"description": "A simple wiki",
"homepage": "https://tas2580.net/downloads/phpbb-wiki/",
"homepage": "https://www.phpbbmodders.com/",
"version": "1.1.0",
"keywords": ["phpbb", "extension", "wiki"],
"keywords": [
"phpbb",
"extension",
"wiki",
"articles"
],
"license": "GPL-2.0-only",
"authors": [{
"authors": [
{
"name": "phpBB Modders",
"email": "board@phpbbmodders.com",
"homepage": "https://www.phpbbmodders.com/",
"role": "Extension Developer"
},
{
"name": "tas2580",
"email": "mail@tas2580.net",
"homepage": "https://tas2580.net",
"role": "Original author"
}, {
"role": "Past Developer"
},
{
"name": "Christian Schnegelberger (Crizz0)",
"homepage": "https://www.crizzo.de",
"role": "phpBB.de 3.2.x fork maintainer"
}],
"role": "Past Developer"
}
],
"require": {
"php": ">=5.4.7"
"php": ">=7.1.3"
},
"require-dev": {
"phpbb/epv": "dev-master"
},
"extra": {
"display-name": "tas2580 Wiki",
"display-name": "phpBB Modders Wiki",
"soft-require": {
"phpbb/phpbb": ">=3.3.0,<4.1@dev"
}
}
}
}
8 changes: 4 additions & 4 deletions config/routing.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
tas2580_wiki_index:
phpbbmodders_wiki_index:
path: /wiki/
defaults: { _controller: tas2580.wiki.overview:base }
defaults: { _controller: phpbbmodders.wiki.overview:base }

tas2580_wiki_article:
phpbbmodders_wiki_article:
path: /wiki/{article}
defaults: { _controller: tas2580.wiki.main:article, article: "" }
defaults: { _controller: phpbbmodders.wiki.main:article, article: "" }


56 changes: 28 additions & 28 deletions config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,38 @@ services:
_defaults:
public: true

tas2580.wiki.overview:
class: tas2580\wiki\controller\overview
phpbbmodders.wiki.overview:
class: phpbbmodders\wiki\controller\overview
arguments:
- '@auth'
- '@controller.helper'
- '@dbal.conn'
- '@request'
- '@template'
- '@user'
- '@tas2580.wiki.edit'
- '@tas2580.wiki.compare'
- '@tas2580.wiki.view'
- '@phpbbmodders.wiki.edit'
- '@phpbbmodders.wiki.compare'
- '@phpbbmodders.wiki.view'
- '%core.root_path%'
- '%core.php_ext%'
- '%tables.wiki.article%'

tas2580.wiki.main:
class: tas2580\wiki\controller\main
phpbbmodders.wiki.main:
class: phpbbmodders\wiki\controller\main
arguments:
- '@auth'
- '@controller.helper'
- '@request'
- '@template'
- '@user'
- '@tas2580.wiki.delete'
- '@tas2580.wiki.edit'
- '@tas2580.wiki.compare'
- '@tas2580.wiki.view'
- '@phpbbmodders.wiki.delete'
- '@phpbbmodders.wiki.edit'
- '@phpbbmodders.wiki.compare'
- '@phpbbmodders.wiki.view'
- '%core.root_path%'
- '%core.php_ext%'
tas2580.wiki.listener:
class: tas2580\wiki\event\listener
phpbbmodders.wiki.listener:
class: phpbbmodders\wiki\event\listener
arguments:
- '@auth'
- '@controller.helper'
Expand All @@ -45,8 +45,8 @@ services:
- '@user'
tags:
- { name: event.listener }
tas2580.wiki.edit:
class: tas2580\wiki\wiki\edit
phpbbmodders.wiki.edit:
class: phpbbmodders\wiki\wiki\edit
arguments:
- '@auth'
- '@config'
Expand All @@ -59,8 +59,8 @@ services:
- '%tables.wiki.article%'
- '%core.root_path%'
- '%core.php_ext%'
tas2580.wiki.compare:
class: tas2580\wiki\wiki\compare
phpbbmodders.wiki.compare:
class: phpbbmodders\wiki\wiki\compare
arguments:
- '@auth'
- '@config'
Expand All @@ -73,30 +73,30 @@ services:
- '%tables.wiki.article%'
- '%core.root_path%'
- '%core.php_ext%'
tas2580.wiki.delete:
class: tas2580\wiki\wiki\delete
phpbbmodders.wiki.delete:
class: phpbbmodders\wiki\wiki\delete
arguments:
- '@auth'
- '@dbal.conn'
- '@controller.helper'
- '@user'
- '%tables.wiki.article%'
tas2580.wiki.view:
class: tas2580\wiki\wiki\view
phpbbmodders.wiki.view:
class: phpbbmodders\wiki\wiki\view
arguments:
- '@auth'
- '@dbal.conn'
- '@controller.helper'
- '@template'
- '@user'
- '@tas2580.wiki.compare'
- '@tas2580.wiki.edit'
- '@phpbbmodders.wiki.compare'
- '@phpbbmodders.wiki.edit'
- '%tables.wiki.article%'
- '%core.root_path%'
- '%core.php_ext%'

tas2580.wiki.notification.type.article_edit:
class: tas2580\wiki\notification\article_edit
phpbbmodders.wiki.notification.type.article_edit:
class: phpbbmodders\wiki\notification\article_edit
shared: false
arguments:
- '@user_loader'
Expand All @@ -110,12 +110,12 @@ services:
- '%tables.user_notifications%'
tags:
- { name: notification.type }
tas2580.wiki.text_reparser.article_text:
class: tas2580\wiki\textreparser\plugins\article_text
phpbbmodders.wiki.text_reparser.article_text:
class: phpbbmodders\wiki\textreparser\plugins\article_text
arguments:
- '@dbal.conn'
- '%tables.wiki.article%'
calls:
- [set_name, [tas2580_wiki_article]]
- [set_name, [phpbbmodders_wiki_article]]
tags:
- { name: text_reparser.plugin}
36 changes: 19 additions & 17 deletions controller/main.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<?php
/**
*
* @package phpBB Extension - Wiki
*
* Wiki extension for the phpBB Forum Software package
*
* @copyright (c) 2015 tas2580 (https://tas2580.net)
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
namespace tas2580\wiki\controller;
* @copyright (c) 2026, phpBB Modders, https://www.phpbbmodders.com/
* @license GNU General Public License, version 2 (GPL-2.0)
*
*/
namespace phpbbmodders\wiki\controller;

class main
{
Expand All @@ -25,16 +27,16 @@ class main
/** @var \phpbb\user */
protected $user;

/** @var \tas2580\wiki\wiki\delete */
/** @var \phpbbmodders\wiki\wiki\delete */
protected $delete;

/** @var \tas2580\wiki\wiki\edit */
/** @var \phpbbmodders\wiki\wiki\edit */
protected $edit;

/** @var \tas2580\wiki\wiki\compare */
/** @var \phpbbmodders\wiki\wiki\compare */
protected $compare;

/** @var \tas2580\wiki\wiki\view */
/** @var \phpbbmodders\wiki\wiki\view */
protected $view;

/** @var string phpbb_root_path */
Expand All @@ -51,14 +53,14 @@ class main
* @param \phpbb\request\request $request Request object
* @param \phpbb\template\template $template Template object
* @param \phpbb\user $user User object
* @param \tas2580\wiki\wiki\delete $delete Delete Wiki object
* @param \tas2580\wiki\wiki\edit $edit Edit Wiki object
* @param \tas2580\wiki\wiki\compare $compare Diff Wiki object
* @param \tas2580\wiki\wiki\view $view View Wiki object
* @param \phpbbmodders\wiki\wiki\delete $delete Delete Wiki object
* @param \phpbbmodders\wiki\wiki\edit $edit Edit Wiki object
* @param \phpbbmodders\wiki\wiki\compare $compare Diff Wiki object
* @param \phpbbmodders\wiki\wiki\view $view View Wiki object
* @param string $phpbb_root_path
* @param string $php_ext
*/
public function __construct(\phpbb\auth\auth $auth, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \tas2580\wiki\wiki\delete $delete, \tas2580\wiki\wiki\edit $edit, \tas2580\wiki\wiki\compare $compare, \tas2580\wiki\wiki\view $view, $phpbb_root_path, $php_ext)
public function __construct(\phpbb\auth\auth $auth, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \phpbbmodders\wiki\wiki\delete $delete, \phpbbmodders\wiki\wiki\edit $edit, \phpbbmodders\wiki\wiki\compare $compare, \phpbbmodders\wiki\wiki\view $view, $phpbb_root_path, $php_ext)
{
$this->auth = $auth;
$this->helper = $helper;
Expand Down Expand Up @@ -92,7 +94,7 @@ public function index()
*/
public function article($article)
{
$this->user->add_lang_ext('tas2580/wiki', 'common');
$this->user->add_lang_ext('phpbbmodders/wiki', 'common');

if (!$this->auth->acl_get('u_wiki_view'))
{
Expand All @@ -101,7 +103,7 @@ public function article($article)

$this->template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $this->user->lang('WIKI'),
'U_VIEW_FORUM' => $this->helper->route('tas2580_wiki_index', array()),
'U_VIEW_FORUM' => $this->helper->route('phpbbmodders_wiki_index', array()),
));

$this->template->assign_vars(array(
Expand Down
Loading
Loading