php 8.1 updates

This commit is contained in:
Brad Dutton
2022-01-08 19:19:03 -08:00
parent 5ac30383a5
commit 3ee59350a1
17 changed files with 56 additions and 42 deletions

View File

@@ -72,6 +72,12 @@ class Comment_Model_Core extends ORM {
parent::validate($array);
}
private function get_server_var($input, $key) {
$value = $input->server($key);
if (is_null($value)) $value = '';
return $value;
}
/**
* @see ORM::save()
*/
@@ -89,18 +95,18 @@ class Comment_Model_Core extends ORM {
// as a semaphore for now (we use that in g2_import.php)
if (empty($this->server_http_host)) {
$input = Input::instance();
$this->server_http_accept = substr($input->server("HTTP_ACCEPT"), 0, 128);
$this->server_http_accept_charset = substr($input->server("HTTP_ACCEPT_CHARSET"), 0, 64);
$this->server_http_accept_encoding = substr($input->server("HTTP_ACCEPT_ENCODING"), 0, 64);
$this->server_http_accept_language = substr($input->server("HTTP_ACCEPT_LANGUAGE"), 0, 64);
$this->server_http_connection = substr($input->server("HTTP_CONNECTION"), 0, 64);
$this->server_http_host = substr($input->server("HTTP_HOST"), 0, 64);
$this->server_http_referer = substr($input->server("HTTP_REFERER"), 0, 255);
$this->server_http_user_agent = substr($input->server("HTTP_USER_AGENT"), 0, 128);
$this->server_query_string = substr($input->server("QUERY_STRING"), 0, 64);
$this->server_remote_addr = substr($input->server("REMOTE_ADDR"), 0, 40);
$this->server_remote_host = substr($input->server("REMOTE_HOST"), 0, 255);
$this->server_remote_port = substr($input->server("REMOTE_PORT"), 0, 16);
$this->server_http_accept = substr($this->get_server_var($input, "HTTP_ACCEPT"), 0, 128);
$this->server_http_accept_charset = substr($this->get_server_var($input, "HTTP_ACCEPT_CHARSET"), 0, 64);
$this->server_http_accept_encoding = substr($this->get_server_var($input, "HTTP_ACCEPT_ENCODING"), 0, 64);
$this->server_http_accept_language = substr($this->get_server_var($input, "HTTP_ACCEPT_LANGUAGE"), 0, 64);
$this->server_http_connection = substr($this->get_server_var($input, "HTTP_CONNECTION"), 0, 64);
$this->server_http_host = substr($this->get_server_var($input, "HTTP_HOST"), 0, 64);
$this->server_http_referer = substr($this->get_server_var($input, "HTTP_REFERER"), 0, 255);
$this->server_http_user_agent = substr($this->get_server_var($input, "HTTP_USER_AGENT"), 0, 128);
$this->server_query_string = substr($this->get_server_var($input, "QUERY_STRING"), 0, 64);
$this->server_remote_addr = substr($this->get_server_var($input, "REMOTE_ADDR"), 0, 40);
$this->server_remote_host = substr($this->get_server_var($input, "REMOTE_HOST"), 0, 255);
$this->server_remote_port = substr($this->get_server_var($input, "REMOTE_PORT"), 0, 16);
}
$visible_change = $this->state == "published";