Commit graph

8358 commits

Author SHA1 Message Date
Nathan Guse
3bd281fa27 [feature/twig] Event template tag
PHPBB3-11598
2013-06-24 11:18:29 -05:00
Nathan Guse
62fda07dd4 [feature/twig] Changing method for begin node to not use anonymous function
The way it was setup would actually require PHP 5.4, which isn't an option
right now. Leaving the old code there, just commented out, for now at least.

PHPBB3-11598
2013-06-23 22:28:39 -05:00
David King
fc99c86252 [ticket/11253] Put AND clause in correct SQL query
PHPBB3-11253
2013-06-23 19:47:13 -04:00
David King
8d86f88ac6 [ticket/11253] Fix a few things brought up in the PR 2013-06-23 09:43:32 -04:00
David King
158483ecad [ticket/11253] Fix typo in constant
PHPBB3-11253
2013-06-22 20:40:08 -04:00
David King
458d1c4961 [ticket/11253] Add migration to add auth check to UCP signature module
PHPBB3-11253
2013-06-22 19:59:33 -04:00
sakimahesh
465b515600 [ticket/9341] Correctly named template vars
PHPBB3-9341
2013-06-22 03:44:17 +05:30
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
c9062fc1ee [feature/auth-refactor] Convert provider_apache to a service
Removes globals from provider_apache and turns it into a service.

PHPBB3-9734
2013-06-20 22:21:22 -04:00
Joseph Warner
c253189e85 [feature/auth-refactor] Convert provider_ldap to a service
Removes globals from provider_ldap and converts it into a service.

PHPBB3-9734
2013-06-20 22:11:53 -04:00
Joseph Warner
24825b9dc8 [feature/auth-refactor] Turn provider_db into a service
Removes globals from provider_db and turns it into a service.

PHPBB3-9734
2013-06-20 21:56:01 -04:00
Joseph Warner
0633666e2b [feature/auth-refactor] Fix LDAP conversion error
I messed up when converting over auth_ldap this commit fixes that
error. I have not been able to extensively test ldap due to not
having ldap set up on this computer yet.
Apache authentication appears to work.

PHPBB3-9734
2013-06-20 16:47:55 -04:00
Dhruv
3eeeaababd [ticket/11503] similar implementation for mssql_native and odbc
mssql_native and mssql_odbc db drivers varied at some places
where they should have been similar.

PHPBB3-11503
2013-06-20 19:16:21 +05:30
Joseph Warner
8214e6e837 [feature/auth-refactor] Finish refactoring auth plugins
I believe that this commit should have final minimal changes needed
to replace the old auth plugins with the refactored auth plugins.
Added a few more elements to the interface based on the old auth
plugins. Documentation is not complete and need works on these new
elements.

PHPBB3-9734
2013-06-19 15:33:59 -04:00
Joseph Warner
f4def220ce [feature/auth-refactor] Refactor session for new auth interface
Refactors phpbb_session to use the new auth interface.

PHPBB3-9734
2013-06-19 15:12:50 -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
Joseph Warner
553c300688 [feature/auth-refactor] Fix typos causing changes to not work
Replaces short tags with long tags.
Fixes the interface to be an interface and not class in the file.
Removes unnecessary include_once from auth.php.

PHPBB-9734
2013-06-19 14:25:58 -04:00
Joseph Warner
7bdab205a1 [feature/auth-refactor] Refactor login to use new interface
Refactors auth.php to use the provider_interface during login.

PHPBB-9734
2013-06-18 16:57:59 -04:00
Dhruv
ffed3d109e [ticket/11437] avoid $start becoming negative when no search results are found
When search returns no results there is no need to go inside the if
statement. Since $result_count becomes zero, $start becomes negative
which leads to failed assertion.

PHPBB3-11437
2013-06-19 02:14:04 +05:30
Joseph Warner
0432c32739 [feature/auth-refactor] Make DB auth consistent with interface
Makes provider_db consistent with provider_interface.
Removes $ip, $browser, and $forwarded_for from the arguments of
phpbb_auth_provider_db::login() as these are provided by the global
variable $user.

PHPBB3-9734
2013-06-18 16:07:23 -04:00
Joseph Warner
204c640c77 [feature/auth-refactor] Make LDAP consistent with interface
Makes the provider_ldap consistent with the provider_interface
except for the acp() method which has not yet been finalized.
Renames phpbb_auth_provider_ldap::user_filter to
phpbb_auth_provider_ldap::ldap_user_filter to maintain the original
name of the function from auth_ldap.

PHPBB3-9734
2013-06-18 15:59:33 -04:00
Joseph Warner
57689948e2 [feature/auth-refactor] Make Apache consistent with interface
Makes the provider_apache consistent with the provider_interface
by removing the pass-by-reference of $username and $password.

PHPBB3-9734
2013-06-18 15:41:07 -04:00
Joseph Warner
db27a8c67a [feature/auth-refactor] Fix comment block indentation
Comment block indentation was off by one space on the provider_*
files due to being incorrectly copied over from the auth_* files.

PHPBB3-9734
2013-06-18 15:32:18 -04:00
Joseph Warner
e64abea999 [feature/auth-refactor] Document the provider interface
Provides basic documentation of the auth_provideR_interface.
Changes the login method to login($username, $password) for
consistency with the providers.
acp() is not fully documented. It appears that it is meant to
return an array of some sort and take in a variable by reference.

PHPBB3-9734
2013-06-18 15:20:41 -04:00
Nathaniel Guse
93d94d5cbe [feature/twig] Setup the style chain/loader properly
PHPBB3-11598
2013-06-18 10:37:25 -05:00
Joseph Warner
8178130340 [feature/auth-refactor] LDAP Auth Provider Skeleton
Creates a ldap auth provider using code taken verbatim from
auth_ldap.php.

PHPBB3-9734
2013-06-17 16:51:51 -04:00
Joseph Warner
4917fd9ca7 [feature/auth-refactor] Database Auth Provider Skeleton
Creates a skeleton of the database auth provider from auth_db.php.
The functions are copied verbatim complete with globals and any
existing errors.

PHPBB3-9734
2013-06-17 16:45:23 -04:00
Joseph Warner
49a5d99ec5 [feature/auth-refactor] Auth Apache Provider Skeleton
Creates a skeleton for Apache based authentication using the
phpbb_auth_provider_interface named phpbb_auth_provider_apache.
This brings over all code in auth_apache.php verbatim complete with
all global variables currently in use.

PHPBB3-9734
2013-06-17 16:38:04 -04:00
Joseph Warner
e2c049c997 [feature/auth-refactor] Provider Interface Skeleton
Creates a skeleton of the authentication provider interface.

PHPBB3-9734
2013-06-17 16:11:23 -04:00
Nathaniel Guse
c5db8be580 [feature/twig] Fix begin loops & subloops
PHPBB3-11598
2013-06-15 11:20:10 -05:00
Nathaniel Guse
8561e187f0 [feature/twig] Throw exceptions (don't catch and ignore)
PHPBB3-11598
2013-06-14 09:41:29 -05:00
Nathaniel Guse
9eb3ad4d90 [feature/twig] Add && and || support
PHPBB3-11598
2013-06-14 09:41:02 -05:00
Nathaniel Guse
30a1f21735 [feature/twig] Use twig loader filesystem with namespaces to add paths
Twig now handles loading style files on its own

PHPBB3-11598
2013-06-14 01:00:38 -05:00
Dhruv
4e8f1bf894 Merge branch 'ticket/10820' into ticket/10820-develop
* ticket/10820:
  [ticket/10820] fix if condition to check for IE

Conflicts:
	phpBB/download/file.php
2013-06-14 00:32:23 +05:30
Fred Sauer
49c12ef4be [ticket/11606] remove preg_replace() /e modifier in make_clickable()
PHPBB3-11606
2013-06-13 09:54:58 -07:00
Dhruv
86583754c3 Merge branch 'ticket/10820' into ticket/10820-develop
# By Dhruv (13) and riadhchtara (1)
* ticket/10820:
  [ticket/10820] Add additional check for IE in condition
  [ticket/10820] Fix function docblock
  [ticket/10820] Inject IE version in function
  [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7
  [ticket/10820] remove unnecessary parentheses
  [ticket/10820] fix docblock
  [ticket/10820] add param and return to function
  [ticket/10820] simplify regex and escape dot
  [ticket/10820] Use singular return
  [ticket/10820] remove unnecessary condition checks
  [ticket/10820] add function docblock
  [ticket/10820] fix IE check function
  [ticket/10820] proper usage of global and local variable browser
  [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8

Conflicts:
	phpBB/download/file.php
2013-06-13 22:12:39 +05:30
Dhruv
773bcc1c9b Merge branch 'develop' into ticket/10820-develop
# By Marc Alexander (10) and Joas Schilling (2)
# Via Andreas Fischer (3) and Joas Schilling (1)
* develop:
  [ticket/11605] Remove unused copied_files property
  [ticket/11605] Use empty_dir to better delete files and dirs of extensions
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()
2013-06-13 22:05:01 +05:30
Dhruv
e8b535bf9b Merge branch 'develop' into ticket/10820-develop
# By Joas Schilling (146) and others
# Via Andreas Fischer (50) and others
* develop: (356 commits)
  [ticket/11599] Copy the forums into a static array for later reuse
  [ticket/11602] Do not call localize_errors() if avatars are disabled
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
  [ticket/11550] Specify a valid path so it's clearer that it must be a path
  [ticket/11550] Move comments to correct function
  [ticket/11550] We use a different fixture set for extension_acp_test.php
  [ticket/11550] Fixtures should only be directories not files
  [ticket/11550] Use new functionality from the test case helpers
  [ticket/11550] Move functionality for copying/restoring to test case helpers
  [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
  [ticket/11543] Add more users so #hidden <> #normal
  [ticket/11590] Close database connections when tearDown() is called
  [ticket/develop/11543] Use plurals in develop
  [ticket/11543] Use correct IP addresses and inject time for correct values
  [ticket/11543] Add unit tests for obtain_users_online_string()
  [ticket/11543] Add unit tests for obtain_users_online() with empty forum
  [ticket/11543] Add unit tests for obtain_users_online()
  [ticket/11543] Add unit tests for obtain_guest_count()
  [ticket/11481] Move prepended slash from calls into function
  ...
2013-06-13 22:00:12 +05:30
Nathan Guse
38d8025f12 [feature/twig] Use phpbb_template_twig in tests
Replace all new phpbb_template( with new phpbb_template_twig(

PHPBB3-11598
2013-06-12 13:29:57 -05:00
Nathan Guse
fa86f45f62 [feature/twig] Use phpBB's resource locator to find templates
PHPBB3-11598
2013-06-12 13:26:20 -05:00
Nathan Guse
74f19830f3 [feature/twig] Some additional operators, more stuff for IF
PHPBB3-11598
2013-06-12 12:48:37 -05:00
Nathan Guse
95884edf08 [feature/twig] Correcting output of INCLUDEJS
PHPBB3-11598
2013-06-12 12:32:56 -05:00
Andreas Fischer
b4183eda0c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()

Conflicts:
	tests/mock/cache.php
2013-06-11 18:46:30 +02:00
Andreas Fischer
30801e1f0a Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympus
* marc1706/ticket/11579:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()
2013-06-11 18:34:36 +02:00
Nathan Guse
612dbad63f [feature/twig] Fixing IF .blah correctly
PHPBB3-11598
2013-06-11 10:57:00 -05:00
Nathan Guse
9acde23a05 [feature/twig] Language output assignments, using context class again
PHPBB3-11598
2013-06-11 09:41:15 -05:00
Marc Alexander
2d934704e2 [ticket/11602] Do not call localize_errors() if avatars are disabled
The avatar manager's method localize_errors() shouldn't be called if
avatars are disabled in the config.

PHPBB3-11602
2013-06-11 14:54:22 +02:00
Nathan Guse
b035697800 [feature/twig] Replace phpBB template with Twig
Move phpbb_template class to phpbb_template_phpbb
Changed phpbb_template class to an interface
Switch services.yml to load phpbb_template_twig instead of phpbb_template

PHPBB3-11598
2013-06-10 12:59:47 -05:00
Nathan Guse
eac3c1f75c [feature/twig] BEGIN loops now work
PHPBB3-11598
2013-06-10 11:57:51 -05:00
Nathan Guse
15114067e6 [feature/twig] Replace phpBB template code with Twig syntax, then parse w/Twig
Fixing begin token/node, adding includejs token/node

PHPBB3-11598
2013-06-10 11:17:11 -05:00