diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-10 23:39:09 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-10 23:39:09 +0200 |
| commit | 353ac33d5cea1752047779eb8c70c7ce3a64b6c8 (patch) | |
| tree | 76e08c4e16c68256700506b7111c3cbb547dc877 /phpBB/phpbb/search/sphinx/config.php | |
| parent | 0228424983e35badc779923a1f0398fc3ab7c8b2 (diff) | |
| parent | b59131f558a6d0fe4c836e2658152c8698f0cd22 (diff) | |
| download | forums-353ac33d5cea1752047779eb8c70c7ce3a64b6c8.tar forums-353ac33d5cea1752047779eb8c70c7ce3a64b6c8.tar.gz forums-353ac33d5cea1752047779eb8c70c7ce3a64b6c8.tar.bz2 forums-353ac33d5cea1752047779eb8c70c7ce3a64b6c8.tar.xz forums-353ac33d5cea1752047779eb8c70c7ce3a64b6c8.zip | |
Merge remote-tracking branch 'phpbb/develop' into ticket/11621
* phpbb/develop: (542 commits)
[ticket/11901] Pass empty string as relative_url for non-local magic URL.
[ticket/11898] Correct adm_relative_path created by installer
[ticket/11898] Correct admin S_LOGIN_ACTION
[ticket/11892] Fix undefined variables: to_forum_id & to_topic_id
[ticket/11890] Fix untranslated string when deleting posts through MCP.
[ticket/11895] Fix undefined $forum_id
[ticket/10383] Update the results without the overlay popup.
[ticket/10383] Make the content transitions smoother.
[ticket/10383] AJAXify poll voting
[ticket/11888] Update default search backend in namespaces migration
[ticket/11739] Rename “Remember Me” login keys module
[ticket/11893] Remove unnecessary <fieldset> causing a large font size
[ticket/11894] Fix typo in "Delete post" option
[ticket/11888] Use \phpbb\search\fulltext_native as search backend config
[ticket/11608] Mark failed test as incomplete for mysql search backend
[ticket/11608] Update search backend class names to namespaces
[ticket/11608] Move markIncomplete to search backends test
[ticket/11608] Rename base search test class file
[ticket/11608] Remove suffix test from base class
[ticket/11608] Mark postgres search not found test as incomplete
...
Diffstat (limited to 'phpBB/phpbb/search/sphinx/config.php')
| -rw-r--r-- | phpBB/phpbb/search/sphinx/config.php | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/phpBB/phpbb/search/sphinx/config.php b/phpBB/phpbb/search/sphinx/config.php index f1864f0c8c..262d6008cc 100644 --- a/phpBB/phpbb/search/sphinx/config.php +++ b/phpBB/phpbb/search/sphinx/config.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\search\sphinx; + /** * @ignore */ @@ -16,12 +18,12 @@ if (!defined('IN_PHPBB')) } /** -* phpbb_search_sphinx_config +* \phpbb\search\sphinx\config * An object representing the sphinx configuration * Can read it from file and write it back out after modification * @package search */ -class phpbb_search_sphinx_config +class config { private $sections = array(); @@ -44,7 +46,7 @@ class phpbb_search_sphinx_config * Get a section object by its name * * @param string $name The name of the section that shall be returned - * @return phpbb_search_sphinx_config_section The section object or null if none was found + * @return \phpbb\search\sphinx\config_section The section object or null if none was found * * @access public */ @@ -53,7 +55,7 @@ class phpbb_search_sphinx_config for ($i = 0, $size = sizeof($this->sections); $i < $size; $i++) { // Make sure this is really a section object and not a comment - if (($this->sections[$i] instanceof phpbb_search_sphinx_config_section) && $this->sections[$i]->get_name() == $name) + if (($this->sections[$i] instanceof \phpbb\search\sphinx\config_section) && $this->sections[$i]->get_name() == $name) { return $this->sections[$i]; } @@ -64,13 +66,13 @@ class phpbb_search_sphinx_config * Appends a new empty section to the end of the config * * @param string $name The name for the new section - * @return phpbb_search_sphinx_config_section The newly created section object + * @return \phpbb\search\sphinx\config_section The newly created section object * * @access public */ function add_section($name) { - $this->sections[] = new phpbb_search_sphinx_config_section($name, ''); + $this->sections[] = new \phpbb\search\sphinx\config_section($name, ''); return $this->sections[sizeof($this->sections) - 1]; } @@ -109,7 +111,7 @@ class phpbb_search_sphinx_config // that way they're not deleted when reassembling the file from the sections if (!$line || $line[0] == '#') { - $this->sections[] = new phpbb_search_sphinx_config_comment($config_file[$i]); + $this->sections[] = new \phpbb\search\sphinx\config_comment($config_file[$i]); continue; } else @@ -143,7 +145,7 @@ class phpbb_search_sphinx_config // And then we create the new section object $section_name = trim($section_name); - $section = new phpbb_search_sphinx_config_section($section_name, $section_name_comment); + $section = new \phpbb\search\sphinx\config_section($section_name, $section_name_comment); } } else @@ -158,10 +160,10 @@ class phpbb_search_sphinx_config // of this section so they're not deleted on reassembly if (!$line || $line[0] == '#') { - $section->add_variable(new phpbb_search_sphinx_config_comment($config_file[$i])); + $section->add_variable(new \phpbb\search\sphinx\config_comment($config_file[$i])); continue; } - + // As long as we haven't yet actually found an opening bracket for this section // we treat everything as comments so it's not deleted either if (!$found_opening_bracket) @@ -174,13 +176,13 @@ class phpbb_search_sphinx_config } else { - $section->add_variable(new phpbb_search_sphinx_config_comment($config_file[$i])); + $section->add_variable(new \phpbb\search\sphinx\config_comment($config_file[$i])); continue; } } } - // If we did not find a comment in this line or still add to the previous + // If we did not find a comment in this line or still add to the previous // line's value ... if ($line || $in_value) { @@ -239,16 +241,16 @@ class phpbb_search_sphinx_config } } - // If a name and an equal sign were found then we have append a + // If a name and an equal sign were found then we have append a // new variable object to the section if ($name && $found_assignment) { - $section->add_variable(new phpbb_search_sphinx_config_variable(trim($name), trim($value), ($end_section) ? '' : $comment)); + $section->add_variable(new \phpbb\search\sphinx\config_variable(trim($name), trim($value), ($end_section) ? '' : $comment)); continue; } /* If we found a closing curly bracket this section has been completed - and we can append it to the section list and continue with looking for + and we can append it to the section list and continue with looking for the next section */ if ($end_section) { @@ -262,7 +264,7 @@ class phpbb_search_sphinx_config // If we did not find anything meaningful up to here, then just treat it // as a comment $comment = ($skip_first) ? "\t" . substr(ltrim($config_file[$i]), 1) : $config_file[$i]; - $section->add_variable(new phpbb_search_sphinx_config_comment($comment)); + $section->add_variable(new \phpbb\search\sphinx\config_comment($comment)); } } |