Fix for dynamic classes deprecation in PHP 8.2
This commit is contained in:
Brian Huisman
parent
f0c178dd67
commit
1363370840
|
|
@ -976,22 +976,23 @@ function os_return_all() {
|
|||
}
|
||||
|
||||
// {{{{{ Create the Mustache template
|
||||
let os_TEMPLATE = {}
|
||||
os_TEMPLATE.addError = function(text) {
|
||||
let os_TEMPLATE = {
|
||||
version: '<?php echo $_ODATA['version']; ?>',
|
||||
searchable: false,
|
||||
addError: function(text) {
|
||||
if (!this.errors) {
|
||||
this.errors = {};
|
||||
this.errors.error_list = [];
|
||||
}
|
||||
this.errors.error_list.push(text);
|
||||
}
|
||||
};
|
||||
os_TEMPLATE.version = '<?php echo $_ODATA['version']; ?>';
|
||||
os_TEMPLATE.limit_term_length = <?php echo $_ODATA['s_limit_term_length']; ?>;
|
||||
|
||||
|
||||
// Check if there are rows in the search database
|
||||
if (os_crawldata.length) {
|
||||
os_TEMPLATE.searchable = {};
|
||||
os_TEMPLATE.searchable.form_action = window.location.pathname;
|
||||
os_TEMPLATE.searchable.limit_term_length = <?php echo $_ODATA['s_limit_term_length']; ?>;
|
||||
|
||||
os_request.c = os_params.get('c');
|
||||
if (!os_request.c || !os_rdata.s_category_list[os_request.c])
|
||||
|
|
|
|||
|
|
@ -336,6 +336,7 @@ $_ODATA = $_DDATA['pdo']->query(
|
|||
'SELECT * FROM `'.$_DDATA['tbprefix'].'config`;'
|
||||
)->fetchAll()[0];
|
||||
|
||||
ini_set('display_errors', 1);
|
||||
error_reporting(E_ALL);
|
||||
date_default_timezone_set($_ODATA['sp_timezone']);
|
||||
ini_set('mbstring.substitute_character', 'none');
|
||||
|
|
@ -573,8 +574,14 @@ if (!$_ODATA['s_result_template']) {
|
|||
// {{{{{ Initialize the Mustache templating engine
|
||||
class OS_Mustache {
|
||||
public $errors;
|
||||
public $version;
|
||||
public $searchable;
|
||||
|
||||
function __construct() {}
|
||||
function __construct() {
|
||||
global $_ODATA;
|
||||
|
||||
$this->version = $_ODATA['version'];
|
||||
}
|
||||
|
||||
function addError($text) {
|
||||
if (!$this->errors) {
|
||||
|
|
|
|||
|
|
@ -325,6 +325,11 @@ function OS_crawlCleanUp() {
|
|||
OS_crawlLog('Could not purge search result cache', 1);
|
||||
}
|
||||
|
||||
// Optimize the query log table
|
||||
$optimize = $_DDATA['pdo']->query(
|
||||
'OPTIMIZE TABLE `'.$_DDATA['tbprefix'].'query`;'
|
||||
);
|
||||
|
||||
OS_setValue('sp_links_crawled', count($_RDATA['sp_links']));
|
||||
OS_setValue('sp_pages_stored', count($_RDATA['sp_store']));
|
||||
OS_setValue('sp_time_end_success', $_ODATA['sp_time_end']);
|
||||
|
|
@ -721,10 +726,10 @@ if ($_cURL) {
|
|||
|
||||
|
||||
// ***** Pre-fill queue with starting URL(s) at depth 0, blank referer
|
||||
$_QUEUE = array();
|
||||
$_RDATA['sp_queue'] = array();
|
||||
foreach ($_RDATA['sp_starting'] as $starting) {
|
||||
$starting = OS_formatURL($starting, $_ODATA['admin_install_domain'].'/');
|
||||
$_QUEUE[] = array($starting, 0, '');
|
||||
$_RDATA['sp_queue'][] = array($starting, 0, '');
|
||||
|
||||
// Add starting URLs to required URLs so the crawler cannot travel
|
||||
// into parent directories
|
||||
|
|
@ -736,14 +741,14 @@ foreach ($_RDATA['sp_starting'] as $starting) {
|
|||
}
|
||||
|
||||
// ***** List of previously crawled links from the database
|
||||
$_EXIST = array();
|
||||
$_RDATA['sp_exist'] = array();
|
||||
$crawldata = $_DDATA['pdo']->query(
|
||||
'SELECT `url`, `content_checksum` FROM `'.$_DDATA['tbprefix'].'crawldata`'
|
||||
);
|
||||
$err = $crawldata->errorInfo();
|
||||
if ($err[0] == '00000') {
|
||||
foreach ($crawldata as $value)
|
||||
$_EXIST[$value['content_checksum']] = $value['url'];
|
||||
$_RDATA['sp_exist'][$value['content_checksum']] = $value['url'];
|
||||
} else OS_crawlLog('Error getting list of previous URLs from crawldata table', 2);
|
||||
|
||||
|
||||
|
|
@ -803,7 +808,7 @@ $updateNotModified = $_DDATA['pdo']->prepare(
|
|||
|
||||
|
||||
// ***** Begin crawling URLs from the queue
|
||||
while ($_cURL && count($_QUEUE)) {
|
||||
while ($_cURL && count($_RDATA['sp_queue'])) {
|
||||
|
||||
// Check if we have run out of execution time
|
||||
if ($_ODATA['sp_time_start'] + $_ODATA['sp_timeout_crawl'] <= time()) {
|
||||
|
|
@ -824,7 +829,7 @@ while ($_cURL && count($_QUEUE)) {
|
|||
}
|
||||
|
||||
// Retrieve next link to crawl from the queue
|
||||
list($url, $depth, $referer) = array_shift($_QUEUE);
|
||||
list($url, $depth, $referer) = array_shift($_RDATA['sp_queue']);
|
||||
$_RDATA['sp_links'][] = $url;
|
||||
|
||||
// Check if URL is beyond the depth limit
|
||||
|
|
@ -872,10 +877,10 @@ while ($_cURL && count($_QUEUE)) {
|
|||
OS_crawlLog('Memory used: '.OS_readSize(memory_get_usage(true)), 1);
|
||||
|
||||
OS_crawlLog('Crawling: '.$url.' (Depth: '.$depth.')', 1);
|
||||
OS_setValue('sp_progress', count($_RDATA['sp_links']).'/'.(count($_RDATA['sp_links']) + count($_QUEUE)));
|
||||
OS_setValue('sp_progress', count($_RDATA['sp_links']).'/'.(count($_RDATA['sp_links']) + count($_RDATA['sp_queue'])));
|
||||
|
||||
// Set the correct If-Modified-Since request header
|
||||
if ($_ODATA['sp_ifmodifiedsince'] && (!count($_EXIST) || in_array($url, $_EXIST))) {
|
||||
if ($_ODATA['sp_ifmodifiedsince'] && (!count($_RDATA['sp_exist']) || in_array($url, $_RDATA['sp_exist']))) {
|
||||
curl_setopt($_cURL, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
|
||||
} else curl_setopt($_cURL, CURLOPT_TIMECONDITION, CURL_TIMECOND_NONE);
|
||||
|
||||
|
|
@ -910,7 +915,8 @@ while ($_cURL && count($_QUEUE)) {
|
|||
|
||||
// If this is a new page, or an existing page but the content
|
||||
// hash has changed
|
||||
if (!isset($_EXIST[$data['info']['sha1']]) || $_EXIST[$data['info']['sha1']] != $url) {
|
||||
if (!isset($_RDATA['sp_exist'][$data['info']['sha1']]) ||
|
||||
$_RDATA['sp_exist'][$data['info']['sha1']] != $url) {
|
||||
|
||||
// Detect MIME-type using extension?
|
||||
if (empty($data['info']['content_type']))
|
||||
|
|
@ -1008,6 +1014,7 @@ while ($_cURL && count($_QUEUE)) {
|
|||
|
||||
// ***** Process <head> elements
|
||||
$head = $document->getElementsByTagName('head');
|
||||
if (!empty($head[0])) {
|
||||
|
||||
$base = $head[0]->getElementsByTagName('base');
|
||||
if (!empty($base[0]))
|
||||
|
|
@ -1138,10 +1145,12 @@ while ($_cURL && count($_QUEUE)) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ***** Process <body> elements
|
||||
$body = $document->getElementsByTagName('body');
|
||||
if (!empty($body[0])) {
|
||||
|
||||
// Replace <img> tags with their alt text
|
||||
$imgs = $body[0]->getElementsByTagName('img');
|
||||
|
|
@ -1191,6 +1200,9 @@ while ($_cURL && count($_QUEUE)) {
|
|||
if (strtolower($iframe->attributes[$x]->name) == 'src')
|
||||
$data['links'][] = $iframe->attributes[$x]->value;
|
||||
|
||||
}
|
||||
|
||||
|
||||
$data['links'] = array_map(function($l) {
|
||||
if (preg_match('/^(tel|telnet|mailto|ftp|sftp|ssh|gopher|news|ldap|urn|onion|magnet):/i', $l)) return '';
|
||||
return preg_replace('/#.*$/', '', $l);
|
||||
|
|
@ -1377,7 +1389,7 @@ while ($_cURL && count($_QUEUE)) {
|
|||
if (!$data['info']['noindex']) {
|
||||
|
||||
// If this URL exists (or existed) in the live table...
|
||||
if (in_array($url, $_EXIST) || $referer == '<orphan>') {
|
||||
if (in_array($url, $_RDATA['sp_exist']) || $referer == '<orphan>') {
|
||||
$_RDATA['sp_status']['Updated']++;
|
||||
|
||||
$selectData->execute(array('url' => $url));
|
||||
|
|
@ -1567,7 +1579,7 @@ while ($_cURL && count($_QUEUE)) {
|
|||
if (!in_array($link, $_RDATA['sp_links'])) {
|
||||
|
||||
// ... and if link hasn't been queued yet
|
||||
foreach ($_QUEUE as $queue)
|
||||
foreach ($_RDATA['sp_queue'] as $queue)
|
||||
if ($link == $queue[0]) continue 2;
|
||||
|
||||
// ... and if link passes our user filters
|
||||
|
|
@ -1577,22 +1589,22 @@ while ($_cURL && count($_QUEUE)) {
|
|||
}
|
||||
|
||||
// ... then add the link to the queue
|
||||
$_QUEUE[] = array($link, $depth + 1, $url);
|
||||
$_RDATA['sp_queue'][] = array($link, $depth + 1, $url);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If we've completed the queue, check for orphans
|
||||
if (!count($_QUEUE)) {
|
||||
if (!count($_RDATA['sp_queue'])) {
|
||||
|
||||
// Diff the previous URL list with the links we've already scanned
|
||||
$_EXIST = array_diff($_EXIST, $_RDATA['sp_links']);
|
||||
$_RDATA['sp_exist'] = array_diff($_RDATA['sp_exist'], $_RDATA['sp_links']);
|
||||
|
||||
// If we have leftover links, and we aren't autodeleting them
|
||||
if (count($_EXIST) && !$_ODATA['sp_autodelete']) {
|
||||
OS_crawlLog('Adding '.count($_EXIST).' orphan(s) to queue...', 1);
|
||||
if (count($_RDATA['sp_exist']) && !$_ODATA['sp_autodelete']) {
|
||||
OS_crawlLog('Adding '.count($_RDATA['sp_exist']).' orphan(s) to queue...', 1);
|
||||
|
||||
foreach ($_EXIST as $key => $link) {
|
||||
foreach ($_RDATA['sp_exist'] as $key => $link) {
|
||||
|
||||
// If orphan URL passes our user filters
|
||||
if ($nx = OS_filterURL($link, $data['base'])) {
|
||||
|
|
@ -1602,7 +1614,7 @@ while ($_cURL && count($_QUEUE)) {
|
|||
}
|
||||
|
||||
// ... then add the orphan to the queue
|
||||
$_QUEUE[] = array($link, 0, '<orphan>');
|
||||
$_RDATA['sp_queue'][] = array($link, 0, '<orphan>');
|
||||
}
|
||||
|
||||
// Else if we stored some pages, we're done
|
||||
|
|
|
|||
|
|
@ -26,14 +26,13 @@ foreach ($_RDATA['s_weights'] as $key => $weight)
|
|||
|
||||
// {{{{{ Create the Mustache template
|
||||
$_TEMPLATE = new OS_Mustache();
|
||||
$_TEMPLATE->version = $_ODATA['version'];
|
||||
$_TEMPLATE->limit_term_length = $_ODATA['s_limit_term_length'];
|
||||
|
||||
|
||||
// Check if there are rows in the search database
|
||||
if ($_RDATA['s_searchable_pages']) {
|
||||
$_TEMPLATE->searchable = new stdClass();
|
||||
$_TEMPLATE->searchable->form_action = $_SERVER['REQUEST_URI'];
|
||||
$_TEMPLATE->searchable->limit_term_length = $_ODATA['s_limit_term_length'];
|
||||
|
||||
if (empty($_REQUEST['c']) || empty($_RDATA['s_category_list'][$_REQUEST['c']]))
|
||||
$_REQUEST['c'] = '<none>';
|
||||
|
|
|
|||
Loading…
Reference in a new issue