Project

General

Profile

Bug #15887 ยป bug_2968.diff

Administrator Admin, 2006-03-23 14:57

View differences:

TYPO3core/typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php 2006-03-23 13:38:54.000000000 +0100
var $iconFileNameCache = array(); // Storage of icons....
var $lexerObj; // Lexer object
var $templateCode; // Will hold the content of $conf['templateFile']
var $hiddenFieldList = 'ext, type, defOp, media, order, group, lang, desc, results';
/**
......
}
$markerArray['###ACTION_URL###'] = $this->pi_getPageLink($GLOBALS['TSFE']->id, $GLOBALS['TSFE']->sPre);
$markerArray['###HIDDEN_VALUE_TYPE###'] = $this->piVars['type'] ? 1 : 0;
$markerArray['###HIDDEN_VALUE_EXT###'] = $this->piVars['ext'] ? 1 : 0;
$hiddenFieldCode = $this->cObj->getSubpart($this->templateCode, '###HIDDEN_FIELDS###');
$hiddenFieldCode = preg_replace('/^\n\t(.+)/ms', '$1', $hiddenFieldCode); // Remove first newline and tab (cosmetical issue)
$hiddenFieldArr = array();
foreach (t3lib_div::trimExplode(',',$this->hiddenFieldList) as $fieldName) {
$hiddenFieldMarkerArray = array();
$hiddenFieldMarkerArray['###HIDDEN_FIELDNAME###'] = $this->prefixId.'['.$fieldName.']';
$hiddenFieldMarkerArray['###HIDDEN_VALUE###'] = (string)$this->piVars[$fieldName];
$hiddenFieldArr[$fieldName] = $this->cObj->substituteMarkerArrayCached($hiddenFieldCode, $hiddenFieldMarkerArray, array(), array());
}
// Extended search
if ($this->piVars['ext']) {
......
$html = $this->cObj->substituteSubpart($html, '###SELECT_SEARCH_FOR###', '');
} else {
if (is_array($optValues['type']) && !$this->conf['blind.']['type']) {
unset($hiddenFieldArr['type']);
$markerArray['###SELECTBOX_TYPE_VALUES###'] = $this->renderSelectBoxValues($this->piVars['type'],$optValues['type']);
} else {
$html = $this->cObj->substituteSubpart($html, '###SELECT_SEARCH_TYPE###', '');
......
$html = $this->cObj->substituteSubpart($html, '###SELECT_SEARCH_IN###', '');
} else {
if (is_array($optValues['media']) && !$this->conf['blind.']['media']) {
unset($hiddenFieldArr['media']);
$markerArray['###SELECTBOX_MEDIA_VALUES###'] = $this->renderSelectBoxValues($this->piVars['media'],$optValues['media']);
} else {
$html = $this->cObj->substituteSubpart($html, '###SELECT_SEARCH_MEDIA###', '');
}
if (is_array($optValues['lang']) || !$this->conf['blind.']['lang']) {
unset($hiddenFieldArr['lang']);
$markerArray['###SELECTBOX_LANG_VALUES###'] = $this->renderSelectBoxValues($this->piVars['lang'],$optValues['lang']);
} else {
$html = $this->cObj->substituteSubpart($html, '###SELECT_SEARCH_LANG###', '');
......
if (!is_array($optValues['order']) || !is_array($optValues['desc']) || $this->conf['blind.']['order']) {
$html = $this->cObj->substituteSubpart($html, '###SELECT_ORDER###', '');
} else {
unset($hiddenFieldArr['order']);
unset($hiddenFieldArr['desc']);
unset($hiddenFieldArr['results']);
$markerArray['###SELECTBOX_ORDER_VALUES###'] = $this->renderSelectBoxValues($this->piVars['order'],$optValues['order']);
$markerArray['###SELECTBOX_DESC_VALUES###'] = $this->renderSelectBoxValues($this->piVars['desc'],$optValues['desc']);
$markerArray['###SELECTBOX_RESULTS_VALUES###'] = $this->renderSelectBoxValues($this->piVars['results'],$optValues['results']);
......
if (!is_array($optValues['group']) || $this->conf['blind.']['group']) {
$html = $this->cObj->substituteSubpart($html, '###SELECT_GROUP###', '');
} else {
unset($hiddenFieldArr['group']);
$markerArray['###SELECTBOX_GROUP_VALUES###'] = $this->renderSelectBoxValues($this->piVars['group'],$optValues['group']);
}
......
$markerArray['###LINKTOOTHERMODE###'] = '';
}
// Write all hidden fields
$html = $this->cObj->substituteSubpart($html, '###HIDDEN_FIELDS###', implode('',$hiddenFieldArr));
$substitutedContent = $this->cObj->substituteMarkerArrayCached($html, $markerArray, array(), array());
return $substitutedContent;
TYPO3core/typo3/sysext/indexed_search/pi/indexed_search.tmpl 2006-03-23 13:18:19.000000000 +0100
<input type="hidden" name="tx_indexedsearch[_sections]" value="0" />
<input type="hidden" name="tx_indexedsearch[_freeIndexUid]" value="_" />
<input type="hidden" name="tx_indexedsearch[pointer]" value="0" />
<input type="hidden" name="tx_indexedsearch[type]" value="###HIDDEN_VALUE_TYPE###" />
<input type="hidden" name="tx_indexedsearch[ext]" value="###HIDDEN_VALUE_EXT###" />
<!-- ###HIDDEN_FIELDS### begin -->
<input type="hidden" name="###HIDDEN_FIELDNAME###" value="###HIDDEN_VALUE###" />
<!-- ###HIDDEN_FIELDS### end -->
<table cellpadding="0" cellspacing="0" border="0" summary="Search form">
    (1-1/1)