Commit graph

11074 commits

Author SHA1 Message Date
Joas Schilling
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
Nils Adermann
2090ecfb8f Merge remote-tracking branch 'github-bantu/ticket/10969' into develop
* github-bantu/ticket/10969:
  [ticket/10969] Also remove COMMENTS key from data array in get_available_dbms()
  [ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).
2012-07-17 20:58:50 +02:00
Andreas Fischer
a4e699db49 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
2012-07-17 20:56:48 +02:00
Patrick Webster
ae07e80a65 [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
PHPBB3-10995
2012-07-17 20:53:29 +02:00
Nils Adermann
fb34a7aa64 Merge remote-tracking branch 'github-exreaction/ticket/7598' into develop
* github-exreaction/ticket/7598:
  [ticket/7598] Use $user->lang['COMMA_SEPARATOR']
  [ticket/7598] Inactive users action notification (ACP)
2012-07-17 20:32:07 +02:00
Fyorl
e71474abb5 [ticket/10944] strpos now stricter and removed superfluous ternary
PHPBB3-10944
2012-07-17 17:39:19 +01:00
Fyorl
6aea4db6c7 [ticket/10944] Reverted changes in PHPBB3-10963
is_image now just checks the mimetype reported by the browser
and get_mimetype goes back to being unused.

PHPBB3-10944
2012-07-17 17:39:00 +01:00
Andreas Fischer
6980b3dcfd Merge remote-tracking branch 'nickvergessen/ticket/10942' into develop
* nickvergessen/ticket/10942:
  [ticket/10942] Avoid possible conflicts with magic words in unit tests
  [ticket/10942] Add access modifiers
  [ticket/10942] Use ANSI SQL standard || in dbal.php
  [ticket/10942] Fix up unit tests for sql_case()
  [ticket/10942] Require same data type and do not cast expressions automatically
  [ticket/10942] Make unit tests for sql_case simpler
  [ticket/10942] Add a comment why we cast to sql_case()
  [ticket/10942] Rename method sql_conditional() to sql_case()
  [ticket/10942] Change term string to expression to avoid confusion
  [ticket/10942] Fix sql_conditional for mssql, postgre and oracle
  [ticket/10942] Fix function name on order_lower_test.php
  [ticket/10942] Add unit tests for sql_concatenate
  [ticket/10942] Add sql_concatenate to dbal
  [ticket/10942] Add unit tests for sql_conditional
  [ticket/10942] Add sql_conditional to dbal
2012-07-17 17:59:56 +02:00
Joas Schilling
3637cd395e [feature/new-tz-handling] Properly name new timezone selection function
Marked the old one as deprecated and made it using the new function.

PHPBB3-9558
2012-07-17 16:09:05 +02:00
Joas Schilling
48d3c68290 [feature/new-tz-handling] Use tmp variable for user timezone
PHPBB3-9558
2012-07-16 18:44:13 +02:00
Joas Schilling
b61ac43abe [feature/new-tz-handling] Allow phpbb prefix for user data validation functions
PHPBB3-9558
2012-07-16 18:41:30 +02:00
Joas Schilling
f5bb145040 [feature/new-tz-handling] Require user argument on phpbb_datetime
PHPBB3-9558
2012-07-16 18:29:31 +02:00
Joas Schilling
d9a32ce614 [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
PHPBB3-10950
2012-07-16 17:22:10 +02:00
Nathan
97350944e3 [ticket/7598] Use $user->lang['COMMA_SEPARATOR']
PHPBB3-7598
2012-07-14 17:40:37 -05:00
Nathan
f3e6547acf [ticket/7598] Inactive users action notification (ACP)
When performing an action on users in the ACP Inactive Users, such as activating, deleting, or reminding, trigger_error is now called to give a notification that the action was performed

PHPBB3-7598
2012-07-13 22:18:28 -05:00
Dhruv Goel
d2e42d7d61 [feature/sphinx-fulltext-search] remove unnecessary code
Some extra conditions and variables used in autoconf are removed.

PHPBB3-10946
2012-07-12 17:32:09 +05:30
Dhruv Goel
569db1471b [feature/sphinx-fulltext-search] fix stopwords option
Stopwords option can be configured in ACP to generate correct sphinx
config file.

PHPBB3-10946
2012-07-12 17:32:08 +05:30
Dhruv Goel
88089194e5 [feature/sphinx-fulltext-search] prefix sphinx with constant names
All constant names are prefixed with SPHINX_

PHPBB3-10946
2012-07-12 17:32:07 +05:30
Dhruv Goel
e486f4389c [feature/sphinx-fulltext-search] remove autoconf
Remove all code related to sphinx automatic configuration and all exec
calls.

PHPBB3-10946
2012-07-12 17:32:06 +05:30
Dhruv Goel
8dcdf8a973 [feature/sphinx-fulltext-search] add docblock and access modifiers
PHPBB3-10946

Conflicts:

	phpBB/includes/search/fulltext_sphinx.php
2012-07-12 17:32:05 +05:30
Dhruv Goel
2503581cd5 [feature/sphinx-fulltext-search] add class properties indexes & sphinx
PHPBB3-10946
2012-07-12 17:32:04 +05:30
Dhruv Goel
0e9174d168 [feature/sphinx-fulltext-search] use keywords_search instead of get_name
using keyword_search method instead of get_name to distinguish between the
search backend classes present in includes/search and other helper classes.

PHPBB3-10946
2012-07-12 17:32:03 +05:30
Dhruv Goel
06eeed058d [feature/sphinx-fulltext-search] remove unused arrays
PHPBB3-10946
2012-07-12 17:32:02 +05:30
Dhruv Goel
4a11a7b970 [feature/sphinx-fulltext-search] add sphinx_table constant to constants.php
PHPBB3-10946
2012-07-12 17:32:01 +05:30
Dhruv Goel
97fda78e7d [feature/sphinx-fulltext-search] Make different files for different classes
Break the classes in functions-sphinx.php into different files
with proper class names according to phpbb class auto loader conventions.

PHPBB3-10946

Conflicts:

	phpBB/includes/search/sphinx/config.php
2012-07-12 17:32:00 +05:30
Dhruv Goel
10b706674e [feature/sphinx-fulltext-search] add binlog_path to config
binlog files are now added to the data folder.

PHPBB3-10946
2012-07-12 17:31:58 +05:30
Dhruv Goel
39f8a5fa9f [feature/sphinx-fulltext-search] use sql_build_query for query
Uses sql_build_query for JOIN query. Remove casting to int and space for
phpbb conventions to be followed

PHPBB3-10946

Conflicts:

	phpBB/includes/search/fulltext_sphinx.php
2012-07-12 17:31:57 +05:30
Dhruv Goel
bfd01f0187 [feature/sphinx-fulltext-search] remove all reference returns
PHPBB3-10946
2012-07-12 17:31:56 +05:30
Dhruv Goel
f609555b1a [feature/sphinx-fulltext-search] integrate sphinx language keys with core
Language keys removed from mods folder and added to
language/en/acp/search.php

PHPBB3-10946
2012-07-12 17:31:49 +05:30
Dhruv Goel
74a7407927 [feature/sphinx-fulltext-search] improve classes in functions-sphinx.php
PHPBB3-10946
2012-07-12 17:27:29 +05:30
Dhruv Goel
02588069f0 [feature/sphinx-fulltext-search] fix config variables
config variables now use class property for unique id

PHPBB3-10946

Conflicts:

	phpBB/includes/search/fulltext_sphinx.php
2012-07-12 17:27:28 +05:30
Dhruv Goel
455a35d836 [feature/sphinx-fulltext-search] temporary commit to pull out sphinx-api
also need to add the latest sphinx api instead of this.

PHPBB3-10946
2012-07-12 17:27:27 +05:30
Dhruv Goel
8d76bc45ee [feature/sphinx-fulltext-search] minor fixes in formatting
Add a newline at the end of files. Update License information in package
docbloc.

PHPBB3-10946
2012-07-12 17:27:25 +05:30
Dhruv Goel
99d4660df6 [feature/sphinx-fulltext-search] update config file
Sphinx config file updated according to new documentation.

PHPBB3-10946
2012-07-12 17:27:24 +05:30
Dhruv Goel
fcf0d04b20 [feature/sphinx-fulltext-search] minor changes
some minor code changes to make it working against current develop
and comply with other search backend coding convetions.

PHPBB3-10946
2012-07-12 17:27:23 +05:30
Dhruv Goel
a50b0faf4a [feature/sphinx-fulltext-search] MOD by naderman installed in phpbb
PHPBB3-10946
2012-07-12 17:27:22 +05:30
Joas Schilling
e68c1fb9e4 [ticket/10950] Use database count() and group by instead of doing that in php
PHPBB3-10950
2012-07-11 12:58:57 +02:00
Nathan
b25efd744d [ticket/8323] Only disable administrative deactivated accounts from receiving PMs
Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation)

PHPBB3-8323
2012-07-10 17:41:27 -05:00
Nathan
08bdebb0b5 [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification
PHPBB3-8323
2012-07-10 16:38:07 -05:00
Nathan
33852e6251 [ticket/8323] Correct PM notification settings (only notify those who can receive them)
Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense)

PHPBB3-8323
2012-07-10 16:07:12 -05:00
Nathan
362ba43f18 [ticket/8323] Allow sending PMs to temporarily banned users
Added an argument to the phpbb_get_banned_user_ids() function to allow specifying a banned end time (default true for current functionality, false for only permanent bans, timestamp to find banned until a specified time)

PHPBB3-8323
2012-07-10 12:34:40 -05:00
Nathan
0f4956b280 [ticket/8323] Do not allow sending PMs to Inactive users
PHPBB3-8323
2012-07-10 12:34:39 -05:00
Nathan
e6d4e9bbb9 [ticket/8323] Correcting the comment
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
c38bb4254a [ticket/8323] Do not allow sending of Private Messages to users who are banned
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
c53d7f0b62 [ticket/8323] Remove code used for testing
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
05452b9ec0 [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages
PHPBB3-8323
2012-07-10 12:34:37 -05:00
Andreas Fischer
8c733b3cd2 [ticket/10969] Also remove COMMENTS key from data array in get_available_dbms()
PHPBB3-10969
2012-07-08 21:42:30 +02:00
Fyorl
d0cb5bb093 [ticket/10970] Added support for forms such as {FOO}bar.{EXT}
PHPBB3-10970
2012-07-08 20:41:22 +01:00
Fyorl
d589623906 [ticket/10970] Paths of the form {FOO}/a/{BAR}/b parsed correctly
A new method to handle this type of path was added and
compile_tag_include, compile_tag_include_php and
compile_tag_include_js were modified to use it appropriately.

Tests were added for these three macros also.

PHPBB3-10970
2012-07-08 20:41:00 +01:00
Andreas Fischer
cb245b1faf [ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).
Merge their bodies into phpbb_remove_comments($input).

PHPBB3-10969
2012-07-08 21:38:53 +02:00