Browse Source

Convert line delimiters to Unix format (LF)

pull/1/head
Sebastian Meyer 10 years ago
parent
commit
c408e1c815
  1. 10
      dlf/common/class.tx_dlf_document.php
  2. 10
      dlf/common/class.tx_dlf_helper.php
  3. 8
      dlf/common/class.tx_dlf_list.php
  4. 32
      dlf/common/class.tx_dlf_solr.php
  5. 28
      dlf/common/locallang.xml
  6. 91
      dlf/plugins/search/class.tx_dlf_search.php

10
dlf/common/class.tx_dlf_document.php

@ -453,11 +453,11 @@ final class tx_dlf_document {
}
if (!empty($divs)) {
if (!empty($divs)) {
if (!$recursive) {
// Get the details for the first xpath hit.
// Get the details for the first xpath hit.
$details = $this->getLogicalStructureInfo($divs[0]);
} else {
@ -469,9 +469,9 @@ final class tx_dlf_document {
}
}
}
}
}
return $details;

10
dlf/common/class.tx_dlf_helper.php

@ -361,11 +361,11 @@ class tx_dlf_helper {
} else {
if (TYPO3_DLOG) {
t3lib_div::devLog('[tx_dlf_helper->getBeUser()] Could not determine current user\'s login status', $this->extKey, SYSLOG_SEVERITY_ERROR);
}
if (TYPO3_DLOG) {
t3lib_div::devLog('[tx_dlf_helper->getBeUser()] Could not determine current user\'s login status', $this->extKey, SYSLOG_SEVERITY_ERROR);
}
return;

8
dlf/common/class.tx_dlf_list.php

@ -295,10 +295,10 @@ class tx_dlf_list implements t3lib_Singleton {
} else {
if (TYPO3_DLOG) {
t3lib_div::devLog('[tx_dlf_list->sort('.$by.', ['.($asc ? 'TRUE' : 'FALSE').'])] Sorted list elements do not match unsorted elements', $this->extKey, SYSLOG_SEVERITY_ERROR);
if (TYPO3_DLOG) {
t3lib_div::devLog('[tx_dlf_list->sort('.$by.', ['.($asc ? 'TRUE' : 'FALSE').'])] Sorted list elements do not match unsorted elements', $this->extKey, SYSLOG_SEVERITY_ERROR);
}
}

32
dlf/common/class.tx_dlf_solr.php

@ -165,14 +165,14 @@ class tx_dlf_solr {
} else {
if (TYPO3_DLOG) {
t3lib_div::devLog('[tx_dlf_solr->getInstance('.$_core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
}
return;
if (TYPO3_DLOG) {
t3lib_div::devLog('[tx_dlf_solr->getInstance('.$_core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
}
return;
}
}
@ -238,14 +238,14 @@ class tx_dlf_solr {
}
/**
* Processes a search request.
*
* @access public
*
* @param string $query: The search query
*
* @return tx_dlf_list The result list
/**
* Processes a search request.
*
* @access public
*
* @param string $query: The search query
*
* @return tx_dlf_list The result list
*/
public function search($query = '*') {

28
dlf/common/locallang.xml

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<T3locallang>
<meta type="array">
<type>module</type>
<description>Common language labels for extension 'dlf'</description>
</meta>
<data type="array">
<languageKey index="default" type="array">
<label index="demo">demo</label>
</languageKey>
<languageKey index="de" type="array">
<label index="demo">demo</label>
</languageKey>
</data>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<T3locallang>
<meta type="array">
<type>module</type>
<description>Common language labels for extension 'dlf'</description>
</meta>
<data type="array">
<languageKey index="default" type="array">
<label index="demo">demo</label>
</languageKey>
<languageKey index="de" type="array">
<label index="demo">demo</label>
</languageKey>
</data>
</T3locallang>

91
dlf/plugins/search/class.tx_dlf_search.php

@ -49,15 +49,8 @@ class tx_dlf_search extends tx_dlf_plugin {
*/
protected function addAutocompleteJS() {
// Ensure extension "t3jquery" is available.
if (t3lib_extMgm::isLoaded('t3jquery')) {
require_once(t3lib_extMgm::extPath('t3jquery').'class.tx_t3jquery.php');
}
// Is "t3jquery" loaded and the custom library created?
if (T3JQUERY === TRUE) {
// Ensure extension "t3jquery" is available and a custom library is created.
if (t3lib_extMgm::isLoaded('t3jquery') && T3JQUERY === TRUE) {
tx_t3jquery::addJqJS();
@ -133,30 +126,30 @@ class tx_dlf_search extends tx_dlf_plugin {
return '';
}
}
// Get facets from plugin configuration.
$facets = array ();
foreach (t3lib_div::trimExplode(',', $this->conf['facets'], TRUE) as $facet) {
// Get facets from plugin configuration.
$facets = array ();
foreach (t3lib_div::trimExplode(',', $this->conf['facets'], TRUE) as $facet) {
$facets[$facet] = tx_dlf_helper::translate($facet, 'tx_dlf_metadata', $this->conf['pages']);
}
// Render facets menu.
$TSconfig = array ();
$TSconfig['special'] = 'userfunction';
$TSconfig['special.']['userFunc'] = 'tx_dlf_search->makeFacetsMenuArray';
$TSconfig['special.']['facets'] = $facets;
$TSconfig = t3lib_div::array_merge_recursive_overrule($this->conf['facetsConf.'], $TSconfig);
return $this->cObj->HMENU($TSconfig);
// Render facets menu.
$TSconfig = array ();
$TSconfig['special'] = 'userfunction';
$TSconfig['special.']['userFunc'] = 'tx_dlf_search->makeFacetsMenuArray';
$TSconfig['special.']['facets'] = $facets;
$TSconfig = t3lib_div::array_merge_recursive_overrule($this->conf['facetsConf.'], $TSconfig);
return $this->cObj->HMENU($TSconfig);
}
/**
@ -309,13 +302,13 @@ class tx_dlf_search extends tx_dlf_plugin {
if (!$solr->ready) {
if (TYPO3_DLOG) {
t3lib_div::devLog('[tx_dlf_search->main('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
}
return $content;
if (TYPO3_DLOG) {
t3lib_div::devLog('[tx_dlf_search->main('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
}
return $content;
}
@ -334,12 +327,12 @@ class tx_dlf_search extends tx_dlf_plugin {
$results = $solr->search($this->piVars['query']);
$results->metadata = array (
'label' => htmlspecialchars(sprintf($this->pi_getLL('searchfor', ''), $this->piVars['query'])),
'description' => '<p class="tx-dlf-search-numHits">'.htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $solr->numHits, $results->count)).'</p>',
'label' => htmlspecialchars(sprintf($this->pi_getLL('searchfor', ''), $this->piVars['query'])),
'description' => '<p class="tx-dlf-search-numHits">'.htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $solr->numberOfHits, $results->count)).'</p>',
'options' => $results->metadata['options']
);
$results->save();
$results->save();
// Clean output buffer.
t3lib_div::cleanOutputBuffers();
@ -356,17 +349,17 @@ class tx_dlf_search extends tx_dlf_plugin {
}
/**
* This builds a menu array for HMENU
*
* @access public
*
* @param string $content: The PlugIn content
* @param array $conf: The PlugIn configuration
*
* @return array HMENU array
*/
public function makeFacetsMenuArray($content, $conf) {
/**
* This builds a menu array for HMENU
*
* @access public
*
* @param string $content: The PlugIn content
* @param array $conf: The PlugIn configuration
*
* @return array HMENU array
*/
public function makeFacetsMenuArray($content, $conf) {
$this->init($conf);

Loading…
Cancel
Save