Skip to content

Update files with deprecated functions for PHP 8.1 #23

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update files with deprecated functions for PHP 8.1 #23

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions birthdays.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ function Birthday2vCal($date, $age) {
$base_from_where AND $table.bmonth = $month_lookup.bmonth AND $table.bday > 0
ORDER BY prio ASC;";

$result = mysql_query($sql);
$resultsnumber = mysql_num_rows($result);
$result = mysqli_query($db,$sql);
$resultsnumber = mysqli_num_rows($result);

while ($myrow = mysql_fetch_array($result))
while ($myrow = mysqli_fetch_array($result))
{
$firstname = $myrow["firstname"];
$id = $myrow["id"];
Expand Down Expand Up @@ -128,11 +128,11 @@ function Birthday2vCal($date, $age) {

// Last year
//* -- commented to reduce traffic
$date = gmmktime(0,0,0,$bmonth_num,$bday,date('Y')-1,0);
$date = gmmktime(0,0,0,$bmonth_num,$bday,date('Y')-1);
Birthday2vCal($date, $addr->getBirthday()->getAge());
//*/

$date = gmmktime(0,0,0,$bmonth_num,$bday,date('Y'),0);
$date = gmmktime(0,0,0,$bmonth_num,$bday,date('Y'));
Birthday2vCal($date, $addr->getBirthday()->getAge(1));

// Next year
Expand Down
6 changes: 3 additions & 3 deletions config/cfg.user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
$userlist['simpletest']['domain'] = 9999;
//*/

/*

// Setup a "readonly" user
$userlist['view']['pass'] = "apassword";
$userlist['view']['role'] = "readonly";

/*
// Setup a user accessing only one group
$userlist['mygroup']['pass'] = "apassword";
$userlist['mygroup']['group'] = "My group";
Expand Down Expand Up @@ -47,7 +47,7 @@
$skin_color = "red"; // global skin color, e.g. on login

// blue, brown, green, grey, pink, purple, red, turquoise, yellow
$domain[0]['skin'] = "red";
$domain[0]['skin'] = "blue";
$domain[1]['skin'] = "pink";
$domain[2]['skin'] = "yellow";

Expand Down
50 changes: 25 additions & 25 deletions include/address.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
function getIfSetFromAddr($addr_array, $key) {

if(isset($addr_array[$key])) {
// $result = mysql_real_escape_string($addr_array[$key]);
// $result = mysqli_real_escape_string($addr_array[$key]);
$result = $addr_array[$key];
} else {
$result = "";
Expand All @@ -30,11 +30,11 @@ function echoIfSet($addr_array, $key) {

function deleteAddresses($part_sql) {

global $keep_history, $domain_id, $base_from_where, $table, $table_grp_adr, $table_groups;
global $db, $keep_history, $domain_id, $base_from_where, $table, $table_grp_adr, $table_groups;

$sql = "SELECT * FROM $base_from_where AND ".$part_sql;
$result = mysql_query($sql);
$resultsnumber = mysql_numrows($result);
$result = mysqli_query($db, $sql);
$resultsnumber = mysqli_num_rows($result);

$is_valid = $resultsnumber > 0;

Expand All @@ -43,16 +43,16 @@ function deleteAddresses($part_sql) {
$sql = "UPDATE $table
SET deprecated = now()
WHERE deprecated is null AND ".$part_sql." AND domain_id = ".$domain_id;
mysql_query($sql);
mysqli_query($db, $sql);
$sql = "UPDATE $table_grp_adr
SET deprecated = now()
WHERE deprecated is null AND ".$part_sql." AND domain_id = ".$domain_id;
mysql_query($sql);
mysqli_query($db, $sql);
} else {
$sql = "DELETE FROM $table_grp_adr WHERE ".$part_sql." AND domain_id = ".$domain_id;
mysql_query($sql);
mysqli_query($db, $sql);
$sql = "DELETE FROM $table WHERE ".$part_sql." AND domain_id = ".$domain_id;
mysql_query($sql);
mysqli_query($db, $sql);
}
}

Expand All @@ -61,7 +61,7 @@ function deleteAddresses($part_sql) {

function saveAddress($addr_array, $group_name = "") {

global $domain_id, $table, $table_grp_adr, $table_groups, $month_lookup, $base_from_where;
global $db, $domain_id, $table, $table_grp_adr, $table_groups, $month_lookup, $base_from_where;

if(isset($addr_array['id'])) {
$set_id = "'".$addr_array['id']."'";
Expand Down Expand Up @@ -101,28 +101,28 @@ function saveAddress($addr_array, $group_name = "") {
, '".getIfSetFromAddr($addr_array, 'notes')."' notes
, now(), now()
FROM ".$src_tbl;
$result = mysql_query($sql);
$result = mysqli_query($db, $sql);

if(mysql_errno() > 0) {
echo "MySQL: ".mysql_errno().": ".mysql_error();
if(mysqli_errno($db) > 0) {
echo "MySQL: ".mysqli_errno().": ".mysqli_error();
}

$sql = "SELECT max(id) max_id from $table";
$result = mysql_query($sql);
$rec = mysql_fetch_array($result);
$result = mysqli_query($db, $sql);
$rec = mysqli_fetch_array($result);
$id = $rec['max_id'];

if(!isset($addr_array['id']) && $group_name) {
$sql = "INSERT INTO $table_grp_adr SELECT $domain_id domain_id, $id id, group_id, now(), now(), NULL FROM $table_groups WHERE group_name = '$group_name'";
$result = mysql_query($sql);
$result = mysqli_query($db, $sql);
}

return $id;
}

function updateAddress($addr, $keep_photo = true) {

global $keep_history, $domain_id, $base_from_where, $table, $table_grp_adr, $table_groups, $only_phone;
global $db, $keep_history, $domain_id, $base_from_where, $table, $table_grp_adr, $table_groups, $only_phone;

$addresses = Addresses::withID($addr['id']);
$resultsnumber = $addresses->count();
Expand All @@ -146,7 +146,7 @@ function updateAddress($addr, $keep_photo = true) {
WHERE deprecated is null
AND id = '".$addr['id']."'
AND domain_id = '".$domain_id."';";
$result = mysql_query($sql);
$result = mysqli_query($db, $sql);

saveAddress($addr);
} else {
Expand Down Expand Up @@ -178,7 +178,7 @@ function updateAddress($addr, $keep_photo = true) {
, modified = now()
WHERE id = '".$addr['id']."'
AND domain_id = '$domain_id';";
$result = mysql_query($sql);
$result = mysqli_query($db, $sql);
}
// header("Location: view?id=$id");
}
Expand Down Expand Up @@ -329,20 +329,20 @@ class Addresses {

function likePhone($row, $searchword) {

global $phone_delims;
global $db, $phone_delims;

$replace = $row;
$like = "'$searchword'";
foreach($phone_delims as $phone_delim) {
$replace = "replace(".$replace.", '".mysql_real_escape_string($phone_delim)."','')";
$like = "replace(".$like. ", '".mysql_real_escape_string($phone_delim)."','')";
$replace = "replace(".$replace.", '".mysqli_real_escape_string($db, $phone_delim)."','')";
$like = "replace(".$like. ", '".mysqli_real_escape_string($db, $phone_delim)."','')";
}
return $replace." LIKE CONCAT('%',".$like.",'%')";
}

protected function loadBy($load_type, $searchstring, $alphabet = "") {

global $base_from_where, $table;
global $db, $base_from_where, $table;

$sql = "SELECT DISTINCT $table.* FROM $base_from_where";

Expand Down Expand Up @@ -394,7 +394,7 @@ protected function loadBy($load_type, $searchstring, $alphabet = "") {
$sql .= " LIMIT ".($page-1)*$pagesize.",".$pagesize;
}
//*/
$this->result = mysql_query($sql);
$this->result = mysqli_query($db, $sql);
}

public static function withSearchString($searchstring, $alphabet = "") {
Expand All @@ -411,7 +411,7 @@ public static function withID( $id ) {

public function nextAddress() {

$myrow = mysql_fetch_array($this->result);
$myrow = mysqli_fetch_array($this->result);
if($myrow) {
return new Address(trimAll($myrow));
} else {
Expand All @@ -424,7 +424,7 @@ public function getResults() {
}

public function count() {
return mysql_numrows($this->getResults());
return mysqli_num_rows($this->getResults());
}
}
?>
Loading