[geeklog-cvs] geeklog-1.3/public_html search.php,1.48,1.49

tony at geeklog.net tony at geeklog.net
Sun Feb 9 16:27:03 EST 2003

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv7737

Modified Files:
search.php
Log Message:
Changed template files to use convential naming standard and changed search related config variables to use conventional naming standards as well.


Index: search.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/search.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** search.php 16 Jan 2003 22:53:15 -0000 1.48
--- search.php 9 Feb 2003 21:27:01 -0000 1.49
***************
*** 174,178 ****
$link_results = new Plugin();
$link_results->searchlabel = $LANG09[38];
! if (!$_CONF['expandedSearchResults'])
{
$link_results->addSearchHeading($LANG09[16]);
--- 174,178 ----
$link_results = new Plugin();
$link_results->searchlabel = $LANG09[38];
! if (!$_CONF['expanded_search_results'])
{
$link_results->addSearchHeading($LANG09[16]);
***************
*** 273,277 ****
$event_results->searchresults = array();
$event_results->searchlabel = $LANG09[37];
! if (!$_CONF['expandedSearchResults'])
{
$event_results->addSearchHeading($LANG09[16]);
--- 273,277 ----
$event_results->searchresults = array();
$event_results->searchlabel = $LANG09[37];
! if (!$_CONF['expanded_search_results'])
{
$event_results->addSearchHeading($LANG09[16]);
***************
*** 324,328 ****
$urlQuery = urlencode($query);

! $resultLimit = ($_CONF['maxSearchResults'] > 0) ? $_CONF['maxSearchResults'] : $_USER['maxstories'];

if($resultLimit == 0)
--- 324,328 ----
$urlQuery = urlencode($query);

! $resultLimit = ($_CONF['max_search_results'] > 0) ? $_CONF['max_search_results'] : $_USER['maxstories'];

if($resultLimit == 0)
***************
*** 491,495 ****
$nrows = $nrows_stories + $nrows_comments + $nrows_plugins + $link_results->num_searchresults + $event_results->num_searchresults;

! if($_CONF['maxSearchResults'] == 1)
$resultLimit = $nrows;

--- 491,495 ----
$nrows = $nrows_stories + $nrows_comments + $nrows_plugins + $link_results->num_searchresults + $event_results->num_searchresults;

! if($_CONF['max_search_results'] == 1)
$resultLimit = $nrows;

***************
*** 518,522 ****
$searchresults = new Template($_CONF['path_layout'] . 'search');

! if($_CONF['expandedSearchResults'])
{
$searchresults->set_file(array('searchresults'=>'searchresults.thtml',
--- 518,522 ----
$searchresults = new Template($_CONF['path_layout'] . 'search');

! if($_CONF['expanded_search_results'])
{
$searchresults->set_file(array('searchresults'=>'searchresults.thtml',
***************
*** 525,532 ****
'searchblock' => 'searchblock.thtml',
'headingcolumn'=>'headingcolumn.thtml',
! 'resultrow'=>'resultrowEnhanced.thtml',
! 'resultTitle'=>'resultTitle.thtml',
! 'resultSummary'=>'resultSummary.thtml',
! 'resultAuthDateHits'=>'resultAuthDateHits.thtml'));
} else {
$searchresults->set_file(array('searchresults'=>'searchresults.thtml',
--- 525,532 ----
'searchblock' => 'searchblock.thtml',
'headingcolumn'=>'headingcolumn.thtml',
! 'resultrow'=>'resultrowenhanced.thtml',
! 'resulttitle'=>'resulttitle.thtml',
! 'resultsummary'=>'resultsummary.thtml',
! 'resultauthdatehits'=>'resultauthdatehits.thtml'));
} else {
$searchresults->set_file(array('searchresults'=>'searchresults.thtml',
***************
*** 536,540 ****
'headingcolumn'=>'headingcolumn.thtml',
'resultrow'=>'resultrow.thtml',
! 'resultTitle'=>'resultcolumn.thtml',
'resultcolumn'=>'resultcolumn.thtml'));
}
--- 536,540 ----
'headingcolumn'=>'headingcolumn.thtml',
'resultrow'=>'resultrow.thtml',
! 'resulttitle'=>'resultcolumn.thtml',
'resultcolumn'=>'resultcolumn.thtml'));
}
***************
*** 568,572 ****

// Print heading for story/comment results
! if (!$_CONF['expandedSearchResults'])
{
$searchresults->set_var('label', $LANG09[16]);
--- 568,572 ----

// Print heading for story/comment results
! if (!$_CONF['expanded_search_results'])
{
$searchresults->set_var('label', $LANG09[16]);
***************
*** 606,616 ****

$searchresults->set_var('data', '<a href="article.php?story=' . $A['sid'] . '&query=' . $urlQuery . '">' . stripslashes($A['title']) . '</a>');
! $searchresults->parse('data_cols','resultTitle',true);

! if($_CONF['expandedSearchResults'])
{
$fulltext = $A['introtext'] . ' ' .$A['bodytext'];
$searchresults->set_var('data',$summary = getSummary($query, $fulltext));
! $searchresults->parse('data_cols','resultSummary',true);

$searchresults->set_var('data', '<b>' . $LANG09[48] . ':</b> ' . DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"));
--- 606,616 ----

$searchresults->set_var('data', '<a href="article.php?story=' . $A['sid'] . '&query=' . $urlQuery . '">' . stripslashes($A['title']) . '</a>');
! $searchresults->parse('data_cols','resulttitle',true);

! if($_CONF['expanded_search_results'])
{
$fulltext = $A['introtext'] . ' ' .$A['bodytext'];
$searchresults->set_var('data',$summary = getSummary($query, $fulltext));
! $searchresults->parse('data_cols','resultsummary',true);

$searchresults->set_var('data', '<b>' . $LANG09[48] . ':</b> ' . DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"));
***************
*** 620,624 ****

$searchresults->set_var('data3', '<b>' . $LANG09[50] . ':</b> ' . $A['hits']);
! $searchresults->parse('data_cols','resultAuthDateHits',true);
}
else
--- 620,624 ----

$searchresults->set_var('data3', '<b>' . $LANG09[50] . ':</b> ' . $A['hits']);
! $searchresults->parse('data_cols','resultauthdatehits',true);
}
else
***************
*** 698,708 ****


! if($_CONF['expandedSearchResults'])
{
$searchresults->set_var('data', "<b>$linkTitle</b>");
! $searchresults->parse('data_cols','resultTitle',true);

$searchresults->set_var('data',$summary = getSummary($query, $linkDescription));
! $searchresults->parse('data_cols','resultSummary',true);

$searchresults->set_var('data', '<b>' . $LANG09[51] . ':</b> ' . $linkURL);
--- 698,708 ----


! if($_CONF['expanded_search_results'])
{
$searchresults->set_var('data', "<b>$linkTitle</b>");
! $searchresults->parse('data_cols','resulttitle',true);

$searchresults->set_var('data',$summary = getSummary($query, $linkDescription));
! $searchresults->parse('data_cols','resultsummary',true);

$searchresults->set_var('data', '<b>' . $LANG09[51] . ':</b> ' . $linkURL);
***************
*** 710,719 ****
$searchresults->set_var('data3', '<b>' . $LANG09[50] . ':</b> ' . $linkHits);

! $searchresults->parse('data_cols','resultAuthDateHits',true);
}
else
{
$searchresults->set_var('data', $linkTitle);
! $searchresults->parse('data_cols','resultTitle',true);

$searchresults->set_var('data', $linkURL);
--- 710,719 ----
$searchresults->set_var('data3', '<b>' . $LANG09[50] . ':</b> ' . $linkHits);

! $searchresults->parse('data_cols','resultauthdatehits',true);
}
else
{
$searchresults->set_var('data', $linkTitle);
! $searchresults->parse('data_cols','resulttitle',true);

$searchresults->set_var('data', $linkURL);
***************
*** 769,778 ****

$searchresults->set_var('data', $eventTitle);
! $searchresults->parse('data_cols','resultTitle',true);

! if($_CONF['expandedSearchResults'])
{
$searchresults->set_var('data',$summary = getSummary($query, $eventDescription));
! $searchresults->parse('data_cols','resultSummary',true);

$searchresults->set_var('data', '<b>' . $LANG09[52] . ':</b> ' . $eventLocation);
--- 769,778 ----

$searchresults->set_var('data', $eventTitle);
! $searchresults->parse('data_cols','resulttitle',true);

! if($_CONF['expanded_search_results'])
{
$searchresults->set_var('data',$summary = getSummary($query, $eventDescription));
! $searchresults->parse('data_cols','resultsummary',true);

$searchresults->set_var('data', '<b>' . $LANG09[52] . ':</b> ' . $eventLocation);
***************
*** 780,784 ****
$searchresults->set_var('data3', '');

! $searchresults->parse('data_cols','resultAuthDateHits',true);
}
else
--- 780,784 ----
$searchresults->set_var('data3', '');

! $searchresults->parse('data_cols','resultauthdatehits',true);
}
else
***************
*** 997,1001 ****
$position = 0;

! $summary = substr( $fullText,$position,$_CONF['summaryLength']);

//remove unnecessary tags
--- 997,1001 ----
$position = 0;

! $summary = substr( $fullText,$position,$_CONF['summary_length']);

//remove unnecessary tags
***************
*** 1010,1014 ****
$summary = "&hellip; $summary";
}
! if($position+$_CONF['summaryLength'] < strlen($fullText))
{
$summary = "$summary &hellip;";
--- 1010,1014 ----
$summary = "&hellip; $summary";
}
! if($position+$_CONF['summary_length'] < strlen($fullText))
{
$summary = "$summary &hellip;";
***************
*** 1024,1029 ****
else
{
! $summary = substr( $fullText,0,$_CONF['summaryLength']);
! if(strlen($fullText) > $_CONF['summaryLength'])
{
$summary = "$summary &hellip;";
--- 1024,1029 ----
else
{
! $summary = substr( $fullText,0,$_CONF['summary_length']);
! if(strlen($fullText) > $_CONF['summary_length'])
{
$summary = "$summary &hellip;";
***************
*** 1145,1147 ****
echo $display;

! ?>
\ No newline at end of file
--- 1145,1147 ----
echo $display;

! ?>



More information about the geeklog-cvs mailing list