diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog new file mode 100644 index 00000000..d8e6f9a6 --- /dev/null +++ b/www-apps/mediawiki/ChangeLog @@ -0,0 +1,710 @@ +# ChangeLog for www-apps/mediawiki +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.136 2010/04/15 20:25:15 maekke Exp $ + + 15 Apr 2010; Markus Meier mediawiki-1.15.2.ebuild: + amd64 stable, bug #308573 + + 15 Apr 2010; Brent Baude mediawiki-1.15.2.ebuild: + Marking mediawiki-1.15.2 ppc for bug 308573 + + 04 Apr 2010; Raúl Porcel mediawiki-1.15.2.ebuild: + sparc/x86 stable wrt #308573 + +*mediawiki-1.15.2 (02 Apr 2010) + + 02 Apr 2010; Tobias Scherbaum + +mediawiki-1.15.2.ebuild: + Non-maintainer commit: Version bump, #308573 + + 14 Mar 2010; Raúl Porcel mediawiki-1.14.1.ebuild, + mediawiki-1.15.1.ebuild: + sparc stable wrt #300220 + + 09 Mar 2010; Joseph Jezak mediawiki-1.15.1.ebuild: + Marked ppc stable for bug #300220. + + 07 Mar 2010; Markus Meier mediawiki-1.14.1.ebuild, + mediawiki-1.15.1.ebuild: + amd64 stable, bug #300220 + + 05 Mar 2010; Christian Faulhammer + mediawiki-1.15.1.ebuild: + stable x86, security bug 300220 + + 05 Mar 2010; Christian Faulhammer + mediawiki-1.14.1.ebuild: + stable x86, security bug 300220 + + 26 Dec 2009; Peter Volkov mediawiki-1.11.2.ebuild, + mediawiki-1.12.3.ebuild, mediawiki-1.13.3.ebuild, mediawiki-1.13.5.ebuild, + mediawiki-1.14.0.ebuild, mediawiki-1.14.1.ebuild, mediawiki-1.15.1.ebuild: + virtual/ghostscript->app-text/ghostscript-gpl: ghostscript-gpl is the only + implementation left in the tree. + +*mediawiki-1.15.1 (17 Oct 2009) + + 17 Oct 2009; Tobias Scherbaum + +mediawiki-1.15.1.ebuild: + Non-maintainer commit: Version bump, #275447 + + 09 Aug 2009; nixnut mediawiki-1.14.1.ebuild: + ppc stable #279189 + +*mediawiki-1.14.1 (01 Aug 2009) + + 01 Aug 2009; Alex Legler +mediawiki-1.14.1.ebuild: + Non-maintainer commit: Version bump for security bug 279189. + + 09 May 2009; Raúl Porcel mediawiki-1.13.5.ebuild: + sparc stable wrt #261128 + + 27 Apr 2009; Brent Baude mediawiki-1.14.0.ebuild: + Marking mediawiki-1.14.0 ppc for bug 261128 + + 23 Apr 2009; Markus Meier mediawiki-1.13.5: + amd64/x86 stable, bug #261128 + + 22 Apr 2009; Peter Volkov mediawiki-1.14.0: + Added spl for php requirements, thank Tobias Scherbaum for report in bug + #261128. + +*mediawiki-1.14.0 (07 Apr 2009) +*mediawiki-1.13.5 (07 Apr 2009) + + 07 Apr 2009; Peter Volkov +mediawiki-1.13.5.ebuild, + +mediawiki-1.14.0.ebuild: + Version bump, bug #261126 and bug #261128, thank Patrick for both reports. + + 01 Jan 2009; Tobias Heinlein + mediawiki-1.13.3.ebuild: + amd64 stable wrt security bug #251044 + + 31 Dec 2008; Raúl Porcel mediawiki-1.13.3.ebuild: + x86 stable wrt #251044 + + 28 Dec 2008; Tobias Scherbaum + mediawiki-1.13.3.ebuild: + ppc stable, bug #251044 + + 28 Dec 2008; Friedrich Oslage + mediawiki-1.13.3.ebuild: + Stable on sparc, security bug #251044 + +*mediawiki-1.13.3 (26 Dec 2008) +*mediawiki-1.12.3 (26 Dec 2008) + + 26 Dec 2008; Peter Volkov -mediawiki-1.12.1.ebuild, + +mediawiki-1.12.3.ebuild, -mediawiki-1.13.2.ebuild, + +mediawiki-1.13.3.ebuild: + Version bump, fixed security issue, bug #251044, thank Bruno Buss for + report. Removed some vulnerable versions. + +*mediawiki-1.13.2 (06 Oct 2008) +*mediawiki-1.12.1 (06 Oct 2008) + + 06 Oct 2008; Peter Volkov -mediawiki-1.12.0.ebuild, + +mediawiki-1.12.1.ebuild, -mediawiki-1.13.1.ebuild, + +mediawiki-1.13.2.ebuild: + Version bump, fixes security issue #239342, thank Hanno Boeck for report. + +*mediawiki-1.13.1 (29 Sep 2008) + + 29 Sep 2008; Peter Volkov +files/postinstall-1.13-en.txt, + +files/postupgrade-1.13-en.txt, -mediawiki-1.11.1.ebuild, + -mediawiki-1.13.0.ebuild, +mediawiki-1.13.1.ebuild: + Version bump, remove old/broken. Should install all files, bug #236411, + thank Dan Johnston for report. Dropped access_restrict patch - let + administrator decide what to restrict, fixes bug #236872, thank Michael + Mair-Keimberger for report. + +*mediawiki-1.13.0 (01 Sep 2008) + + 01 Sep 2008; Benedikt Böhm mediawiki-1.11.1.ebuild, + mediawiki-1.11.2.ebuild, mediawiki-1.12.0.ebuild, + +mediawiki-1.13.0.ebuild: + fix #218051; version bump + + 23 Aug 2008; Doug Goldstein metadata.xml: + add GLEP 56 USE flag desc from use.local.desc + + 26 Jun 2008; Raúl Porcel mediawiki-1.12.0.ebuild: + Add ~alpha wrt #229197 + + 01 Jun 2008; wrobel@gentoo.org +files/access_restrict_1.12.0.patch, + mediawiki-1.12.0.ebuild: + Fix for #219713. + + 29 May 2008; Christian Heim metadata.xml: + Removing Philippe Trottier (tchiwam) from metadata.xml (as per #52828). + +*mediawiki-1.12.0 (27 Apr 2008) + + 27 Apr 2008; wrobel@gentoo.org +mediawiki-1.12.0.ebuild: + Added mediawiki-1.12.0. Bug #216192. + + 03 Apr 2008; Benedikt Böhm mediawiki-1.11.1.ebuild, + mediawiki-1.11.2.ebuild: + fix #212738 + + 08 Mar 2008; mediawiki-1.11.2.ebuild: + amd64 stable, security bug #212170. + + 04 Mar 2008; Tobias Scherbaum + mediawiki-1.11.2.ebuild: + ppc stable, bug #212170 + + 04 Mar 2008; Raúl Porcel mediawiki-1.11.2.ebuild: + sparc stable wrt #212170 + + 03 Mar 2008; Markus Meier mediawiki-1.11.2.ebuild: + x86 stable, security bug #212170 + +*mediawiki-1.11.2 (03 Mar 2008) + + 03 Mar 2008; Benedikt Böhm +mediawiki-1.11.2.ebuild: + version bump wrt security #212170 + + 26 Feb 2008; Gunnar Wrobel + -files/postinstall-1.5-en.txt, -mediawiki-1.8.5.ebuild, + mediawiki-1.11.1.ebuild: + Remove vulnerable version (sec issue #207757) and fix dependencies (#208584). + + 25 Feb 2008; Steve Dibb mediawiki-1.11.1.ebuild: + amd64 stable, security bug 207757 + + 24 Feb 2008; Raúl Porcel mediawiki-1.11.1.ebuild: + sparc stable wrt security #207757 + + 19 Feb 2008; Tobias Scherbaum + mediawiki-1.11.1.ebuild: + ppc stable, bug #207757 + + 16 Feb 2008; Markus Meier mediawiki-1.11.1.ebuild: + x86 stable, security bug #207757 and restrict tests with jakubs permission + +*mediawiki-1.11.1 (15 Feb 2008) + + 15 Feb 2008; Gunnar Wrobel + -files/jobindexlength-mysql5.patch, +files/postinstall-1.11-en.txt, + -files/jobindexlength-mysql4.patch, -files/postinstall-en.txt, + -mediawiki-1.6.10.ebuild, -mediawiki-1.9.4.ebuild, + -mediawiki-1.10.2.ebuild, -mediawiki-1.11.0.ebuild, + +mediawiki-1.11.1.ebuild: + Added mediawiki-1.11.1 to the tree. Removed the other branches (sec issue + #207757) + + 26 Nov 2007; files/postinstall-1.5-en.txt, + mediawiki-1.6.10.ebuild, mediawiki-1.8.5.ebuild, mediawiki-1.9.4.ebuild, + mediawiki-1.10.2.ebuild, mediawiki-1.11.0.ebuild: + Fixed quoting complaint from repoman + + 26 Nov 2007; Philippe Trottier + files/postinstall-1.5-en.txt, mediawiki-1.11.0.ebuild: + Bug 199361 xml support needed in php, Thanks to Jakub we also clean up the + dieing properly. + + 26 Nov 2007; Philippe Trottier + files/postinstall-1.5-en.txt: + Make it even more clear to users not to just expect upgrade and work. Bug + 185731 + + 29 Sep 2007; -mediawiki-1.8.3.ebuild, + -mediawiki-1.8.4.ebuild, -mediawiki-1.9.0.ebuild, -mediawiki-1.9.1.ebuild, + -mediawiki-1.9.2.ebuild, -mediawiki-1.9.3.ebuild, + -mediawiki-1.10.0_rc1.ebuild, -mediawiki-1.10.0.ebuild: + -m Removed insecure versions (see #192197). + + 29 Sep 2007; Wulf C. Krueger + mediawiki-1.8.5.ebuild: + Marked stable on amd64 as per security bug 192197. + + 25 Sep 2007; Raúl Porcel mediawiki-1.8.5.ebuild: + sparc stable wrt security #192197 + + 19 Sep 2007; mediawiki-1.11.0.ebuild: + Fixed missing includes/filerepo in mediawiki-1.11.0. Fixes #192861. + + 17 Sep 2007; Markus Meier mediawiki-1.8.5.ebuild: + x86 stable, security bug #192197 + + 17 Sep 2007; Tobias Scherbaum + mediawiki-1.8.5.ebuild: + ppc stable, bug #192197 + +*mediawiki-1.11.0 (17 Sep 2007) +*mediawiki-1.10.2 (17 Sep 2007) +*mediawiki-1.9.4 (17 Sep 2007) +*mediawiki-1.8.5 (17 Sep 2007) + + 17 Sep 2007; mediawiki-1.8.4.ebuild, + +mediawiki-1.8.5.ebuild, +mediawiki-1.9.4.ebuild, + +mediawiki-1.10.2.ebuild, +mediawiki-1.11.0.ebuild: + Added mediawiki 1.11.0, 1.10.2, 1.9.4, 1.8.5 in response to sec issue #192197. + + 02 Jul 2007; Piotr Jaroszyński + mediawiki-1.6.10.ebuild, mediawiki-1.8.3.ebuild, mediawiki-1.8.4.ebuild, + mediawiki-1.9.0.ebuild, mediawiki-1.9.1.ebuild, mediawiki-1.9.2.ebuild, + mediawiki-1.9.3.ebuild, mediawiki-1.10.0_rc1.ebuild, + mediawiki-1.10.0.ebuild: + (QA) RESTRICT clean up. + + 10 May 2007; Christian Parpart + -mediawiki-1.6.9.ebuild, -mediawiki-1.7.2.ebuild, -mediawiki-1.7.3.ebuild: + cleaned up very old releases + +*mediawiki-1.10.0 (10 May 2007) + + 10 May 2007; Christian Parpart + +mediawiki-1.10.0.ebuild: + version bump + +*mediawiki-1.10.0_rc1 (01 May 2007) + + 01 May 2007; Christian Parpart + +mediawiki-1.10.0_rc1.ebuild: + version bump to 1.10.0_rc1 + +*mediawiki-1.9.3 (21 Feb 2007) +*mediawiki-1.8.4 (21 Feb 2007) +*mediawiki-1.7.3 (21 Feb 2007) +*mediawiki-1.6.10 (21 Feb 2007) + + 21 Feb 2007; +mediawiki-1.6.10.ebuild, + +mediawiki-1.7.3.ebuild, +mediawiki-1.8.4.ebuild, +mediawiki-1.9.3.ebuild: + Security fix in many versions + + 14 Feb 2007; mediawiki-1.8.3.ebuild, + mediawiki-1.9.2.ebuild: + bug #162535, thank you to ProTech for working this out. + + 08 Feb 2007; mediawiki-1.8.3.ebuild: + 30 days went by and there is no major bugs + +*mediawiki-1.9.2 (05 Feb 2007) + + 05 Feb 2007; Philippe Trottier + +mediawiki-1.9.2.ebuild: + Version bump and security fix. + +*mediawiki-1.9.1 (24 Jan 2007) + + 24 Jan 2007; Philippe Trottier +mediawiki-1.9.1.ebuild: + New version, bug fixes and one security fix. + + 08 Jan 2007; Philippe Trottier -mediawiki-1.7.1, + -mediawiki-1.6.8, -mediawiki-1.8.2: + Cleaning versions with security vulnerability + +*mediawiki-1.8.3 (12 Jan 2007) + 12 Jan 2007; Philippe Trottier +mediawiki-1.9.0: + Version Bump + +*mediawiki-1.8.3 (08 Jan 2007) + 08 Jan 2007; Philippe Trottier +mediawiki-1.8.3: + Security update and upstream bug fixes. bug#161091 + Will not pull the database anymore bug#159781. + +*mediawiki-1.7.2 (08 Jan 2007) + 08 Jan 2007; Philippe Trottier +mediawiki-1.7.2: + Security update, bug fixes upstream. bug#161091 + +*mediawiki-1.6.9 (08 Jan 2007) + 08 Jan 2007; Philippe Trottier +mediawiki-1.6.9: + Security update bug#161091 + +*mediawiki-1.5.8 (08 Jan 2007) + 08 Jan 2007; Philippe Trottier -mediawiki-1.5.8: + mediawiki-1.6.8 can support the dbase used by 1.5.x. + +*mediawiki-1.4.15 (08 Jan 2007) + 08 Jan 2007; Philippe Trottier -mediawiki-1.4.15: + Too hard to support security update on that old version. + + 13 Dec 2006; Michael Sterrett + mediawiki-1.8.2.ebuild: + add restrict use flag to IUSE + + 11 Dec 2006; Philippe Trottier mediawiki-1.8.2.ebuild: + start with more restricted access possible bug#150143. + + 11 Dec 2006; Philippe Trottier mediawiki-1.8.2.ebuild: + job key lenght bug#152089. + +*mediawiki-1.8.2 (05 Dec 2006) + 05 Dec 2006; Philippe Trottier mediawiki-1.8.2.ebuild: + version update, support for postgres, bug#156334, bug#152089, bug#147668 + big thank you to dev-zero to test this. + + 23 Nov 2006; Francesco Riosa mediawiki-1.4.15.ebuild, + mediawiki-1.5.8.ebuild, mediawiki-1.6.8.ebuild, mediawiki-1.7.1.ebuild: + dev-db/mysql => virtual/mysql + +*mediawiki-1.6.8 (03 Oct 2006) + 03 Oct 2006; Philippe Trottier + 30 days are gone, no bugs, I use it myself, it's now stable. + +*mediawiki-1.7.1 (31 Aug 2006) + 31 Aug 2006; Philippe Trottier + mediawiki-1.7.1: + Patched some KEY lenght issue + +*mediawiki-1.7.1 (30 Aug 2006) + 30 Aug 2006; Philippe Trottier + +mediawiki-1.7.1: + New major version has come out. Big thanks to Daedius. Bug #139942 + +*mediawiki-1.6.x (30 Aug 2006) + 30 Aug 2006; Philippe Trottier + -mediawiki-1.6.4, -mediawiki-1.6.5, -mediawiki-1.6.6, -mediawiki-1.6.7: + Removed versions with GLSA + +*mediawiki-1.5.x (30 Aug 2006) + 30 Aug 2006; Philippe Trottier + -mediawiki-1.5.3, -mediawiki-1.5.4, -mediawiki-1.5.6: + Removed versions with GLSA. + +*mediawiki-1.5.8 (30 Aug 2006) + 30 Aug 2006; Philippe Trottier + mediawiki-1.5.8.ebuild: + Stable for more than 30 days, also oldest supported version by upstream. + Closing bug # 105818. + +*mediawiki-1.6.8 (30 Aug 2006) + 30 Aug 2006; Philippe Trottier + +mediawiki-1.6.8.ebuild: + Version bump and bug fix. + +*mediawiki-1.4.x (30 Aug 2006) + 30 Aug 2006; Philippe Trottier + -mediawiki-1.4.11.ebuild, -mediawiki-1.4.12.ebuild, -mediawiki-1.4.14.ebuild: + removed ebuilds with GLSA bug #140492 + +*mediawiki-1.3.x (30 Aug 2006) + 30 Aug 2006; Philippe Trottier + -mediawiki-1.3.16.ebuild, -mediawiki-1.3.17.ebuild, -mediawiki-1.3.18.ebuild: + removed mediawiki-1.3.x from the tree bug #140492 and bug #105818 + +*mediawiki-1.6.7 (07 Jun 2006) + 07 Jun 2006; Philippe Trottier + +mediawiki-1.6.7.ebuild: + version bump, security bug #135883 + +*mediawiki-1.6.6 (23 May 2006) + 23 May 2006; Philippe Trottier + +mediawiki-1.6.6.ebuild: + version bump, security bug #134115 + +*mediawiki-1.6.5 (03 May 2006) + + 03 May 2006; Christian Parpart + +mediawiki-1.6.5.ebuild: + version bump + +*mediawiki-1.6.4 (02 May 2006) + + 02 May 2006; Christian Parpart + +mediawiki-1.6.4.ebuild: + initial 1.6.x ebuild + +*mediawiki-1.5.8 (12 Apr 2006) +*mediawiki-1.5.3 (12 Apr 2006) +*mediawiki-1.3.18 (12 Apr 2006) + + 12 Apr 2006; Philippe Trottier + +mediawiki-1.5.8: + postinstall-1.5-en.txt created change to reflect configuration changes. refs bug #129138 + +mediawiki-1.5.3: + fixed header complain from repoman. + +mediawiki-1.3.18: + created digest. + +*mediawiki-1.4.15 (29 Mar 2006) + + 29 Mar 2006; Christian Parpart + +mediawiki-1.4.15.ebuild: + version bump, see #127971 + +*mediawiki-1.5.8 (28 Mar 2006) + + 28 Mar 2006; Christian Parpart + +mediawiki-1.5.8.ebuild: + version bump + + 09 Mar 2006; Christian Parpart mediawiki-1.5.6.ebuild: + adding missing use-flag requirement. refs bug #105818 + + 07 Mar 2006; Christian Parpart + -mediawiki-1.4.10.ebuild: + plain old version cleanup + +*mediawiki-1.4.14 (07 Mar 2006) + + 07 Mar 2006; Christian Parpart + +mediawiki-1.4.14.ebuild: + bump 1.4.14 for the 1.4.x series + +*mediawiki-1.5.6 (29 Jan 2006) + + 29 Jan 2006; Christian Parpart + +mediawiki-1.5.6.ebuild: + version bump + + 14 Jan 2006; Tobias Scherbaum + mediawiki-1.5.4.ebuild: + added to ~ppc + + 14 Jan 2006; Tobias Scherbaum + mediawiki-1.4.12.ebuild: + ppc stable, bug #113887 + + 26 Dec 2005; Jason Wever mediawiki-1.4.12.ebuild: + Stable on SPARC. + +*mediawiki-1.5.4 (23 Dec 2005) + + 23 Dec 2005; Christian Parpart + +mediawiki-1.5.4.ebuild: + version bump + + 06 Dec 2005; Christian Parpart + -mediawiki-1.3.15-r1.ebuild, -mediawiki-1.4.9-r1.ebuild, + -mediawiki-1.5.0.ebuild, -mediawiki-1.5.1.ebuild, + -mediawiki-1.5.1-r1.ebuild, -mediawiki-1.5.2.ebuild: + cleanup old/sick versions + +*mediawiki-1.5.3 (06 Dec 2005) + + 06 Dec 2005; Christian Parpart + +mediawiki-1.5.3.ebuild: + version bump (closes #114582) - also fixes #112500 + +*mediawiki-1.5.2 (07 Nov 2005) +*mediawiki-1.4.12 (07 Nov 2005) +*mediawiki-1.3.18 (07 Nov 2005) + + 07 Nov 2005; Christian Parpart + +mediawiki-1.3.18.ebuild, +mediawiki-1.4.12.ebuild, + +mediawiki-1.5.2.ebuild: + version bumps + +*mediawiki-1.5.1-r1 (31 Oct 2005) + + 31 Oct 2005; Christian Parpart + +mediawiki-1.5.1-r1.ebuild: + incorporate thoughts from bug #110977 + + 26 Oct 2005; Christian Parpart + -mediawiki-1.5.0_rc2.ebuild, -mediawiki-1.5.0_rc3.ebuild, + -mediawiki-1.5.0_rc4.ebuild: + more cleanup + + 26 Oct 2005; Christian Parpart + -mediawiki-1.5.0_rc4-r1.ebuild: + version cleanup + +*mediawiki-1.5.1 (26 Oct 2005) + + 26 Oct 2005; Christian Parpart + +mediawiki-1.5.1.ebuild: + version bump + +*mediawiki-1.4.11 (23 Oct 2005) +*mediawiki-1.3.17 (23 Oct 2005) + + 23 Oct 2005; Christian Parpart + +mediawiki-1.3.17.ebuild, +mediawiki-1.4.11.ebuild: + version bumps (security/bug fix releases) + +*mediawiki-1.5.0 (23 Oct 2005) + + 23 Oct 2005; Christian Parpart + +mediawiki-1.5.0.ebuild: + version bump + + 16 Oct 2005; Jason Wever mediawiki-1.5.0_rc4-r1.ebuild: + Added ~sparc keyword. + +*mediawiki-1.4.10 (24 Sep 2005) +*mediawiki-1.3.16 (24 Sep 2005) + + 24 Sep 2005; Christian Parpart + +mediawiki-1.3.16.ebuild, +mediawiki-1.4.10.ebuild: + version bump + +*mediawiki-1.3.15-r1 (17 Sep 2005) + + 17 Sep 2005; Christian Parpart + +mediawiki-1.3.15-r1.ebuild: + use virtual/tetex and virtual/ghostscript instead of explicitely qualifying + a fixed package + + 16 Sep 2005; Christian Parpart + mediawiki-1.5.0_rc4-r1.ebuild: + cleaning up some DIRS not to install from dist (as supposed in #105435) + + 15 Sep 2005; Michael Sterrett + mediawiki-1.5.0_rc4-r1.ebuild: + functions go in pkg_setup + +*mediawiki-1.5.0_rc4-r1 (15 Sep 2005) +*mediawiki-1.4.9-r1 (15 Sep 2005) + + 15 Sep 2005; Christian Parpart + +mediawiki-1.4.9-r1.ebuild, +mediawiki-1.5.0_rc4-r1.ebuild: + fixing ghostscript depend and solved some more depend-on-useflag issues on + mediawiki 1.5 + +*mediawiki-1.5.0_rc4 (30 Aug 2005) +*mediawiki-1.4.9 (30 Aug 2005) +*mediawiki-1.3.15 (30 Aug 2005) + + 30 Aug 2005; Christian Parpart + +mediawiki-1.3.15.ebuild, +mediawiki-1.4.9.ebuild, + +mediawiki-1.5.0_rc4.ebuild: + version bumps + +*mediawiki-1.5.0_rc3 (25 Aug 2005) + + 25 Aug 2005; Christian Parpart + +mediawiki-1.5.0_rc3.ebuild: + versiion bump + +*mediawiki-1.5.0_rc2 (24 Aug 2005) + + 24 Aug 2005; Christian Parpart + -mediawiki-1.5.0_rc1.ebuild, +mediawiki-1.5.0_rc2.ebuild: + bumping 1.5.0_rc2... + +*mediawiki-1.5.0_rc1 (24 Aug 2005) + + 24 Aug 2005; Christian Parpart + +mediawiki-1.5.0_rc1.ebuild: + bringing 1.5 series into the tree (masked for testing anyway) + + 24 Aug 2005; Christian Parpart + -mediawiki-1.3.11.ebuild, -mediawiki-1.3.12.ebuild, + -mediawiki-1.4.4.ebuild, -mediawiki-1.4.5.ebuild: + clean out pretty old versions of mediawiki + +*mediawiki-1.4.8 (24 Aug 2005) +*mediawiki-1.3.14 (24 Aug 2005) + + 24 Aug 2005; Christian Parpart + +mediawiki-1.3.14.ebuild, +mediawiki-1.4.8.ebuild: + version bump; 1.3.14 is security fix only and 1.4.8 is security fix *and* + minor bugfixes regarding IE7/mono-skin. read the RELEASE-NOTES for more + infos + +*mediawiki-1.4.7 (16 Jul 2005) + + 16 Jul 2005; Christian Parpart + +mediawiki-1.4.7.ebuild: + version bump + + 22 Jun 2005; Jason Wever mediawiki-1.4.5.ebuild: + Added ~sparc keyword. + +*mediawiki-1.4.5 (05 Jun 2005) +*mediawiki-1.3.13 (05 Jun 2005) + + 05 Jun 2005; Christian Parpart + +mediawiki-1.3.13.ebuild, +mediawiki-1.4.5.ebuild: + Bumping upstream releases 1.3.13 and 1.4.5 + + 10 May 2005; Christian Parpart mediawiki-1.4.4.ebuild: + marked stable for amd64 and x86 + +*mediawiki-1.4.4 (04 May 2005) + + 04 May 2005; Christian Parpart + +mediawiki-1.4.4.ebuild: + man, yet another release, they're fast, aren't they? (just announced a + minute ago) + +*mediawiki-1.4.3 (04 May 2005) + + 04 May 2005; Christian Parpart mediawiki-1.4.0.ebuild, + mediawiki-1.4.1.ebuild, mediawiki-1.4.2.ebuild, +mediawiki-1.4.3.ebuild: + version bump, and honoring bug #78164 + +*mediawiki-1.3.12 (25 Apr 2005) + + 25 Apr 2005; Christian Parpart + +mediawiki-1.3.12.ebuild: + version bump + + 25 Apr 2005; Christian Parpart : + version bump + +*mediawiki-1.4.1 (25 Apr 2005) + + 25 Apr 2005; Christian Parpart + +mediawiki-1.4.1.ebuild: + version bump + + 03 Apr 2005; Christian Parpart mediawiki-1.4.0.ebuild: + adding ppc keyword on request + +*mediawiki-1.4.0 (23 Mar 2005) + + 23 Mar 2005; Christian Parpart + +mediawiki-1.4.0.ebuild: + version bump + +*mediawiki-1.4.0_rc1 (21 Feb 2005) + + 21 Feb 2005; Christian Parpart + +mediawiki-1.4.0_rc1.ebuild: + version bump of to 1.4.0_rc1 of the 1.4.x series (security update) + +*mediawiki-1.3.11 (21 Feb 2005) + + 21 Feb 2005; Christian Parpart + +mediawiki-1.3.11.ebuild: + * version bump to 1.3.11 (security update) + * also make use of local math useflag as proposed in bug 82329. + + 18 Feb 2005; Christian Parpart : + fixed bug 82329: typo + + 17 Feb 2005; Christian Parpart + +files/postinstall-1.4-en.txt: + be honest to comments in bug #81671 + +*mediawiki-1.4.0_beta6 (17 Feb 2005) + + 17 Feb 2005; Christian Parpart + +mediawiki-1.4.0_beta6.ebuild: + version bump to 1.4.0_beta6; although fixed bug #81671 for 1.4x line + +*mediawiki-1.3.10 (04 Feb 2005) + + 04 Feb 2005; Christian Parpart + +mediawiki-1.3.10.ebuild: + version bump + + 23 Jan 2005; Christian Parpart mediawiki-1.3.9.ebuild: + -m marking stable for x86 and amd64 since no known problems occured + +*mediawiki-1.3.9 (19 Dec 2004) + + 19 Dec 2004; Christian Parpart + +mediawiki-1.3.9.ebuild: + version bump to 1.3.9 + + 05 Dec 2004; Christian Parpart mediawiki-1.3.8.ebuild: + marked ~amd64, as proposed by Wolfgang Loeffler (bug #37894) comment 19; + he tested it, and it runs well on this arch + + 16 Nov 2004; Christian Parpart : + improved ebuild'ing behavior with the experience users made in + bug #37894 already. Thanks to Alex Plank + for his initial ebuild. + +*mediawiki-1.3.8 (16 Nov 2004) + + 16 Nov 2004; Christian Parpart +metadata.xml, + +mediawiki-1.3.8.ebuild: + Initial import of WikiPedia's MediaWiki + diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest new file mode 100644 index 00000000..2e99114b --- /dev/null +++ b/www-apps/mediawiki/Manifest @@ -0,0 +1,7 @@ +AUX mediawiki-1.15.1-restrict-0.8.4.patch 85120 RMD160 08867fba1a7d10c4bcf9879f467ae0e68b39fb49 SHA1 7577154e26e3b746fcb4b389eaa80c7b02e6258c SHA256 2d3abad56abdfce4a162bd895e00832a0fc5427965da76a641b16901c85fea62 +AUX postinstall-1.13-en.txt 2751 RMD160 4f6c918bc1b897ed017ab8129a6d5387e982e07a SHA1 a4afb248ab7cb7abe25aa9d69533a7fd52401d73 SHA256 cebfe53c219cd6acacffcf0ed24493c0aa3180c89fa954e4a7e458dd0feb62c9 +AUX postupgrade-1.13-en.txt 1651 RMD160 aaae13a05a0984dfb327b9b5e2c6faa0d3c0c037 SHA1 a97fb9f33d964a795ec159df0628e1897b12e257 SHA256 be7ed53ebce19077a55ce3fbd7eafca7843fffc0c5e821549a4e2e1db9c560bf +DIST mediawiki-1.15.4.tar.gz 11531488 RMD160 f4879c0f9cb1b8a6f5682f9fad14010703d49c27 SHA1 c00267663a0a05ace4bd28b53b0b3b0f08dad551 SHA256 c9ef415f13efc6b450276d0e7d0d488f4a113bf9c999f411ebb12b0b693a8eae +EBUILD mediawiki-1.15.4.ebuild 4205 RMD160 e8ef76e76e694176f89e2f73a2ef536604a6511d SHA1 2243d9fa10d29bbc92e321cc4a50887c0917ed92 SHA256 123f4b3cf13159559c9382723d1d5c02afeab3c54171a3f7d70a2a71113a7e17 +MISC ChangeLog 23348 RMD160 e2d5301cca5743095247d9df788fda19c067e4e6 SHA1 1a8a6caca76088fe4a5969c9ff50e795a6b8e5de SHA256 da0b4cb30636b97a517ee048d8a3b4b6dd4ce8f309ba45dfa061137c1558a910 +MISC metadata.xml 418 RMD160 337019d783d66bbadf67162c84d6d3b8b3a8f0f4 SHA1 b49b71fd11a91a2e5f8953cf9a1643abee3c67b3 SHA256 68dd9b135528db0c39e306e60b4e910b402ee121fa1b0dc17107d1ba7c66d0eb diff --git a/www-apps/mediawiki/files/mediawiki-1.15.1-restrict-0.8.4.patch b/www-apps/mediawiki/files/mediawiki-1.15.1-restrict-0.8.4.patch new file mode 100644 index 00000000..2bf4083b --- /dev/null +++ b/www-apps/mediawiki/files/mediawiki-1.15.1-restrict-0.8.4.patch @@ -0,0 +1,1745 @@ +Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com) +Date: 2010-02-06 +Initial Package Version: 0.8.4 +Origin: http://www.mediawiki.org/wiki/Extension:Page_access_restriction +Upstream Status: never accepted +Description: This is a patch to enable page restriction under the MediaWiki software. +Pages can be articles or categories. +It adds a new |restrict| tab link allowing members of the group restrict to restrict pages. +Users member of the group viewrestrict can read (and modify) the restricted pages. +Other users cannot see, search, export, etc, the restricted pages. +You can still |protect| them for editing. + +diff -Naur mediawiki-1.15.1.orig/README.restriction-patch mediawiki-1.15.1/README.restriction-patch +--- mediawiki-1.15.1.orig/README.restriction-patch 1970-01-01 00:00:00.000000000 +0000 ++++ mediawiki-1.15.1/README.restriction-patch 2010-02-06 08:30:41.400049450 +0000 +@@ -0,0 +1,138 @@ ++ ++Article restriction patch for MediaWiki ++--------------------------------------- ++ ++Here is a patch to enable article restriction under MediaWiki. Pages can be articles or categories. It adds a new |restrict| tab link allowing members of the group ''restrict'' to restrict pages. Users member of the group ''viewrestrict'' can read (and modify) the restricted pages. Others users cannot see, search, export, etc, the restricted pages. You can still |protect| them for editing. A restricted page is distinguished by a red background tab, and you have a special page (Special:Restrictedpages) to list the restricted pages. All restriction/unrestriction actions are loggued in the wiki log. It is also possible to restrict pages by providing a regular expression array matching titles. Optionaly the user's pages can be restricted to their owner. Currently it is localized in English, German, Dutch, Swedish, Finnish, Russian, Hebrew and French. ++ ++This feature is mainly useful for intranet relying on WikiMedia as a non-encyclopedic content management system, like e-learning platforms or informational systems. To respect the wiki philosophy, it is not appropriate to use it to restrict public access! ++ ++To install restriction-patch, download MediaWiki (do a security backup if you patch your own installation). ++ ++- Apply patch : ++ ++ mv restriction-version.mediawiki-version.patch ./mediawiki-version ++ cd ./mediawiki-version ++ patch -p0 < restriction-version.mediawiki-version.patch ++ ++- Configure : ++ ++Restriction is disabled by default. Add in your ''./LocalSettings.php'' file (below require_once( "includes/DefaultSettings.php" );) : ++ ++ /** ++ * If true, a new menu action allows to restrict pages access to 'restrict' group users. If false, all previously restricted pages are accessible again. ++ */ ++ $wgEnableRestrict = true; ++ ++ /** ++ * If true, new pages are restricted by default for 'restrict' group users. ++ */ ++ $wgRestrictNewPages = false; ++ ++ /** ++ * If true restrict user pages to their owner (as well as viewrestrict/restrict members) ++ */ ++ $wgUserPageRestrict = false; ++ ++ /** ++ * when wgUserPageRestrict is enabled, still allow user pages to be read by others ++ */ ++ $wgUserReadRestrict = false; ++ ++ /** ++ * Regular expression array to restrict matching pages ++ * eg. $wgRegexRestrict = array("^Secure:", "^Secret "); // restrict all pages where title is like 'Secure:...' or 'Secret ...' ++ * Warning : titles can still be retrieved via the search engine (to be fixed) ++ */ ++ $wgRegexRestrict = array(); ++ ++ /** ++ * If true do not add recent changes entry for restricted pages ++ */ ++ $wgNoRecentChangesRestrict = true; ++ ++ /** ++ * If true hide log entries related to restriction, except for 'restrict' or 'viewrestrict' users (Special:Log page) ++ */ ++ $wgHideRestrictLog = true; ++ ++ ++Go to the ''User rights management'' page (in special pages) and add users in group ''restrict'' (allow to view and restrict pages) or ''viewrestrict'' (allow only to view restricted pages). If $wgUserPageRestrict is true, user pages are restricted to their respective owner, as well as members of the ''viewrestrict'' group. ++ ++Don't write sensible information in page titles, they could be retrieved in some cases. This is beta and GPL, test and feedback welcome ! ++ ++ ++Jerome Combaz (restrict-mediawiki/at/conseil-recherche-innovation.net) ++ ++ ++ Download patch, updates, screenshots and comments here : ++ http://conseil-recherche-innovation.net/index.php/1974/04/11/41-restrict-pages-under-mediawiki-15 ++ ++ ++ChangeLog ++--------- ++Version beta-0.8.4 for MW 1.15.1 (2010-02-06) ++- Made the patch work for MW 1.15.1 (Mario Fetka) ++ ++Version beta-0.8.4 for MW 1.13.2 (2008-12-03) ++- Made the patch work for MW 1.13.2 (Mario Fetka) ++- add the SpecialRestrictedPages.php ++ ++Version beta-0.8.4 for MW 1.12.0 (2008-04-24) ++- Made the patch work for MW 1.12.0 (Jan Krcmar) ++ ++Version beta-0.8.2 for MW 1.10.0 (2007-05-21) ++- Added UserReadRestrict function which allows users to read but not edit other users pages. ++- members of groups with ['edituser'] can edit other users pages. (Ryan Fulcher, D0li0@MW) ++ ++Version beta-0.8 for MW 1.10.0 (2007-05-21) ++- Made the patch work for MW 1.10.0 (Ryan Fulcher, D0li0@MW) ++ ++Version beta-0.8.1 for MW 1.7.1 (~2006-11-22) ++- Added inverse regex function, begin regex with !! to inverse the matching (134.91.37.96) ++ ++Version beta-0.8 for MW 1.7.1 (2006-10-06) ++- Made the patch work for MW 1.7.1 (Jesper Zedlitz) ++ ++Version beta-0.72 for MW 1.6.6/1.6.7/1.6.8 (09-01-2006) ++- Spanish translation (thanks to Victor Fari� from Queres tecnologias) ++- Czech translation (thanks to Michal Ciza) ++ ++Version beta-0.71 for MW 1.6.6/1.6.7 (07-13-2006) ++- Two bugs in Articles.php and Skin.php (thanks to Owen, see http://conseil-recherche-innovation.net/index.php/1974/04/11/41-restrict-pages-under-mediawiki-15#c489) ++ ++Version beta-0.70 for MW 1.6.6/1.6.7 (06-06-2006) ++- SQL requests are not modified anymore to check the restriction (better sustenability of the patch) ++- Now restricted pages and *regex* restricted pages are treated in the same way. So none of pages title should be listed whatever the protection mechanism choosed, nor during a search request ++- Regex restriction include the namespace, so it is now possible to restrict whole namespaces (eg. "^Talk:" restrict all talk pages) ++- Image partialy restricted (not listed but file accessible via HTTP) ++- The SpecialVersion page informs that MW is patched ++- Correction of text error on the unrestrict page (thanks to Mathaba) ++- Polish translation (thanks to Janusz 'Ency' Dorozynski) ++ ++Version beta-0.64 for MW 1.6.3 (05-01-2006) ++- Bug when displaying SpecialCategories page (thanks to T O X I N) ++- Hebrew translation (thanks to Yuval Hager) ++- Bug in OutputPage.php (thanks again to Yuval Hager) ++ ++Version beta-0.63 for MW 1.6.3 (04-20-2006) ++- Upgrade for 1.6.3 (thanks to Anthony for his help) ++- Russian translation (thanks to T O X I N) ++- Finnish translation (thanks to Tuomas Helin) ++ ++Version beta-0.62 for MW 1.5.5/1.5.6 (02-13-2006) 1.5.7 (03-05-2006) ++- Catalan translation (thanks to Pau Cabot) ++- Small mistake (comma) in swedish translation ++ ++Version beta-0.61 for MW 1.5.5/1.5.6 (01-18-2006) ++- Swedish translation (thanks to Samuel Lampa) ++- Dutch translation (thanks to Peter De Baets) ++ ++Version beta-0.6 for MW 1.5.3 (12-15-2005) ++- $wgHideRestrictLog option is back ++ ++Version beta-0.59 for MW 1.5.1/1.5.2 (10-31-2005) ++- Allow to restrict new pages by default ($wgRestrictNewPages option) ++- Bug : 'ArticleProtectComplete' hook function remplaced by 'ArticleRestrictComplete' (stupid mistake !) ++ ++Version beta-0.58 for MW 1.5.0 (10-07-2005) ++- Restriction by regular expression test on title. +diff -Naur mediawiki-1.15.1.orig/includes/Article.php mediawiki-1.15.1/includes/Article.php +--- mediawiki-1.15.1.orig/includes/Article.php 2009-03-22 13:26:27.000000000 +0000 ++++ mediawiki-1.15.1/includes/Article.php 2010-02-06 07:31:12.987049096 +0000 +@@ -912,7 +912,11 @@ + + # Another whitelist check in case oldid is altering the title + if( !$this->mTitle->userCanRead() ) { +- $wgOut->loginToUse(); ++ if ( $this->mTitle->isRestricted() ) { ++ $wgOut->restrictGroupRequired(); ++ } else { ++ $wgOut->loginToUse(); ++ } + $wgOut->output(); + $wgOut->disable(); + wfProfileOut( __METHOD__ ); +@@ -1547,7 +1551,7 @@ + * Compatibility note: this function previously returned a boolean value indicating success/failure + */ + public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) { +- global $wgUser, $wgDBtransactions, $wgUseAutomaticEditSummaries; ++ global $wgUser, $wgDBtransactions, $wgUseAutomaticEditSummaries, $wgEnableRestrict, $wgNoRecentChangesRestrict, $wgRestrictNewPages; + + # Low-level sanity check + if( $this->mTitle->getText() == '' ) { +@@ -1662,13 +1666,14 @@ + wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, $baseRevId, $user) ); + # Update recentchanges + if( !( $flags & EDIT_SUPPRESS_RC ) ) { ++ if (!$wgEnableRestrict || !$wgNoRecentChangesRestrict || !$this->mTitle->isRestricted()) { + # Mark as patrolled if the user can do so + $patrolled = $wgUseRCPatrol && $this->mTitle->userCan('autopatrol'); + # Add RC row to the DB + $rc = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $user, $summary, + $this->mLatest, $this->getTimestamp(), $bot, '', $oldsize, $newsize, + $revisionId, $patrolled +- ); ++ ); } + # Log auto-patrolled edits + if( $patrolled ) { + PatrolLog::record( $rc, true ); +@@ -1715,7 +1720,7 @@ + + # Add the page record; stake our claim on this title! + # This will return false if the article already exists +- $newid = $this->insertOn( $dbw ); ++ $newid = $this->insertOn( $dbw, ($wgRestrictNewPages && $wgUser->isAllowed('restrict') ? 'view=1' : '') ); + + if( $newid === false ) { + $dbw->rollback(); +@@ -1951,6 +1956,142 @@ + } + + /** ++ * Restrict a page ++ * (restrict-patch by Jerome Combaz) ++ */ ++ function restrict( $limit = true ) { ++ global $wgUser, $wgOut, $wgRequest, $wgEnableRestrict; ++ ++ if ( ! $wgEnableRestrict == true ) return; ++ ++ if ( ! $wgUser->isAllowed('restrict') ) { ++ $wgOut->restrictGroupRequired(); ++ return; ++ } ++ if ( wfReadOnly() ) { ++ $wgOut->readOnlyPage(); ++ return; ++ } ++ $id = $this->mTitle->getArticleID(); ++ if ( 0 == $id ) { ++ $wgOut->fatalError( wfMsg( 'badarticleerror' ) ); ++ return; ++ } ++ ++ $confirm = $wgRequest->wasPosted() && ++ $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ); ++ $reason = $wgRequest->getText( 'wpReasonRestrict' ); ++ ++ if ( $confirm ) { ++ $dbw =& wfGetDB( DB_MASTER ); ++ $dbw->update( 'page', ++ array( /* SET */ ++ 'page_touched' => $dbw->timestamp(), ++ 'page_restrictions' => (string)$limit ++ ), array( /* WHERE */ ++ 'page_id' => $id ++ ), 'Article::restrict' ++ ); ++ ++ $getredit = $this->mTitle->getRestrictions('edit'); ++ $edit = "edit=".current($getredit); ++ $getrmove = $this->mTitle->getRestrictions('move'); ++ $move = "move=".current($getrmove); ++ $view = ($limit ? 'view=1' : 'view=0'); ++ $restrictions = implode(':', array($edit, $move, $view)); ++ ++ if (wfRunHooks('ArticleRestrict', array(&$this, &$wgUser, $limit == true, $reason))) { ++ ++ $dbw =& wfGetDB( DB_MASTER ); ++ $dbw->update( 'page', ++ array( /* SET */ ++ 'page_touched' => $dbw->timestamp(), ++ 'page_restrictions' => $restrictions ++ ), array( /* WHERE */ ++ 'page_id' => $id ++ ), 'Article::restrict' ++ ); ++ ++ wfRunHooks('ArticleRestrictComplete', array(&$this, &$wgUser, $limit == true, $reason, $moveonly)); ++ ++ $log = new LogPage( 'restrict' ); ++ if ( $limit === '' ) { ++ $log->addEntry( 'unrestrict', $this->mTitle, $reason ); ++ } else { ++ $log->addEntry( 'restrict', $this->mTitle, $reason ); ++ } ++ $wgOut->redirect( $this->mTitle->getFullURL() ); ++ } ++ return; ++ } else { ++ return $this->confirmRestrict( '', '', $limit ); ++ } ++ } ++ ++ /** ++ * Output restriction confirmation dialog ++ */ ++ function confirmRestrict( $par, $reason, $limit ) { ++ global $wgOut, $wgUser; ++ ++ wfDebug( "Article::confirmRestrict\n" ); ++ ++ $sub = htmlspecialchars( $this->mTitle->getPrefixedText() ); ++ $wgOut->setRobotpolicy( 'noindex,nofollow' ); ++ ++ $check = ''; ++ $protcom = ''; ++ $moveonly = ''; ++ ++ if ( $limit === '' ) { ++ $wgOut->setPageTitle( wfMsg( 'confirmunrestrict' ) ); ++ $wgOut->setSubtitle( wfMsg( 'unrestrictsub', $sub ) ); ++ $wgOut->addWikiText( wfMsg( 'confirmunrestricttext' ) ); ++ $protcom = htmlspecialchars( wfMsg( 'unrestrictcomment' ) ); ++ $formaction = $this->mTitle->escapeLocalURL( 'action=unrestrict' . $par ); ++ } else { ++ $wgOut->setPageTitle( wfMsg( 'confirmrestrict' ) ); ++ $wgOut->setSubtitle( wfMsg( 'restrictsub', $sub ) ); ++ $wgOut->addWikiText( wfMsg( 'confirmrestricttext' ) ); ++ $protcom = htmlspecialchars( wfMsg( 'restrictcomment' ) ); ++ $formaction = $this->mTitle->escapeLocalURL( 'action=restrict' . $par ); ++ } ++ ++ $confirm = htmlspecialchars( wfMsg( 'confirm' ) ); ++ $token = htmlspecialchars( $wgUser->editToken() ); ++ ++ $wgOut->addHTML( " ++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++
++ ++ ++ ++
  ++ ++
++ ++
" ); ++ ++ $wgOut->returnToMain( false ); ++ } ++ ++ /** ++ * Unrestrict the pages ++ */ ++ function unrestrict() { ++ return $this->restrict( '' ); ++ } ++ ++ /** + * Update the article's restriction field, and leave a log entry. + * + * @param $limit Array: set of restriction keys +@@ -2008,6 +2149,10 @@ + + $current = Article::flattenRestrictions( $current ); + ++ if(current($this->mTitle->getRestrictions('view'))) { ++ $updated .= ":view=1"; ++ } ++ + $changed = ($changed || $current != $updated ); + $changed = $changed || ($updated && $this->mTitle->areRestrictionsCascading() != $cascade); + $protect = ( $updated != '' ); +diff -Naur mediawiki-1.15.1.orig/includes/DefaultSettings.php mediawiki-1.15.1/includes/DefaultSettings.php +--- mediawiki-1.15.1.orig/includes/DefaultSettings.php 2009-07-13 16:47:17.000000000 +0000 ++++ mediawiki-1.15.1/includes/DefaultSettings.php 2010-02-06 07:33:11.166050159 +0000 +@@ -2861,6 +2861,7 @@ + 'upload', + 'move', + 'import', ++ 'restrict', + 'patrol', + 'merge', + 'suppress', +@@ -2934,7 +2935,8 @@ + 'delete' => 'dellogpagetext', + 'upload' => 'uploadlogpagetext', + 'move' => 'movelogpagetext', +- 'import' => 'importlogpagetext', ++ 'import' => 'importlogpagetext', ++ 'restrict'=> 'restrictlogtext', + 'patrol' => 'patrol-log-header', + 'merge' => 'mergelogpagetext', + 'suppress' => 'suppressionlogtext', +@@ -2954,6 +2956,8 @@ + 'protect/modify' => 'modifiedarticleprotection', + 'protect/unprotect' => 'unprotectedarticle', + 'protect/move_prot' => 'movedarticleprotection', ++ 'restrict/restrict' => 'restrictedarticle', ++ 'restrict/unrestrict'=> 'unrestrictedarticle', + 'rights/rights' => 'rightslogentry', + 'delete/delete' => 'deletedarticle', + 'delete/restore' => 'undeletedarticle', +@@ -3450,6 +3454,56 @@ + $wgRestrictDisplayTitle = true; + + /** ++ * ++ * Restriction patch (by Jerome Combaz) ++ * see http://www.mediawiki.org/wiki/Extension:Page_access_restriction ++ * ++ */ ++ ++/** ++ * If true, a new menu action allows to restrict pages access to 'restrict' group users ++ */ ++$wgEnableRestrict = false; ++ ++/** ++ * If true, new pages are restricted by default for 'restrict' group users ++ */ ++$wgRestrictNewPages = false; ++ ++/** ++ * Restrict user pages to their owner (as well as viewrestrict/restrict members) ++ */ ++$wgUserPageRestrict = false; ++ ++/** ++ * when wgUserPageRestrict is enabled, still allow user pages to be read by others ++ */ ++$wgUserReadRestrict = false; ++ ++/** ++ * Regular expression array to restrict matching pages ++ * eg. $wgRegexRestrict = array("^Secure:", "^Secret "); // restrict all pages where title is like 'Secure:...' or 'Secret ...' ++ */ ++$wgRegexRestrict = array(); ++ ++/** ++ * Hide recent changes entry for restricted pages ++ */ ++$wgNoRecentChangesRestrict = true; ++ ++/** ++ * Hide log entries related to restriction except for 'restrict' or 'viewrestrict' users (Special:Log page) ++ */ ++$wgHideRestrictLog = true; ++ ++/** ++ * MediaWiki permissions setup ++ */ ++$wgGroupPermissions['restrict']['restrict'] = ++$wgGroupPermissions['restrict']['viewrestrict'] = true; ++$wgGroupPermissions['viewrestrict']['viewrestrict'] = true; ++ ++/** + * Array of usernames which may not be registered or logged in from + * Maintenance scripts can still use these + */ +diff -Naur mediawiki-1.15.1.orig/includes/Export.php mediawiki-1.15.1/includes/Export.php +--- mediawiki-1.15.1.orig/includes/Export.php 2009-03-02 19:48:41.000000000 +0000 ++++ mediawiki-1.15.1/includes/Export.php 2010-02-06 07:07:23.241049161 +0000 +@@ -122,6 +122,9 @@ + + public function pageByName( $name ) { + $title = Title::newFromText( $name ); ++ if ($title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) { ++ return new WikiError( wfMsgHtml( 'restricttext' ) ); ++ } + if( is_null( $title ) ) { + return new WikiError( "Can't export invalid title" ); + } else { +diff -Naur mediawiki-1.15.1.orig/includes/LogPage.php mediawiki-1.15.1/includes/LogPage.php +--- mediawiki-1.15.1.orig/includes/LogPage.php 2009-03-14 10:02:17.000000000 +0000 ++++ mediawiki-1.15.1/includes/LogPage.php 2010-02-06 07:07:23.272049863 +0000 +@@ -43,7 +43,7 @@ + * Constructor + * + * @param string $type One of '', 'block', 'protect', 'rights', 'delete', +- * 'upload', 'move' ++ * 'upload', 'move', 'restrict' + * @param bool $rc Whether to update recent changes as well as the logging table + * @param bool $udp Whether to send to the UDP feed if NOT sent to RC + */ +@@ -314,7 +314,7 @@ + + /** + * Add a log entry +- * @param string $action one of '', 'block', 'protect', 'rights', 'delete', 'upload', 'move', 'move_redir' ++ * @param string $action one of '', 'block', 'protect', 'rights', 'delete', 'upload', 'move', 'move_redir', 'restrict' + * @param object &$target A title object. + * @param string $comment Description associated + * @param array $params Parameters passed later to wfMsg.* functions +diff -Naur mediawiki-1.15.1.orig/includes/OutputHandler.php mediawiki-1.15.1/includes/OutputHandler.php +--- mediawiki-1.15.1.orig/includes/OutputHandler.php 2009-01-27 15:20:31.000000000 +0000 ++++ mediawiki-1.15.1/includes/OutputHandler.php 2010-02-06 07:07:23.283049008 +0000 +@@ -5,8 +5,8 @@ + */ + function wfOutputHandler( $s ) { + global $wgDisableOutputCompression, $wgValidateAllHtml; +- $s = wfMangleFlashPolicy( $s ); +- if ( $wgValidateAllHtml ) { ++ $s = wfMangleFlashPolicy( $s ); ++ if ( $wgValidateAllHtml ) { + $headers = apache_response_headers(); + $isHTML = true; + foreach ( $headers as $name => $value ) { +diff -Naur mediawiki-1.15.1.orig/includes/OutputPage.php mediawiki-1.15.1/includes/OutputPage.php +--- mediawiki-1.15.1.orig/includes/OutputPage.php 2009-03-18 23:27:48.000000000 +0000 ++++ mediawiki-1.15.1/includes/OutputPage.php 2010-02-06 07:07:23.294049619 +0000 +@@ -1191,6 +1191,22 @@ + throw new MWException( "Call to deprecated OutputPage::developerRequired() method\n" ); + } + ++ function restrictGroupRequired() { ++ global $wgUser, $wgTitle; ++ ++ $this->setPageTitle( wfMsg( 'restricttitle' ) ); ++ $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) ); ++ $this->setRobotpolicy( 'noindex,nofollow' ); ++ $this->setArticleRelated( false ); ++ $this->mBodytext = ''; ++ ++ $sk = $wgUser->getSkin(); ++ $ap = $sk->makeKnownLink( wfMsgForContent( 'administrators' ), '' ); ++ $this->addHTML( wfMsg( 'restricttext', $ap ) ); ++ $this->returnToMain( false ); ++ } ++ ++ + /** + * Produce the stock "please login to use the wiki" page + */ +diff -Naur mediawiki-1.15.1.orig/includes/QueryPage.php mediawiki-1.15.1/includes/QueryPage.php +--- mediawiki-1.15.1.orig/includes/QueryPage.php 2009-02-21 17:30:59.000000000 +0000 ++++ mediawiki-1.15.1/includes/QueryPage.php 2010-02-06 07:07:23.307048919 +0000 +@@ -170,6 +170,7 @@ + * If the function return "false", the line output will be skipped. + */ + function formatResult( $skin, $result ) { ++ if ($nt->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + return ''; + } + +@@ -498,6 +499,7 @@ + return NULL; + } + $title = Title::MakeTitle( intval( $row->namespace ), $row->title ); ++ if ($title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return NULL; + if( $title ) { + $date = isset( $row->timestamp ) ? $row->timestamp : ''; + $comments = ''; +diff -Naur mediawiki-1.15.1.orig/includes/Skin.php mediawiki-1.15.1/includes/Skin.php +--- mediawiki-1.15.1.orig/includes/Skin.php 2009-03-12 12:26:28.000000000 +0000 ++++ mediawiki-1.15.1/includes/Skin.php 2010-02-06 07:33:50.886313728 +0000 +@@ -1258,7 +1258,7 @@ + } + + function bottomLinks() { +- global $wgOut, $wgUser, $wgTitle, $wgUseTrackbacks; ++ global $wgOut, $wgUser, $wgTitle, $wgUseTrackbacks, $wgEnableRestrict; + $sep = wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . "\n"; + + $s = ''; +@@ -1296,6 +1296,7 @@ + $s .= "\n
"; + if($wgUser->isAllowed('delete')) { $s .= $this->deleteThisPage(); } + if($wgUser->isAllowed('protect')) { $s .= $sep . $this->protectThisPage(); } ++ if( $wgEnableRestrict == true && $wgUser->isAllowed('restrict')) { $s .= $sep . $this->restrictThisPage(); } + if($wgUser->isAllowed('move')) { $s .= $sep . $this->moveThisPage(); } + } + $s .= "
\n" . $this->otherLanguages(); +@@ -1576,6 +1577,31 @@ + return $s; + } + ++ /** ++ * (restrict-patch by Jerome Combaz) ++ * @access private ++ */ ++ function restrictThisPage() { ++ global $wgUser, $wgOut, $wgTitle, $wgRequest; ++ ++ $diff = $wgRequest->getVal( 'diff' ); ++ if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('restrict') ) { ++ $n = $wgTitle->getPrefixedText(); ++ ++ if ( $wgTitle->isRestricted() ) { ++ $t = wfMsg( 'unrestrictthispage' ); ++ $q = 'action=unrestrict'; ++ } else { ++ $t = wfMsg( 'restrictthispage' ); ++ $q = 'action=restrict'; ++ } ++ $s = $this->makeKnownLink( $n, $t, $q ); ++ } else { ++ $s = ''; ++ } ++ return $s; ++ } ++ + function watchThisPage() { + global $wgOut, $wgTitle; + ++$this->mWatchLinkNum; +diff -Naur mediawiki-1.15.1.orig/includes/SkinTemplate.php mediawiki-1.15.1/includes/SkinTemplate.php +--- mediawiki-1.15.1.orig/includes/SkinTemplate.php 2009-02-25 00:13:04.000000000 +0000 ++++ mediawiki-1.15.1/includes/SkinTemplate.php 2010-02-06 07:37:24.363247680 +0000 +@@ -649,7 +649,7 @@ + * @private + */ + function buildContentActionUrls() { +- global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest; ++ global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgEnableRestrict; + + wfProfileIn( __METHOD__ ); + +@@ -717,6 +717,44 @@ + 'href' => $this->mTitle->getLocalUrl( 'action=history' ), + 'rel' => 'archives', + ); ++ ++ // page restriction ++ if($wgEnableRestrict == true){ ++ if($wgUser->isAllowed('restrict')){ ++ if(!$this->mTitle->isRestricted()){ ++ $content_actions['restrict'] = array( ++ 'class' => ($action == 'restrict') ? 'selected' : false, ++ 'text' => wfMsg('restrict'), ++ 'href' => $this->mTitle->getLocalUrl( 'action=restrict' ) ++ ); ++ ++ } else { ++ if ($this->mTitle->isRegexRestricted()){ ++ $content_actions['unrestrict'] = array( ++ 'class' => ($action == 'unrestrict') ? 'selected' : false, ++ 'text' => wfMsg('restricttitle'), ++ 'href' => $this->mTitle->getLocalUrl( '' ) ++ ); ++ } else { ++ $content_actions['unrestrict'] = array( ++ 'class' => ($action == 'unrestrict') ? 'selected' : false, ++ 'text' => wfMsg('unrestrict'), ++ 'href' => $this->mTitle->getLocalUrl( 'action=unrestrict' ) ++ ); ++ } ++ } ++ } else { ++ if($wgUser->isAllowed('viewrestrict')){ ++ if($this->mTitle->isRestricted()){ ++ $content_actions['unrestrict'] = array( ++ 'class' => ($action == 'unrestrict') ? 'selected' : false, ++ 'text' => wfMsg('restricttitle'), ++ 'href' => $this->mTitle->getLocalUrl( '' ) ++ ); ++ } ++ } ++ } ++ } + + if( $wgUser->isAllowed('delete') ) { + $content_actions['delete'] = array( +diff -Naur mediawiki-1.15.1.orig/includes/SpecialPage.php mediawiki-1.15.1/includes/SpecialPage.php +--- mediawiki-1.15.1.orig/includes/SpecialPage.php 2009-03-18 21:13:34.000000000 +0000 ++++ mediawiki-1.15.1/includes/SpecialPage.php 2010-02-06 07:07:23.333048988 +0000 +@@ -199,8 +199,8 @@ + */ + static function initList() { + global $wgSpecialPages; +- global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication; +- ++ global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication, $wgEnableRestrict; ++ + if ( self::$mListInitialised ) { + return; + } +@@ -222,6 +222,10 @@ + self::$mList['Invalidateemail'] = 'EmailInvalidation'; + } + ++ if( $wgEnableRestrict ) { ++ self::$mList['Restrictedpages'] = array('SpecialPage', 'Restrictedpages' ); ++ } ++ + # Add extension special pages + self::$mList = array_merge( self::$mList, $wgSpecialPages ); + +diff -Naur mediawiki-1.15.1.orig/includes/Title.php mediawiki-1.15.1/includes/Title.php +--- mediawiki-1.15.1.orig/includes/Title.php 2009-03-25 11:35:02.000000000 +0000 ++++ mediawiki-1.15.1/includes/Title.php 2010-02-06 07:07:23.335049143 +0000 +@@ -1041,7 +1041,16 @@ + * @return \type{\bool} + */ + public function isNamespaceProtected() { +- global $wgNamespaceProtection, $wgUser; ++ global $wgNamespaceProtection, $wgUser, $wgUserPageRestrict; ++ ++ if ( $wgUserPageRestrict == true ) { ++ if ( $this->getNamespace() == NS_USER && ! (substr_count($this->getText(), $wgUser->getName()))) { ++ if ( ( ! $wgUser->isAllowed('viewrestrict') ) && ( ! $wgUser->isAllowed('edituser') ) ) { ++ return false; ++ } ++ } ++ } ++ + if( isset( $wgNamespaceProtection[ $this->mNamespace ] ) ) { + foreach( (array)$wgNamespaceProtection[ $this->mNamespace ] as $right ) { + if( $right != '' && !$wgUser->isAllowed( $right ) ) +@@ -1376,7 +1385,39 @@ + wfProfileOut( __METHOD__ ); + return $errors; + } ++ ++ /* ++ * Does the title correspond to a restricted article? ++ * (restrict-patch by Jerome Combaz) ++ * @return boolean ++ * @access public ++ */ ++ function isRestricted() { ++ global $wgEnableRestrict; ++ if ( $wgEnableRestrict == true ) { ++ $a = $this->getRestrictions("view"); ++ if ( $this->isRegexRestricted() || (!empty($a) && $a[0] == true) ) return true; ++ } ++ return false; ++ } + ++ function isRegexRestricted() { ++ global $wgEnableRestrict, $wgRegexRestrict; ++ if ( $wgEnableRestrict == true ) { ++ foreach ( $wgRegexRestrict as $k=>$v ) { ++ // Reverse restriction START ++ // If an entry starts with "!!" and the remaining string matches the namespace, ++ // the page is NOT restricted ++ if (substr($v, 0, 2) == "!!") { ++ if (ereg (substr($v, 2), $this->makeName( $this->mNamespace, $this->mTextform) ) ) return false; ++ } else ++ // Reverse restriction END ++ if ( ereg ( $v, $this->makeName( $this->mNamespace, $this->mTextform) ) ) return true; ++ } ++ } ++ return false; ++ } ++ + /** + * Is this title subject to title protection? + * @return \type{\mixed} An associative array representing any existent title +@@ -1508,7 +1549,7 @@ + * @todo fold these checks into userCan() + */ + public function userCanRead() { +- global $wgUser, $wgGroupPermissions; ++ global $wgUser, $wgGroupPermissions, $wgUserPageRestrict, $wgUserReadRestrict, $wgUserPagePrivate; + + $result = null; + wfRunHooks( 'userCan', array( &$this, &$wgUser, 'read', &$result ) ); +@@ -1516,6 +1557,32 @@ + return $result; + } + ++ // restricted page ? ++ if ( $this->isRestricted() && ! $wgUser->isAllowed('viewrestrict') ) { ++ return false; ++ } ++ ++ // restricted user pages ? ++ if ( $wgUserPageRestrict == true ) { ++ if ( $wgUserReadRestrict == false ) { ++ if ( $this->getNamespace() == NS_USER && $wgUser->getName() != $this->getText() ) { ++ if ( ! $wgUser->isAllowed('viewrestrict') ) { ++ return false; ++ } ++ } ++ } else { ++ if ( $this->getNamespace() == NS_USER && $wgUser->getName() != $this->getText() ) { ++ if ($wgUserPagePrivate) { ++ foreach ( $wgUserPagePrivate as $k=>$v ) { ++ if ( ereg (substr($v, 2), $this->makeName( $this->mNamespace, $this->mTextform) ) ++ && ! (substr_count($this->getText(), $wgUser->getName() ) ) ) ++ return false; ++ } ++ } ++ } ++ } ++ } ++ + # Shortcut for public wikis, allows skipping quite a bit of code + if ( !empty( $wgGroupPermissions['*']['read'] ) ) + return true; +diff -Naur mediawiki-1.15.1.orig/includes/User.php mediawiki-1.15.1/includes/User.php +--- mediawiki-1.15.1.orig/includes/User.php 2009-05-01 06:24:09.000000000 +0000 ++++ mediawiki-1.15.1/includes/User.php 2010-02-06 07:07:23.338049133 +0000 +@@ -160,6 +160,7 @@ + 'override-export-depth', + 'patrol', + 'protect', ++ 'restrict', + 'proxyunbannable', + 'purge', + 'read', +diff -Naur mediawiki-1.15.1.orig/includes/Wiki.php mediawiki-1.15.1/includes/Wiki.php +--- mediawiki-1.15.1.orig/includes/Wiki.php 2009-02-17 03:28:54.000000000 +0000 ++++ mediawiki-1.15.1/includes/Wiki.php 2010-02-06 07:38:16.786702542 +0000 +@@ -149,7 +149,11 @@ + # the Read array in order for the user to see it. (We have to check here to + # catch special pages etc. We check again in Article::view()) + if( !is_null( $title ) && !$title->userCanRead() ) { +- $output->loginToUse(); ++ if ( $title->isRestricted() ) { ++ $output->restrictGroupRequired(); ++ } else { ++ $output->loginToUse(); ++ } + $output->output(); + $output->disable(); + return false; +@@ -462,6 +466,8 @@ + case 'rollback': + case 'protect': + case 'unprotect': ++ case 'restrict': ++ case 'unrestrict': + case 'info': + case 'markpatrolled': + case 'render': +diff -Naur mediawiki-1.15.1.orig/includes/parser/Parser.php mediawiki-1.15.1/includes/parser/Parser.php +--- mediawiki-1.15.1.orig/includes/parser/Parser.php 2009-05-15 04:00:34.000000000 +0000 ++++ mediawiki-1.15.1/includes/parser/Parser.php 2010-02-06 07:49:14.340048341 +0000 +@@ -2878,7 +2878,7 @@ + wfDebug( __METHOD__.": template inclusion denied for " . $title->getPrefixedDBkey() ); + } else { + list( $text, $title ) = $this->getTemplateDom( $title ); +- if ( $text !== false ) { ++ if ( $text !== false && $title->userCanRead() ) { + $found = true; + $isChildObj = true; + } +@@ -2996,9 +2996,14 @@ + if ( isset( $this->mTplDomCache[$titleText] ) ) { + return array( $this->mTplDomCache[$titleText], $title ); + } +- +- // Cache miss, go to the database +- list( $text, $title ) = $this->fetchTemplateAndTitle( $title ); ++ ++ // page restriction ++ if (!$title->userCanRead()) { ++ $text = false; ++ } else { ++ // Cache miss, go to the database ++ list( $text, $title ) = $this->fetchTemplateAndTitle( $title ); ++ } + + if ( $text === false ) { + $this->mTplDomCache[$titleText] = false; +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialAllpages.php mediawiki-1.15.1/includes/specials/SpecialAllpages.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialAllpages.php 2009-02-20 16:13:40.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialAllpages.php 2010-02-06 10:33:14.800048683 +0000 +@@ -303,21 +303,23 @@ + + while( ( $n < $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) { + $t = Title::makeTitle( $s->page_namespace, $s->page_title ); +- if( $t ) { +- $link = ( $s->page_is_redirect ? '
' : '' ) . +- $sk->makeKnownLinkObj( $t, htmlspecialchars( $t->getText() ), false, false ) . +- ($s->page_is_redirect ? '
' : '' ); +- } else { +- $link = '[[' . htmlspecialchars( $s->page_title ) . ']]'; +- } +- if( $n % 3 == 0 ) { +- $out .= ''; +- } +- $out .= "$link"; +- $n++; +- if( $n % 3 == 0 ) { +- $out .= ''; +- } ++ if (! $GLOBALS['wgEnableRestrict'] or ! $t->isRestricted() or $wgUser->isAllowed('viewrestrict')) { ++ if( $t ) { ++ $link = ( $s->page_is_redirect ? '
' : '' ) . ++ $sk->makeKnownLinkObj( $t, htmlspecialchars( $t->getText() ), false, false ) . ++ ($s->page_is_redirect ? '
' : '' ); ++ } else { ++ $link = '[[' . htmlspecialchars( $s->page_title ) . ']]'; ++ } ++ if( $n % 3 == 0 ) { ++ $out .= ''; ++ } ++ $out .= "$link"; ++ $n++; ++ if( $n % 3 == 0 ) { ++ $out .= ''; ++ } ++ } // restrict patch + } + if( ($n % 3) != 0 ) { + $out .= ''; +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialAncientpages.php mediawiki-1.15.1/includes/specials/SpecialAncientpages.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialAncientpages.php 2008-07-15 15:43:43.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialAncientpages.php 2010-02-06 07:07:28.585048968 +0000 +@@ -46,6 +46,7 @@ + + $d = $wgLang->timeanddate( wfTimestamp( TS_MW, $result->value ), true ); + $title = Title::makeTitle( $result->namespace, $result->title ); ++ if ($GLOBALS['wgEnableRestrict'] and $title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $link = $skin->makeKnownLinkObj( $title, htmlspecialchars( $wgContLang->convert( $title->getPrefixedText() ) ) ); + return wfSpecialList($link, $d); + } +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialBrokenRedirects.php mediawiki-1.15.1/includes/specials/SpecialBrokenRedirects.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialBrokenRedirects.php 2008-06-19 21:12:45.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialBrokenRedirects.php 2010-02-06 07:07:28.586048801 +0000 +@@ -64,8 +64,13 @@ + return '' . $skin->makeLinkObj( $fromObj ) . ''; + } + +- $from = $skin->makeKnownLinkObj( $fromObj ,'', 'redirect=no' ); +- $edit = $skin->makeKnownLinkObj( $fromObj, wfMsgHtml( 'brokenredirects-edit' ), 'action=edit' ); ++ if ($GLOBALS['wgEnableRestrict'] and $fromObj->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) { ++ $from = "".wfMsgHtml( 'restricttitle' ).""; ++ $edit = ""; ++ } else { ++ $from = $skin->makeKnownLinkObj( $fromObj ,'', 'redirect=no' ); ++ $edit = $skin->makeKnownLinkObj( $fromObj, wfMsgHtml( 'brokenredirects-edit' ), 'action=edit' ); ++ } + $to = $skin->makeBrokenLinkObj( $toObj ); + $arr = $wgContLang->getArrow(); + +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialCategories.php mediawiki-1.15.1/includes/specials/SpecialCategories.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialCategories.php 2009-02-25 16:57:03.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialCategories.php 2010-02-06 07:07:28.593049101 +0000 +@@ -92,6 +92,7 @@ + function formatRow($result) { + global $wgLang; + $title = Title::makeTitle( NS_CATEGORY, $result->cat_title ); ++ if ($GLOBALS['wgEnableRestrict'] and $title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $titleText = $this->getSkin()->makeLinkObj( $title, htmlspecialchars( $title->getText() ) ); + $count = wfMsgExt( 'nmembers', array( 'parsemag', 'escape' ), + $wgLang->formatNum( $result->cat_pages ) ); +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialContributions.php mediawiki-1.15.1/includes/specials/SpecialContributions.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialContributions.php 2009-05-01 05:23:04.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialContributions.php 2010-02-06 07:52:27.164510419 +0000 +@@ -482,6 +482,9 @@ + + $page = Title::newFromRow( $row ); + $page->resetArticleId( $row->rev_page ); // use process cache ++ if ($GLOBALS['wgEnableRestrict'] and $page->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) ++ $link = "".wfMsgHtml( 'restricttitle' ).""; ++ else + $link = $sk->makeLinkObj( $page, $page->getPrefixedText(), $page->isRedirect() ? 'redirect=no' : '' ); + # Mark current revisions + $difftext = $topmarktext = ''; +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialDisambiguations.php mediawiki-1.15.1/includes/specials/SpecialDisambiguations.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialDisambiguations.php 2008-11-13 08:15:23.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialDisambiguations.php 2010-02-06 07:57:45.448576569 +0000 +@@ -86,11 +86,19 @@ + global $wgContLang; + $title = Title::newFromID( $result->value ); + $dp = Title::makeTitle( $result->namespace, $result->title ); +- +- $from = $skin->link( $title ); +- $edit = $skin->link( $title, "(".wfMsgHtml("qbedit").")", array(), array( 'redirect' => 'no', 'action' => 'edit' ) ); + $arr = $wgContLang->getArrow(); +- $to = $skin->link( $dp ); ++ ++ if ($GLOBALS['wgEnableRestrict'] and $title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) { ++ $from = "".wfMsgHtml( 'restricttitle' ).""; ++ $edit =""; ++ } else { ++ $from = $skin->makeKnownLinkObj( $title, '' ); ++ $edit = $skin->makeKnownLinkObj( $title, "(".wfMsgHtml("qbedit").")", array(), array( 'redirect' => 'no', 'action' => 'edit' ) ); ++ } ++ if ($GLOBALS['wgEnableRestrict'] and $dp->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) ++ $to = "".wfMsgHtml( 'restricttitle' ).""; ++ else ++ $to = $skin->makeKnownLinkObj( $dp, '' ); + + return "$from $edit $arr $to"; + } +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialDoubleRedirects.php mediawiki-1.15.1/includes/specials/SpecialDoubleRedirects.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialDoubleRedirects.php 2008-06-19 21:12:45.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialDoubleRedirects.php 2010-02-06 07:07:28.598048757 +0000 +@@ -23,6 +23,7 @@ + } + + function getSQLText( &$dbr, $namespace = null, $title = null ) { ++ global $wgEnableRestrict, $wgUser; + + list( $page, $redirect ) = $dbr->tableNamesN( 'page', 'redirect' ); + +@@ -38,7 +39,8 @@ + " AND ra.rd_title=pb.page_title" . + " AND rb.rd_from=pb.page_id" . + " AND rb.rd_namespace=pc.page_namespace" . +- " AND rb.rd_title=pc.page_title"; ++ " AND rb.rd_title=pc.page_title" . ++ (($wgEnableRestrict == true and ! $wgUser->isAllowed('viewrestrict') ) ? " AND pa.page_restrictions NOT LIKE '%view=1%'" : ""); + + if( $limitToTitle ) { + $encTitle = $dbr->addQuotes( $title ); +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialListredirects.php mediawiki-1.15.1/includes/specials/SpecialListredirects.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialListredirects.php 2008-10-17 01:25:31.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialListredirects.php 2010-02-06 07:07:35.943767670 +0000 +@@ -32,6 +32,7 @@ + + # Make a link to the redirect itself + $rd_title = Title::makeTitle( $result->namespace, $result->title ); ++ if ($GLOBALS['wgEnableRestrict'] and $rd_title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $rd_link = $skin->makeLinkObj( $rd_title, '', 'redirect=no' ); + + # Find out where the redirect leads +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialLog.php mediawiki-1.15.1/includes/specials/SpecialLog.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialLog.php 2009-01-28 19:08:18.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialLog.php 2010-02-06 08:09:53.322049681 +0000 +@@ -26,9 +26,9 @@ + * constructor + */ + function wfSpecialLog( $par = '' ) { +- global $wgRequest, $wgOut, $wgUser, $wgLogTypes; +- ++ global $wgRequest, $wgOut, $wgUser, $wgLogTypes, $wgEnableRestrict, $wgHideRestrictLog; + # Get parameters ++ if ( ($wgEnableRestrict and $wgHideRestrictLog == true and !($wgUser->isAllowed('restrict') || $wgUser->isAllowed('viewrestrict'))) or ! $wgEnableRestrict ) $this->whereClauses[] = 'log_type != "restrict"'; + $parms = explode( '/', ($par = ( $par !== null ) ? $par : '' ) ); + $symsForAll = array( '*', 'all' ); + if ( $parms[0] != '' && ( in_array( $par, $wgLogTypes ) || in_array( $par, $symsForAll ) ) ) { +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialMIMEsearch.php mediawiki-1.15.1/includes/specials/SpecialMIMEsearch.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialMIMEsearch.php 2008-12-01 17:14:30.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialMIMEsearch.php 2010-02-06 07:07:35.943767670 +0000 +@@ -64,6 +64,7 @@ + global $wgContLang, $wgLang; + + $nt = Title::makeTitle( $result->namespace, $result->title ); ++ if ($GLOBALS['wgEnableRestrict'] and $nt->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $text = $wgContLang->convert( $nt->getText() ); + $plink = $skin->makeLink( $nt->getPrefixedText(), $text ); + +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialMostcategories.php mediawiki-1.15.1/includes/specials/SpecialMostcategories.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialMostcategories.php 2008-09-08 22:08:39.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialMostcategories.php 2010-02-06 08:11:33.204699758 +0000 +@@ -39,7 +39,7 @@ + function formatResult( $skin, $result ) { + global $wgLang; + $title = Title::makeTitleSafe( $result->namespace, $result->title ); +- ++ if ($GLOBALS['wgEnableRestrict'] and $titel->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $count = wfMsgExt( 'ncategories', array( 'parsemag', 'escape' ), $wgLang->formatNum( $result->value ) ); + $link = $skin->link( $title ); + return wfSpecialList( $link, $count ); +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialMostlinked.php mediawiki-1.15.1/includes/specials/SpecialMostlinked.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialMostlinked.php 2008-07-18 01:31:18.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialMostlinked.php 2010-02-06 07:07:35.952814569 +0000 +@@ -75,6 +75,7 @@ + function formatResult( $skin, $result ) { + global $wgLang; + $title = Title::makeTitleSafe( $result->namespace, $result->title ); ++ if ($GLOBALS['wgEnableRestrict'] and $title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $link = $skin->makeLinkObj( $title ); + $wlh = $this->makeWlhLink( $title, + wfMsgExt( 'nlinks', array( 'parsemag', 'escape'), +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialMostlinkedcategories.php mediawiki-1.15.1/includes/specials/SpecialMostlinkedcategories.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialMostlinkedcategories.php 2008-07-18 01:31:18.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialMostlinkedcategories.php 2010-02-06 07:07:35.952814569 +0000 +@@ -56,6 +56,7 @@ + global $wgLang, $wgContLang; + + $nt = Title::makeTitle( $result->namespace, $result->title ); ++ if ($GLOBALS['wgEnableRestrict'] and $nt->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $text = $wgContLang->convert( $nt->getText() ); + + $plink = $skin->makeLinkObj( $nt, htmlspecialchars( $text ) ); +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialMostrevisions.php mediawiki-1.15.1/includes/specials/SpecialMostrevisions.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialMostrevisions.php 2008-07-18 01:31:18.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialMostrevisions.php 2010-02-06 07:07:35.952814569 +0000 +@@ -40,6 +40,7 @@ + global $wgLang, $wgContLang; + + $nt = Title::makeTitle( $result->namespace, $result->title ); ++ if ($GLOBALS['wgEnableRestrict'] and $nt->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $text = $wgContLang->convert( $nt->getPrefixedText() ); + + $plink = $skin->makeKnownLinkObj( $nt, $text ); +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialNewimages.php mediawiki-1.15.1/includes/specials/SpecialNewimages.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialNewimages.php 2008-12-20 00:28:34.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialNewimages.php 2010-02-06 08:12:04.846071268 +0000 +@@ -123,12 +123,14 @@ + + $name = $s->img_name; + $ut = $s->img_user_text; +- ++ + $nt = Title::newFromText( $name, NS_FILE ); + $ul = $sk->makeLinkObj( Title::makeTitle( NS_USER, $ut ), $ut ); +- +- $gallery->add( $nt, "$ul
\n".$wgLang->timeanddate( $s->img_timestamp, true )."
\n" ); +- ++ ++ // page restrict ++ if (! $GLOBALS['wgEnableRestrict'] or ! $nt->isRestricted() or $GLOBALS['wgUser']->isAllowed('viewrestrict')) ++ $gallery->add( $nt, "$ul
\n".$wgLang->timeanddate( $s->img_timestamp, true )."
\n" ); ++ + $timestamp = wfTimestamp( TS_MW, $s->img_timestamp ); + if( empty( $firstTimestamp ) ) { + $firstTimestamp = $timestamp; +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialNewpages.php mediawiki-1.15.1/includes/specials/SpecialNewpages.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialNewpages.php 2009-05-01 05:23:04.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialNewpages.php 2010-02-06 08:13:50.760259190 +0000 +@@ -254,6 +254,7 @@ + $dm = $wgContLang->getDirMark(); + + $title = Title::makeTitleSafe( $result->rc_namespace, $result->rc_title ); ++ if ($GLOBALS['wgEnableRestrict'] and $title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $time = $wgLang->timeAndDate( $result->rc_timestamp, true ); + $query = $this->patrollable( $result ) ? "rcid={$result->rc_id}&redirect=no" : 'redirect=no'; + $plink = $this->skin->makeKnownLinkObj( $title, '', $query ); +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialPopularpages.php mediawiki-1.15.1/includes/specials/SpecialPopularpages.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialPopularpages.php 2008-06-19 21:12:45.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialPopularpages.php 2010-02-06 07:07:35.952814569 +0000 +@@ -48,6 +48,7 @@ + function formatResult( $skin, $result ) { + global $wgLang, $wgContLang; + $title = Title::makeTitle( $result->namespace, $result->title ); ++ if ($GLOBALS['wgEnableRestrict'] and $title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $link = $skin->makeKnownLinkObj( $title, htmlspecialchars( $wgContLang->convert( $title->getPrefixedText() ) ) ); + $nv = wfMsgExt( 'nviews', array( 'parsemag', 'escape'), + $wgLang->formatNum( $result->value ) ); +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialPrefixindex.php mediawiki-1.15.1/includes/specials/SpecialPrefixindex.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialPrefixindex.php 2009-03-03 19:58:05.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialPrefixindex.php 2010-02-06 07:07:35.961800354 +0000 +@@ -134,6 +134,9 @@ + + while( ( $n < $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) { + $t = Title::makeTitle( $s->page_namespace, $s->page_title ); ++ if ($GLOBALS['wgEnableRestrict'] and $t->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) { ++ $link = "".wfMsgHtml( 'restricttitle' ).""; ++ } else + if( $t ) { + $link = ($s->page_is_redirect ? '
' : '' ) . + $sk->makeKnownLinkObj( $t, htmlspecialchars( $t->getText() ), false, false ) . +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialRandompage.php mediawiki-1.15.1/includes/specials/SpecialRandompage.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialRandompage.php 2009-03-05 13:38:17.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialRandompage.php 2010-02-06 07:07:35.961800354 +0000 +@@ -41,7 +41,7 @@ + + $title = $this->getRandomTitle(); + +- if( is_null( $title ) ) { ++ if( is_null( $title ) || ($GLOBALS['wgEnableRestrict'] and $title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) ) { + $this->setHeaders(); + $wgOut->addWikiMsg( strtolower( $this->mName ) . '-nopages', $wgContLang->getNsText( $this->namespace ) ); + return; +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialRecentchangeslinked.php mediawiki-1.15.1/includes/specials/SpecialRecentchangeslinked.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialRecentchangeslinked.php 2009-05-01 05:23:04.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialRecentchangeslinked.php 2010-02-06 07:07:35.961800354 +0000 +@@ -51,7 +51,7 @@ + return false; + } + $title = Title::newFromURL( $target ); +- if( !$title || $title->getInterwiki() != '' ){ ++ if( !$title || ($GLOBALS['wgEnableRestrict'] and $title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) || $title->getInterwiki() != '' ){ + $wgOut->wrapWikiMsg( '
$1

', 'allpagesbadtitle' ); + return false; + } +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialRestrictedpages.php mediawiki-1.15.1/includes/specials/SpecialRestrictedpages.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialRestrictedpages.php 1970-01-01 00:00:00.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialRestrictedpages.php 2010-02-06 07:07:35.961800354 +0000 +@@ -0,0 +1,80 @@ ++'.wfMsg('restrictedpagespagetext'); ++ if (! empty($wgRegexRestrict) ) { ++ $string .= "

\n

".wfMsg('regexrestrictedpagespagetext'); ++ foreach( $wgRegexRestrict as $k => $v ) $string .= "{$v}, "; ++ $string = substr( $string, 0, -2); ++ } ++ ++ $string .= "

\n
"; ++ ++ return $string; ++ } ++ ++ function getSQL() { ++ global $wgEnableRestrict, $wgUser; ++ ++ $db =& wfGetDB( DB_SLAVE ); ++ $page = $db->tableName( 'page' ); ++ return ++ "SELECT 'Restrictedpages' as type, ++ page_namespace as namespace, ++ page_title as title, ++ page_title as value ++ FROM $page ++ WHERE page_namespace=".NS_MAIN." AND page_is_redirect=0 AND page_restrictions LIKE '%view=1%'"; ++ } ++ ++ function sortDescending() { ++ return false; ++ } ++ ++ function formatResult( $skin, $result ) { ++ global $wgLang, $wgContLang; ++ ++ $d = $wgLang->timeanddate( wfTimestamp( TS_MW, $result->value ), true ); ++ $link = $skin->makeKnownLink( $result->title, $wgContLang->convert( $result->title) ); ++ return "{$link} ({$d})"; ++ } ++} ++ ++function wfSpecialRestrictedpages() { ++ list( $limit, $offset ) = wfCheckLimits(); ++ ++ $app = new RestrictedPagesPage(); ++ ++ $app->doQuery( $offset, $limit ); ++} ++ ++?> +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialSearch.php mediawiki-1.15.1/includes/specials/SpecialSearch.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialSearch.php 2009-03-21 10:51:08.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialSearch.php 2010-02-06 07:07:35.961800354 +0000 +@@ -1173,6 +1173,7 @@ + } + + $t = $result->getTitle(); ++ if ($GLOBALS['wgEnableRestrict'] and $t->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "
  • ".wfMsgHtml( 'restricttitle' )."
    • \n"; + $sk = $wgUser->getSkin(); + + $link = $sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms)); +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialShortpages.php mediawiki-1.15.1/includes/specials/SpecialShortpages.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialShortpages.php 2008-09-20 09:02:35.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialShortpages.php 2010-02-06 07:07:35.961800354 +0000 +@@ -71,6 +71,7 @@ + $dm = $wgContLang->getDirMark(); + + $title = Title::makeTitleSafe( $result->namespace, $result->title ); ++ if ($GLOBALS['wgEnableRestrict'] and $title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + if ( !$title ) { + return ''; + } +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialUnusedcategories.php mediawiki-1.15.1/includes/specials/SpecialUnusedcategories.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialUnusedcategories.php 2009-01-27 22:54:01.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialUnusedcategories.php 2010-02-06 07:07:35.961800354 +0000 +@@ -34,6 +34,7 @@ + + function formatResult( $skin, $result ) { + $title = Title::makeTitle( NS_CATEGORY, $result->title ); ++ if ($GLOBALS['wgEnableRestrict'] and $title->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + return $skin->makeLinkObj( $title, $title->getText() ); + } + } +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialUnwatchedpages.php mediawiki-1.15.1/includes/specials/SpecialUnwatchedpages.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialUnwatchedpages.php 2009-01-07 00:19:09.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialUnwatchedpages.php 2010-02-06 07:07:35.961800354 +0000 +@@ -42,6 +42,7 @@ + global $wgContLang; + + $nt = Title::makeTitle( $result->namespace, $result->title ); ++ if ($GLOBALS['wgEnableRestrict'] and $nt->isRestricted() and ! $GLOBALS['wgUser']->isAllowed('viewrestrict')) return "".wfMsgHtml( 'restricttitle' ).""; + $text = $wgContLang->convert( $nt->getPrefixedText() ); + + $plink = $skin->makeKnownLinkObj( $nt, htmlspecialchars( $text ) ); +diff -Naur mediawiki-1.15.1.orig/includes/specials/SpecialVersion.php mediawiki-1.15.1/includes/specials/SpecialVersion.php +--- mediawiki-1.15.1.orig/includes/specials/SpecialVersion.php 2009-01-08 01:29:11.000000000 +0000 ++++ mediawiki-1.15.1/includes/specials/SpecialVersion.php 2010-02-06 07:07:35.961800354 +0000 +@@ -88,7 +88,7 @@ + \n + + [http://www.mediawiki.org/ MediaWiki] +- " . self::getVersionLinked() . " ++ " . self::getVersionLinked() . " (patched to enable [http://www.mediawiki.org/wiki/Extension:Page_access_restriction page accessrestriction]) + \n + + [http://www.php.net/ PHP] +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesCa.php mediawiki-1.15.1/languages/messages/MessagesCa.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesCa.php 2009-06-01 11:27:42.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesCa.php 2010-02-06 08:19:27.474156763 +0000 +@@ -2484,6 +2484,35 @@ + 'mw_math_modern' => 'Recomanat per a navegadors moderns', + 'mw_math_mathml' => 'MathML si és possible (experimental)', + ++# Traducció del pedaç de les restriccions ++# http://www.mediawiki.org/wiki/Extension:Page_access_restriction ++# http://conseil-recherche-innovation.net/index.php/1974/04/11/41-restrict-pages-under-mediawiki-15 ++# Pau 05-02-06 ++'restrict' => 'Restringeix', ++'restrictthispage' => 'Restringeix aquesta pàgina', ++'unrestrict' => 'Desrentringeix', ++'unrestrictthispage' => 'Permet el lliure accés aquesta pàgina', ++'restricttitle' => 'Pàgina restringida', ++'restricttext' => 'Aquesta pàgina és restringida. Per veure-la, heu d\'esser membres del grup \'restrict\' o del grup \'viewrestrict\'.', ++'restrictedpages' => 'Pàgines restringides', ++'restrictlogpage' => 'Log_restriccions', ++'restrictlogtext' => 'A continuació, teniu una llista de restriccions de pàgina. Vegeu [[{{ns:4}}:Restricted page]] per més informació.', ++'restrictedarticle' => '[[$1]] restringida', ++'unrestrictedarticle' => '[[$1]] desrentringida', ++'restrictsub' => '(Restringeix \'[[$1]]\')', ++'confirmrestrict' => 'Confirma la restricció', ++'confirmrestricttext' => 'Segur que voleu restringir aquesta pàgina?', ++'restrictcomment' => 'Raó per la restricció', ++'unrestrictsub' => '(Desrestringeix \'[[$1]]\')', ++'confirmunrestricttext' => 'Segur que voleu desrestringir aquesta pàgina?', ++'confirmunrestrict' => 'Confirmeu la desrestricció', ++'unrestrictcomment' => 'Raó per la desrestricció', ++'restrictreason' => '(doneu una raó)', ++'tooltip-restrict' => 'Restringeix aquesta pàgina', ++'notallowedtomoverestrictedpagetext' => 'Per moure aquesta pàgina, heu de ser membre del grup \'restrict\'.', ++'restrictedpagespagetext' => 'Aquesta pàgina llista totes les pàgines restringides del wiki. ', ++'regexrestrictedpagespagetext' => 'Totes les pàgines amb títols que compleixin aquesta/aquestes expressió(ns) regulars també seran restringides: ', ++ + # Patrolling + 'markaspatrolleddiff' => 'Marca com a supervisat', + 'markaspatrolledtext' => 'Marca la pàgina com a supervisada', +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesCs.php mediawiki-1.15.1/languages/messages/MessagesCs.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesCs.php 2009-06-01 11:27:42.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesCs.php 2010-02-06 08:23:01.155049621 +0000 +@@ -1,3 +1,4 @@ ++<<<<<<< + 'Atom kanál stránky „$1“', + 'red-link-title' => '$1 (stránka neexistuje)', + ++#Restrict patch (http://www.mediawiki.org/wiki/Extension:Page_access_restriction) ++'restrict' => 'Omezit přístup', ++'restrictthispage' => 'Omezit přístup na tuto stránku', ++'unrestrict' => 'Zveřejnit', ++'unrestrictthispage' => 'Zveřejnit tuto stránku', ++'restricttitle' => 'Stránka s omezeným přístupem', ++'restricttext' => 'Na tuto stránku je omezený přístup. Zřejmě nemáte oprávnění k jejímu čtení', ++'restrictedpages' => 'Stránky s omezeným přístupem', ++'restrictlogpage' => 'Restriction_log', ++'restrictlogtext' => 'Zde je seznam omezení stránky. Pro více informací se podívejte na [[{{ns:4}}:Restricted page]] .', ++'restrictedarticle' => 'omezený [[$1]]', ++'unrestrictedarticle' => 'neomezený [[$1]]', ++'restrictsub' => '(Omezit přístup \'[[$1]]\')', ++'confirmrestrict' => 'Potvrzení omezení přístupu', ++'confirmrestricttext' => 'Opravdu chcete omezit přístup k této stránce?', ++'restrictcomment' => 'Důvod pro omezení', ++'unrestrictsub' => '(Neomezovat \'[[$1]]\')', ++'confirmunrestricttext' => 'Opravdu chcete zveřejnit tuto stránku?', ++'confirmunrestrict' => 'Potvrzení zveřejnění', ++'unrestrictcomment' => 'Důvod zveřejnění', ++'restrictreason' => '(udejte důvod)', ++'tooltip-restrict' => 'Omezit přístup', ++'notallowedtomoverestrictedpagetext' => 'Pro přesunutí této stránky musíte být členem skupiny \'restrict\' ', ++'restrictedpagespagetext' => 'Na této stránce je seznam všech omezených stránek ve wiki.', ++'regexrestrictedpagespagetext' => 'Všechny stránky s názvem obsahující tento/tyto výraz(y) jsou také omezeny : ', ++ + # Short words for each namespace, by default used in the namespace tab in monobook + 'nstab-main' => 'Stránka', + 'nstab-user' => 'Uživatelova stránka', +@@ -683,7 +710,7 @@ + 'login' => 'Přihlaste se', + 'nav-login-createaccount' => 'Přihlášení / vytvoření účtu', + 'loginprompt' => 'K přihlášení do {{grammar:2sg|{{SITENAME}}}} musíte mít povoleny cookies.', +-'userlogin' => 'Přihlášení / vytvoření účtu', ++'userlogin' => 'Přihlášení', + 'logout' => 'Odhlásit se', + 'userlogout' => 'Odhlášení', + 'notloggedin' => 'Nejste přihlášen(a)', +@@ -3199,3 +3226,4 @@ + 'dberr-cachederror' => 'Následující stránka je kopie z cache a nemusí být aktuální.', + + ); ++ +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesDe.php mediawiki-1.15.1/languages/messages/MessagesDe.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesDe.php 2009-06-07 23:02:47.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesDe.php 2010-02-06 08:28:19.594049779 +0000 +@@ -319,6 +319,31 @@ + ); + + $messages = array( ++/* Restrict patch (http://www.mediawiki.org/wiki/Extension:Page_access_restriction) */ ++'restrict' => 'Sperren', ++'restrictthispage' => 'Diese Seite sperren', ++'unrestrict' => 'Sperrung aufheben', ++'unrestrictthispage' => 'Sperrung der Seite aufheben', ++'restricttitle' => 'Gesperrte Seite', ++'restricttext' => 'Diese Seite ist gesperrt. Um sie zu betrachten, musst du ein Mitglied der Gruppe \'restrict\' oder \'viewrestrict\' sein.', ++'restrictedpages' => 'Gesperrte Seiten', ++'restrictlogpage' => 'Log der Sperrungen', ++'restrictlogtext' => 'Unten folgt eine Liste mit gesperrten Seiten. Vgl. [[{{ns:4}}:Gesperrte Seiten]] für mehr Information.', ++'restrictedarticle' => 'Gesperrt: [[$1]]', ++'unrestrictedarticle' => 'Ungesperrt: [[$1]]', ++'restrictsub' => '(Gesperrt: \'[[$1]]\')', ++'confirmrestrict' => 'Sperrung bestätigen', ++'confirmrestricttext' => 'Willst du die Seite wirklich sperren?', ++'restrictcomment' => 'Grund für die Sperrung', ++'unrestrictsub' => '(Entsperren \'[[$1]]\')', ++'confirmunrestricttext' => 'Willst du die Seite wirklich entsperren?', ++'confirmunrestrict' => 'Entsperrung bestätigen', ++'unrestrictcomment' => 'Grund für Entsperrung', ++'restrictreason' => '(einen Grund angeben)', ++'tooltip-restrict' => 'Diese Seite sperren', ++'notallowedtomoverestrictedpagetext' => 'Um diese Seite zu verschieben, musst du ein Mitglied der Gruppe \'restrict\' sein.', ++'regexrestrictedpagespagetext' => 'Diese Seite listet alle gepserrten Seiten in diesem wiki.', ++ + # User preference toggles + 'tog-underline' => 'Links unterstreichen:', + 'tog-highlightbroken' => 'Links auf nicht vorhandene Seiten hervorheben Beispiel (Alternative: wie dieser?)', +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesEn.php mediawiki-1.15.1/languages/messages/MessagesEn.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesEn.php 2009-06-01 11:27:42.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesEn.php 2010-02-06 07:07:36.142032833 +0000 +@@ -3629,6 +3629,32 @@ + 'ellipsis' => '…', # only translate this message to other languages if you have to change it + 'percent' => '$1%', # only translate this message to other languages if you have to change it + ++#Restrict patch (http://www.mediawiki.org/wiki/Extension:Page_access_restriction) ++'restrict' => 'Restrict', ++'restrictthispage' => 'Restrict this page', ++'unrestrict' => 'Unrestrict', ++'unrestrictthispage' => 'Unrestrict this page', ++'restricttitle' => 'Restricted page', ++'restricttext' => 'This page is restricted. To view it you have to be member of the \'restrict\' group or \'viewrestrict\' group.', ++'restrictedpages' => 'Restricted pages', ++'restrictlogpage' => 'Restriction_log', ++'restrictlogtext' => 'Below is a list of page restrictions. See [[{{ns:4}}:Restricted page]] for more information.', ++'restrictedarticle' => 'restricted [[$1]]', ++'unrestrictedarticle' => 'unrestricted [[$1]]', ++'restrictsub' => '(Restrict \'[[$1]]\')', ++'confirmrestrict' => 'Confirm the restriction', ++'confirmrestricttext' => 'Do you really want to restrict this page?', ++'restrictcomment' => 'Reason for restricting', ++'unrestrictsub' => '(Unrestrict \'[[$1]]\')', ++'confirmunrestricttext' => 'Do you really want to unrestrict this page?', ++'confirmunrestrict' => 'Confirm unrestriction', ++'unrestrictcomment' => 'Reason for unrestricting', ++'restrictreason' => '(give a reason)', ++'tooltip-restrict' => 'Restrict this page', ++'notallowedtomoverestrictedpagetext' => 'To move this page, you have to be member of the \'restrict\' group.', ++'restrictedpagespagetext' => 'This page lists all restricted pages in the wiki. ', ++'regexrestrictedpagespagetext' => 'All page titles matching this/these regular expression(s) are also restricted : ', ++ + # Multipage image navigation + 'imgmultipageprev' => '← previous page', + 'imgmultipagenext' => 'next page →', +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesEs.php mediawiki-1.15.1/languages/messages/MessagesEs.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesEs.php 2009-06-07 23:02:47.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesEs.php 2010-02-06 07:07:36.169041035 +0000 +@@ -3095,4 +3095,32 @@ + 'dberr-outofdate' => 'Tenga en cuenta que su índice de nuestro contenido puede estar desactualizado.', + 'dberr-cachederror' => 'La siguiente es una página guardada de la página solicitada, y puede no estar actualizada.', + ++# Traducción de restriccion de paginas para mediawiki ++# http://www.mediawiki.org/wiki/Extension:Page_access_restriction ++# Coffman 18-07-06 ++'restrict' => 'Restringir', ++'restrictthispage' => 'Restringir esta página', ++'unrestrict' => 'Quitar restricción', ++'unrestrictthispage' => 'Quitar restricción en esta página', ++'restricttitle' => 'Página restringida', ++'restricttext' => 'Esta página esta restringida. Para verla tienes que pertenecer al grupo \'restrict\' o al grupo \'viewrestrict\'.', ++'restrictedpages' => 'Páginas restringidas', ++'restrictlogpage' => 'Restriction_log', ++'restrictlogtext' => 'A continuación está una lista de las páginas restringidas. Mira [[{{ns:4}}:Restricted page]] para más información.', ++'restrictedarticle' => 'restringido [[$1]]', ++'unrestrictedarticle' => 'no restringido [[$1]]', ++'restrictsub' => '(Restringir \'[[$1]]\')', ++'confirmrestrict' => 'Confirma la restricción', ++'confirmrestricttext' => '¿ Quieres realmente restringir esta página ?', ++'restrictcomment' => 'Razon de la restricción', ++'unrestrictsub' => '(Quitar restriccion \'[[$1]]\')', ++'confirmunrestricttext' => '¿ Quieres realmente quitar la restricción de esta página ?', ++'confirmunrestrict' => 'Confirma que quieres quitar la restricción', ++'unrestrictcomment' => 'Razon para quitar la restricción', ++'restrictreason' => '(da una razon)', ++'tooltip-restrict' => 'Restringir esta página', ++'notallowedtomoverestrictedpagetext' => 'Para mover esta página, debes ser miembro del grupo \'restrict\'.', ++'restrictedpagespagetext' => 'Esta página lista todas las páginas restringidas del wiki. ', ++'regexrestrictedpagespagetext' => 'Todas las páginas cuyos títulos cumplan alguna de estas expresiones regulares están restringidas : ', ++ + ); +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesFi.php mediawiki-1.15.1/languages/messages/MessagesFi.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesFi.php 2009-06-01 11:27:42.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesFi.php 2010-02-06 07:07:36.178022908 +0000 +@@ -3078,4 +3078,32 @@ + 'dberr-outofdate' => 'Googlen indeksi ei välttämättä ole ajan tasalla.', + 'dberr-cachederror' => 'Alla on välimuistissa oleva sivun versio, joka ei välttämättä ole ajan tasalla.', + ++#Restrict patch (http://www.mediawiki.org/wiki/Extension:Page_access_restriction) ++'restrict' => 'Rajoita', ++'restrictthispage' => 'Rajoita sivua', ++'unrestrict' => 'Poista rajoitukset', ++'unrestrictthispage' => 'Poista rajoitukset sivulta', ++'restricttitle' => 'Rajoitettu aihe', ++//##title is different from page in Finnish, I had to make a semantic change: page = sivu, title = aihe . Hope it works.## ++'restricttext' => 'Tällä sivulla on rajoituksia. Nähdäksesi sivun sinun on oltava \'restrict\' tai \'viewrestrict\' -ryhmän jäsen.', ++'restrictedpages' => 'Rajoitetut sivut', ++'restrictlogpage' => 'Rajoitusten_seuranta', ++'restrictlogtext' => 'Alla on listaus sivun rajoituksista. Lue enemmän [[{{ns:4}}:rajoitetuista sivuista]] täältä.', ++'restrictedarticle' => 'rajoitettu [[$1]]', ++'unrestrictedarticle' => 'rajoittamaton [[$1]]', ++'restrictsub' => '(Rajoita aihetta: \'[[$1]]\')', ++//##I had to include "aihe"; $1 refers to a variable, which is probably a new topic/ title (=aihe). Finnish language uses postpositioned suffixes (which are difficult to include in code without making silly sounding sentences). Like this: aihe = title, aiheesta = about a title, aiheeseen = to the title. See what I mean?## ++'confirmrestrict' => 'Vahvista rajoitukset', ++'confirmrestricttext' => 'Haluatko varmasti luoda rajoituksia tälle sivulle?', ++'restrictcomment' => 'Kommentti', ++'unrestrictsub' => '(Poista rajoitus aiheesta: \'[[$1]]\')', ++'confirmunrestricttext' => 'Haluatko varmasti poistaa rajoitukset?', ++'confirmunrestrict' => 'Vahvista rajoitus', ++'unrestrictcomment' => 'Kommentti', ++'restrictreason' => '(syy)', ++'tooltip-restrict' => 'Rajoita', ++'notallowedtomoverestrictedpagetext' => 'Siirtääksesi tätä sivua sinun on oltava jäsen \'restrict\' ryhmässä.', ++'restrictedpagespagetext' => 'Tämä sivu listaa kaikki wikissä olevat rajoitetut sivut...', ++'regexrestrictedpagespagetext' => 'Tätä lauseketta vastaavilla sivuilla on rajoituksia:', ++ + ); +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesFr.php mediawiki-1.15.1/languages/messages/MessagesFr.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesFr.php 2009-06-01 11:27:42.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesFr.php 2010-02-06 07:07:36.214030095 +0000 +@@ -2886,6 +2886,32 @@ + 'exif-orientation-7' => 'Tournée de 90° dans le sens horaire et inversée verticalement', # 0th row: right; 0th column: bottom + 'exif-orientation-8' => 'Tournée de 90° dans le sens antihoraire', # 0th row: left; 0th column: bottom + ++#Restrict patch (http://www.mediawiki.org/wiki/Extension:Page_access_restriction) ++'restrict' => 'Restreindre', ++'restrictthispage' => 'Restreindre cette page', ++'unrestrict' => 'Autoriser', ++'unrestrictthispage' => 'Autoriser cette page', ++'restricttitle' => 'Page restreinte', ++'restricttext' => 'L\'accès à cette page a été restreint. Pour pouvoir y accéder vous devez être membre du groupe \'restrict\' ou \'viewrestrict\'', ++'restrictedpages' => 'Pages restreintes', ++'restrictlogpage' => 'Log_de_restriction', ++'restrictlogtext' => 'Voir les [[{{ns:4}}:Page restreinte|directives concernant les pages restreintes]].', ++'restrictedarticle' => 'a restreint [[$1]]', ++'unrestrictedarticle' => 'a autorisé [[$1]]', ++'restrictsub' => '(Restreint \'[[$1]]\')', ++'confirmrestrict' => 'Confirmer la restriction', ++'confirmrestricttext' => 'Voulez vous vraiment restreindre l\'accès à cette page ?', ++'restrictcomment' => 'Raison de la restriction', ++'unrestrictsub' => '(Autorise \'[[$1]]\')', ++'confirmunrestricttext' => 'Voulez-vous vraiment autoriser l\'accès à cette page ?', ++'confirmunrestrict' => 'Confirmer l\'autorisation', ++'unrestrictcomment' => 'Raison de l\'autorisation', ++'restrictreason' => '(indiquez une raison)', ++'tooltip-restrict' => 'Restreindre cette page', ++'notallowedtomoverestrictedpagetext' => 'Pour pouvoir déplacer cette page, vous devez être membre du groupe \'restrict\'', ++'restrictedpagespagetext' => 'Cette page liste les pages restreintes de ce wiki.', ++'regexrestrictedpagespagetext' => 'Les pages dont le titre correspond à cette/ces expressions(s) régulière(s) sont également restreintes : ', ++ + 'exif-planarconfiguration-1' => 'Données contiguës', + 'exif-planarconfiguration-2' => 'Données séparées', + +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesHe.php mediawiki-1.15.1/languages/messages/MessagesHe.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesHe.php 2009-06-01 11:27:42.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesHe.php 2010-02-06 07:07:36.223036415 +0000 +@@ -3095,6 +3095,32 @@ + 'confirm-purge-top' => 'לנקות את המטמון של דף זה?', + 'confirm-purge-bottom' => 'ניקוי המטמון של דף גורם לגרסה החדשה ביותר להופיע.', + ++#Restrict patch ( http://www.mediawiki.org/wiki/Extension:Page_access_restriction ) ++'restrict' => '', ++'restrictthispage' => ' ף ', ++'unrestrict' => ' ', ++'unrestrictthispage' => ' ת ף ', ++'restricttitle' => 'ף ', ++'restricttext' => 'ף צפ. ע נת רת ע ת ר קצת \'restrict\' \'viewrestrict\'.', ++'restrictedpages' => 'פ ', ++'restrictlogpage' => ' ת', ++'restrictlogtext' => ' פ . ר [[{{ns:4}}:Restricted page]] ע נסף.', ++'restrictedarticle' => ' ת [[$1]]', ++'unrestrictedarticle' => ' ע [[$1]]', ++'restrictsub' => '( \'[[$1]]\')', ++'confirmrestrict' => ' ת שרצנכ ף ?', ++'confirmrestricttext' => 'שר ת ', ++'restrictcomment' => 'סת ', ++'unrestrictsub' => '( ת \'[[$1]]\')', ++'confirmunrestricttext' => ' ת שרצנכ ת ף ?', ++'confirmunrestrict' => 'שר ת ', ++'unrestrictcomment' => 'סת ', ++'restrictreason' => 'ס', ++'tooltip-restrict' => ' ע ', ++'notallowedtomoverestrictedpagetext' => 'ע נת ער ף ע ת ר קצת \'restrict\'', ++'restrictedpagespagetext' => 'ר רשת כ פ ק', ++'regexrestrictedpagespagetext' => 'כ פ שת רר כ :', ++ + # Multipage image navigation + 'imgmultipageprev' => '→ לדף הקודם', + 'imgmultipagenext' => 'לדף הבא ←', +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesNl.php mediawiki-1.15.1/languages/messages/MessagesNl.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesNl.php 2009-06-07 23:02:47.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesNl.php 2010-02-06 07:07:36.241009940 +0000 +@@ -2735,6 +2735,33 @@ + 'mw_math_modern' => 'Aanbevolen methode voor recente browsers', + 'mw_math_mathml' => 'MathML als mogelijk (experimenteel)', + ++#Restrict patch (http://www.mediawiki.org/wiki/Extension:Page_access_restriction) ++'restrict' => 'Beperk', ++'restrictthispage' => 'Beperk deze pagina', ++'unrestrict' => 'Onbeperk', ++'unrestrictthispage' => 'Onbeperk deze pagina', ++'restricttitle' => 'Beperkte pagina', ++'restricttext' => 'Deze pagina is beperkt. Om deze te zien moet u lid zijn van de \'restrict\' groep of \'viewrestrict\' groep.', ++'restrictedpages' => 'Beperkte paginas', ++'restrictlogpage' => 'Beperkingen_log', ++'restrictlogtext' => 'Hier is een lijst met pagina beperkingen. Zie [[{{ns:4}}:Restricted page]] voor meer informatie.', ++'restrictedarticle' => 'beperkt [[$1]]', ++'unrestrictedarticle' => 'onbeperkt [[$1]]', ++'restrictsub' => '(Beperk \'[[$1]]\')', ++'confirmrestrict' => 'Bevestig de beperking', ++'confirmrestricttext' => 'Wilt u deze pagina echt beperken?', ++'restrictcomment' => 'Reden voor de beperking', ++'unrestrictsub' => '(Unrestrict \'[[$1]]\')', ++'confirmunrestricttext' => 'Wilt u deze pagina echt onbeperken?', ++'confirmunrestrict' => 'Bevestig de onbeperking', ++'unrestrictcomment' => 'Reden voor de onbeperking', ++'restrictreason' => '(geef een reden)', ++'tooltip-restrict' => 'Beperk deze pagina', ++'notallowedtomoverestrictedpagetext' => 'Om de locatie van deze pagina te veranderen, moet u lid zijn van de \'restrict\' groep.', ++'restrictedpagespagetext' => 'Deze pagina geeft een lijst van alle beperkte paginas in deze wiki. ', ++'regexrestrictedpagespagetext' => 'Alle pagina titels die aan deze uitdrukking voldoen zijn ook beperkt : ', ++ ++ + # Patrolling + 'markaspatrolleddiff' => 'Markeren als gecontroleerd', + 'markaspatrolledtext' => 'Deze pagina als gecontroleerd markeren', +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesPl.php mediawiki-1.15.1/languages/messages/MessagesPl.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesPl.php 2009-06-01 11:27:42.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesPl.php 2010-02-06 07:07:36.241009940 +0000 +@@ -2612,6 +2612,34 @@ + 'mw_math_modern' => 'HTML – zalecane dla nowych przeglądarek', + 'mw_math_mathml' => 'MathML jeśli dostępny (eksperymentalne)', + ++#Polish translation by Janusz 'Ency' Dorożyński 2006-05-16 ++#Restrict patch (http://www.mediawiki.org/wiki/Extension:Page_access_restriction) ++'restrict' => 'Zastrzeżenie', ++'restrictthispage' => 'Zastrzeżenie tej strony', ++'unrestrict' => 'Zdjęcie zastrzeżenia', ++'unrestrictthispage' => 'Zdjęcie zastrzeżenia tej strony', ++'restricttitle' => 'Strona zastrzeżona', ++'restricttext' => 'Ta strona jest zastrzeżona. Aby mieć do niej wgląd musisz być w grupie użytkowników \'restrict\' lub \'viewrestrict\'.', ++'restrictedpages' => 'Strony zastrzeżone', ++'restrictlogpage' => 'Dziennik (log) zastrzeżeń', ++'restrictlogtext' => 'Poniżej jest lista zastrzeżeń stron. Zobacz [[{{ns:4}}:Strony zastrzeżone]] z dodatkowymi informacjami.', ++'restrictedarticle' => 'zastrzeżono [[$1]]', ++'unrestrictedarticle' => 'zdjęto zastrzeżenie [[$1]]', ++'restrictsub' => '(Zastrzeżenie \'[[$1]]\')', ++'confirmrestrict' => 'Potwierdź zastrzeżenie', ++'confirmrestricttext' => 'Czy naprawdę chcesz zastrzec tę stronę?', ++'restrictcomment' => 'Powod zastrzeżenia', ++'unrestrictsub' => '(Zdjęcie zastrzeżenia \'[[$1]]\')', ++'confirmunrestricttext' => 'Czy naprawdę chcesz zdjąć zastrzeżenie tej stronę?', ++'confirmunrestrict' => 'Potwierdź zdjęcie zastrzeżenia', ++'unrestrictcomment' => 'Powód zdjęcia zastrzeżenia', ++'restrictreason' => '(podaj powód)', ++'tooltip-restrict' => 'Zastrzeż tę stronę', ++'notallowedtomoverestrictedpagetext' => 'Przeniesienie tej strony mogą wykonać tylko użytkownicy z grupy \'restrict\'.', ++'restrictedpagespagetext' => 'Ta strona podaje listę wszystkich zastrzeżonych stron tej wiki.', ++'regexrestrictedpagespagetext' => 'Zastrzeżenie dotyczy wszytkich tytułów artykułów spełniających warunki regularnych wyrażeń: ' ++ ++ + # Patrolling + 'markaspatrolleddiff' => 'oznacz edycję jako „sprawdzoną”', + 'markaspatrolledtext' => 'Oznacz tę stronę jako „sprawdzoną”', +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesRu.php mediawiki-1.15.1/languages/messages/MessagesRu.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesRu.php 2009-06-01 11:27:42.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesRu.php 2010-02-06 07:07:36.268010807 +0000 +@@ -3006,6 +3006,32 @@ + 'confirm-purge-top' => 'Очистить кеш этой страницы?', + 'confirm-purge-bottom' => 'После очистки кэша страницы будет показана её последняя версия.', + ++#Restrict patch (http://www.mediawiki.org/wiki/Extension:Page_access_restriction) ++'restrict' => 'гании', ++'restrictthispage' => 'гании а', ++'unrestrict' => 'е оганиива', ++'unrestrictthispage' => 'е оганиива а', ++'restricttitle' => 'оп к ае оганиен', ++'restricttext' => 'анна аниа оганиена дл пблиного помоа. л помоа в должн б повеенн.', ++'restrictedpages' => 'ганиенне аи', ++'restrictlogpage' => 'нал оганиений', ++'restrictlogtext' => 'иже пиок ани оганиеними. См. [[{{ns:4}}:ганиенне аи]] дл болей иномаии.', ++'restrictedarticle' => 'ганиенно [[$1]]', ++'unrestrictedarticle' => 'е оганиенно [[$1]]', ++'restrictsub' => '(гании \'[[$1]]\')', ++'confirmrestrict' => 'одведи оганиение', ++'confirmrestricttext' => ' дейвиелно желаее огании а?', ++'restrictcomment' => 'иин дл оганиени', ++'unrestrictsub' => '(е оганиива \'[[$1]]\')', ++'confirmunrestricttext' => ' дейвиелно желаее н оганиение?', ++'confirmunrestrict' => 'одведи ние оганиений', ++'unrestrictcomment' => 'иин ни оганиений', ++'restrictreason' => '(кажие пиин)', ++'tooltip-restrict' => 'гании а', ++'notallowedtomoverestrictedpagetext' => 'л пеемеени ой ани, должн б леном \'restrict\' гпп.', ++'restrictedpagespagetext' => ' ом пике ани оганиенне дл помоа аи. ', ++'regexrestrictedpagespagetext' => 'е названи аей довлевои ом/им еманиеким важеним бд ак же оганиенн: ', ++ + # Multipage image navigation + 'imgmultipageprev' => '← предыдущая страница', + 'imgmultipagenext' => 'следующая страница →', +diff -Naur mediawiki-1.15.1.orig/languages/messages/MessagesSv.php mediawiki-1.15.1/languages/messages/MessagesSv.php +--- mediawiki-1.15.1.orig/languages/messages/MessagesSv.php 2009-06-01 11:27:42.000000000 +0000 ++++ mediawiki-1.15.1/languages/messages/MessagesSv.php 2010-02-06 07:07:36.294990162 +0000 +@@ -2563,6 +2563,33 @@ + 'nocreativecommons' => 'Creative Commons RDF metadata avstängd på denna server.', + 'notacceptable' => 'Den här wiki-servern kan inte erbjuda data i ett format som din klient kan läsa.', + ++ ++#Restrict patch (http://www.mediawiki.org/wiki/Extension:Page_access_restriction) ++'restrict' => 'Begränsa åtkomst', ++'restrictthispage' => "Begränsa åtkomst för denna sida", ++'unrestrict' => 'Upphäv begränsning av åtkomst', ++'unrestrictthispage' => 'Upphäv begränsning av åtkomst för denna sida', ++'restricttitle' => 'Åtkomstbegränsad', ++'restricttext' => 'Denna sida har begränsad åtkomst. För att visa sidan måste du vara medlem i \'åtkomstbegränsa\' - eller \'visaåtkomstbegränsade\' - gruppen.', ++'restrictedpages' => 'Sidor med begränsad åtkomst', ++'restrictlogpage' => 'Logg för åtkomstbegränsning', ++'restrictlogtext' => 'Nedan finns en lista över åtkomstbegränsade sidor. Se [[{{ns:4}}:Åtkomstbegränsadesidor]] för ytterligare information.', ++'restrictedarticle' => 'Begränsade åtkomst för [[$1]]', ++'unrestrictedarticle' => 'Upphävde åtkomstbegränsning för [[$1]]', ++'restrictsub' => '(Begränsa åtkomst för \'[[$1]]\')', ++'confirmrestrict' => 'Bekräfta begränsning av åtkomst', ++'confirmrestricttext' => 'Är du säker på att du vill begränsa åtkomsten för denna sida?', ++'restrictcomment' => 'Orsak till begränsning av åtkomst', ++'unrestrictsub' => '(Upphäv begränsning av åtkomst för \'[[$1]]\')', ++'confirmunrestricttext' => 'Är du säker på att du vill upphäva åtkomstbegränsningen för denna sida?', ++'confirmunrestrict' => 'Bekräfta upphävning av åtkomstbegränsning', ++'unrestrictcomment' => 'Orsak till upphävning av åtkomstbegränsning', ++'restrictreason' => '(ange orsak)', ++'tooltip-restrict' => 'Begränsa åtkomst för denna sida', ++'notallowedtomoverestrictedpagetext' => 'För att kunna flytta denna sida måste du vara medlem i \'åtkomstbegränsa\' - gruppen.', ++'restrictedpagespagetext' => 'Denna sida listar alla sidor med begränsad åtkomst i hela wikin. ', ++'regexrestrictedpagespagetext' => 'Alla titlar som matchar denna/dessa regular expression(s) begränsas också: ', ++ + # Attribution + 'anonymous' => '{{PLURAL:$1|Anonym användare|Anonyma användare}} på {{SITENAME}}', + 'siteuser' => 'användaren $1 på {{SITENAME}}', diff --git a/www-apps/mediawiki/files/postinstall-1.13-en.txt b/www-apps/mediawiki/files/postinstall-1.13-en.txt new file mode 100644 index 00000000..4fbc2475 --- /dev/null +++ b/www-apps/mediawiki/files/postinstall-1.13-en.txt @@ -0,0 +1,88 @@ +To complete installation you need to proceed the following steps: +================================================================= + +1. Temporarily make the MediaWiki config/ directory writable to the user the +web server is running as. The quickest way is to make the directory world +writable. For example: + +$ cd ${MY_INSTALLDIR} +$ chmod a+w config + + +2. Configure database. +a.) If you know the root password on your database, the MediaWiki installation +script can create a new database for you. + +b.) If you don't know the root password, MediaWiki still needs database to +work with. So, please, read the following link and find solution which suits +your needs best: + +http://www.mediawiki.org/wiki/Manual:Installing_MediaWiki#Create_a_database + + +3. Now continue the installation through web browser by accessing the +following page: + +lynx http://${VHOST_HOSTNAME}${VHOST_APPDIR}/config/ + + +4. After the setup script has finished running successfully, a file called +LocalSettings.php is created in the "config" directory. Move this file to the +root wiki directory (${MY_INSTALLDIR}): + +$ mv config/LocalSettings.php . + +Set stringent permissions on the LocalSettings.php file: + +$ chown :root LocalSettings.php +$ chmod 600 LocalSettings.php + +And delete the "config" directory: + +$ rm -rf config + + +5. Once you have done the above, your wiki should be ready to use! + +http://${VHOST_HOSTNAME}${VHOST_APPDIR}/ + + +Enabling Optional Features and other configuration +================================================== + +Allow images and other files to be uploaded through the wiki +------------------------------------------------------------ + +If you wish to enable images and other files to be uploaded through wiki then +edit the LocalSettings.php file and set \$wgEnableUploads to 'true': + +\$wgEnableUploads = true; + +Now if MediaWiki was built with the imagemagick USE-flag the directory +permissions are correct, otherwise install ImageMagick and adjust permissions +on the images directory to allow the web server to write. For example: + +$ chown : ${MY_INSTALLDIR}/images + +IMPORTANT: Uploads need to be set up properly in order to be secure! For more +details take a look at the following page: + +http://www.mediawiki.org/wiki/Manual:$wgEnableUploads + + +Math Support +------------ + +If you wish to enable the math support then you need to build MediaWiki with +'math' USE-flag enabled or required support executable will no be present. +After you've installed MediaWiki with math USE-flag enabled edit +LocalSettings.php file to set the \$wgUseTeX to 'true': + +\$wgUseTeX = true; + + +Other +----- + +For other tweaks, continue with the following: +http://www.mediawiki.org/wiki/Manual:Installing_MediaWiki#See_also diff --git a/www-apps/mediawiki/files/postupgrade-1.13-en.txt b/www-apps/mediawiki/files/postupgrade-1.13-en.txt new file mode 100644 index 00000000..00d16a8e --- /dev/null +++ b/www-apps/mediawiki/files/postupgrade-1.13-en.txt @@ -0,0 +1,49 @@ +These instructions help you to upgrade your mediawiki installation. + +Please NOTE: at this point it is supposed that you've already read +RELEASE-NOTES and done full wiki backup, as described here: +http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki + + +Run the update script +===================== + +Note: Make sure there's an AdminSettings.php file in the wiki root, and it +contains up to date information. The user needs full permissions (shell +access) on the database. If there is no AdminSettings.php, create it: + +$ cd ${MY_INSTALLDIR} +$ cp AdminSettings.sample AdminSettings.php + +Now edit AdminSettings.php. + +The preferred method of performing the update is using the command-line +maintenance script, although it is also possible to re-run the web-based +installer. To run command-line maintenance script, change to the maintenance +directory and execute the update script: + +$ cd ${MY_INSTALLDIR}/maintenance +$ php update.php + +MediaWiki will inspect the existing schema and update it to work with the new +code, adding tables and columns as needed. + +For alternative ways to upgrade your wiki, please, take a look at: +http://www.mediawiki.org/wiki/Manual:Upgrading + + +Upgrade extensions +================== + +Certain extensions have been updated in order to work with MediaWiki 1.13. Be +sure to upgrade to the latest versions of such extensions. You might need to +perform manual updates to custom extensions. + + +Test the update +=============== + +Once the upgrade has completed, browse to the wiki and check basics such as +viewing and editing pages to ensure things still work as expected. + +Visit Special:Version and check that the version shown is correct. diff --git a/www-apps/mediawiki/mediawiki-1.15.4.ebuild b/www-apps/mediawiki/mediawiki-1.15.4.ebuild new file mode 100644 index 00000000..a80c1c7d --- /dev/null +++ b/www-apps/mediawiki/mediawiki-1.15.4.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.2.ebuild,v 1.5 2010/04/15 20:25:15 maekke Exp $ + +EAPI="2" +inherit webapp depend.php versionator eutils + +MY_BRANCH=$(get_version_component_range 1-2) + +DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)" +HOMEPAGE="http://www.mediawiki.org" +SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~alpha amd64 ppc sparc x86" +IUSE="imagemagick math mysql postgres +ocamlopt" + +DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )" +RDEPEND="${DEPEND} + math? ( + app-text/dvipng + virtual/tex-base + app-text/ghostscript-gpl + media-gfx/imagemagick + ) + imagemagick? ( media-gfx/imagemagick )" + +RESTRICT="test" + +need_httpd_cgi +need_php_httpd + +src_prepare() { + epatch "${FILESDIR}"/mediawiki-1.15.1-restrict-0.8.4.patch +} + +pkg_setup() { + webapp_pkg_setup + local flags="pcre session spl xml" + use mysql && flags="${flags} mysql" + use postgres && flags="${flags} postgres" + if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \ + ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then + die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external" + fi + + # see Bug 204812 + if use ocamlopt && use math && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then + eerror "In order to build ${PN} with native code support from ocaml" + eerror "You first need to have a native code ocaml compiler." + eerror "You need to install dev-lang/ocaml with ocamlopt useflag on." + die "Please install ocaml with ocamlopt useflag" + fi +} + +src_compile() { + if use math; then + einfo "Compiling math support" + cd math || die + if ! use ocamlopt; then + sed -e "s/ocamlopt/ocamlc/" \ + -e "s/cmxa/cma/" \ + -e "s/cmx/cmo/g" -i Makefile || die + fi + emake || die + else + einfo "No math support enabled. Skipping." + fi + + # TODO: 1. think about includes/zhtable/ support + # 2. generate docs (?): echo '0' | php mwdocgen.php +} + +src_install() { + webapp_src_preinst + + # First we install math, docs and then copy everything left into htdocs dir + # to avoid bugs like #236411. + + # If we've enabled math USE-flag, install math support. + # We ensure the directories are prepared for writing. The post- + # install instructions guide the user to enable the feature. + if use math; then + einfo "Installing math support" + exeinto "${MY_HTDOCSDIR}"/math + doexe math/texvc || die "Failed to create math support executable." + + docinto math + dodoc math/{README,TODO} + docinto "" + + # Working directories. Server writeable. + dodir "${MY_HTDOCSDIR}"/images/math + webapp_serverowned "${MY_HTDOCSDIR}"/images/math + dodir "${MY_HTDOCSDIR}"/images/tmp + webapp_serverowned "${MY_HTDOCSDIR}"/images/tmp + fi + + local DOCS="FAQ HISTORY INSTALL README* RELEASE-NOTES UPGRADE CREDITS" + dodoc ${DOCS} docs/*.txt + docinto php-memcached + dodoc docs/php-memcached/* + + # Clean everything not used at the site... + rm -rf ${DOCS} COPYING tests math t docs + find . -name Makefile -delete + # and install + insinto "${MY_HTDOCSDIR}" + doins -r . + + # If imagemagick is enabled then setup for image upload. + # We ensure the directory is prepared for writing. + if use imagemagick; then + webapp_serverowned "${MY_HTDOCSDIR}"/images + fi + + webapp_postinst_txt en "${FILESDIR}/postinstall-1.13-en.txt" + webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.13-en.txt" + webapp_src_install +} + +pkg_preinst() { + prev_instal="false" + if has_version ${CATEGORY}/${PN}; then + prev_instal="true" + fi +} + +pkg_postinst() { + webapp_pkg_postinst + if ${prev_instal}; then + einfo + elog "=== Consult the release notes ===" + elog "Before doing anything, stop and consult the release notes" + elog "/usr/share/doc/${PF}/RELEASE-NOTES.bz2" + elog + elog "These detail bug fixes, new features and functionality, and any" + elog "particular points that may need to be noted during the upgrade procedure." + einfo + ewarn "Back up existing files and the database before upgrade." + ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki" + ewarn "provides an overview of the backup process." + einfo + fi +} diff --git a/www-apps/mediawiki/metadata.xml b/www-apps/mediawiki/metadata.xml new file mode 100644 index 00000000..72591f42 --- /dev/null +++ b/www-apps/mediawiki/metadata.xml @@ -0,0 +1,13 @@ + + + + web-apps + + trapni@gentoo.org + + + Ads math rendering support + Initial setup will only allow sysop user to create + new accounts, read and edit any pages + +