Commit graph

6380 commits

Author SHA1 Message Date
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
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
Oleg Pudeyev
b6a364b706 Merge PR #856 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:30 -04:00
Oleg Pudeyev
a7da376004 Merge PR #856 branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:28 -04:00
Oleg Pudeyev
36a568fd56 Merge PR #856 branch 'bantu/ticket/10937' into prep-release-3.0.11
* bantu/ticket/10937:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:24 -04:00
Oleg Pudeyev
1526886e3e Merge PR #832 branch 'dhruvgoel92/feature/postgresql-fulltext-search' into develop
* dhruvgoel92/feature/postgresql-fulltext-search: (28 commits)
  [feature/postgresql-fulltext-search] supports_phrase_search function
  [feature/postgresql-fulltext-search] use proper variable name
  [feature/postgresql-fulltext-search] each config is checked if it is set
  [feature/postgresql-fulltext-search] fix formatting
  [feature/postgresql-fulltext-search] add docblocks to functions
  [feature/postgresql-fulltext-search] remove phrase search code
  [feature/postgresql-fulltext-search] define access control specifiers
  [feature/postgresql-fulltext-search] use version_compare
  [feature/postgresql-fulltext-search] fix language key
  [feature/postgresql-fulltext-search] remove Readme
  [feature/postgresql-fulltext-search] removes pcre check
  [feature/postgresql-fulltext-search] fix language tsearch2 to text search
  [feature/postgresql-fulltext-search] remove mbstring support
  [feature/postgresql-fulltext-search] change language for pgsql < 8.3
  [feature/postgresql-fulltext-search] use phpbb_pcre_utf8_support()
  [feature/postgresql-fulltext-search] fix variable name
  [feature/postgresql-fulltext-search] Fix version comparison for 9.0+.
  [feature/postgresql-fulltext-search] fixing license
  [feature/postgresql-fulltext-search] assign empty stats
  [feature/postgresql-fulltext-search] remove backward compatibility
  ...
2012-07-07 16:19:53 -04:00
Dhruv Goel
70a0caee28 [feature/postgresql-fulltext-search] supports_phrase_search function
function to return the value of the the private property phrase_search

PHPBB3-9730
2012-07-08 01:38:53 +05:30
Dhruv Goel
bc699f66cf [feature/postgresql-fulltext-search] fix formatting
adds proper spaces after control keywords and comment symbol

PHPBB3-9730
2012-07-05 21:17:26 +05:30
Dhruv Goel
dfbd32ce24 [feature/postgresql-fulltext-search] add docblocks to functions
Docblocks are added to the functions of this search backend.

PHPBB3-9730
2012-07-05 21:17:25 +05:30
Dhruv Goel
19d76f76dc [feature/postgresql-fulltext-search] remove phrase search code
Unused Code for phrase search removed as pgsql doesnt support it. An added
message is displayed if user tries to perform exact phrase search.

PHPBB3-9730
2012-07-05 21:17:23 +05:30
Dhruv Goel
f2dfaa73ff [feature/postgresql-fulltext-search] define access control specifiers
PHPBB3-9730
2012-07-05 21:17:22 +05:30
Dhruv Goel
ebc4c20199 [feature/postgresql-fulltext-search] use version_compare
version_compare is used for version comparision and pgsql version is now
a global variable that is displayed in the acp too.

PHPBB3-9730
2012-07-05 21:17:20 +05:30