From 66cb53c5350698ebc8c9776814d0fe32f5903e3a Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 31 May 2008 18:11:59 +0000 Subject: [PATCH] recommitting PHP5 cleanup in search --- search/add.php | 6 ------ search/delete.php | 7 ------- search/indexer.php | 5 ----- search/indexersplash.php | 8 -------- search/lib.php | 18 ------------------ search/query.php | 9 --------- search/stats.php | 12 ++---------- search/tests/index.php | 7 ------- search/update.php | 7 ------- 9 files changed, 2 insertions(+), 77 deletions(-) diff --git a/search/add.php b/search/add.php index be33ab3494..17d74377b0 100644 --- a/search/add.php +++ b/search/add.php @@ -40,12 +40,6 @@ /// 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); - } - try { $index = new Zend_Search_Lucene(SEARCH_INDEX_PATH); } catch(LuceneException $e) { diff --git a/search/delete.php b/search/delete.php index c269f66610..47a07ec481 100644 --- a/search/delete.php +++ b/search/delete.php @@ -35,13 +35,6 @@ 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); - } - try { $index = new Zend_Search_Lucene(SEARCH_INDEX_PATH); } catch(LuceneException $e) { diff --git a/search/indexer.php b/search/indexer.php index 95443167c2..a8a6a2ae2b 100644 --- a/search/indexer.php +++ b/search/indexer.php @@ -65,11 +65,6 @@ $separator = (array_key_exists('WINDIR', $_SERVER)) ? ';' : ':' ; /// 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 01f1238c4a..cf400cb416 100644 --- a/search/indexersplash.php +++ b/search/indexersplash.php @@ -36,14 +36,6 @@ ini_set('include_path', $CFG->dirroot.'\search'.$separator.ini_get('include_path 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"); $indexinfo = new IndexInfo(); diff --git a/search/lib.php b/search/lib.php index 638fea885e..b715d2ad53 100644 --- a/search/lib.php +++ b/search/lib.php @@ -24,7 +24,6 @@ function search_get_document_types($prefix = 'X_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 = "") { */ @@ -175,23 +174,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 e8affc712c..cd0aaf2d7d 100644 --- a/search/query.php +++ b/search/query.php @@ -50,7 +50,6 @@ /// 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); @@ -145,7 +144,6 @@ //run the query against the index ensuring internal coding works in UTF-8 Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8()); $sq = new SearchQuery($query_string, $page_number, 10, false); - } if (!$site = get_site()) { redirect("index.php"); @@ -166,13 +164,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); - } - if (!empty($error)){ notice ($error); } diff --git a/search/stats.php b/search/stats.php index 651780f3a7..84e4d12429 100644 --- a/search/stats.php +++ b/search/stats.php @@ -32,11 +32,9 @@ require_once("{$CFG->dirroot}/search/lib.php"); /// check for php5, but don't die yet - if ($check = search_check_php5()) { - require_once("{$CFG->dirroot}/search/indexlib.php"); + require_once("{$CFG->dirroot}/search/indexlib.php"); - $indexinfo = new IndexInfo(); - } + $indexinfo = new IndexInfo(); if (!$site = get_site()) { redirect("index.php"); @@ -58,12 +56,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 1ba5e14544..6510140437 100644 --- a/search/tests/index.php +++ b/search/tests/index.php @@ -32,13 +32,6 @@ $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 10a88241eb..e621e32dfc 100644 --- a/search/update.php +++ b/search/update.php @@ -38,13 +38,6 @@ 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); - } - try { $index = new Zend_Search_Lucene(SEARCH_INDEX_PATH); } catch(LuceneException $e) { -- 2.39.5