Browse Source

Fix PHP 8.1 ringback errors

markjcrane 2 years ago
parent
commit
2121cb4b1b
1 changed files with 5 additions and 5 deletions
  1. 5 5
      resources/classes/ringbacks.php

+ 5 - 5
resources/classes/ringbacks.php

@@ -51,7 +51,7 @@ if (!class_exists('ringbacks')) {
 				$sql .= "order by var_name asc ";
 				$database = new database;
 				$ringtones = $database->select($sql, null, 'all');
-				if (is_array($ringtones) && @sizeof($ringtones) != 0) {
+				if (!empty($ringtones)) {
 					foreach ($ringtones as $ringtone) {
 						$ringtone = $ringtone['var_name'];
 						$label = $text['label-'.$ringtone];
@@ -109,7 +109,7 @@ if (!class_exists('ringbacks')) {
 				$select .= "		<option value=''></option>\n";
 
 			//music list
-				if (count($this->music_list) > 0) {
+				if (!empty($this->music_list)) {
 					$select .= "	<optgroup label='".$text['label-music_on_hold']."'>\n";
 					$previous_name = '';
 					foreach ($this->music_list as $row) {
@@ -127,7 +127,7 @@ if (!class_exists('ringbacks')) {
 				}
 
 			//recordings
-				if (is_array($this->recordings_list) && sizeof($this->recordings_list) > 0) {
+				if (!empty($this->recordings_list)) {
 					$select .= "	<optgroup label='".$text['label-recordings']."'>";
 					foreach ($this->recordings_list as $recording_value => $recording_name) {
 						$select .= "		<option value='".$recording_value."' ".(($selected == $recording_value) ? 'selected="selected"' : null).">".$recording_name."</option>\n";
@@ -155,7 +155,7 @@ if (!class_exists('ringbacks')) {
 				}
 
 			//ringtones
-				if (sizeof($this->ringtones_list) > 0) {
+				if (!empty($this->ringtones_list)) {
 					$selected_ringtone = $selected;
 					$selected_ringtone = preg_replace('/\A\${/',"",$selected_ringtone);
 					$selected_ringtone = preg_replace('/}\z/',"",$selected_ringtone);
@@ -171,7 +171,7 @@ if (!class_exists('ringbacks')) {
 				}
 
 			//tones
-				if (sizeof($this->tones_list) > 0) {
+				if (!empty($this->tones_list)) {
 					$selected_tone = $selected;
 					$selected_tone = preg_replace('/\A\${/',"",$selected_tone);
 					$selected_tone = preg_replace('/}\z/',"",$selected_tone);