Commit graph

5869 commits

Author SHA1 Message Date
Dhruv Goel
537a16220e [feature/sphinx-fulltext-search] remove recent search queries
remove recent search queries from the stats as they can't be retreived
and remove other language keys being used no more.

PHPBB3-10946
2012-07-19 23:01:36 +05:30
Dhruv Goel
45c0956bcf [feature/sphinx-fulltext-search] implementing db_tools
Use db_tools class for creating/dropping sphinx table.

PHPBB3-10946
2012-07-19 23:01:35 +05:30
Dhruv Goel
79432aa4a0 [feature/sphinx-fulltext-search] assign all globals to class properties
PHPBB3-10946
2012-07-19 23:01:34 +05:30
Dhruv Goel
9711da2763 [feature/sphinx-fulltext-search] adds default config values
Default config values are added to config table in new install as well
as database_update.

PHPBB3-10946
2012-07-19 23:01:28 +05:30
Nils Adermann
737828f009 Merge pull request #843 from nickvergessen/feature/new-tz-handling
Feature/new tz handling
2012-07-19 08:46:25 -07:00
Joas Schilling
7df1c84447 [feature/new-tz-handling] Don't use global user but make it a parameter
PHPBB3-9558
2012-07-19 17:41:27 +02:00
Andreas Fischer
c896cd06dd Merge remote-tracking branch 'Fyorl/ticket/10944' into develop
* Fyorl/ticket/10944:
  [ticket/10944] strpos now stricter and removed superfluous ternary
  [ticket/10944] Reverted changes in PHPBB3-10963
2012-07-19 17:16:37 +02:00
Joas Schilling
196e634370 [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
This should avoid problems, when the board files are updated but database isn't.

PHPBB3-9558
2012-07-19 15:46:12 +02:00
Joas Schilling
6de222065e [feature/new-tz-handling] Add previous selected value to validation if valid
We also add the selected timezone if we can create an object with it.
DateTimeZone::listIdentifiers seems to not add all identifiers to the list,
because some are only kept for backward compatible reasons. If the user has
a deprecated value, we add it here, so it can still be kept. Once the user
changed his value, there is no way back to deprecated values.

PHPBB3-9558
2012-07-19 14:36:20 +02:00
Joas Schilling
d099ef8cad [feature/new-tz-handling] Display suggestion when a different value is selected
PHPBB3-9558
2012-07-19 14:24:59 +02:00
Joas Schilling
81627e2888 [feature/new-tz-handling] Remove additional marking of selected items
PHPBB3-9558
2012-07-18 18:59:25 +02:00
Joas Schilling
14a07b1193 [feature/new-tz-handling] Move update helper function to new class
PHPBB3-9558
2012-07-18 17:18:10 +02:00
Joas Schilling
248a52be2a [feature/new-tz-handling] Delete old variable which is not used anymore
PHPBB3-9558
2012-07-18 16:55:14 +02:00
Joas Schilling
a71e60cdbd [feature/new-tz-handling] Rename $user->tz back to $user->timezone
PHPBB3-9558
2012-07-18 16:52:52 +02:00
Drae
584d49459d [feature/pagination-as-list] New parameter for name of start var
Add a new parameter to hold the name of the start variable. This
fulfills ticket PHPBB3-8535.

PHPBB3-10968
2012-07-18 14:32:42 +01:00
Drae
27d8aef528 [feature/pagination-as-list] Updates for nils comments
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.

PHPBB3-10968
2012-07-18 14:32:18 +01:00
Drae
cf4d6e926d [feature/pagination-as-list] Rename and deprecate functions
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.

PHPBB3-10968
2012-07-18 14:31:50 +01:00
Drae
dc71c0629e [feature/pagination-as-list] Various fixes and improvements
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.

PHPBB3-10968
2012-07-18 14:31:21 +01:00
Drae
922147f05a [ticket/10968] Render pagination within the template
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
2012-07-18 14:30:20 +01:00
Joas Schilling
515e1662a9 [feature/new-tz-handling] Remove "timezone might be numeric"
As we updated all of the used values, there really shouldn't be one anymore.

PHPBB3-9558
2012-07-18 15:01:29 +02:00
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