Nasty has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362397 )
Change subject: ExtendedSearch: removed ExtendedSearchAdmin
......................................................................
ExtendedSearch: removed ExtendedSearchAdmin
It is not needed anymore.
ERM#6267
Needs merge to master.
Change-Id: I44b9ecde3298b76d75dbeff3624ecadd2217e722
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/extension.json
M ExtendedSearch/i18n/en.json
D ExtendedSearch/includes/ExtendedSearchAdmin.class.php
M ExtendedSearch/includes/specials/SpecialExtendedSearch.class.php
D ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.alias.php
D ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.class.php
D ExtendedSearch/resources/bluespice.extendedSearch.admin.js
D ExtendedSearch/resources/images/bs-searchindex-delete.png
D ExtendedSearch/resources/images/bs-searchindex-optimization.png
D ExtendedSearch/resources/images/bs-searchindex-rebuild.png
11 files changed, 4 insertions(+), 365 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/97/362397/1
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index 06310bb..5c5923f 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -48,12 +48,7 @@
*/
public function __construct() {
wfProfileIn( 'BS::'.__METHOD__ );
- WikiAdmin::registerModuleClass( 'ExtendedSearchAdmin', array(
- 'image' =>
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_suche_v1.png',
- 'level' => 'wikiadmin',
- 'message' => 'bs-extendedsearchadmin-label',
- 'iconCls' => 'bs-icon-magnifying-glass'
- ) );
+
wfProfileOut( 'BS::'.__METHOD__ );
}
diff --git a/ExtendedSearch/extension.json b/ExtendedSearch/extension.json
index 49a6f59..9f6324a 100644
--- a/ExtendedSearch/extension.json
+++ b/ExtendedSearch/extension.json
@@ -19,8 +19,7 @@
},
"callback": "ExtendedSearch::onRegistration",
"SpecialPages": {
- "SpecialExtendedSearch": "SpecialExtendedSearch",
- "ExtendedSearchAdmin": "SpecialExtendedSearchAdmin"
+ "SpecialExtendedSearch": "SpecialExtendedSearch"
},
"APIModules": {
"feedextendedsearch": "ApiFeedExtendedSearch"
@@ -31,8 +30,7 @@
]
},
"ExtensionMessagesFiles": {
- "ExtendedSearchAlias":
"languages/SpecialExtendedSearch.alias.php",
- "ExtendedSearchAdminAlias":
"includes/specials/SpecialExtendedSearchAdmin.alias.php"
+ "ExtendedSearchAlias":
"languages/SpecialExtendedSearch.alias.php"
},
"AutoloadClasses": {
"ApiFeedExtendedSearch": "api/ApiFeedExtendedSearch.php",
@@ -53,7 +51,6 @@
"BuildIndexMwSingleFile":
"includes/BuildIndex/BuildIndexMwSingleFile.class.php",
"BuildIndexMwSpecialLinked":
"includes/BuildIndex/BuildIndexMwSpecialLinked.class.php",
"BuildIndexMwLinked":
"includes/BuildIndex/BuildIndexMwLinked.class.php",
- "ExtendedSearchAdmin": "includes/ExtendedSearchAdmin.class.php",
"ExtendedSearchBase": "includes/ExtendedSearchBase.class.php",
"SearchIndex": "includes/SearchIndex/SearchIndex.class.php",
"SearchOptions": "includes/SearchIndex/SearchOptions.class.php",
@@ -71,7 +68,6 @@
"ViewMoreLikeThis": "views/view.MoreLikeThis.php",
"ViewExtendedSearchResultEntry":
"views/view.ExtendedSearchResultEntry.php",
"SpecialExtendedSearch":
"includes/specials/SpecialExtendedSearch.class.php",
- "SpecialExtendedSearchAdmin":
"includes/specials/SpecialExtendedSearchAdmin.class.php",
"TagCloudSearchStatsHandler":
"includes/Handler/TagCloudSearchStatsHandler.class.php"
},
"ResourceModules": {
@@ -91,9 +87,6 @@
"dependencies": [
"jquery.ui.autocomplete"
]
- },
- "ext.bluespice.extendedsearch.admin": {
- "scripts": "bluespice.extendedSearch.admin.js"
},
"ext.bluespice.extendedsearch.specialpage.style": {
"styles": "bluespice.extendedSearch.specialpage.css",
diff --git a/ExtendedSearch/i18n/en.json b/ExtendedSearch/i18n/en.json
index bac530b..565304d 100644
--- a/ExtendedSearch/i18n/en.json
+++ b/ExtendedSearch/i18n/en.json
@@ -73,21 +73,8 @@
"bs-extendedsearch-pref-showmlt": "Show similar pages",
"bs-extendedsearch-pref-solrcore": "Solr core instance:",
"bs-extendedsearch-pref-mltns": "Namespaces for
\"{{int:bs-extendedsearch-morelikethis}}\":",
- "bs-extendedsearch-about-to-start": "Starting...",
- "bs-extendedsearch-index-successfully-deleted": "The index was
deleted.",
- "bs-extendedsearch-create-index": "Re-create index",
- "bs-extendedsearch-delete-index": "Delete index",
- "bs-extendedsearch-overwrite-index": "Overwrite index",
"bs-extendedsearch-docs-in-index": "documents indexed.",
- "bs-extendedsearchadmin-label": "Search options",
- "bs-extendedsearch-status": "Status",
- "bs-extendedsearch-index-error-deleting": "Error while deleting index:
$1",
- "bs-extendedsearch-no-success-deleting": "Exception thrown while
deleting index: $1",
- "bs-extendedsearch-statistics": "Statistics",
"bs-extendedsearch-indexinginprogress": "The index is being created at
the moment.",
- "bs-extendedsearch-delete-lock": "Delete lock file",
- "bs-extendedsearch-warning": "Warning",
- "bs-extendedsearch-lockfiletext": "Please, only delete the lock file if
you are sure indexing is not in progress.",
"bs-extendedsearch-did-you-mean": "Did you mean \"$1\"?",
"bs-extendedsearch-ascending": "Ascending",
"bs-extendedsearch-descending": "Descending",
diff --git a/ExtendedSearch/includes/ExtendedSearchAdmin.class.php
b/ExtendedSearch/includes/ExtendedSearchAdmin.class.php
deleted file mode 100644
index b38c942..0000000
--- a/ExtendedSearch/includes/ExtendedSearchAdmin.class.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Admin section for ExtendedSearch
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Mathias Scheer <sch...@hallowelt.com>
- * @author Markus Glaser <gla...@hallowelt.com>
- * @author Stephan Muggli <mug...@hallowelt.com>
- * @package BlueSpice_Extensions
- * @subpackage ExtendedSearch
- * @copyright Copyright (C) 2016 Hallo Welt! GmbH, All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
- * @filesource
- */
-/* Changelog
- * v0.1
- * FIRST CHANGES
- */
-/**
- * Base class for ExtendedSearch admin section
- * @package BlueSpice_Extensions
- * @subpackage ExtendedSearch
- */
-class ExtendedSearchAdmin {
-
- /**
- * Instance of ExtendedSearchAdmin
- * @var Object
- */
- protected static $oInstance = null;
-
- /**
- * Constructor of ExtendedSearchAdmin class
- */
- public function __construct() {}
-
- /**
- * Return a instance of ExtendedSearchAdmin.
- * @return ExtendedSearchAdmin Instance of ExtendedSearchAdmin
- */
- public static function getInstance() {
- wfProfileIn( 'BS::'.__METHOD__ );
- if ( self::$oInstance === null ) {
- self::$oInstance = new self();
- }
-
- wfProfileOut( 'BS::'.__METHOD__ );
- return self::$oInstance;
- }
-
- /**
- * Return progress information when update index is called.
- * @param string $sMode which progress should be rendered
- */
- public static function getProgressBar( $sMode ) {
- switch ( $sMode ) {
- case 'createForm' :
- $sOutput =
ExtendedSearchAdmin::getInstance()->getCreateForm();
- break;
- case 'create':
- $sOutput =
ExtendedSearchAdmin::getInstance()->getCreateFeedback();
- break;
- case 'delete':
- $sOutput =
ExtendedSearchAdmin::getInstance()->getDeleteFeedback();
- break;
- case 'deleteLock':
- $sOutput = (string) self::checkLockExistence(
$sMode );
- break;
- default:
- $sOutput = '';
- }
- return $sOutput;
- }
-
- /**
- * Checks if lock file exists
- * @param String $sMode
- * @return bool existence
- */
- public static function checkLockExistence( $sMode = '' ) {
- if ( file_exists( BSDATADIR.DS.'ExtendedSearch.lock' ) ) {
- if ( $sMode == 'deleteLock' ) {
- unlink( BSDATADIR.DS.'ExtendedSearch.lock' );
- } else {
- return true;
- }
- } else {
- return false;
- }
-
- return true;
- }
-
- /**
- * Returns content of create index dialogue.
- * @return string HTML to be rendered.
- */
- public function getCreateForm() {
- return '<div id="hwstatus">
- <span id="BsExtendedSearchMode">'.
wfMessage( 'bs-extendedsearch-status' )->plain().'</span>:
- <span id="BsExtendedSearchMessage">' .
wfMessage( 'bs-extendedsearch-about_to_start' )->plain() . '</span>
- </div>
- <div
id="BsExtendedSearchProgress"> </div>';
- }
-
- /**
- * Returns status information of create index progress.
- * Error is indicated by return false or return null
- * An ApacheAjaxResponse is expected
- * If you return a string $s a new ApacheAjaxResponse($s) is created
- * @return string Progress in percent or error message.
- */
- public function getCreateFeedback() {
- // delete the old Index
- $this->getDeleteFeedback();
- // build the new Index
- $vRes = BuildIndexMainControl::getInstance()->buildIndex();
- /* Beware of returntype:
- * Error is indicated by return false or return null
- * An ApacheAjaxResponse is expected
- * If you return a string $s a new ApacheAjaxResponse($s) is
created
- */
-
- return $vRes;
- }
-
- /**
- * Returns status information of delete index progress.
- * Error is indicated by return false or return null
- * @return string information about the Progress or error message.
- */
- public function getDeleteFeedback() {
- $sForm = '';
- $oSolr = SearchService::getInstance();
- if ( $oSolr === null ) return '';
-
- try {
- $iStatus = $oSolr->deleteIndex();
- if ( $iStatus == 200 ) {
- $iStatus = $oSolr->deleteIndex();
- $sForm .= wfMessage(
'bs-extendedsearch-index-successfully-deleted' )->plain() . '<br />';
- } else {
- $sForm .= wfMessage(
'bs-extendedsearch-index-error-deleting', $iStatus )->plain() . '<br />';
- }
- } catch ( Exception $e ) {
- $sForm .= wfMessage(
'bs-extendedsearch-no-success-deleting', $e->getMessage() )->plain() . '<br />';
- $sForm .= $e->getMessage();
- }
-
- return $sForm;
- }
-
-}
\ No newline at end of file
diff --git a/ExtendedSearch/includes/specials/SpecialExtendedSearch.class.php
b/ExtendedSearch/includes/specials/SpecialExtendedSearch.class.php
index 4d74394..8438174 100644
--- a/ExtendedSearch/includes/specials/SpecialExtendedSearch.class.php
+++ b/ExtendedSearch/includes/specials/SpecialExtendedSearch.class.php
@@ -1,4 +1,4 @@
-<?php
+geht noch alles<?php
/**
* Special page for ExtendedSearch for MediaWiki
*
diff --git
a/ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.alias.php
b/ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.alias.php
deleted file mode 100644
index b039302..0000000
--- a/ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.alias.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$specialPageAliases = array();
-
-/** English */
-$specialPageAliases['en'] = array(
- 'ExtendedSearchAdmin' => array( 'ExtendedSearchAdmin', 'Search
settings' ),
-);
-
-/** German */
-$specialPageAliases['de'] = array(
- 'ExtendedSearchAdmin' => array( 'Sucheinstellungen' ),
-);
\ No newline at end of file
diff --git
a/ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.class.php
b/ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.class.php
deleted file mode 100644
index 0b34911..0000000
--- a/ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.class.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-class SpecialExtendedSearchAdmin extends BsSpecialPage {
-
- public function __construct() {
- parent::__construct( 'ExtendedSearchAdmin',
'extendedsearchadmin-viewspecialpage' );
-
- }
-
- /**
- *
- * @global OutputPage $this->getOutput()
- * @param type $sParameter
- * @return type
- */
- public function execute( $sParameter ) {
- parent::execute( $sParameter );
- if ( wfReadOnly() ) {
- throw new ReadOnlyError;
- }
- global $wgScriptPath;
-
- RequestContext::getMain()->getOutput()->addModules(
'ext.bluespice.extendedsearch.admin' );
-
- $sForm = '';
-
- if ( SearchService::getInstance()->ping( 2 ) === false ) {
- RequestContext::getMain()->getOutput()->addHTML(
- '<br /><div style="color:#F00;
font-size:20px;">' . wfMessage( 'bs-extendedsearch-server-not-available'
)->escaped() . '</div><br />'
- );
- return false;
- }
-
- if ( !ExtendedSearchBase::isCurlActivated() ) {
- RequestContext::getMain()->getOutput()->addHTML(
- '<br /><div style="color:#F00;
font-size:20px;">' . wfMessage( 'bs-extendedsearch-curl-not-active'
)->escaped() . '</div><br />'
- );
- return false;
- }
-
- if ( ExtendedSearchAdmin::checkLockExistence() === false ) {
- $aSearchAdminButtons = array(
- 'create' => array(
- 'href' => '#',
- 'onclick' => 'bs.util.toggleMessage(
bs.util.getAjaxDispatcherUrl( \'ExtendedSearchAdmin::getProgressBar\',
[\'createForm\'] ), \'' . addslashes( wfMessage(
'bs-extendedsearch-create-index' )->plain() ) . '\', 400,
300);setTimeout(\'bsExtendedSearchStartCreate()\', 1000);',
- 'label' => wfMessage(
'bs-extendedsearch-create-index' )->escaped(),
- 'image' =>
"$wgScriptPath/extensions/BlueSpiceExtensions/ExtendedSearch/resources/images/bs-searchindex-rebuild.png"
- ),
- 'delete' => array(
- 'href' => '#',
- 'onclick' => 'bs.util.toggleMessage(
bs.util.getAjaxDispatcherUrl( \'ExtendedSearchAdmin::getProgressBar\',
[\'delete\'] ), \'' . addslashes( wfMessage( 'bs-extendedsearch-delete-index'
)->plain() ) . '\', 400, 300);',
- 'label' => wfMessage(
'bs-extendedsearch-delete-index' )->escaped(),
- 'image' =>
"$wgScriptPath/extensions/BlueSpiceExtensions/ExtendedSearch/resources/images/bs-searchindex-delete.png"
- ),
- 'overwrite' => array(
- 'href' => '#',
- 'onclick' => 'bs.util.toggleMessage(
bs.util.getAjaxDispatcherUrl( \'ExtendedSearchAdmin::getProgressBar\',
[\'createForm\'] ), \'' . addslashes( wfMessage(
'bs-extendedsearch-overwrite-index' )->plain() ) . '\', 400,
300);setTimeout(\'bsExtendedSearchStartCreate()\', 1000);',
- 'label' => wfMessage(
'bs-extendedsearch-overwrite-index' )->escaped(),
- 'image' =>
"$wgScriptPath/extensions/BlueSpiceExtensions/ExtendedSearch/resources/images/bs-searchindex-optimization.png"
- )
- );
- } else {
- $aSearchAdminButtons = array(
- 'deleteLock' => array(
- 'href' => '#',
- 'onclick' => 'bsExtendedSearchConfirm(
\'' . wfMessage( 'bs-extendedsearch-warning' )->escaped() . '\', \'' .
wfMessage( 'bs-extendedsearch-lockfiletext' )->escaped() . '\')',
- 'label' => wfMessage(
'bs-extendedsearch-delete-lock' )->escaped(),
- 'image' =>
"$wgScriptPath/extensions/BlueSpiceExtensions/ExtendedSearch/resources/images/bs-searchindex-delete.png"
- )
- );
- $sForm .= '<h3><font color=\'red\'>' . wfMessage(
'bs-extendedsearch-indexinginprogress' )->escaped() . '</font></h3><br />';
- }
-
- wfRunHooks( 'BSExtendedSearchAdminButtons', array( $this,
&$aSearchAdminButtons ) );
-
- foreach ( $aSearchAdminButtons as $key => $params ) {
- $sForm .= '<div class="bs-admincontrolbtn">';
- $sForm .= '<a href="'.$params['href'].'"';
- if ( $params['onclick'] ) $sForm .= '
onclick="'.$params['onclick'].'"';
- $sForm .= '>';
- $sForm .= '<img src="'.$params['image'].'"
alt="'.$params['label'].'" title="'.$params['label'].'">';
- $sForm .= '<div class="bs-admin-label">';
- $sForm .= $params['label'];
- $sForm .= '</div>';
- $sForm .= '</a>';
- $sForm .= '</div>';
- }
-
- $this->getOutput()->addHTML( $sForm );
- }
-
-}
diff --git a/ExtendedSearch/resources/bluespice.extendedSearch.admin.js
b/ExtendedSearch/resources/bluespice.extendedSearch.admin.js
deleted file mode 100644
index d223184..0000000
--- a/ExtendedSearch/resources/bluespice.extendedSearch.admin.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * ExtendedSearch admin extension
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Markus Glaser <gla...@hallowelt.com>
- * @author Stephan Muggli <mug...@hallowelt.com>
- * @package Bluespice_Extensions
- * @subpackage ExtendedSearch
- * @copyright Copyright (C) 2016 Hallo Welt! GmbH, All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
- * @filesource
- */
-
- /**
- * Triggers Re-indexing of search index.
- */
-bsExtendedSearchConfirm = function( warning, msg ) {
- bs.util.confirm( 'ESAdmin', { text: msg, title: warning }, { ok:
processConfirm, cancel: function() {}, scope: this } );
-};
-
-processConfirm = function() {
- Ext.Ajax.request( {
- url: bs.util.getAjaxDispatcherUrl(
'ExtendedSearchAdmin::getProgressBar', [ "deleteLock" ] ),
- method: 'post',
- scope: this,
- success: function( response, opts ) {
- var x = true;
- window.location.reload();
- }
- } );
-};
-
-bsExtendedSearchStartCreate = function() {
- try {
- if ( !document.getElementById( 'BsExtendedSearchProgress' ) ) {
- setTimeout( bsExtendedSearchStartCreate, 100 );
- return;
- }
- } catch(e) {}
-
- progBar = new Ext.ProgressBar({
- renderTo:'BsExtendedSearchProgress'
- });
-
- Ext.Ajax.request( { url: bs.util.getAjaxDispatcherUrl(
'ExtendedSearchAdmin::getProgressBar', [ "create" ] ), timeout: 60000 } );
- setTimeout( bsExtendedSearchRequestProgress, 500 );
-};
-
-/**
- * Updates progress bar.
- * @var int count Number of progress bar iterations.
- */
-bsExtendedSearchRequestProgress = function() {
- Ext.Ajax.request({
- url: mw.config.get( "wgScriptPath" ) +
'/extensions/BlueSpiceExtensions/ExtendedSearch/includes/BuildIndex/index_progress.php',
- success: function( response, opts ) {
- var res = "";
- if ( response.responseText !== "" ) {
- res = Ext.decode( response.responseText );
- }
- var finished = false;
- if ( typeof( res ) === 'object' ) {
- if ( res[0] === "__FINISHED__" ) {
- finished = true;
- } else {
- if ( res[0] ) document.getElementById(
'BsExtendedSearchMode' ).innerHTML = res[0];
- if ( res[1] ) document.getElementById(
'BsExtendedSearchMessage' ).innerHTML = res[1];
- if ( res[2] ) progBar.updateProgress(
res[2] / 100 );
- }
- }
- if ( !finished ) {
- setTimeout( bsExtendedSearchRequestProgress,
300 );
- }
- },
- failure: function(response, opts) {}
- });
-};
\ No newline at end of file
diff --git a/ExtendedSearch/resources/images/bs-searchindex-delete.png
b/ExtendedSearch/resources/images/bs-searchindex-delete.png
deleted file mode 100644
index a286df0..0000000
--- a/ExtendedSearch/resources/images/bs-searchindex-delete.png
+++ /dev/null
Binary files differ
diff --git a/ExtendedSearch/resources/images/bs-searchindex-optimization.png
b/ExtendedSearch/resources/images/bs-searchindex-optimization.png
deleted file mode 100644
index 08376fa..0000000
--- a/ExtendedSearch/resources/images/bs-searchindex-optimization.png
+++ /dev/null
Binary files differ
diff --git a/ExtendedSearch/resources/images/bs-searchindex-rebuild.png
b/ExtendedSearch/resources/images/bs-searchindex-rebuild.png
deleted file mode 100644
index d29852f..0000000
--- a/ExtendedSearch/resources/images/bs-searchindex-rebuild.png
+++ /dev/null
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/362397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44b9ecde3298b76d75dbeff3624ecadd2217e722
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Nasty <kon...@hallowelt.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
