dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Frytimo pr patches for php8.1 (#6630)

Browse Source 
* Passing null to parameter #2 ($string) of type string is deprecated

* Passing null to parameter #1 ($string) of type string is deprecated

* php 8.1 fixes

* php 8.1 fixes - replace strlen($var) > 0 with !empty($var)

* php 8.1 fixes - replace ${var} with {$var}

* php 8.1 fixes - replace ${var} with {$var}

* php 8.1 fixes - replace ${var} with {$var}

* php 8.1 fixes - replace ${var} with {$var}

* php 8.1 fixes - strlower with null

* php 8.1 fixes - strreplace with null

* php 8.1 fixes - passing null to base64_decode

* php 8.1 fixes - check for false and check for null on $this->dir

* php 8.1 fixes - remove assignment of $db variable to modules object

* php 8.1 fixes - avoid sending null to substr

* php 8.1 fixes - change ${var} to {$var}

* php 8.1 fixes - check for null before preg_replace

* php 8.1 fixes - remove setting db variable on domains object

* php 8.1 fixes - set empty string if $row['domain_setting_subcategory'] is null

* php 8.1 fixes - set empty string if $_REQUEST['show'] is not available

* php 8.1 fixes

* php 8.1 fixes - correct $_POST checking syntax

* php 8.1 fixes - correct $_POST variables

* php 8.1 fixes

* Use brackets consistently

* Update user_setting_edit.php

* Change to not empty

* Update device.php

* Update text.php

---------

Co-authored-by: Tim Fry <tim@voipstratus.com>
Co-authored-by: FusionPBX <markjcrane@gmail.com>
This commit is contained in:
frytimo
2023-05-05 10:46:37 -06:00
committed by GitHub
co-authored by Tim Fry FusionPBX
parent ebbb2f1a72
commit fef8165be2
230 changed files with 1948 additions and 1937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/tcpdf/include/barcodes/pdf417.php
+5 -5
View File
@@ -835,11 +835,11 @@ class PDF417 {
if ($txtseq[1] > 0) {
// extract byte sequence before the text sequence
$prevtxtseq = substr($prevseq, $txtoffset, ($txtseq[1] - $txtoffset));
if (strlen($prevtxtseq) > 0) {
if (!empty($prevtxtseq)) {
// add BYTE sequence
if ((strlen($prevtxtseq) == 1) AND ((count($sequence_array) > 0) AND ($sequence_array[(count($sequence_array) - 1)][0] == 900))) {
if ((!empty($prevtxtseq) == 1) AND ((count($sequence_array)) AND ($sequence_array[(count($sequence_array) - 1)][0] == 900))) {
$sequence_array[] = array(913, $prevtxtseq);
} elseif ((strlen($prevtxtseq) % 6) == 0) {
} elseif ((empty($prevtxtseq) % 6)) {
$sequence_array[] = array(924, $prevtxtseq);
} else {
$sequence_array[] = array(901, $prevtxtseq);
@@ -924,7 +924,7 @@ class PDF417 {
}
case 901:
case 924: { // Byte Compaction mode latch
while (($codelen = strlen($code)) > 0) {
while (($codelen = !empty($code))) {
if ($codelen > 6) {
$rest = substr($code, 6);
$code = substr($code, 0, 6);
@@ -960,7 +960,7 @@ class PDF417 {
break;
}
case 902: { // Numeric Compaction mode latch
while (($codelen = strlen($code)) > 0) {
while (($codelen = !empty($code))) {
if ($codelen > 44) {
$rest = substr($code, 44);
$code = substr($code, 0, 44);
resources/tcpdf/include/barcodes/qrcode.php
+1 -1
View File
@@ -1443,7 +1443,7 @@ class QRcode {
* @return (int)
*/
protected function splitString() {
while (strlen($this->dataStr) > 0) {
while (!empty($this->dataStr)) {
$mode = $this->identifyMode(0);
switch ($mode) {
case QR_MODE_NM: {
resources/tcpdf/include/tcpdf_colors.php
+1 -1
View File
@@ -314,7 +314,7 @@ class TCPDF_COLORS {
return array();
}
}
if (strlen($color) == 0) {
if (empty($color)) {
return $defcol;
}
// RGB ARRAY
resources/tcpdf/include/tcpdf_fonts.php
+4 -4
View File
@@ -1793,10 +1793,10 @@ class TCPDF_FONTS {
* @public static
*/
public static function UTF8ArrSubString($strarr, $start='', $end='', $unicode=true) {
if (strlen($start) == 0) {
if (empty($start)) {
$start = 0;
}
if (strlen($end) == 0) {
if (empty($end)) {
$end = count($strarr);
}
$string = '';
@@ -1816,10 +1816,10 @@ class TCPDF_FONTS {
* @public static
*/
public static function UniArrSubString($uniarr, $start='', $end='') {
if (strlen($start) == 0) {
if (empty($start)) {
$start = 0;
}
if (strlen($end) == 0) {
if (empty($end)) {
$end = count($uniarr);
}
$string = '';
resources/tcpdf/include/tcpdf_static.php
+6 -6
View File
@@ -230,7 +230,7 @@ class TCPDF_STATIC {
if (strpos($border, 'B') !== false) {
// remove bottom line
$newkey = str_replace('B', '', $border);
if (strlen($newkey) > 0) {
if (!empty($newkey)) {
$brd[$newkey] = $style;
}
unset($brd[$border]);
@@ -241,7 +241,7 @@ class TCPDF_STATIC {
if (strpos($border, 'B') !== false) {
// remove bottom line
$newkey = str_replace('B', '', $border);
if (strlen($newkey) > 0) {
if (!empty($newkey)) {
$brd[$newkey] = $style;
}
unset($brd[$border]);
@@ -250,7 +250,7 @@ class TCPDF_STATIC {
if (strpos($border, 'T') !== false) {
// remove bottom line
$newkey = str_replace('T', '', $border);
if (strlen($newkey) > 0) {
if (!empty($newkey)) {
$brd[$newkey] = $style;
}
unset($brd[$border]);
@@ -261,7 +261,7 @@ class TCPDF_STATIC {
if (strpos($border, 'T') !== false) {
// remove bottom line
$newkey = str_replace('T', '', $border);
if (strlen($newkey) > 0) {
if (!empty($newkey)) {
$brd[$newkey] = $style;
}
unset($brd[$border]);
@@ -281,7 +281,7 @@ class TCPDF_STATIC {
* @public static
*/
public static function empty_string($str) {
return (is_null($str) OR (is_string($str) AND (strlen($str) == 0)));
return (is_null($str) OR (is_string($str) AND (empty($str))));
}
/**
@@ -1799,7 +1799,7 @@ class TCPDF_STATIC {
$ret[] = "\n";
$subject = substr($subject, ($nl + 1));
}
if (strlen($subject) > 0) {
if (!empty($subject)) {
$ret = array_merge($ret, preg_split($pattern.$modifiers, $subject, $limit, $flags));
}
return $ret;