Skip to content

Updated functions.inc.php for PHP8 compliance. #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SinusPi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated functions.inc.php for PHP8 compliance. #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions includes/functions.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function format_time($seconds)
// Given a string such as "comment_123" or "id_57", it returns the final, numeric id.
function split_id($str)
{
return match('/[_-]([0-9]+)$/', $str, 1);
return spf_match('/[_-]([0-9]+)$/', $str, 1);
}

// Creates a friendly URL slug from a string
Expand All @@ -68,7 +68,7 @@ function slugify($str)
// Computes the *full* URL of the current page (protocol, server, path, query parameters, etc)
function full_url()
{
$s = empty($_SERVER['HTTPS']) ? '' : ($_SERVER['HTTPS'] == 'on') ? 's' : '';
$s = empty($_SERVER['HTTPS']) ? '' : (($_SERVER['HTTPS'] == 'on') ? 's' : '');
$protocol = substr(strtolower($_SERVER['SERVER_PROTOCOL']), 0, strpos(strtolower($_SERVER['SERVER_PROTOCOL']), '/')) . $s;
$port = ($_SERVER['SERVER_PORT'] == '80') ? '' : (":".$_SERVER['SERVER_PORT']);
return $protocol . "://" . $_SERVER['HTTP_HOST'] . $port . $_SERVER['REQUEST_URI'];
Expand Down Expand Up @@ -476,7 +476,7 @@ function browser_info()
}

// Quick wrapper for preg_match
function match($regex, $str, $i = 0)
function spf_match($regex, $str, $i = 0)
{
if(preg_match($regex, $str, $match) == 1)
return $match[$i];
Expand Down