From 25b5c5284e17aac0958150008f9f334ee96a13e6 Mon Sep 17 00:00:00 2001 From: Bournwog Date: Tue, 3 Sep 2013 02:43:13 -0700 Subject: [PATCH 1/2] Update snippet.msearch.php add 'reconfig' option, if this option set we will use new script configuration for mSearch --- .../msearch/elements/snippets/snippet.msearch.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/components/msearch/elements/snippets/snippet.msearch.php b/core/components/msearch/elements/snippets/snippet.msearch.php index 477b933..9883ec8 100644 --- a/core/components/msearch/elements/snippets/snippet.msearch.php +++ b/core/components/msearch/elements/snippets/snippet.msearch.php @@ -9,6 +9,10 @@ $mSearch = $modx->getService('msearch','mSearch',$modx->getOption('core_path').'components/msearch/model/msearch/',$scriptProperties); if (!($mSearch instanceof mSearch)) return ''; +//reconfigurate mSearch +if($reconfig==1) + $mSearch->reconfigurate($scriptProperties); + // Обрабатываем поисковый запрос if (isset($_REQUEST[$queryVar])) { $query = trim(strip_tags($_REQUEST[$queryVar])); @@ -100,4 +104,4 @@ return; } return implode($outputSeparator, $result); -} \ No newline at end of file +} From 787fbce2e03b14cd935593ed9cedfacb13b3347e Mon Sep 17 00:00:00 2001 From: Bournwog Date: Tue, 3 Sep 2013 02:45:50 -0700 Subject: [PATCH 2/2] Update msearch.class.php --- .../components/msearch/model/msearch/msearch.class.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/components/msearch/model/msearch/msearch.class.php b/core/components/msearch/model/msearch/msearch.class.php index af8b230..7744ba9 100644 --- a/core/components/msearch/model/msearch/msearch.class.php +++ b/core/components/msearch/model/msearch/msearch.class.php @@ -12,7 +12,7 @@ function __construct(modX &$modx,array $config = array()) { $assetsUrl = $this->modx->getOption('msearch.assets_url',$config,$this->modx->getOption('assets_url').'components/msearch/'); $connectorUrl = $assetsUrl.'connector.php'; - $this->config = array_merge(array( + $this->config = array( 'assetsUrl' => $assetsUrl ,'cssUrl' => $assetsUrl.'css/' ,'jsUrl' => $assetsUrl.'js/' @@ -31,8 +31,14 @@ function __construct(modX &$modx,array $config = array()) { ,'morphy_lang' => $this->modx->getOption('msearch.lang') ,'morphy_storage' => 'mem' ,'disablePhpMorphy' => false - ),$config); + ); + $this->reconfigurate($config); + + } + public function reconfigurate(array $config = array()) { + $this->config = array_merge($this->config,$config); + if (isset($this->config['sortFilters'])) {$this->config['sortFilters'] = explode(',', $this->config['sortFilters']);} $this->modx->addPackage('msearch',$this->config['modelPath'], $this->modx->config['table_prefix'].'mse_');