1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00

1541 Commits

Author SHA1 Message Date
Nathan Guse
b71038486e Merge pull request #1513 from nickvergessen/ticket/11582
Ticket/11582 Split permission logic from translations
2013-07-22 11:28:55 -07:00
Joas Schilling
0f70864624 [ticket/11582] Move global declaration to beginning of block
PHPBB3-11582
2013-07-22 20:06:30 +02:00
Marc Alexander
f421c082f7 [ticket/11713] Do not remove module if it couldn't be deleted
Up to now, the module or module category was always removed with jQuery,
even if there was an error. With this change, the modules will not be deleted
by jQuery if the return JSON array will have SUCCESS set to false.

PHPBB3-11713
2013-07-18 22:41:23 +02:00
Joas Schilling
060754fd6c [ticket/11582] Fix missing closing bracket
PHPBB3-11582
2013-07-14 12:02:47 -04:00
Joas Schilling
aadff800dc [ticket/11582] Remove left over calls to lang['acl_*']
PHPBB3-11582
2013-07-14 11:51:39 -04:00
Joas Schilling
22ba3de1a2 [ticket/11582] Use member isntead of a new variable everytime
PHPBB3-11582
2013-07-14 11:51:37 -04:00
Joas Schilling
9c653341e4 [ticket/11582] Use new methods and remove duplicated entries
PHPBB3-11582
2013-07-14 11:51:36 -04:00
Joas Schilling
ce0a182c7f [ticket/11582] Add methods to return the language string
PHPBB3-11582
2013-07-14 11:51:34 -04:00
Joas Schilling
e8d2a2fd88 [ticket/11582] Use new class for categories
PHPBB3-11582
2013-07-14 11:51:30 -04:00
Joas Schilling
573987d2d2 [ticket/11582] Add new service for permissions
Replace calls to the language-array type with a call to get_types()

PHPBB3-11582
2013-07-14 11:51:29 -04:00
Joas Schilling
057d860d07 [ticket/11696] Rename db_tools.php so it can be autoloaded
PHPBB3-11696
2013-07-14 10:10:05 -04:00
Nils Adermann
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/
PHPBB3-11698
2013-07-14 01:32:34 -04:00
Nils Adermann
9f5ee08bae [ticket/11690] Old module class names may get autoloaded by class_exists
PHPBB3-11690
2013-07-13 16:47:25 -04:00
Nathan Guse
b6c3939c32 Merge pull request #1543 from nickvergessen/ticket/11685
[ticket/11685] Remove logout confirmation page
2013-07-13 10:37:43 -07:00
Nils Adermann
0ef95a7009 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com

Conflicts:
	phpBB/language/en/install.php
	phpBB/language/en/ucp.php
2013-07-13 13:16:58 -04:00
Joas Schilling
8f95ef55a6 [ticket/11685] Remove logout confirmation page
PHPBB3-11685
2013-07-13 12:27:00 -04:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
2013-07-13 09:36:24 -04:00
Marc Alexander
07eadac2f6 [ticket/11112] Use https for user-visible links to phpbb.com
PHPBB3-11112
2013-07-12 16:24:27 -04:00
Nathaniel Guse
b5651c0289 Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop
# By Joseph Warner
# Via Joseph Warner
* remotes/Hardolaf/ticket/11626:
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [ticket/11626] Make identifier uppercase per style requirements
  [ticket/11626] Change the identifier template file in the template
  [ticket/11626] Call method only one time per provider
  [ticket/11626] Change interface to match functionality
  [ticket/11626] Include the template file in acp_board
  [ticket/11626] LDAP Auth ACP Template File
  [ticket/11626] Create get_acp_template method for auth providers
2013-07-12 14:59:43 -05:00
Joseph Warner
631ce22f2c [ticket/11626] Remove LDAP dependency on template
Returns template vars rather than requiring the template.

PHPBB3-11626
2013-07-12 15:54:41 -04:00
Nathan Guse
86b910692a Merge pull request #1515 from Hardolaf/feature/auth-refactor
[feature/auth-refactor] Use a base class for all authentication providers
2013-07-12 12:51:35 -07:00
Andreas Fischer
0d0338a55c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11548] Fix incorrect usage of array_map on acp groups page

Conflicts:
	tests/functional/common_groups_test.php
	tests/functional/ucp_groups_test.php
2013-07-12 20:09:22 +02:00
Marc Alexander
da8e35ac77 [ticket/11548] Fix incorrect usage of array_map on acp groups page
The array_map was only ran on small parts of the actual error array instead
of the whole one. This resulted in the output of the language variables' names
rather than their actual value.

PHPBB3-11548
2013-07-12 13:40:30 -04:00
Joseph Warner
f4f29a1c0a [feature/auth-refactor] Fix style issue
PHPBB3-9734
2013-07-11 17:43:53 -04:00
Joseph Warner
a64a042830 [feature/auth-refactor] Fix typo
PHPBB3-9734
2013-07-11 17:39:51 -04:00
Joseph Warner
f24a8e5b81 [ticket/11626] Make identifier uppercase per style requirements
PHPBB3-11626
2013-07-11 15:49:46 -04:00
Joseph Warner
3465867a4e [ticket/11626] Change the identifier template file in the template
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
3431cb8ed7 [ticket/11626] Call method only one time per provider
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
60100b62f3 [ticket/11626] Change interface to match functionality
Changes the interface so that it matches the new functionality of
phpbb_provider_auth_interface::acp().

PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
29b472c2e5 [ticket/11626] Include the template file in acp_board
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
9c0495664d [feature/auth-refactor] Remove invalid providers from acp select
PHPBB3-9734
2013-07-11 15:46:08 -04:00
Joseph Warner
e2435f25d9 [feature/auth-refactor] Check that providers implement auth interface
PHPBB3-9734
2013-07-11 14:54:52 -04:00
Nathaniel Guse
ece01f0a1f Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/8319:
  [ticket/8319] Do not repeat the replacement
  [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
  [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
  [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
  [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
2013-07-11 10:09:53 -05:00
Joas Schilling
bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +02:00
Joas Schilling
34ad665c8b Merge branch 'ticket/8319' into ticket/8319-develop2
* ticket/8319:
  [ticket/8319] Do not repeat the replacement
  [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
  [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
  [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
  [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse

Conflicts:
	phpBB/install/database_update.php
2013-07-10 17:24:49 +02:00
Joas Schilling
9210d735a5 [ticket/8319] Do not repeat the replacement
PHPBB3-8319
2013-07-10 17:13:02 +02:00
David King
73c289ae49 Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into develop
* Hardolaf/feature/auth-refactor: (44 commits)
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [feature/auth-refactor] Forgot @inheritdoc on methods
  [feature/auth-refactor] Finish and clean up documentation
  [feature/auth-refactor] Change phpEx to php_ext in new classes
  [feature/auth-refactor] Fix two session tests broken by changes
  [feature/auth-refactor] Removed no longer used variable
  [feature/auth-refactor] Fix errors in acp_board
  [feature/auth-refactor] Fix indentation on acp_board
  [feature/auth-refactor] Refactor auth in acp_board
  [feature/auth-refactor] Don't truncate name then reattach same thing
  [feature/auth-refactor] Remove old auth plugins
  [feature/auth-refactor] Remove references to old auth plugins
  [feature/auth-refactor] Fix auth tests to use mock objects correctly
  [feature/auth-refactor] Test validate_session on provider_apache
  [feature/auth-refactor] Test autologin() on provider_apache
  [feature/auth-refactor] Test login() for provider_apache
  [feature/auth-refactor] Test for init on provider_apache
  ...
2013-07-03 12:46:18 -04:00
Andreas Fischer
3c3f203f14 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
2013-07-03 04:03:39 +02:00
Matt Friedman
5ef4987ffe [ticket/11617] Remove spaces and tabs from empty lines
PHPBB3-11617
2013-07-02 18:47:56 -07:00
Matt Friedman
fba3a9d600 [ticket/11617] Missing U_ACTION in acp_captcha.php
http://tracker.phpbb.com/browse/PHPBB3-11617

PHPBB3-11617
2013-07-02 16:52:15 -07:00
Joseph Warner
f9672e9b45 [feature/auth-refactor] Fix code style issue
PHPBB3-9734
2013-07-02 14:03:43 -04:00
Dhruv
9e3d5420ad [ticket/11585] Make $auth_admin class property
$auth_admin is class property and used via $this reference in all
methods

PHPBB3-11585
2013-07-02 00:10:30 +05:30
Joseph Warner
4afdd650cd [feature/auth-refactor] Removed no longer used variable
PHPBB3-9734
2013-06-26 00:02:20 -04:00
Joseph Warner
59929669f5 [feature/auth-refactor] Fix errors in acp_board
Fixes errors introduced by the last several commits.

PHPBB3-9734
2013-06-25 22:27:16 -04:00
Joseph Warner
08614e2b85 [feature/auth-refactor] Fix indentation on acp_board
PHPBB3-9734
2013-06-25 22:26:03 -04:00
Joseph Warner
3c394aee62 [feature/auth-refactor] Refactor auth in acp_board
Changes the acp_board code to directly call the auth providers out
of the $auth_providers variable that is populated by the
phpbb_container.

PHPBB3-9734
2013-06-25 22:21:38 -04:00
Joseph Warner
b78b6711c8 [feature/auth-refactor] Don't truncate name then reattach same thing
PHPBB3-9734
2013-06-25 22:15:21 -04:00
Joseph Warner
4f3f0a8791 [feature/auth-refactor] Remove references to old auth plugins
Removes what is hopefully the last references to the old auth
plugins in the code base.

PHPBB3-9734
2013-06-25 21:59:19 -04:00
Joseph Warner
b8610c4b98 [feature/auth-refactor] Refactor code to use services
Refactors all loading of auth providers to use services instead of
directly calling the class.

PHPBB3-9734
2013-06-21 18:04:11 -04:00
Joseph Warner
2445766b92 [feature/auth-refactor] Refactor acp_board for new auth interface
Partially refactors acp_board for the new authentication interface.
Leaves some questionable if statements in the file.
Modifies the interface to correctly impletment the acp() method.
Modifies each provider to comply with the above mentioned interface
modification.

PHPBB3-9734
2013-06-19 15:02:34 -04:00