From: skodak Date: Thu, 1 May 2008 21:22:01 +0000 (+0000) Subject: MDL-14617 removed PHP5 checks from global search X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=dd93d8e94c8dcbb8b51bc36c37a8896621445220;p=moodle.git MDL-14617 removed PHP5 checks from global search --- diff --git a/blocks/search/block_search.php b/blocks/search/block_search.php index 92b05be271..e021f99243 100644 --- a/blocks/search/block_search.php +++ b/blocks/search/block_search.php @@ -47,22 +47,18 @@ $this->content = new stdClass; //lazy check for the moment - if (check_php_version("5.0.0")) { - //fetch values if defined in admin, otherwise use defaults - $label = (!empty($CFG->block_search_text)) ? $CFG->block_search_text : get_string('searchmoodle', 'block_search'); - $button = (!empty($CFG->block_search_button)) ? $CFG->block_search_button : get_string('go', 'block_search'); - - //basic search form - $this->content->text = + //fetch values if defined in admin, otherwise use defaults + $label = (!empty($CFG->block_search_text)) ? $CFG->block_search_text : get_string('searchmoodle', 'block_search'); + $button = (!empty($CFG->block_search_button)) ? $CFG->block_search_button : get_string('go', 'block_search'); + + //basic search form + $this->content->text = '
' . '' . '' . '' . '
'; - } else { - $this->content->text = "Sorry folks, PHP 5 is needed for the new search module."; - } //else - + //no footer, thanks $this->content->footer = ''; diff --git a/search/add.php b/search/add.php index cfdb5fb255..6421014ac8 100644 --- a/search/add.php +++ b/search/add.php @@ -33,14 +33,6 @@ require_once("$CFG->dirroot/search/lib.php"); error(get_string('beadmin', 'search'), "$CFG->wwwroot/login/index.php"); } -/// check for php5 (lib.php) - - if (!search_check_php5()) { - $phpversion = phpversion(); - mtrace("Sorry, global search requires PHP 5.0.0 or later (currently using version ".phpversion().")"); - exit(0); - } - require_once("$CFG->dirroot/search/indexlib.php"); $index = new Zend_Search_Lucene(SEARCH_INDEX_PATH); diff --git a/search/cron.php b/search/cron.php index 017c2fd45a..dd04ae260a 100644 --- a/search/cron.php +++ b/search/cron.php @@ -18,11 +18,7 @@ require_once("$CFG->dirroot/search/lib.php"); - if (!search_check_php5()) { - $phpversion = phpversion(); - mtrace("Sorry, cannot cron global search as it requires PHP 5.0.0 or later (currently using version $phpversion)"); - } - else if (empty($CFG->enableglobalsearch)) { + if (empty($CFG->enableglobalsearch)) { mtrace('Global searching is not enabled. Nothing performed by search.'); } else{ diff --git a/search/delete.php b/search/delete.php index 21ed6f61ef..1f6784444f 100644 --- a/search/delete.php +++ b/search/delete.php @@ -32,13 +32,6 @@ require_once("$CFG->dirroot/search/lib.php"); error(get_string('beadmin', 'search'), "$CFG->wwwroot/login/index.php"); } //if - //check for php5 (lib.php) - if (!search_check_php5()) { - $phpversion = phpversion(); - mtrace("Sorry, global search requires PHP 5.0.0 or later (currently using version ".phpversion().")"); - exit(0); - } - require_once("$CFG->dirroot/search/indexlib.php"); $index = new Zend_Search_Lucene(SEARCH_INDEX_PATH); diff --git a/search/indexer.php b/search/indexer.php index a7396aefd3..a48d505ab4 100644 --- a/search/indexer.php +++ b/search/indexer.php @@ -59,13 +59,6 @@ require_once("$CFG->dirroot/search/lib.php"); exit(0); } -/// check for php5 (lib.php) - - if (!search_check_php5()) { - mtrace("Sorry, global search requires PHP 5.0.0 or later (currently using version ".phpversion().")"); - exit(0); - } - //php5 found, continue including php5-only files //require_once("$CFG->dirroot/search/Zend/Search/Lucene.php"); require_once("$CFG->dirroot/search/indexlib.php"); diff --git a/search/indexersplash.php b/search/indexersplash.php index 8efdab6140..bd8b9208f3 100644 --- a/search/indexersplash.php +++ b/search/indexersplash.php @@ -32,13 +32,6 @@ require_once("$CFG->dirroot/search/lib.php"); error(get_string('beadmin', 'search'), "$CFG->wwwroot/login/index.php"); } -/// check for php5 (lib.php) - - if (!search_check_php5()) { - mtrace("Sorry, global search requires PHP 5.0.0 or later (currently using version ".phpversion().")"); - exit(0); - } - require_once("$CFG->dirroot/search/indexlib.php"); $indexinfo = new IndexInfo(); diff --git a/search/lib.php b/search/lib.php index af40f8f1d9..c38290f578 100644 --- a/search/lib.php +++ b/search/lib.php @@ -22,7 +22,6 @@ function search_get_document_types($prefix = 'SEARCH_TYPE_') { function search_get_additional_modules() { function search_shorten_url($url, $length=30) { function search_escape_string($str) { -function search_check_php5($feedback = false) { function search_stopwatch($cli = false) { function search_pexit($str = "") { */ @@ -113,23 +112,6 @@ function search_escape_string($str) { return $s; } //search_escape_string -/** -* get a real php 5 version number, using 5.0.0 arbitrarily -* @param feedback if true, prints a feedback message to output. -* @return true if version of PHP is high enough -*/ -function search_check_php5($feedback = false) { - if (!check_php_version("5.0.0")) { - if ($feedback) { - print_heading(get_string('versiontoolow', 'search')); - } - return false; - } - else { - return true; - } -} //search_check_php5 - /** * simple timer function, on first call, records a current microtime stamp, outputs result on 2nd call * @param cli an output formatting switch diff --git a/search/query.php b/search/query.php index cd62c2cbef..38ae1b76f1 100644 --- a/search/query.php +++ b/search/query.php @@ -50,92 +50,90 @@ /// check for php5, but don't die yet (see line 52) - if ($check = search_check_php5()) { - require_once("{$CFG->dirroot}/search/querylib.php"); - - $page_number = optional_param('page', -1, PARAM_INT); - $pages = ($page_number == -1) ? false : true; - $advanced = (optional_param('a', '0', PARAM_INT) == '1') ? true : false; - $query_string = optional_param('query_string', '', PARAM_CLEAN); - - if ($pages && isset($_SESSION['search_advanced_query'])) { - // if both are set, then we are busy browsing through the result pages of an advanced query - $adv = unserialize($_SESSION['search_advanced_query']); - } else if ($advanced) { - // otherwise we are dealing with a new advanced query - unset($_SESSION['search_advanced_query']); - session_unregister('search_advanced_query'); - - // chars to strip from strings (whitespace) - $chars = " \t\n\r\0\x0B,-+"; - - // retrieve advanced query variables - $adv->mustappear = trim(optional_param('mustappear', '', PARAM_CLEAN), $chars); - $adv->notappear = trim(optional_param('notappear', '', PARAM_CLEAN), $chars); - $adv->canappear = trim(optional_param('canappear', '', PARAM_CLEAN), $chars); - $adv->module = optional_param('module', '', PARAM_CLEAN); - $adv->title = trim(optional_param('title', '', PARAM_CLEAN), $chars); - $adv->author = trim(optional_param('author', '', PARAM_CLEAN), $chars); + require_once("{$CFG->dirroot}/search/querylib.php"); + + $page_number = optional_param('page', -1, PARAM_INT); + $pages = ($page_number == -1) ? false : true; + $advanced = (optional_param('a', '0', PARAM_INT) == '1') ? true : false; + $query_string = optional_param('query_string', '', PARAM_CLEAN); + + if ($pages && isset($_SESSION['search_advanced_query'])) { + // if both are set, then we are busy browsing through the result pages of an advanced query + $adv = unserialize($_SESSION['search_advanced_query']); + } else if ($advanced) { + // otherwise we are dealing with a new advanced query + unset($_SESSION['search_advanced_query']); + session_unregister('search_advanced_query'); + + // chars to strip from strings (whitespace) + $chars = " \t\n\r\0\x0B,-+"; + + // retrieve advanced query variables + $adv->mustappear = trim(optional_param('mustappear', '', PARAM_CLEAN), $chars); + $adv->notappear = trim(optional_param('notappear', '', PARAM_CLEAN), $chars); + $adv->canappear = trim(optional_param('canappear', '', PARAM_CLEAN), $chars); + $adv->module = optional_param('module', '', PARAM_CLEAN); + $adv->title = trim(optional_param('title', '', PARAM_CLEAN), $chars); + $adv->author = trim(optional_param('author', '', PARAM_CLEAN), $chars); + } + + if ($advanced) { + //parse the advanced variables into a query string + //TODO: move out to external query class (QueryParse?) + + $query_string = ''; + + // get all available module types + $module_types = array_merge(array('all'), array_values(search_get_document_types())); + $adv->module = in_array($adv->module, $module_types) ? $adv->module : 'all'; + + // convert '1 2' into '+1 +2' for required words field + if (strlen(trim($adv->mustappear)) > 0) { + $query_string = ' +'.implode(' +', preg_split("/[\s,;]+/", $adv->mustappear)); } - - if ($advanced) { - //parse the advanced variables into a query string - //TODO: move out to external query class (QueryParse?) - - $query_string = ''; - - // get all available module types - $module_types = array_merge(array('all'), array_values(search_get_document_types())); - $adv->module = in_array($adv->module, $module_types) ? $adv->module : 'all'; - - // convert '1 2' into '+1 +2' for required words field - if (strlen(trim($adv->mustappear)) > 0) { - $query_string = ' +'.implode(' +', preg_split("/[\s,;]+/", $adv->mustappear)); - } - - // convert '1 2' into '-1 -2' for not wanted words field - if (strlen(trim($adv->notappear)) > 0) { - $query_string .= ' -'.implode(' -', preg_split("/[\s,;]+/", $adv->notappear)); - } - - // this field is left untouched, apart from whitespace being stripped - if (strlen(trim($adv->canappear)) > 0) { - $query_string .= ' '.implode(' ', preg_split("/[\s,;]+/", $adv->canappear)); - } - - // add module restriction - $doctypestr = get_string('doctype', 'search'); - $titlestr = get_string('title', 'search'); - $authorstr = get_string('author', 'search'); - if ($adv->module != 'all') { - $query_string .= " +{$doctypestr}:".$adv->module; - } - - // create title search string - if (strlen(trim($adv->title)) > 0) { - $query_string .= " +{$titlestr}:".implode(" +{$titlestr}:", preg_split("/[\s,;]+/", $adv->title)); - } - - // create author search string - if (strlen(trim($adv->author)) > 0) { - $query_string .= " +{$authorstr}:".implode(" +{$authorstr}:", preg_split("/[\s,;]+/", $adv->author)); - } - - // save our options if the query is valid - if (!empty($query_string)) { - $_SESSION['search_advanced_query'] = serialize($adv); - } + + // convert '1 2' into '-1 -2' for not wanted words field + if (strlen(trim($adv->notappear)) > 0) { + $query_string .= ' -'.implode(' -', preg_split("/[\s,;]+/", $adv->notappear)); } - - // normalise page number - if ($page_number < 1) { - $page_number = 1; + + // this field is left untouched, apart from whitespace being stripped + if (strlen(trim($adv->canappear)) > 0) { + $query_string .= ' '.implode(' ', preg_split("/[\s,;]+/", $adv->canappear)); + } + + // add module restriction + $doctypestr = get_string('doctype', 'search'); + $titlestr = get_string('title', 'search'); + $authorstr = get_string('author', 'search'); + if ($adv->module != 'all') { + $query_string .= " +{$doctypestr}:".$adv->module; + } + + // create title search string + if (strlen(trim($adv->title)) > 0) { + $query_string .= " +{$titlestr}:".implode(" +{$titlestr}:", preg_split("/[\s,;]+/", $adv->title)); + } + + // create author search string + if (strlen(trim($adv->author)) > 0) { + $query_string .= " +{$authorstr}:".implode(" +{$authorstr}:", preg_split("/[\s,;]+/", $adv->author)); + } + + // save our options if the query is valid + if (!empty($query_string)) { + $_SESSION['search_advanced_query'] = serialize($adv); } - - //run the query against the index - $sq = new SearchQuery($query_string, $page_number, 10, false); } - + + // normalise page number + if ($page_number < 1) { + $page_number = 1; + } + + //run the query against the index + $sq = new SearchQuery($query_string, $page_number, 10, false); + if (!$site = get_site()) { redirect("index.php"); } @@ -155,13 +153,6 @@ print_header("$strsearch", "$site->fullname" , $navigation, "", "", true, " ", navmenu($site)); } - //keep things pretty, even if php5 isn't available - if (!$check) { - print_heading(search_check_php5(true)); - print_footer(); - exit(0); - } - print_box_start(); print_heading($strquery); diff --git a/search/stats.php b/search/stats.php index 8412241ef2..58edf11607 100644 --- a/search/stats.php +++ b/search/stats.php @@ -30,13 +30,9 @@ require_once("{$CFG->dirroot}/search/lib.php"); error(get_string('globalsearchdisabled', 'search')); } -/// check for php5, but don't die yet - - if ($check = search_check_php5()) { - require_once("{$CFG->dirroot}/search/indexlib.php"); - - $indexinfo = new IndexInfo(); - } + require_once("{$CFG->dirroot}/search/indexlib.php"); + + $indexinfo = new IndexInfo(); if (!$site = get_site()) { redirect("index.php"); @@ -58,12 +54,6 @@ require_once("{$CFG->dirroot}/search/lib.php"); /// keep things pretty, even if php5 isn't available - if (!$check) { - print_heading(search_check_php5(true)); - print_footer(); - exit(0); - } - print_box_start(); print_heading($strquery); diff --git a/search/tests/index.php b/search/tests/index.php index 8b111808f5..19b36915e5 100644 --- a/search/tests/index.php +++ b/search/tests/index.php @@ -38,13 +38,6 @@ mtrace("Testing global search capabilities:\n"); $phpversion = phpversion(); -if (!search_check_php5()) { - mtrace("ERROR: PHP 5.0.0 or later required (currently using version ".phpversion().")."); - exit(0); -} else { - mtrace("Success: PHP 5.0.0 or later is installed (".phpversion().").\n"); -} //else - //fix paths for testing set_include_path(get_include_path().":../"); require_once("$CFG->dirroot/search/Zend/Search/Lucene.php"); diff --git a/search/update.php b/search/update.php index c83e2f8595..08487f2c90 100644 --- a/search/update.php +++ b/search/update.php @@ -33,14 +33,6 @@ require_once("$CFG->dirroot/search/lib.php"); error(get_string('beadmin', 'search'), "$CFG->wwwroot/login/index.php"); } -/// check for php5 (lib.php) - - if (!search_check_php5()) { - $phpversion = phpversion(); - mtrace("Sorry, global search requires PHP 5.0.0 or later (currently using version ".phpversion().")"); - exit(0); - } - require_once("$CFG->dirroot/search/indexlib.php"); $index = new Zend_Search_Lucene(SEARCH_INDEX_PATH);