1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

5920 Commits

Author SHA1 Message Date
Dhruv
db1c80dee9 [ticket/11011] add access specifiers and docblocks
Add access specifiers and docblocks to mysql search backend.

PHPBB3-11011
2012-07-28 15:02:18 +05:30
Oleg Pudeyev
7fd1a166da Merge PR #865 branch 'dhruvgoel92/feature/sphinx-fulltext-search' into develop
* dhruvgoel92/feature/sphinx-fulltext-search: (57 commits)
  [feature/sphinx-fulltext-search] add sphinx to Authors file
  [feature/sphinx-fulltext-search] add sphinxapi.php file
  [feature/sphinx-fulltext-search] fix auth bug
  [feature/sphinx-fulltext-search] remove unused property
  [feature/sphinx-fulltext-search] use 9312 as default port
  [feature/sphinx-fulltext-search] fix language of host config
  [feature/sphinx-fulltext-search] fix sphinx for arbitary host
  [feature/sphinx-fulltext-search] coding changes acc to phbb conventions
  [feature/sphinx-fulltext-search] fixing comments
  [feature/sphinx-fulltext-search] add trailing slash in language
  [feature/sphinx-fulltext-search] improve port option
  [feature/sphinx-fulltext-search] remove stopwords and config path
  [feature/sphinx-fulltext-search] makes sql host configurable
  [feature/sphinx-fulltext-search] use readonly instead of disabled
  [feature/sphinx-fulltext-search] fix language keys' typo
  [feature/sphinx-fulltext-search] remove note from db_tools
  [feature/sphinx-fulltext-search] add support for postgres
  [feature/sphinx-fulltext-search] add pgsql functionality
  [feature/sphinx-fulltext-search] use Update in sphinx query
  [feature/sphinx-fulltext-search] use CASE instead of IF
  ...
2012-07-27 22:27:26 -04:00
Dhruv
033a2328c4 [feature/sphinx-fulltext-search] add sphinxapi.php file
PHPBB3-10946
2012-07-27 11:27:25 +05:30
Dhruv
fe8a0d3bc6 [feature/sphinx-fulltext-search] fix auth bug
$this->auth replaces $auth as at other occurences of auth.

PHPBB3-10946
2012-07-27 11:10:12 +05:30
Dhruv
cec9f7d54e [feature/sphinx-fulltext-search] remove unused property
Removes unused property $word_length

PHPBB3-10946
2012-07-27 11:10:10 +05:30
Dhruv
6547989225 [feature/sphinx-fulltext-search] use 9312 as default port
Uses 9312 instead of 3312 as default port for searchd to listen on
according to latest sphinx documentation. Use filename sphinxapi.php
instead of old one.

PHPBB3-10946
2012-07-27 11:10:04 +05:30
Dhruv
a6b5b2784f [feature/sphinx-fulltext-search] fix sphinx for arbitary host
PHPBB3-10946
2012-07-26 17:32:06 +05:30
Dhruv
eb4298c646 [feature/sphinx-fulltext-search] coding changes acc to phbb conventions
Add a new line after break. Change docblocks to be more informative.

PHPBB3-10946
2012-07-26 16:55:11 +05:30
Dhruv
747af894a0 [feature/sphinx-fulltext-search] fixing comments
Use // for two liners in comments.

PHPBB3-10946
2012-07-26 16:18:53 +05:30
Andreas Fischer
f6b4aec9d0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
2012-07-23 23:40:09 +02:00
Andreas Fischer
60acd63c70 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
2012-07-23 23:39:58 +02:00
Nils Adermann
296fadfca4 [ticket/10965] Profile data is only grabbed when show_novalue is enabled
PHPBB3-10965
2012-07-23 23:35:48 +02:00
Andreas Fischer
dad99dcd8e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
2012-07-23 22:56:57 +02:00
Andreas Fischer
27d9e3133b Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
2012-07-23 22:56:47 +02:00
Nils Adermann
2f5692d4bb [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
PHPBB3-10965
2012-07-23 22:38:38 +02:00
Andreas Fischer
9480a5e512 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value

Conflicts:
	phpBB/includes/acp/acp_profile.php
2012-07-23 15:50:54 +02:00
Andreas Fischer
7b98e75ec3 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
2012-07-23 15:48:53 +02:00
Nils Adermann
10172887fd [ticket/10965] Introduce a new profile field option to display no value
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
2012-07-23 15:45:57 +02:00
Nils Adermann
147a125f69 Merge pull request #914 from EXreaction/ticket/10990
Ticket/10990
2012-07-22 16:25:17 -07:00
Nathan Guse
577dbf8951 [ticket/10990] Changes for develop
PHPBB3-10990
2012-07-22 14:48:39 -05:00
Nathan Guse
eb5e33a768 [ticket/10990] Do not use comma separator when storing it as a log.
PHPBB3-10990
2012-07-22 14:39:10 -05:00
Nathan
67665f5957 [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
PHPBB3-10990
2012-07-22 14:32:03 -05:00
Dhruv
39bac86f7d [feature/sphinx-fulltext-search] improve port option
Use listen instead of deprecated port value in sphinx config file.
sqlhost uses default $dbhost.

PHPBB3-10946
2012-07-22 04:24:34 +05:30
Dhruv
e40758db84 [feature/sphinx-fulltext-search] remove stopwords and config path
Remove stopwords and config_path options from ACP.

PHPBB3-10946
2012-07-22 03:16:03 +05:30
Dhruv
161e469b5a [feature/sphinx-fulltext-search] makes sql host configurable
The SQL server host which sphinx connects to index the posts is now
configurable via ACP.

PHPBB3-10946
2012-07-22 02:50:53 +05:30
Dhruv
0e9eb9401a [feature/sphinx-fulltext-search] use readonly instead of disabled
PHPBB3-10946
2012-07-22 01:53:04 +05:30
Nils Adermann
cc0aa90c49 Merge remote-tracking branch 'github-igorw/ticket/11012' into develop
* github-igorw/ticket/11012:
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
2012-07-21 16:39:57 +02:00
Nils Adermann
61f05e027d Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into develop
* github-nickvergessen/ticket/11002:
  [ticket/11002] Use translating option to rename the Etc/GMT options
2012-07-21 16:35:24 +02:00
Igor Wiedler
85bcdbad46 [ticket/11012] Normalize $phpEx member vars to $php_ext
PHPBB3-11012
2012-07-21 16:19:01 +02:00
Nils Adermann
f7f78adeb9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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 16:15:42 +02:00
Nils Adermann
29bee5b01a Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [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 16:15:32 +02:00
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