aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/search.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-161-12/+31
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * Merge pull request #1640 from brunoais/ticket/11637Nathan Guse2013-09-121-8/+2
| |\ | | | | | | [ticket/11637] generate_text_for_display on search.php
| | * [ticket/11637] generate_text_for_display on search.phpbrunoais2013-08-041-8/+2
| | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| * | [ticket/11749] Move event after all template data has been definedMatt Friedman2013-07-291-13/+15
| | | | | | | | | | | | PHPBB3-11749
| * | [ticket/11749] PHP Events for search.phpMatt Friedman2013-07-271-0/+23
| | | | | | | | | | | | PHPBB3-11749
| * | [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-201-2/+2
| | | | | | | | | | | | | | | | | | | | | Due to the move to soft-delete, the topic_replies column no longer exists in the topics table. Instead, the column topic_posts_approved should be used. PHPBB3-11717
* | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-1/+1
| | | | | | | | | | | | PHPBB3-11700
* | | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-141-1/+1
|/ / | | | | | | PHPBB3-11700
* | [ticket/9657] Use the service instead of the static classJoas Schilling2013-07-111-3/+5
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Fix some more subsilver2Joas Schilling2013-03-121-1/+1
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Remove line with unused variableJoas Schilling2013-03-111-1/+0
| | | | | | | | PHPBB3-9657
* | Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-101-8/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-merge-develop # By Oleg Pudeyev (45) and others # Via Oleg Pudeyev (42) and others * remotes/phpbb/develop: (289 commits) [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. [ticket/11050] make all properties protected in all search backends [ticket/11050] get_common_words() returns empty array for sphinx [ticket/11050] fix tidied search query docblock language [ticket/11050] fix min/max length docblock language [ticket/11050] multi sentences separated by period in docblocks [ticket/11050] fix separated spelling in docblock [ticket/11050] fix split words doc block language [ticket/11050] remove class word from docblocks ... Conflicts: phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/language/en/acp/permissions_phpbb.php phpBB/styles/prosilver/template/posting_editor.html
| * [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-171-2/+2
| | | | | | | | PHPBB3-11023
| * [ticket/11051] add common_words variableDhruv2012-10-041-2/+4
| | | | | | | | PHPBB3-11051
| * [ticket/11051] remove unnecessary commentDhruv2012-10-041-1/+0
| | | | | | | | PHPBB3-11051
| * [ticket/11051] add get_word_len() in sphinx searchDhruv2012-10-041-1/+8
| | | | | | | | | | | | | | get_word_len() for sphinx search backend returns false always and triggers proper error. PHPBB3-11051
| * [ticket/11051] use get_word_length in search backendDhruv2012-08-171-1/+3
| | | | | | | | | | | | | | Use get_word_length() instead od accessing the word_length property directly as it is now protected. PHPBB3-11051
| * [ticket/11051] use get_common_words in search backendDhruv2012-08-161-2/+2
| | | | | | | | | | | | | | Use get_common_words() instead of accessing the common_words property directly as it is now protected. PHPBB3-11051
| * [ticket/11051] function instead of accessing property in searchDhruv2012-08-161-3/+3
| | | | | | | | | | | | | | Use get_search_query() instead of accessing the search_query property directly as it is now protected. PHPBB3-11051
* | [feature/soft-delete] Link to delete_topics module when the topic is deletedJoas Schilling2012-11-101-2/+3
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Display soft deleted icon on search.phpJoas Schilling2012-11-091-1/+1
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Fix some more uses of topic_replies_realJoas Schilling2012-10-221-1/+1
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Correctly calculate the number of replies everywhereJoas Schilling2012-10-221-2/+1
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Add unit tests for get_global_visibility_sql()Joas Schilling2012-10-011-2/+2
| | | | | | | | PHPBB3-9657
* | [feature/soft-delete] Fix some more usages of _approved column namesJoas Schilling2012-08-301-17/+1
| | | | | | | | PHPBB3-9657
* | [feature/soft-delete] Update search to use $post_visibilityJoas Schilling2012-08-301-10/+10
| | | | | | | | | | | | Todo: Sphinx currently does not respect this setting at all. PHPBB3-9657
* | [feature/soft-delete] Try to fix search.phpJoas Schilling2012-08-301-14/+14
| | | | | | | | | | | | at least it's running now, but the performance is not very good. PHPBB3-9657
* | [feature/soft-delete] Rename phpbb_visibility class to phpbb_content_visibilityJosh Woody2012-08-291-1/+1
| | | | | | | | | | | | Rename the class to more accurately reflect what it does. PHPBB3-9657
* | [feature/soft-delete] I told you I was going to rename the class!Josh Woody2012-08-291-1/+1
| | | | | | | | | | | | Rename topic_visibility class to phpbb_visibility. Also a bit of work to the class itself, mostly cleanup and adding the comments that I'd previously written. PHPBB3-9657
* | [feature/soft-delete] Lay the groundwork for a soft-delete featureJosh Woody2012-08-291-7/+12
|/ | | | | | So far, I've added no new functionality. The biggest change here is adjusting the DB column names to "visibility" rather than "approved". Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :) PHPBB3-9657
* [ticket/11011] pass $auth to search backend constructorDhruv2012-08-081-1/+1
| | | | | | | $auth global var is passed to search backend constructor, as it is used by sphinx backend. PHPBB3-11011
* [ticket/11011] passing global variablesDhruv2012-07-281-1/+1
| | | | | | Pass global variables to class constructor when making a new object. PHPBB3-11011
* [feature/pagination-as-list] New parameter for name of start varDrae2012-07-181-2/+2
| | | | | | | Add a new parameter to hold the name of the start variable. This fulfills ticket PHPBB3-8535. PHPBB3-10968
* [feature/pagination-as-list] Updates for nils commentsDrae2012-07-181-3/+3
| | | | | | | Re-remove deprecated functions, change on_page to phpbb_on_page, add null returns, remove globals and pass as params. PHPBB3-10968
* [feature/pagination-as-list] Rename and deprecate functionsDrae2012-07-181-2/+2
| | | | | | | Returned and marked deprecated topic_generate_pagination. Rename new function in line with coding guidelines. PHPBB3-10968
* [feature/pagination-as-list] Various fixes and improvementsDrae2012-07-181-3/+3
| | | | | | | | | | 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
* [ticket/10968] Render pagination within the templateDrae2012-07-181-2/+7
| | | | | | | | | | | | | | 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
* Merge PR #854 branch 'dhruvgoel92/ticket/10943' into developOleg Pudeyev2012-07-071-1/+2
|\ | | | | | | | | | | * dhruvgoel92/ticket/10943: [ticket/10943] displays searched query in search result [ticket/10943] use keywords variable to display in search box
| * [ticket/10943] displays searched query in search resultDhruv Goel2012-07-081-0/+1
| | | | | | | | | | | | | | Search backend displays an additional normalized search query just above the ignored words. PHPBB3-10943
| * [ticket/10943] use keywords variable to display in search boxDhruv Goel2012-07-081-1/+1
| | | | | | | | | | | | | | $keywords which contains the string as entered by the user should be used to display in search box instead of search_query. PHPBB3-10943
* | [feature/postgresql-fulltext-search] supports_phrase_search functionDhruv Goel2012-07-081-2/+2
| | | | | | | | | | | | function to return the value of the the private property phrase_search PHPBB3-9730
* | [feature/postgresql-fulltext-search] use proper variable nameDhruv Goel2012-07-081-3/+3
| | | | | | | | PHPBB3-9730
* | [feature/postgresql-fulltext-search] fix formattingDhruv Goel2012-07-051-1/+1
| | | | | | | | | | | | adds proper spaces after control keywords and comment symbol PHPBB3-9730
* | [feature/postgresql-fulltext-search] remove phrase search codeDhruv Goel2012-07-051-0/+10
|/ | | | | | | 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
* Merge branch 'develop-olympus' into developAndreas Fischer2012-02-261-12/+37
|\ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10532] Remove unnecessary parentheses around calculations of addition. [ticket/10532] Remove one unnecessary level of if block nesting. [ticket/10532] Get rid of inline calculation of $start, remove duplicated check [ticket/10532] Put $total_match_count assignment onto its own line. [ticket/10532] Adjust total match count and limit [ticket/10532] Fix $start out of range for pre-made searches Conflicts: phpBB/search.php
| * [ticket/10532] Remove unnecessary parentheses around calculations of addition.Andreas Fischer2012-02-261-2/+2
| | | | | | | | PHPBB3-10532
| * [ticket/10532] Remove one unnecessary level of if block nesting.Andreas Fischer2012-02-261-37/+34
| | | | | | | | PHPBB3-10532
| * [ticket/10532] Get rid of inline calculation of $start, remove duplicated checkAndreas Fischer2012-02-261-2/+7
| | | | | | | | PHPBB3-10532
| * [ticket/10532] Put $total_match_count assignment onto its own line.Andreas Fischer2012-02-261-1/+2
| | | | | | | | PHPBB3-10532
| * [ticket/10532] Adjust total match count and limitrxu2012-01-141-6/+21
| | | | | | | | | | | | | | | | Set a variable for the limit of total matches count. Adjust total match count to limit to provide proper $start value calculation. Adjust $start value if no matches were found. PHPBB3-10532