From: Sverre B. <sv...@us...> - 2005-10-04 23:40:54
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv865/src/webapps/wera Modified Files: result.php overview.php top.php documentDispatcher.php asearch.php index.php Log Message: Index: asearch.php =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/asearch.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** asearch.php 4 Oct 2005 22:59:27 -0000 1.1 --- asearch.php 4 Oct 2005 23:40:44 -0000 1.2 *************** *** 155,159 **** } $time_search = $from . ";" . $to; ! $query_time = "archival_time:[$time_search] "; } --- 155,159 ---- } $time_search = $from . ";" . $to; ! $query_time = "date:[$time_search] "; } *************** *** 450,454 **** } ! $fields = "url archival_time teaser collection"; if (isset($size)) { --- 450,454 ---- } ! $fields = "url date title collection"; if (isset($size)) { Index: index.php =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.php 4 Oct 2005 22:59:27 -0000 1.1 --- index.php 4 Oct 2005 23:40:44 -0000 1.2 *************** *** 47,59 **** $start = $_REQUEST['start']; $debug = $_REQUEST['debug']; ?> - <HTML> - <HEAD> - <link rel="stylesheet" href="<?php print $conf_gui_style;?>" type="text/css"> - <META HTTP-EQUIV="Cache-Control" Content="must-revalidate"> - <META Http-Equiv="Pragma" Content="no-cache"> - <META Http-Equiv="Expires" Content="0"> - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> - <TITLE><?php print(nls("NWA search"));?></TITLE> <script language="javascript"> --- 47,52 ---- $start = $_REQUEST['start']; $debug = $_REQUEST['debug']; + include($conf_includepath . "/header.inc"); ?> <script language="javascript"> *************** *** 84,88 **** $query_time = ""; } else { ! $first_year = "2002"; $today = getdate(); $next_year = $today['year'] + 1; --- 77,81 ---- $query_time = ""; } else { ! $first_year = "0000"; $today = getdate(); $next_year = $today['year'] + 1; *************** *** 105,109 **** $year_from = $first_year; } ! $query_time = "archival_time:[".$year_from."0101000000;".$year_to."0101000000] "; } ?> --- 98,103 ---- $year_from = $first_year; } ! # $query_time = "date:[".$year_from."0101000000;".$year_to."0101000000] "; ! $query_time = "date:".$year_from."0101000000-".$year_to."0101000000 "; } ?> *************** *** 225,229 **** } ! $fields = "url archival_time teaser dctitle"; if (isset ($size)) { --- 219,223 ---- } ! $fields = "url date title dctitle"; if (isset ($size)) { *************** *** 241,245 **** $search->setSizeOfResultSet($sizeofresultset); $search->setOffset($start -1); ! $search->setFieldsInResult("teaser url description"); $search->setSupressDuplicates(); --- 235,239 ---- $search->setSizeOfResultSet($sizeofresultset); $search->setOffset($start -1); ! $search->setFieldsInResult("title url description archiveidentifier"); $search->setSupressDuplicates(); *************** *** 261,269 **** foreach ($results as $key => $value) { $hits_in_set++; ! print "<b>".$key.". ".$value['teaser']."</b> "; print "(".$value['url'].")<br>"; print "(".$value['description'].")<br>"; $search2 = new $conf_index_class (); ! $vquery = $query." url:".$value["url"]; $search2->setQuery($vquery); $search2->unsetSupressDuplicates(); --- 255,263 ---- foreach ($results as $key => $value) { $hits_in_set++; ! print "<b>".$key.". ".$value['title']."</b> "; print "(".$value['url'].")<br>"; print "(".$value['description'].")<br>"; $search2 = new $conf_index_class (); ! $vquery = $query . " exacturl:" . urlencode($value["url"]); $search2->setQuery($vquery); $search2->unsetSupressDuplicates(); *************** *** 271,286 **** $search2->setSizeOfResultSet(1); $search2->setOffset(0); ! $search2->setFieldsInResult(archival_time); ! $search2->doQuery(); ! $versions = $search2->getResultSet(); ! $numversions = $search2->getNumHitsTotal(); ! ! $search2->setQuery("url:".$value["url"]); ! $search2->doQuery(); ! $totalversions = $search2->getNumHitsTotal(); ! print nls("Number of versions satisfying query")." / ".nls("total number of versions")." : "; print $numversions."/".$totalversions."<br>"; ! $linkstring = "<a href=\"result.php?time=".$versions[1]['archival_time']."&url=".index_encode($value["url"])."\">".nls("Timeline")."</a>"; $overview = "<a href=\"overview.php?url=".index_encode($value["url"])."\" >".nls("Overview")."</a>"; print "<b>".$linkstring." | ".$overview."</b>"; --- 265,287 ---- $search2->setSizeOfResultSet(1); $search2->setOffset(0); ! $search2->setFieldsInResult(date); ! if ($search2->doQuery()) { ! $versions = $search2->getResultSet(); ! $numversions = $search2->getNumHitsTotal(); ! } ! else { ! $numversions = "<b>? <a href=\"" . $search2->queryurl . "\">" . $search2->getErrorMessage() . "</a></b>"; ! } ! $search2->setQuery("exacturl:" . urlencode($value["url"])); ! if ($search2->doQuery()) { ! $totalversions = $search2->getNumHitsTotal(); ! } ! else { ! $totalversions = "<b>? <a href=\"" . $search2->queryurl . "\">" . $search2->getErrorMessage() . "</a></b>"; ! } ! print nls("Number of versions satisfying query")." / ".nls("total number of versions")." : "; print $numversions."/".$totalversions."<br>"; ! $linkstring = "<a href=\"result.php?time=".$versions[1]['date']."&url=".index_encode($value["url"])."\">".nls("Timeline")."</a>"; $overview = "<a href=\"overview.php?url=".index_encode($value["url"])."\" >".nls("Overview")."</a>"; print "<b>".$linkstring." | ".$overview."</b>"; *************** *** 339,345 **** } } ! if ($conf_debug == 1) { ! print "Query string : ".$querystring."<br> <br>"; ! print "Total : ".$total."<br> <br>"; } } --- 340,345 ---- } } ! else { ! print "<b>" . $search->getErrorMessage() . "</b> (<a href=\"" . $search->queryurl . "\">" . $search->queryurl . "</a>)"; } } *************** *** 365,370 **** </table> </center> ! </body> ! </html> --- 365,371 ---- </table> </center> ! <?php ! include($conf_includepath . "/footer.inc"); ! ?> Index: documentDispatcher.php =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/documentDispatcher.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** documentDispatcher.php 4 Oct 2005 22:59:27 -0000 1.1 --- documentDispatcher.php 4 Oct 2005 23:40:44 -0000 1.2 *************** *** 148,154 **** $numhits = $locator->findVersions(); if($numhits <= 0) { // No document found ! print "<HTML>\n<HEAD>\n<link rel=\"stylesheet\" href=\"$conf_gui_style\" type=\"text/css\">\n</HEAD>\n<BODY>\n<p>"; print nls("Sorry, no documents with the given uri were found"); ! print "\n</p>\n</BODY>\n</HTML>"; exit(); } --- 148,155 ---- $numhits = $locator->findVersions(); if($numhits <= 0) { // No document found ! include('lib/config.inc'); ! include($conf_includepath . "/header.inc"); print nls("Sorry, no documents with the given uri were found"); ! include($conf_includepath . "/footer.inc"); exit(); } *************** *** 197,201 **** function parse_document($handler_url, $document, $handler_has_links, $js) { global $conf_document_retriever, $conf_result_page, $mode; ! $handler_url .= '?aid='.urlencode($conf_document_retriever . $document['archiveidentifier']).'&time='.$document['archival_time'].'&mime='.$document['dcformat'].'&url='.$document['url']; Header("content-type: " . $document['dcformat'], false); if($handler_has_links && $mode != "external") { --- 198,202 ---- function parse_document($handler_url, $document, $handler_has_links, $js) { global $conf_document_retriever, $conf_result_page, $mode; ! $handler_url .= '?aid='.urlencode($conf_document_retriever . $document['archiveidentifier']).'&time='.$document['date'].'&mime='.$document['dcformat'].'&url='.$document['url']; Header("content-type: " . $document['dcformat'], false); if($handler_has_links && $mode != "external") { Index: top.php =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/top.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** top.php 4 Oct 2005 22:59:27 -0000 1.1 --- top.php 4 Oct 2005 23:40:44 -0000 1.2 *************** *** 58,239 **** ?> - <html> - <HEAD> - <link rel="stylesheet" href="<?php print $conf_gui_style;?>" type="text/css"> - <META HTTP-EQUIV="Cache-Control" Content="must-revalidate"> - <META Http-Equiv="Pragma" Content="no-cache"> - <META Http-Equiv="Expires" Content="0"> - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> - <title>NWA Version Browser</title> - <script language="javascript"> - <!-- - - // name - name of the cookie - // value - value of the cookie - // [expires] - expiration date of the cookie (defaults to end of current session) - // [path] - path for which the cookie is valid (defaults to path of calling document) - // [domain] - domain for which the cookie is valid (defaults to domain of calling document) - // [secure] - Boolean value indicating if the cookie transmission requires a secure transmission - // * an argument defaults when it is assigned null as a placeholder - // * a null placeholder is not required for trailing omitted arguments - function setCookie(name, value, expires, path, domain, secure) { - var curCookie = name + "=" + escape(value) + - ((expires) ? "; expires=" + expires.toGMTString() : "") + - ((path) ? "; path=" + path : "") + - ((domain) ? "; domain=" + domain : "") + - ((secure) ? "; secure" : ""); - document.cookie = curCookie; - } - - // name - name of the desired cookie - // * return string containing value of specified cookie or null if cookie does not exist - function getCookie(name) { - var dc = document.cookie; - var prefix = name + "="; - var begin = dc.indexOf("; " + prefix); - if (begin == -1) { - begin = dc.indexOf(prefix); - if (begin != 0) return null; - } else - begin += 2; - var end = document.cookie.indexOf(";", begin); - if (end == -1) - end = dc.length; - return unescape(dc.substring(begin + prefix.length, end)); - } - - function minusResolution() - { - tmp = document.timeline.autolevel.value; - if(tmp > 1) - { - document.timeline.level.value = --tmp; - document.timeline.submit() - } - } - - function plusResolution() - { - tmp = document.timeline.autolevel.value; - if(tmp < 5) - { - document.timeline.level.value = ++tmp; - document.timeline.submit() - } - } - - function autoResolution() - { - document.timeline.level.value = 6; - document.timeline.submit() - - } - - function autoResolutionOff() - { - document.timeline.level.value = document.timeline.autolevel.value; - document.timeline.submit() - } - - function js_control() - { - - var imagepath = document.images.js.src; - var imagename = imagepath.substring(imagepath.length - 19, imagepath.length) - - - if ( imagename == 'js_selected_new.gif') - { - alert('Javascript on the archived web pages will not be loaded' ); - document.images.js.src = 'images/js_disabled_new.gif'; - setCookie("nwabrowser","off"); - } - else - { - alert('Javascript on the archived web pages will be loaded with the page'); - document.images.js.src = 'images/js_selected_new.gif'; - setCookie("nwabrowser","on"); - } - } - - function getDefaultJavaScriptConfig(name, defaultvalue) - { - - if (getCookie(name) == null) - { - setCookie("nwabrowser",defaultvalue); - if (defaultvalue == 'on') - { - document.images.js.src = 'images/js_selected_new.gif'; - } - else - { - document.images.js.src = 'images/js_disabled_new.gif'; - } - } - else - { - if(getCookie(name) == "on"){ - document.images.js.src = 'images/js_selected_new.gif'; - } - else{ - document.images.js.src = 'images/js_disabled_new.gif'; - } - - } - - return true; - } - - --> - </script> - - </head> - - <body onLoad="getDefaultJavaScriptConfig('nwabrowser','<? echo getJavaScriptDefault($conf_javascript); ?>')"> - <table width="100%" border='0' cellpadding='0' cellspacing='0'> - - <tr> - <td colspan='2' class='border'><img alt='' height='2' src='images/1px.gif' width='1'></td> - </tr> - <tr> - <td colspan='2'><img src='images/1px.gif' width='1' height='5' alt=''></td> - </tr> - - <tr> - <td width="1"></td> - <td> - <table cellspacing="0" border="0" cellpadding="0" width="100%"> - <tr> - <td width="1" class="shade"></td> - <td align="left" valign="middle"> <span class="caption">Uri:</span> </td> - <form name="loc" method="GET" target="_top" action="result.php"> - <td align="left" valign="middle"> - <input name="url" type="text" size="70" value="<?php print $url; ?>" class="searchtext"> - <input type="hidden" name="level" value="<?php print($level);?>"> - <input type="hidden" name="time" value="<?php print($time);?>"> - </td> - </form> - - <td align="left" valign="middle"> - <input type='button' onClick="document.loc.submit()" value='<?php print nls("Go");?>'/> - </td> - <td width="50%" nowrap></td> - <td align="left" valign="middle"> <span class="caption"><?php print nls("Search");?></span> </td> - <form name="search" target="_top" action="<?php print $conf_simple_search ?>"> - <td align="left" valign="middle" nowrap> - - <input type="text" size="30" name="query" value=""> - <input type="hidden" name="querytype" value="all"> - <input type='submit' value='<?php print(nls("Go"));?>'/> - </td> - </form> - </tr> - </table> - </td> - </tr> - - - <?php --- 58,61 ---- *************** *** 256,262 **** $result_page = $conf_result_page; - print "<!-- hepp level: $level-->"; $timeline = new timeline($level, $time, $url, $conf_index_class); $timeline_data = $timeline->getTimelineData(); if ($level != 6) { --- 78,90 ---- $result_page = $conf_result_page; $timeline = new timeline($level, $time, $url, $conf_index_class); $timeline_data = $timeline->getTimelineData(); + + if ($timeline_data == false) { + include($conf_includepath . "/header.inc"); + print $timeline->getError(); + include($conf_includepath . "/footer.inc"); + die(); + } if ($level != 6) { *************** *** 442,448 **** } } ! ?> <tr> <td width="1" nowrap></td> --- 270,448 ---- } } ! include($conf_includepath . "/header.inc"); ?> + <script language="javascript"> + <!-- + + // name - name of the cookie + // value - value of the cookie + // [expires] - expiration date of the cookie (defaults to end of current session) + // [path] - path for which the cookie is valid (defaults to path of calling document) + // [domain] - domain for which the cookie is valid (defaults to domain of calling document) + // [secure] - Boolean value indicating if the cookie transmission requires a secure transmission + // * an argument defaults when it is assigned null as a placeholder + // * a null placeholder is not required for trailing omitted arguments + function setCookie(name, value, expires, path, domain, secure) { + var curCookie = name + "=" + escape(value) + + ((expires) ? "; expires=" + expires.toGMTString() : "") + + ((path) ? "; path=" + path : "") + + ((domain) ? "; domain=" + domain : "") + + ((secure) ? "; secure" : ""); + document.cookie = curCookie; + } + + // name - name of the desired cookie + // * return string containing value of specified cookie or null if cookie does not exist + function getCookie(name) { + var dc = document.cookie; + var prefix = name + "="; + var begin = dc.indexOf("; " + prefix); + if (begin == -1) { + begin = dc.indexOf(prefix); + if (begin != 0) return null; + } else + begin += 2; + var end = document.cookie.indexOf(";", begin); + if (end == -1) + end = dc.length; + return unescape(dc.substring(begin + prefix.length, end)); + } + + function minusResolution() + { + tmp = document.timeline.autolevel.value; + if(tmp > 1) + { + document.timeline.level.value = --tmp; + document.timeline.submit() + } + } + + function plusResolution() + { + tmp = document.timeline.autolevel.value; + if(tmp < 5) + { + document.timeline.level.value = ++tmp; + document.timeline.submit() + } + } + + function autoResolution() + { + document.timeline.level.value = 6; + document.timeline.submit() + + } + + function autoResolutionOff() + { + document.timeline.level.value = document.timeline.autolevel.value; + document.timeline.submit() + } + + function js_control() + { + + var imagepath = document.images.js.src; + var imagename = imagepath.substring(imagepath.length - 19, imagepath.length) + + + if ( imagename == 'js_selected_new.gif') + { + alert('Javascript on the archived web pages will not be loaded' ); + document.images.js.src = 'images/js_disabled_new.gif'; + setCookie("nwabrowser","off"); + } + else + { + alert('Javascript on the archived web pages will be loaded with the page'); + document.images.js.src = 'images/js_selected_new.gif'; + setCookie("nwabrowser","on"); + } + } + + function getDefaultJavaScriptConfig(name, defaultvalue) + { + + if (getCookie(name) == null) + { + setCookie("nwabrowser",defaultvalue); + if (defaultvalue == 'on') + { + document.images.js.src = 'images/js_selected_new.gif'; + } + else + { + document.images.js.src = 'images/js_disabled_new.gif'; + } + } + else + { + if(getCookie(name) == "on"){ + document.images.js.src = 'images/js_selected_new.gif'; + } + else{ + document.images.js.src = 'images/js_disabled_new.gif'; + } + + } + + return true; + } + + --> + </script> + + </head> + + <body onLoad="getDefaultJavaScriptConfig('nwabrowser','<? echo getJavaScriptDefault($conf_javascript); ?>')"> + <table width="100%" border='0' cellpadding='0' cellspacing='0'> + + <tr> + <td colspan='2' class='border'><img alt='' height='2' src='images/1px.gif' width='1'></td> + </tr> + <tr> + <td colspan='2'><img src='images/1px.gif' width='1' height='5' alt=''></td> + </tr> + + <tr> + <td width="1"></td> + <td> + <table cellspacing="0" border="0" cellpadding="0" width="100%"> + <tr> + <td width="1" class="shade"></td> + <td align="left" valign="middle"> <span class="caption">Uri:</span> </td> + <form name="loc" method="GET" target="_top" action="result.php"> + <td align="left" valign="middle"> + <input name="url" type="text" size="70" value="<?php print $url; ?>" class="searchtext"> + <input type="hidden" name="level" value="<?php print($level);?>"> + <input type="hidden" name="time" value="<?php print($time);?>"> + </td> + </form> + + <td align="left" valign="middle"> + <input type='button' onClick="document.loc.submit()" value='<?php print nls("Go");?>'/> + </td> + <td width="50%" nowrap></td> + <td align="left" valign="middle"> <span class="caption"><?php print nls("Search");?></span> </td> + <form name="search" target="_top" action="<?php print $conf_simple_search ?>"> + <td align="left" valign="middle" nowrap> + + <input type="text" size="30" name="query" value=""> + <input type="hidden" name="querytype" value="all"> + <input type='submit' value='<?php print(nls("Go"));?>'/> + </td> + </form> + </tr> + </table> + </td> + </tr> + + + + + <tr> <td width="1" nowrap></td> *************** *** 593,596 **** </table> ! </body> ! </html> --- 593,597 ---- </table> ! <?php ! include($conf_includepath . "/footer.inc"); ! ?> Index: overview.php =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/overview.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** overview.php 4 Oct 2005 22:59:27 -0000 1.1 --- overview.php 4 Oct 2005 23:40:44 -0000 1.2 *************** *** 1,5 **** <?php /* ! * This file is part of The NWA Toolset. * * Copyright (C) 2001-2002 Royal Library in Stockholm, --- 1,5 ---- <?php /* ! * This file is part of WERA. * * Copyright (C) 2001-2002 Royal Library in Stockholm, *************** *** 20,24 **** * * You should have received a copy of the GNU General Public License ! * along with The NWA Toolset; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ --- 20,24 ---- * * You should have received a copy of the GNU General Public License ! * along with WERA; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ *************** *** 44,59 **** * */ ! ?> - - <HTML> - <HEAD> - <link rel="stylesheet" href="<?php print $conf_gui_style;?>" type="text/css"> - <META HTTP-EQUIV="Cache-Control" Content="must-revalidate"> - <META Http-Equiv="Pragma" Content="no-cache"> - <META Http-Equiv="Expires" Content="0"> - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> - <TITLE><?php print(nls("NWA Overview"));?></TITLE> <script language="javascript"> </script> --- 44,50 ---- * */ ! include($conf_includepath . "/header.inc"); ?> <script language="javascript"> </script> *************** *** 109,114 **** <?php ! //$querystring = "url:" . $encoded_url; ! $querystring = "url:" . $url; --- 100,104 ---- <?php ! $querystring = "exacturl:" . urlencode($url); *************** *** 116,148 **** $s->setQuery($querystring); $s->setSizeOfResultSet(1000); ! $s->setFieldsInResult("archival_time"); $s->setSortOrder("ascending"); ! $s->doQuery(); ! ! $numhits = $s->getNumHits(); ! $total = $s->getNumHitsTotal(); ! $rset = $s->getResultSet(); ! print "<!-- Query url : " . $s->queryurl . " -->"; ! print "<!--"; ! print_r($rset); ! print "-->"; ! $timelineurl = $conf_result_page . "?url=" . $encoded_url . "&time="; ! ! ! foreach ($rset as $hit){ ! $prevyear = $year; ! $year = substr($hit['archival_time'],0,4); ! if ($year != $prevyear) { ! if (isset($prevyear)) { ! print "</td></tr></table></td>"; ! } ! print "<td valign=\"top\"><table width=\"150\">"; ! print "<tr><td class=\"norm\" align=\"center\"><b>$year</</td></tr><tr><td class=\"norm\" align=\"center\" valign=\"top\">"; ! } ! print "<b><a target=\"_top\" href=\"" . $timelineurl . $hit['archival_time'] . "\">"; ! print (substr($hit['archival_time'],6,2) . "." . substr($hit['archival_time'],4,2) . "." . $year . '</a><b><br/>'); ! } ! ?> </tr> --- 106,147 ---- $s->setQuery($querystring); $s->setSizeOfResultSet(1000); ! $s->setFieldsInResult("date"); $s->setSortOrder("ascending"); ! if ($s->doQuery()) { ! $numhits = $s->getNumHits(); ! ! if ($numhits == 0) { ! print "Sorry, the url were not found in the index (" . $url . ")"; ! } ! else { ! $total = $s->getNumHitsTotal(); ! $rset = $s->getResultSet(); ! if ($conf_debug == 1) { ! print "<pre>"; ! print_r($rset); ! print "</pre>"; ! } ! $timelineurl = $conf_result_page . "?url=" . $encoded_url . "&time="; ! ! ! foreach ($rset as $hit){ ! $prevyear = $year; ! $year = substr($hit['date'],0,4); ! if ($year != $prevyear) { ! if (isset($prevyear)) { ! print "</td></tr></table></td>"; ! } ! print "<td valign=\"top\"><table width=\"150\">"; ! print "<tr><td class=\"norm\" align=\"center\"><b>$year</</td></tr><tr><td class=\"norm\" align=\"center\" valign=\"top\">"; ! } ! print "<b><a target=\"_top\" href=\"" . $timelineurl . $hit['date'] . "\">"; ! print (substr($hit['date'],6,2) . "." . substr($hit['date'],4,2) . "." . $year . '</a><b><br/>'); ! ! } ! } } ! else { ! print "<b>" . $s->getErrorMessage() . "</b> (<a href=\"" . $s->queryurl . "\">" . $s->queryurl . "</a>)"; ! } ?> </tr> *************** *** 158,163 **** </center> </center> - </body> - </html> ! --- 157,162 ---- </center> </center> ! <?php ! include($conf_includepath . "/footer.inc"); ! ?> \ No newline at end of file Index: result.php =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/result.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** result.php 4 Oct 2005 22:59:27 -0000 1.1 --- result.php 4 Oct 2005 23:40:44 -0000 1.2 *************** *** 34,47 **** include_once("lib/config.inc"); ! include('httpUtils.inc'); ! $mode = $_REQUEST['mode']; ! $time = $_REQUEST['time']; ! $mime = $_REQUEST['mime']; ! $url = $_REQUEST['url']; ! $level = $_REQUEST['level']; ! $manlevel = $_REQUEST['manlevel']; ! $autoresolution = $_REQUEST['autoresolution']; ! $debug = $_REQUEST['debug']; if ($autoresolution != "on") { --- 34,70 ---- include_once("lib/config.inc"); ! include($conf_includepath . '/httpUtils.inc'); ! if (isset($_REQUEST['mode'])){ ! $mode = $_REQUEST['mode']; ! } ! ! if (isset($_REQUEST['time'])){ ! $time = $_REQUEST['time']; ! } ! ! if (isset($_REQUEST['mime'])){ ! $mime = $_REQUEST['mime']; ! } ! ! if (isset($_REQUEST['url'])){ ! $url = $_REQUEST['url']; ! } ! ! if (isset($_REQUEST['level'])){ ! $level = $_REQUEST['level']; ! } ! ! if (isset($_REQUEST['manlevel'])){ ! $manlevel = $_REQUEST['manlevel']; ! } ! ! if (isset($_REQUEST['autoresolution'])){ ! $autoresolution = $_REQUEST['autoresolution']; ! } ! ! if (isset($_REQUEST['debug'])){ ! $debug = $_REQUEST['debug']; ! } if ($autoresolution != "on") { *************** *** 76,80 **** <html> ! <head><title>NWA Browser</title><head> <?php --- 99,103 ---- <html> ! <head><title>WERA</title><head> <?php |