1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 14:04:57 +02:00

6144 Commits

Author SHA1 Message Date
Nils Adermann
3dfcb212dc Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into prep-release-3.0.11
* github-nickvergessen/ticket/10950:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 15:21:26 +02:00
Joas Schilling
656d2c34e0 [ticket/11002] Use translating option to rename the Etc/GMT options
They have the invers offset of their name. So GMT+2 has the offset -7200.
To avoid additional confusion, we simply overwrite their name.

PHPBB3-11002
2012-07-21 15:18:16 +02:00
Dhruv
3ecc81f853 [feature/sphinx-fulltext-search] remove note from db_tools
Note saying db_tools not being used currently is remove from db_tools.php
We utilize db_tools in sphinx search.

PHPBB3-10946
2012-07-21 14:14:19 +05:30
Joas Schilling
3036db481a [ticket/10950] Fix grammar in comments
PHPBB3-10950
2012-07-20 18:03:06 +02:00
Joas Schilling
a3517232f9 [ticket/10950] Delete PMs for users that have not yet read the pm
PHPBB3-10950
2012-07-20 17:11:20 +02:00
Dhruv
a3d103c9c0 [feature/sphinx-fulltext-search] add support for postgres
Don't generate sphinx config file if database is not supported. Add
property $dbtype to write into sphinx config file according to sql_layer.

PHPBB3-10946
2012-07-19 23:01:50 +05:30
Dhruv
609ce3ae8f [feature/sphinx-fulltext-search] add pgsql functionality
PHPBB3-10946
2012-07-19 23:01:49 +05:30
Dhruv
81959927e5 [feature/sphinx-fulltext-search] use Update in sphinx query
Instead of REPLACE use UPDATE since pgsql does not support REPLACE.
A row is inserted at time of creating table so REPLACE is no longer
needed.

PHPBB3-10946
2012-07-19 23:01:49 +05:30
Dhruv
b81941a997 [feature/sphinx-fulltext-search] use CASE instead of IF
IF is not supported in pgsql, use CASE instead supported in both mysql
and pgsql.

PHPBB3-10946
2012-07-19 23:01:48 +05:30
Dhruv
118b57f71d [feature/sphinx-fulltext-search] minor changes in sphinx.conf
PHPBB3-10946
2012-07-19 23:01:47 +05:30
Dhruv
13c451ca2e [feature/sphinx-fulltext-search] use sql_table_exists
Use sql_table_exists( ) method in db_tools to support all database types.

PHPBB3-10946
2012-07-19 23:01:46 +05:30
Dhruv
f40da411c3 [feature/sphinx-fulltext-search] modify language keys
Modify language keys according to what the config setting actually does.
Remove references to autoconf.

PHPBB3-10946
2012-07-19 23:01:45 +05:30
Dhruv
78e7f2a529 [feature/sphinx-fulltext-search] improve sphinx helper classes
add access modifiers and docblocks to properties and methods of
sphinx helper classes.

PHPBB3-10946
2012-07-19 23:01:44 +05:30
Dhruv
b8103c5c31 [feature/sphinx-fulltext-search] fix comments and indentation
PHPBB3-10946
2012-07-19 23:01:43 +05:30
Dhruv
172c583f19 [feature/sphinx-fulltext-search] use new unique id instead of salt
a new unique id is generated by sphinx and stored in the config table
instead of using avatar_salt.

PHPBB3-10946
2012-07-19 23:01:42 +05:30
Dhruv
4b40f0d3c6 [feature/sphinx-fulltext-search] display config file in ACP
sphinx config file is generated and displayed in the ACP for user to use
it to start sphinx search daemon.

PHPBB3-10946
2012-07-19 23:01:41 +05:30
Dhruv Goel
b16e70ae1d [feature/sphinx-fulltext-search] remove bin_path
fulltext_sphinx_bin_path from ACP as it is no longer required.

PHPBB3-10946
2012-07-19 23:01:40 +05:30
Dhruv Goel
f0692bb9e8 [feature/sphinx-fulltext-search] modify config class
Sphinx config class is modified to return the configuration data instead
of writing it to a file. Search backend property config_file_data stores
the generated data.

PHPBB3-10946
2012-07-19 23:01:39 +05:30
Dhruv Goel
01261179ce [feature/sphinx-fulltext-search] improve formatting
PHPBB3-10946
2012-07-19 23:01:38 +05:30
Dhruv Goel
fdb7e64e29 [feature/sphinx-fulltext-search] fix comments
PHPBB3-10946
2012-07-19 23:01:37 +05:30
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