Version 4.5.0
This commit is contained in:
Neo committed
1 parent
1a0c7fd3c2
commit
f79dcf067a
3791 files changed
+248032
-76372
No files matched your search
@@ -11,7 +11,7 @@
|
||||
namespace IPS\core\modules\admin\discovery;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
{
|
||||
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
exit;
|
||||
@@ -22,6 +22,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
*/
|
||||
class _search extends \IPS\Dispatcher\Controller
|
||||
{
|
||||
/**
|
||||
* @brief Has been CSRF-protected
|
||||
*/
|
||||
public static $csrfProtected = TRUE;
|
||||
|
||||
/**
|
||||
* Execute
|
||||
*
|
||||
@@ -45,7 +50,7 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
'rebuildIndex' => array(
|
||||
'title' => 'search_rebuild_index',
|
||||
'icon' => 'undo',
|
||||
'link' => \IPS\Http\Url::internal( 'app=core&module=discovery&controller=search&do=queueIndexRebuild' ),
|
||||
'link' => \IPS\Http\Url::internal( 'app=core&module=discovery&controller=search&do=queueIndexRebuild' )->csrf(),
|
||||
'data' => array( 'confirm' => '', 'confirmSubMessage' => \IPS\Member::loggedIn()->language()->get('search_rebuild_index_confirm') ),
|
||||
),
|
||||
);
|
||||
@@ -74,7 +79,6 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
throw new \DomainException('form_url_error');
|
||||
}
|
||||
|
||||
$requiredVersion = '5.5.0';
|
||||
try
|
||||
{
|
||||
$response = $val->request()->get()->decodeJson();
|
||||
@@ -87,48 +91,79 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
{
|
||||
throw new \DomainException('search_elastic_server_no_version');
|
||||
}
|
||||
if ( version_compare( $response['version']['number'], $requiredVersion, '<' ) )
|
||||
if ( version_compare( $response['version']['number'], \IPS\Content\Search\Elastic\Index::MINIMUM_VERSION, '<' ) )
|
||||
{
|
||||
throw new \DomainException( \IPS\Member::loggedIn()->language()->addToStack('search_elastic_server_unsupported_version', FALSE, array( 'sprintf' => array( $requiredVersion, $response['version']['number'] ) ) ) );
|
||||
throw new \DomainException( \IPS\Member::loggedIn()->language()->addToStack('search_elastic_server_unsupported_version', FALSE, array( 'sprintf' => array( \IPS\Content\Search\Elastic\Index::MINIMUM_VERSION, $response['version']['number'] ) ) ) );
|
||||
}
|
||||
if ( version_compare( $response['version']['number'], \IPS\Content\Search\Elastic\Index::UNSUPPORTED_VERSION, '>=' ) )
|
||||
{
|
||||
throw new \DomainException( \IPS\Member::loggedIn()->language()->addToStack('search_elastic_server_unsupported_version_high', FALSE, array( 'sprintf' => array( \IPS\Content\Search\Elastic\Index::UNSUPPORTED_VERSION, $response['version']['number'] ) ) ) );
|
||||
}
|
||||
}, NULL, NULL, 'search_elastic_server' ) );
|
||||
\IPS\Member::loggedIn()->language()->words['search_elastic_server_desc'] = sprintf( \IPS\Member::loggedIn()->language()->get('search_elastic_server_desc'), \IPS\Content\Search\Elastic\Index::MINIMUM_VERSION, \IPS\Content\Search\Elastic\Index::UNSUPPORTED_VERSION );
|
||||
$form->add( new \IPS\Helpers\Form\Text( 'search_elastic_index', \IPS\Settings::i()->search_elastic_index, NULL, array( 'regex' => '/^[A-Z0-9_]*$/i' ), NULL, NULL, NULL, 'search_elastic_index' ) );
|
||||
$form->add( new \IPS\Helpers\Form\Select( 'search_elastic_analyzer', \IPS\Settings::i()->search_elastic_analyzer, FALSE, array( 'options' => array(
|
||||
'standard' => 'elastic_analyzer_standard',
|
||||
'arabic' => 'elastic_analyzer_arabic',
|
||||
'armenian' => 'elastic_analyzer_armenian',
|
||||
'basque' => 'elastic_analyzer_basque',
|
||||
'brazilian' => 'elastic_analyzer_brazilian',
|
||||
'bulgarian' => 'elastic_analyzer_bulgarian',
|
||||
'catalan' => 'elastic_analyzer_catalan',
|
||||
'cjk' => 'elastic_analyzer_cjk',
|
||||
'czech' => 'elastic_analyzer_czech',
|
||||
'danish' => 'elastic_analyzer_danish',
|
||||
'dutch' => 'elastic_analyzer_dutch',
|
||||
'english' => 'elastic_analyzer_english',
|
||||
'finnish' => 'elastic_analyzer_finnish',
|
||||
'french' => 'elastic_analyzer_french',
|
||||
'galician' => 'elastic_analyzer_galician',
|
||||
'german' => 'elastic_analyzer_german',
|
||||
'greek' => 'elastic_analyzer_greek',
|
||||
'hindi' => 'elastic_analyzer_hindi',
|
||||
'hungarian' => 'elastic_analyzer_hungarian',
|
||||
'indonesian' => 'elastic_analyzer_indonesian',
|
||||
'irish' => 'elastic_analyzer_irish',
|
||||
'italian' => 'elastic_analyzer_italian',
|
||||
'latvian' => 'elastic_analyzer_latvian',
|
||||
'lithuanian' => 'elastic_analyzer_lithuanian',
|
||||
'norwegian' => 'elastic_analyzer_norwegian',
|
||||
'persian' => 'elastic_analyzer_persian',
|
||||
'portuguese' => 'elastic_analyzer_portuguese',
|
||||
'romanian' => 'elastic_analyzer_romanian',
|
||||
'russian' => 'elastic_analyzer_russian',
|
||||
'sorani' => 'elastic_analyzer_sorani',
|
||||
'spanish' => 'elastic_analyzer_spanish',
|
||||
'swedish' => 'elastic_analyzer_swedish',
|
||||
'turkish' => 'elastic_analyzer_turkish',
|
||||
'thai' => 'elastic_analyzer_thai',
|
||||
) ), NULL, NULL, NULL, 'search_elastic_analyzer' ) );
|
||||
$form->add( new \IPS\Helpers\Form\Select( 'search_elastic_analyzer', \IPS\Settings::i()->search_elastic_analyzer, FALSE, array(
|
||||
'options' => array(
|
||||
'language' => array(
|
||||
'arabic' => 'elastic_analyzer_arabic',
|
||||
'armenian' => 'elastic_analyzer_armenian',
|
||||
'basque' => 'elastic_analyzer_basque',
|
||||
'brazilian' => 'elastic_analyzer_brazilian',
|
||||
'bulgarian' => 'elastic_analyzer_bulgarian',
|
||||
'catalan' => 'elastic_analyzer_catalan',
|
||||
'cjk' => 'elastic_analyzer_cjk',
|
||||
'czech' => 'elastic_analyzer_czech',
|
||||
'danish' => 'elastic_analyzer_danish',
|
||||
'dutch' => 'elastic_analyzer_dutch',
|
||||
'english' => 'elastic_analyzer_english',
|
||||
'finnish' => 'elastic_analyzer_finnish',
|
||||
'french' => 'elastic_analyzer_french',
|
||||
'galician' => 'elastic_analyzer_galician',
|
||||
'german' => 'elastic_analyzer_german',
|
||||
'greek' => 'elastic_analyzer_greek',
|
||||
'hindi' => 'elastic_analyzer_hindi',
|
||||
'hungarian' => 'elastic_analyzer_hungarian',
|
||||
'indonesian' => 'elastic_analyzer_indonesian',
|
||||
'irish' => 'elastic_analyzer_irish',
|
||||
'italian' => 'elastic_analyzer_italian',
|
||||
'latvian' => 'elastic_analyzer_latvian',
|
||||
'lithuanian' => 'elastic_analyzer_lithuanian',
|
||||
'norwegian' => 'elastic_analyzer_norwegian',
|
||||
'persian' => 'elastic_analyzer_persian',
|
||||
'portuguese' => 'elastic_analyzer_portuguese',
|
||||
'romanian' => 'elastic_analyzer_romanian',
|
||||
'russian' => 'elastic_analyzer_russian',
|
||||
'sorani' => 'elastic_analyzer_sorani',
|
||||
'spanish' => 'elastic_analyzer_spanish',
|
||||
'swedish' => 'elastic_analyzer_swedish',
|
||||
'turkish' => 'elastic_analyzer_turkish',
|
||||
'thai' => 'elastic_analyzer_thai',
|
||||
),
|
||||
'other' => array(
|
||||
'standard' => 'elastic_analyzer_standard',
|
||||
'custom' => 'elastic_analyzer_custom',
|
||||
)
|
||||
),
|
||||
'toggles' => array(
|
||||
'custom' => array( 'search_elastic_custom_analyzer_row' )
|
||||
)
|
||||
), NULL, NULL, NULL, 'search_elastic_analyzer' ) );
|
||||
$form->add( new \IPS\Helpers\Form\Codemirror(
|
||||
'search_elastic_custom_analyzer',
|
||||
\IPS\Settings::i()->search_elastic_custom_analyzer ?: "\t\"analyzer\": {\n\t\t\"my_custom_analyzer\": {\n\t\t\t\"type\": \"custom\",\n\t\t\t\"char_filter\": [\n\t\t\t\t\"emoticons\" \n\t\t\t],\n\t\t\t\"tokenizer\": \"punctuation\", \n\t\t\t\"filter\": [\n\t\t\t\t\"lowercase\",\n\t\t\t\t\"english_stop\" \n\t\t\t]\n\t\t}\n\t},\n\t\"tokenizer\": {\n\t\t\"punctuation\": { \n\t\t\t\"type\": \"pattern\",\n\t\t\t\"pattern\": \"[ .,!?]\"\n\t\t}\n\t},\n\t\"char_filter\": {\n\t\t\"emoticons\": { \n\t\t\t\"type\": \"mapping\",\n\t\t\t\"mappings\": [\n\t\t\t\t\":) => _happy_\",\n\t\t\t\t\":( => _sad_\"\n\t\t\t]\n\t\t}\n\t},\n\t\"filter\": {\n\t\t\"english_stop\": { \n\t\t\t\"type\": \"stop\",\n\t\t\t\"stopwords\": \"_english_\"\n\t\t}\n\t}",
|
||||
NULL,
|
||||
array( 'mode' => 'javascript' ),
|
||||
function( $val ) {
|
||||
$json = json_decode( '{' . $val . '}', TRUE );
|
||||
if ( $json === NULL or !isset( $json['analyzer'] ) or \count( $json['analyzer'] ) !== 1 )
|
||||
{
|
||||
throw new \DomainException( 'search_elastic_custom_analyzer_error' );
|
||||
}
|
||||
},
|
||||
'<code>"analysis": {</code>',
|
||||
'<code>}</code>',
|
||||
'search_elastic_custom_analyzer_row'
|
||||
) );
|
||||
$form->addHeader('search_options');
|
||||
$form->add( new \IPS\Helpers\Form\Radio( 'search_default_operator', \IPS\Settings::i()->search_default_operator, FALSE, array( 'options' => array(
|
||||
'or' => 'search_default_operator_or',
|
||||
@@ -140,7 +175,7 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
return \IPS\Theme::i()->getTemplate( 'settings' )->searchDecay( isset( $field->value[0] ) ? $field->value[0] : 0, isset( $field->value[1] ) ? $field->value[1] : 0 );
|
||||
}
|
||||
), NULL, NULL, NULL, 'search_decay' ) );
|
||||
$form->add( new \IPS\Helpers\Form\Number( 'search_elastic_self_boost', \IPS\Settings::i()->search_elastic_self_boost, FALSE, array( 'unlimited' => floatval( 0 ), 'unlimitedLang' => 'do_not_boost', 'decimals' => 1 ), NULL, \IPS\Member::loggedIn()->language()->addToStack('search_elastic_self_boost_prefix'), \IPS\Member::loggedIn()->language()->addToStack('search_elastic_self_boost_suffix'), 'search_elastic_self_boost' ) );
|
||||
$form->add( new \IPS\Helpers\Form\Number( 'search_elastic_self_boost', \IPS\Settings::i()->search_elastic_self_boost, FALSE, array( 'unlimited' => \floatval( 0 ), 'unlimitedLang' => 'do_not_boost', 'decimals' => 1 ), NULL, \IPS\Member::loggedIn()->language()->addToStack('search_elastic_self_boost_prefix'), \IPS\Member::loggedIn()->language()->addToStack('search_elastic_self_boost_suffix'), 'search_elastic_self_boost' ) );
|
||||
$form->add( new \IPS\Helpers\Form\Number( 'search_index_timeframe', \IPS\Settings::i()->search_index_timeframe, FALSE, array( 'unlimited' => 0, 'unlimitedLang' => 'search_index_timeframe_unlimited' ), NULL, \IPS\Member::loggedIn()->language()->addToStack('search_index_timeframe_prefix'), \IPS\Member::loggedIn()->language()->addToStack('search_index_timeframe_suffix'), 'search_index_timeframe' ) );
|
||||
$form->add( new \IPS\Helpers\Form\Number( 'search_index_maxresults', \IPS\Settings::i()->search_index_maxresults, FALSE, array(), NULL, NULL, NULL, 'search_index_maxresults' ) );
|
||||
|
||||
@@ -149,6 +184,7 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
$engine = \IPS\Settings::i()->search_method;
|
||||
$indexPrune = \IPS\Settings::i()->search_index_timeframe;
|
||||
$analyzer = \IPS\Settings::i()->search_elastic_analyzer;
|
||||
$customAnalyzer = \IPS\Settings::i()->search_elastic_custom_analyzer;
|
||||
$maxResults = \IPS\Settings::i()->search_index_maxresults;
|
||||
|
||||
if ( isset( $values['search_decay'][2] ) )
|
||||
@@ -180,7 +216,7 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
\IPS\Session::i()->log( 'acplogs__search_settings' );
|
||||
|
||||
/* And re-index if setting updated */
|
||||
if( $engine != $values['search_method'] or ( $values['search_method'] == 'elastic' and ( $values['search_elastic_analyzer'] != $analyzer or $values['search_index_maxresults'] != $maxResults ) ) )
|
||||
if( $engine != $values['search_method'] or ( $values['search_method'] == 'elastic' and ( $values['search_elastic_analyzer'] != $analyzer or ( $values['search_elastic_analyzer'] == 'custom' and $values['search_elastic_custom_analyzer'] != $customAnalyzer ) or $values['search_index_maxresults'] != $maxResults ) ) )
|
||||
{
|
||||
/* We pass TRUE to the i() method to ensure we get a new instance, otherwise the old instance cached from the previous prune call will be used */
|
||||
\IPS\Content\Search\Index::i( TRUE )->init();
|
||||
@@ -203,6 +239,8 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
*/
|
||||
protected function queueIndexRebuild()
|
||||
{
|
||||
\IPS\Session::i()->csrfCheck();
|
||||
|
||||
/* Clear MySQL minimum word length cached value */
|
||||
unset( \IPS\Data\Store::i()->mysqlMinWord );
|
||||
unset( \IPS\Data\Store::i()->mysqlMaxWord );
|
||||
|
||||
Reference in new issue
Block a user