1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

5916 Commits

Author SHA1 Message Date
Fyorl
74423eaf12 [ticket/10939] Added $_FILES handling to phpbb_request
PHPBB3-10939
2012-08-15 14:21:19 +01:00
Andreas Fischer
64ff06cf87 Merge remote-tracking branch 'dhruvgoel92/ticket/11048' into develop
* dhruvgoel92/ticket/11048:
  [ticket/11048] use protected instead of private in pgsql fulltext
  [ticket/11048] use protected instead of private in native search
  [ticket/11048] remove @access from all docblocks
  [ticket/11048] use protected instead of private in mysql fulltext
  [ticket/11048] use protected instead of private in sphinx
  [ticket/11048] add access specifiers to phpbb native search properties
  [ticket/11048] add access specifiers to sphinx search
  [ticket/11048] add access specifiers to phpbb native search
  [ticket/11048] add access specifiers to mysql search
  [ticket/11048] add access specifiers to pgsql search
2012-08-14 14:38:19 +02:00
Dhruv
a9fd98c136 [ticket/11048] use protected instead of private in pgsql fulltext
PHPBB3-11048
2012-08-14 17:47:01 +05:30
Dhruv
469d808365 [ticket/11048] use protected instead of private in native search
PHPBB3-11048
2012-08-14 17:46:17 +05:30
Dhruv
8e8e94ec4c [ticket/11048] remove @access from all docblocks
PHPBB3-11048
2012-08-14 17:43:01 +05:30
Dhruv
5698d03ead [ticket/11048] use protected instead of private in mysql fulltext
PHPBB3-11048
2012-08-14 17:35:24 +05:30
Dhruv
d0cdf445fb [ticket/11048] use protected instead of private in sphinx
PHPBB3-11048
2012-08-14 17:33:44 +05:30
Nils Adermann
dca9057559 Merge pull request #932 from EXreaction/ticket/10875
Ticket/10875
2012-08-14 02:30:49 -07:00
Dhruv
17b8719144 [ticket/11032] sphinx retries before triggering error
Sphinx connection retries should be done before error is triggered.

PHPBB3-11032
2012-08-11 01:06:07 +05:30
Dhruv
a3a359d80a [ticket/11048] add access specifiers to phpbb native search properties
PHPBB3-11048
2012-08-10 16:35:06 +05:30
Dhruv
42d6e0715f [ticket/11048] add access specifiers to sphinx search
PHPBB3-11048
2012-08-10 14:06:25 +05:30
Dhruv
dd56c401af [ticket/11048] add access specifiers to phpbb native search
PHPBB3-11048
2012-08-10 12:23:25 +05:30
Dhruv
de8b7c0b7d [ticket/11048] add access specifiers to mysql search
PHPBB3-11048
2012-08-10 11:35:50 +05:30
Dhruv
b2e166dbfa [ticket/11048] add access specifiers to pgsql search
PHPBB3-11048
2012-08-10 11:30:02 +05:30
Dhruv
698b7999c4 [ticket/11032] trigger error in case search fails
Admins are shown actual error while users are shown a search failed error
in case sphinx search fails.

PHPBB3-11032
2012-08-10 10:46:32 +05:30
Oleg Pudeyev
7c6e1ba109 Merge PR #916 branch 'dhruvgoel92/ticket/11011' into develop
* dhruvgoel92/ticket/11011:
  [ticket/11011] rename property phpEx to php_ext
  [ticket/11011] pass $auth to search backend constructor
  [ticket/11011] remove global keyword from sphinx
  [ticket/11011] pass global variables in construct
  [ticket/11011] passing global variables
  [ticket/11011] remove global keyword in native search
  [ticket/11011] remove global keyword in pgsql search
  [ticket/11011] global variables as constructor parameters
  [ticket/11011] add access specifiers and docblocks
2012-08-08 03:19:00 -04:00
Dhruv
a422ddfe31 [ticket/11011] rename property phpEx to php_ext
PHPBB3-11011
2012-08-08 11:16:46 +05:30
Dhruv
794d6ec443 [ticket/11011] pass $auth to search backend constructor
$auth global var is passed to search backend constructor, as it is used
by sphinx backend.

PHPBB3-11011
2012-08-08 11:07:47 +05:30
Oleg Pudeyev
ce32a31b60 Merge PR #933 branch 'dhruvgoel92/ticket/11032' into develop
* dhruvgoel92/ticket/11032:
  [ticket/11032] use method GetLastError to get error
  [ticket/11032] add sphinx errors to error log
2012-08-08 01:18:10 -04:00
Andreas Fischer
bb40b558f1 Merge remote-tracking branch 'Noxwizard/ticket/11043' into develop
* Noxwizard/ticket/11043:
  [ticket/11043] Change hook name back to display, since that's where we hook in.
  [ticket/11043] Allow call_hook() to be called from more than one location.
  [ticket/11043] Update template hook name
2012-08-07 22:27:30 +02:00
Andreas Fischer
095d7d97a3 Merge remote-tracking branch 'Fyorl/ticket/11044' into develop
* Fyorl/ticket/11044:
  [ticket/11044] Added comment explaining filename splitting
  [ticket/11044] Preserve the file extension in unique filenames
  [ticket/11044] Minor adjustments as per PR comments
  [ticket/11044] Compress class now deals with file conflicts
2012-08-06 23:32:28 +02:00
Nathan Guse
dcefa16318 [ticket/10875] Return $query_id from sql_save
Have to return the $query_id from sql_save so that the results can be pulled

Updated cache test to do some basic sql cache testing.

PHPBB3-10875
2012-08-06 16:26:55 -05:00
Igor Wiedler
ae3f86dbb0 Merge remote-tracking branch 'bantu/ticket/11041' into develop
* bantu/ticket/11041:
  [ticket/11041] Correctly import PHP file extension from global space.
2012-08-06 23:21:06 +02:00
Andreas Fischer
8ce0a4eebd Merge remote-tracking branch 'EXreaction/ticket/10885' into develop
* EXreaction/ticket/10885:
  [ticket/10885] Fix UCP Main Error if no forums exist
2012-08-06 23:07:32 +02:00
Nathan Guse
a2dd99b75e [ticket/10885] Fix UCP Main Error if no forums exist
This error is caused by an empty set passed to sql_in_set
if the user cannot read any forums

PHPBB3-10885
2012-08-06 16:01:05 -05:00
Andreas Fischer
bdbc57e49a Merge remote-tracking branch 'EXreaction/ticket/11029' into develop
* EXreaction/ticket/11029:
  [ticket/11029] Remove $reparse variable
  [ticket/11029] Return $parsed_array (may have loaded from the cache)
  [ticket/11029] Cache obtain_cfg_items should return empty array on failure
2012-08-06 22:47:23 +02:00
Nathan Guse
1b126908c6 [ticket/11029] Remove $reparse variable
Its only set to false, then true in one case, and only checked once.
So remove it because it is unnecessary.

PHPBB3-11029
2012-08-06 15:10:20 -05:00
Nathan Guse
907f1771f9 [ticket/11029] Return $parsed_array (may have loaded from the cache)
Even if the file does not exist, it may be in the cache, so return
$parsed_array just in case

PHPBB3-11029
2012-08-06 15:05:06 -05:00
Fyorl
ecb310c6f7 [ticket/11044] Added comment explaining filename splitting
PHPBB3-11044
2012-08-06 08:32:12 +08:00
Fyorl
011b494bc5 [ticket/11044] Preserve the file extension in unique filenames
PHPBB3-11044
2012-08-05 22:13:35 +01:00
Fyorl
3390712ed7 [ticket/11044] Minor adjustments as per PR comments
Changed private to protected, renamed check_name to unique_filename.

PHPBB3-11044
2012-08-05 11:29:02 +01:00
Fyorl
70d9c02aae [ticket/11044] Compress class now deals with file conflicts
PHPBB3-11044
2012-08-04 16:52:41 +01:00
Andreas Fischer
ae612de663 [ticket/11043] Allow call_hook() to be called from more than one location.
Allow the helper function call_hook() of class phpbb_template to be called
from more than once location and thus for more than one hook (although there is
only one) by adding the method name as a parameter.

PHPBB3-11043
2012-08-03 05:56:49 -05:00
Andreas Fischer
a35ad4e689 [ticket/11041] Correctly import PHP file extension from global space.
85bcdbad468cd255a02d6c48b2dcd1d128978eed shouldn't have changed imports of
"global $phpEx".

PHPBB3-11041
2012-08-02 12:38:49 +02:00
Dhruv
9358bf3de5 [ticket/11032] use method GetLastError to get error
Instead of using _error property, use method GetLastError to retrieve
the error as sphinx API documentation states.

PHPBB3-11032
2012-08-01 22:23:51 +05:30
Dhruv
6fbbb30a81 [ticket/11032] add sphinx errors to error log
PHPBB3-11032
2012-08-01 22:18:12 +05:30
Nathan Guse
01bc818d46 [ticket/10875] Fix SQL Caching
The sql_save function cannot take arguments by reference since it is called
by call_user_func_array()

Replace use of isset($cache->sql_rowset[$query_id]) with $cache->sql_exists

Replace $cache->cache_dir with $cache->get_driver()->cache_dir

PHPBB3-10875
2012-07-30 18:44:40 -05:00
Nathan Guse
2c1da15ae8 [ticket/11029] Cache obtain_cfg_items should return empty array on failure
continue was used where it should not have been, causing a fatal error

This file is loaded on every page to check if style.cfg has changed. If it
has not, the user is not affected, so if it does not exist, the user should
not be affected either.

PHPBB3-11029
2012-07-30 16:23:18 -05:00
Nathan Guse
edcac438df [ticket/10875] method_exists check is not required, interface declares them
The changes to the cache drivers added an interface, which requires many
cache functions exist. For these, we can remove the method_exists() check

PHPBB3-10875
2012-07-30 15:57:51 -05:00
Nathan Guse
828eaecf6a [ticket/10875] Changes to Cache Driver caused method_exists checks to fail
SQL Cache and other functions using the check
method_exists($cache,
failed because of the changes to the cache system.

method_exists($cache has been changed to
method_exists($cache->get_driver()

PHPBB3-10875
2012-07-30 15:31:27 -05:00
Dhruv
9eb6c2ba5b [ticket/11011] remove global keyword from sphinx
PHPBB3-11011
2012-07-28 18:50:56 +05:30
Dhruv
d982a37f19 [ticket/11011] pass global variables in construct
Use global variables passed through constructor instead of using global
keyword in sphinx search backend.

PHPBB3-11011
2012-07-28 18:29:02 +05:30
Dhruv
2e218776bb [ticket/11011] passing global variables
Pass global variables to class constructor when making a new object.

PHPBB3-11011
2012-07-28 18:28:51 +05:30
Dhruv
33c6d7c8be [ticket/11011] remove global keyword in native search
Pass global variables into the search backend class constructor.

PHPBB3-11011
2012-07-28 15:08:09 +05:30
Dhruv
a1da7ff861 [ticket/11011] remove global keyword in pgsql search
Pass global variables into the search backend class constructor.

PHPBB3-11011
2012-07-28 15:02:20 +05:30
Dhruv
9c7a1a1472 [ticket/11011] global variables as constructor parameters
Pass global variables into the search backend class constructor.

PHPBB3-11011
2012-07-28 15:02:19 +05:30
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