aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'Fyorl/ticket/11044' into developAndreas Fischer2012-08-061-0/+37
|\ | | | | | | | | | | | | | | * 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
| * [ticket/11044] Added comment explaining filename splittingFyorl2012-08-061-1/+4
| | | | | | | | PHPBB3-11044
| * [ticket/11044] Preserve the file extension in unique filenamesFyorl2012-08-051-1/+9
| | | | | | | | PHPBB3-11044
| * [ticket/11044] Minor adjustments as per PR commentsFyorl2012-08-051-6/+7
| | | | | | | | | | | | Changed private to protected, renamed check_name to unique_filename. PHPBB3-11044
| * [ticket/11044] Compress class now deals with file conflictsFyorl2012-08-041-0/+25
| | | | | | | | PHPBB3-11044
* | Merge remote-tracking branch 'bantu/ticket/11041' into developIgor Wiedler2012-08-062-5/+5
|\ \ | | | | | | | | | | | | * bantu/ticket/11041: [ticket/11041] Correctly import PHP file extension from global space.
| * | [ticket/11041] Correctly import PHP file extension from global space.Andreas Fischer2012-08-022-5/+5
| |/ | | | | | | | | | | | | 85bcdbad468cd255a02d6c48b2dcd1d128978eed shouldn't have changed imports of "global $phpEx". PHPBB3-11041
* | Merge remote-tracking branch 'EXreaction/ticket/10885' into developAndreas Fischer2012-08-061-9/+8
|\ \ | | | | | | | | | | | | * EXreaction/ticket/10885: [ticket/10885] Fix UCP Main Error if no forums exist
| * | [ticket/10885] Fix UCP Main Error if no forums existNathan Guse2012-08-061-9/+8
| | | | | | | | | | | | | | | | | | | | | This error is caused by an empty set passed to sql_in_set if the user cannot read any forums PHPBB3-10885
* | | Merge remote-tracking branch 'EXreaction/ticket/11029' into developAndreas Fischer2012-08-061-8/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | * 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
| * | [ticket/11029] Remove $reparse variableNathan Guse2012-08-061-7/+2
| | | | | | | | | | | | | | | | | | | | | Its only set to false, then true in one case, and only checked once. So remove it because it is unnecessary. PHPBB3-11029
| * | [ticket/11029] Return $parsed_array (may have loaded from the cache)Nathan Guse2012-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Even if the file does not exist, it may be in the cache, so return $parsed_array just in case PHPBB3-11029
| * | [ticket/11029] Cache obtain_cfg_items should return empty array on failureNathan Guse2012-07-301-1/+1
| |/ | | | | | | | | | | | | | | | | | | 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
* | [ticket/10875] method_exists check is not required, interface declares themNathan Guse2012-07-3010-20/+19
| | | | | | | | | | | | | | 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
* | [ticket/10875] Changes to Cache Driver caused method_exists checks to failNathan Guse2012-07-3010-19/+19
|/ | | | | | | | | | | 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
* Merge PR #865 branch 'dhruvgoel92/feature/sphinx-fulltext-search' into developOleg Pudeyev2012-07-279-2/+3097
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * [feature/sphinx-fulltext-search] add sphinxapi.php fileDhruv2012-07-271-0/+1712
| | | | | | | | PHPBB3-10946
| * [feature/sphinx-fulltext-search] fix auth bugDhruv2012-07-271-1/+1
| | | | | | | | | | | | $this->auth replaces $auth as at other occurences of auth. PHPBB3-10946
| * [feature/sphinx-fulltext-search] remove unused propertyDhruv2012-07-271-1/+0
| | | | | | | | | | | | Removes unused property $word_length PHPBB3-10946
| * [feature/sphinx-fulltext-search] use 9312 as default portDhruv2012-07-271-4/+4
| | | | | | | | | | | | | | | | 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
| * [feature/sphinx-fulltext-search] fix sphinx for arbitary hostDhruv2012-07-261-4/+4
| | | | | | | | PHPBB3-10946
| * [feature/sphinx-fulltext-search] coding changes acc to phbb conventionsDhruv2012-07-261-2/+12
| | | | | | | | | | | | Add a new line after break. Change docblocks to be more informative. PHPBB3-10946
| * [feature/sphinx-fulltext-search] fixing commentsDhruv2012-07-262-18/+18
| | | | | | | | | | | | Use // for two liners in comments. PHPBB3-10946
| * [feature/sphinx-fulltext-search] improve port optionDhruv2012-07-221-4/+3
| | | | | | | | | | | | | | Use listen instead of deprecated port value in sphinx config file. sqlhost uses default $dbhost. PHPBB3-10946
| * [feature/sphinx-fulltext-search] remove stopwords and config pathDhruv2012-07-221-12/+2
| | | | | | | | | | | | Remove stopwords and config_path options from ACP. PHPBB3-10946
| * [feature/sphinx-fulltext-search] makes sql host configurableDhruv2012-07-221-2/+7
| | | | | | | | | | | | | | The SQL server host which sphinx connects to index the posts is now configurable via ACP. PHPBB3-10946
| * [feature/sphinx-fulltext-search] use readonly instead of disabledDhruv2012-07-221-1/+1
| | | | | | | | PHPBB3-10946
| * [feature/sphinx-fulltext-search] remove note from db_toolsDhruv2012-07-211-1/+0
| | | | | | | | | | | | | | Note saying db_tools not being used currently is remove from db_tools.php We utilize db_tools in sphinx search. PHPBB3-10946
| * [feature/sphinx-fulltext-search] add support for postgresDhruv2012-07-191-3/+20
| | | | | | | | | | | | | | 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
| * [feature/sphinx-fulltext-search] add pgsql functionalityDhruv2012-07-191-1/+1
| | | | | | | | PHPBB3-10946
| * [feature/sphinx-fulltext-search] use Update in sphinx queryDhruv2012-07-191-2/+9
| | | | | | | | | | | | | | | | 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
| * [feature/sphinx-fulltext-search] use CASE instead of IFDhruv2012-07-191-2/+2
| | | | | | | | | | | | | | IF is not supported in pgsql, use CASE instead supported in both mysql and pgsql. PHPBB3-10946
| * [feature/sphinx-fulltext-search] minor changes in sphinx.confDhruv2012-07-191-1/+1
| | | | | | | | PHPBB3-10946
| * [feature/sphinx-fulltext-search] use sql_table_existsDhruv2012-07-191-6/+1
| | | | | | | | | | | | Use sql_table_exists( ) method in db_tools to support all database types. PHPBB3-10946
| * [feature/sphinx-fulltext-search] modify language keysDhruv2012-07-191-2/+1
| | | | | | | | | | | | | | Modify language keys according to what the config setting actually does. Remove references to autoconf. PHPBB3-10946
| * [feature/sphinx-fulltext-search] improve sphinx helper classesDhruv2012-07-194-11/+50
| | | | | | | | | | | | | | add access modifiers and docblocks to properties and methods of sphinx helper classes. PHPBB3-10946
| * [feature/sphinx-fulltext-search] fix comments and indentationDhruv2012-07-192-5/+5
| | | | | | | | PHPBB3-10946
| * [feature/sphinx-fulltext-search] use new unique id instead of saltDhruv2012-07-191-7/+8
| | | | | | | | | | | | | | a new unique id is generated by sphinx and stored in the config table instead of using avatar_salt. PHPBB3-10946
| * [feature/sphinx-fulltext-search] display config file in ACPDhruv2012-07-191-9/+13
| | | | | | | | | | | | | | sphinx config file is generated and displayed in the ACP for user to use it to start sphinx search daemon. PHPBB3-10946
| * [feature/sphinx-fulltext-search] remove bin_pathDhruv Goel2012-07-191-5/+0
| | | | | | | | | | | | fulltext_sphinx_bin_path from ACP as it is no longer required. PHPBB3-10946
| * [feature/sphinx-fulltext-search] modify config classDhruv Goel2012-07-192-158/+145
| | | | | | | | | | | | | | | | 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
| * [feature/sphinx-fulltext-search] improve formattingDhruv Goel2012-07-191-8/+8
| | | | | | | | PHPBB3-10946
| * [feature/sphinx-fulltext-search] fix commentsDhruv Goel2012-07-193-39/+53
| | | | | | | | PHPBB3-10946
| * [feature/sphinx-fulltext-search] remove recent search queriesDhruv Goel2012-07-191-3/+0
| | | | | | | | | | | | | | remove recent search queries from the stats as they can't be retreived and remove other language keys being used no more. PHPBB3-10946
| * [feature/sphinx-fulltext-search] implementing db_toolsDhruv Goel2012-07-191-8/+19
| | | | | | | | | | | | Use db_tools class for creating/dropping sphinx table. PHPBB3-10946
| * [feature/sphinx-fulltext-search] assign all globals to class propertiesDhruv Goel2012-07-191-70/+56
| | | | | | | | PHPBB3-10946
| * [feature/sphinx-fulltext-search] adds default config valuesDhruv Goel2012-07-191-18/+0
| | | | | | | | | | | | | | Default config values are added to config table in new install as well as database_update. PHPBB3-10946
| * [feature/sphinx-fulltext-search] remove unnecessary codeDhruv Goel2012-07-121-20/+5
| | | | | | | | | | | | Some extra conditions and variables used in autoconf are removed. PHPBB3-10946
| * [feature/sphinx-fulltext-search] fix stopwords optionDhruv Goel2012-07-121-24/+4
| | | | | | | | | | | | | | Stopwords option can be configured in ACP to generate correct sphinx config file. PHPBB3-10946
| * [feature/sphinx-fulltext-search] prefix sphinx with constant namesDhruv Goel2012-07-121-7/+7
| | | | | | | | | | | | All constant names are prefixed with SPHINX_ PHPBB3-10946