Commit: 0b05648a53510c35f0f1030912f070b577804a24 Author: Hannes Magnusson <[email protected]> Thu, 21 Nov 2013 20:21:41 -0800 Parents: 138b5651793850a8fc537ab79c510036eb4cafdb Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=0b05648a53510c35f0f1030912f070b577804a24 Log: Remove dead code and add back language search Changed paths: M results.php Diff: diff --git a/results.php b/results.php index 58dd47d..40a7f50 100644 --- a/results.php +++ b/results.php @@ -3,56 +3,18 @@ $_SERVER['BASE_PAGE'] = 'results.php'; include $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; include $_SERVER['DOCUMENT_ROOT'] . '/include/results.inc'; -#include $_SERVER['DOCUMENT_ROOT'] . '/include/loadavg.inc'; -function exit_with_pretty_error($title, $header, $msg) { - if ($title) { - site_header($title, array("noindex", 'layout_span' => 12, "current" => "help")); - } - echo '<h2>' .$header. '</h2>'; - echo '<p>' .$msg. '</p>'; - site_footer(); - exit; -} - -if (!isset($_GET['q']) || (!is_string($_GET['q']) || strlen($_GET['q']) < 3)) { - exit_with_pretty_error("Search results", "Empty query", "Please provide at least 3 characters to search for."); -} if (!isset($_GET['l']) || !is_string($_GET['l'])) { $_GET['l'] = null; } -// Prepare data for search -if ($MQ) { - $q = stripslashes($_GET['q']); //query - $l = stripslashes($_GET['l']); // language -} else { - $q = isset($_GET['q']) ? $_GET['q'] : ''; - $l = isset($_GET['l']) ? $_GET['l'] : 'en'; -} - -if(strlen($l)>2) $l = substr($l,0,2); // Just take the first 2 chars. eg. pt_BR = pt +$lang = isset($_GET["l"]) ? (string)$_GET["l"] : "en"; +$query = isset($_GET["q"]) ? (string)$_GET["q"] : ''; -$uq = urlencode($q); -$ul = urlencode($l); - -$s = (isset($_GET['start']) && is_numeric($_GET['start'])) ? (int)$_GET['start'] : 0; -$profile = (isset($_GET['p']) && is_string($_GET['p'])) ? $_GET['p'] : 'all'; -$per_page = 10; - -$valid_profiles = array('all', 'local', 'manual', 'news', 'bugs', 'pear', 'pecl', 'talks'); -$scope = in_array($profile, $valid_profiles) ? $profile : 'all'; -$srch_host = "php.net"; -$srch_rqst = "/ws.php?profile=$scope&q=$uq&lang=$ul&results=$per_page&start=$s&mirror=".trim(substr($MYSITE,7),'/'); -$url = "http://".$srch_host.$srch_rqst; +if (!isset($LANGUAGES[$lang])) { + $lang = "en"; +} -#$data = fetch_contents($url); -#if (is_array($data)) { -# // FIXME: if (is_authenticated()) ... -# $comment = '<!-- ' .print_r($data, true). '-->'; -# exit_with_pretty_error("Search error", "Internal error", "This mirror does not support searches, please report this error to <a href='/contact'>our webmasters</a>" . $comment); -#} -#$res = unserialize($data); // HTTP status line is passed on, signifies an error site_header( @@ -66,20 +28,7 @@ site_header( echo '<h1>Search results</h1>'; -#if (!is_array($res)) { -# exit_with_pretty_error(null, 'Internal error', 'Please try again later'); -#} - -// No results for query -#if ($res['ResultSet']['totalResultsAvailable'] == 0) { - // TODO Research possible encoding issues - google_cse($q); - - site_footer(); - exit; -#} +google_cse($query, $lang); -#search_results($res, $q, $scope, $per_page, $s, $l); +site_footer(); -#site_footer(); -?> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
