Skip to content

Commit 9b92212

Browse files
tbrehmtbrehm
committed
Fixed various PHP 8.2 related warnings.
1 parent c053973 commit 9b92212

13 files changed

+48
-33
lines changed

‎install/tpl/system.ini.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ vhost_aliasdomains=n
3535
client_username_web_check_disabled=n
3636
backups_include_into_web_quota=n
3737
reseller_can_use_options=n
38-
web_php_options=no,fast-cgi,mod,php-fpm
38+
web_php_options=no,fast-cgi,php-fpm
3939
show_aps_menu=n
4040
client_protection=y
4141
ssh_authentication=

‎server/lib/classes/system.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,6 +1151,7 @@ function add_user_to_group($group, $user = 'admispconfig'){
11511151
$group_file = $app->file->rf($this->server_conf['group_datei']);
11521152
$group_file_lines = explode("\n", $group_file);
11531153
foreach($group_file_lines as $group_file_line){
1154+
if(empty($group_file_line)) continue;
11541155
list($group_name, $group_x, $group_id, $group_users) = explode(':', $group_file_line);
11551156
if($group_name == $group){
11561157
$group_users = explode(',', str_replace(' ', '', $group_users));

‎server/plugins-available/apache2_plugin.inc.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,7 +2189,7 @@ function delete($event_name, $data) {
21892189
}
21902190

21912191
if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain' || $data['old']['type'] == 'vhostalias'){
2192-
if(is_array($log_folders) && !empty($log_folders)){
2192+
if(isset($log_folders) && is_array($log_folders) && !empty($log_folders)){
21932193
foreach($log_folders as $log_folder){
21942194
$app->system->exec_safe('umount -l ? 2>/dev/null', $data['old']['document_root'].'/'.$log_folder);
21952195
}
@@ -2209,7 +2209,7 @@ function delete($event_name, $data) {
22092209
}
22102210

22112211
//* remove mountpoint from fstab
2212-
if(is_array($log_folders) && !empty($log_folders)){
2212+
if(isset($log_folders) && is_array($log_folders) && !empty($log_folders)){
22132213
foreach($log_folders as $log_folder){
22142214
$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind';
22152215
$app->system->removeLine('/etc/fstab', $fstab_line);
@@ -2365,7 +2365,7 @@ function delete($event_name, $data) {
23652365

23662366
// Delete the symlinks for the sites
23672367
$client = $app->db->queryOneRecord('SELECT client_id FROM sys_group WHERE sys_group.groupid = ?', $data['old']['sys_groupid']);
2368-
$client_id = intval($client['client_id']);
2368+
$client_id = (is_array($client) && isset($client['client_id']))?intval($client['client_id']):0;
23692369
unset($client);
23702370
$tmp_symlinks_array = explode(':', $web_config['website_symlinks']);
23712371
if(is_array($tmp_symlinks_array)) {
@@ -3391,7 +3391,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
33913391

33923392
// Custom php.ini settings
33933393
$final_php_ini_settings = array();
3394-
$custom_php_ini_settings = trim($data['new']['custom_php_ini']);
3394+
$custom_php_ini_settings = (isset($data['new']['custom_php_ini']) && !is_null($data['new']['custom_php_ini']))?trim($data['new']['custom_php_ini']):'';
33953395

33963396
if(intval($data['new']['directive_snippets_id']) > 0){
33973397
$snippet = $app->db->queryOneRecord("SELECT * FROM directive_snippets WHERE directive_snippets_id = ? AND type = 'apache' AND active = 'y' AND customer_viewable = 'y'", intval($data['new']['directive_snippets_id']));

‎server/plugins-available/cron_jailkit_plugin.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class cron_jailkit_plugin {
3434
//* $plugin_name and $class_name have to be the same then the name of this class
3535
var $plugin_name = 'cron_jailkit_plugin';
3636
var $class_name = 'cron_jailkit_plugin';
37+
var $parent_domain = array();
3738

3839
//* This function is called during ispconfig installation to determine
3940
// if a symlink shall be created for this plugin.

‎server/plugins-available/cron_plugin.inc.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class cron_plugin {
3333

3434
var $plugin_name = 'cron_plugin';
3535
var $class_name = 'cron_plugin';
36+
var $parent_domain = array();
3637

3738
// private variables
3839
var $action = '';
@@ -106,7 +107,7 @@ function update($event_name, $data) {
106107

107108
// Get the client ID
108109
$client = $app->dbmaster->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ?", $data["new"]["sys_groupid"]);
109-
$client_id = intval($client["client_id"]);
110+
$client_id = (is_array($client) && isset($client["client_id"]))?intval($client["client_id"]):0;
110111
unset($client);
111112

112113
// Create group and user, if not exist

‎server/plugins-available/mail_plugin.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ function user_insert($event_name, $data) {
222222
$placeholders = array(
223223
'{domain}' => "$domain",
224224
'{email}' => $data["new"]["email"],
225-
'{admin_mail}' => ($global_mail_config['admin_mail'] != '' ? $global_mail_config['admin_mail'] : 'root'),
226-
'{admin_name}' => ($global_mail_config['admin_name'] != '' ? $global_mail_config['admin_name'] : ''),
225+
'{admin_mail}' => (isset($global_mail_config['admin_mail']) && $global_mail_config['admin_mail'] != '' ? $global_mail_config['admin_mail'] : 'root'),
226+
'{admin_name}' => (isset($global_mail_config['admin_name']) && $global_mail_config['admin_name'] != '' ? $global_mail_config['admin_name'] : ''),
227227
);
228228

229229
//* Get from address

‎server/plugins-available/maildeliver_plugin.inc.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,18 +134,20 @@ function update($event_name, $data) {
134134
}
135135

136136
// Custom filters
137-
if($data["new"]["custom_mailfilter"] == 'NULL') $data["new"]["custom_mailfilter"] = '';
137+
if(is_null($data["new"]["custom_mailfilter"])) $data["new"]["custom_mailfilter"] = '';
138138
$tpl->setVar('custom_mailfilter', str_replace("\r\n","\n",$data["new"]["custom_mailfilter"]));
139139

140140
// Move junk
141141
$tpl->setVar('move_junk', $data["new"]["move_junk"]);
142142
$tpl->setVar('imap_prefix', $data["new"]["imap_prefix"]);
143143

144144
// Set autoresponder start date
145+
if(is_null($data["new"]["autoresponder_start_date"])) $data["new"]["autoresponder_start_date"] = '';
145146
$data["new"]["autoresponder_start_date"] = str_replace(" ", "T", $data["new"]["autoresponder_start_date"]);
146147
$tpl->setVar('start_date', $data["new"]["autoresponder_start_date"]);
147148

148149
// Set autoresponder end date
150+
if(is_null($data["new"]["autoresponder_end_date"])) $data["new"]["autoresponder_end_date"] = '';
149151
$data["new"]["autoresponder_end_date"] = str_replace(" ", "T", $data["new"]["autoresponder_end_date"]);
150152
$tpl->setVar('end_date', $data["new"]["autoresponder_end_date"]);
151153

@@ -157,10 +159,11 @@ function update($event_name, $data) {
157159
$tpl->setVar('autoresponder_subject', $data["new"]["autoresponder_subject"]);
158160

159161
// Autoresponder Text
162+
if(is_null($data["new"]["autoresponder_text"])) $data["new"]["autoresponder_text"] = '';
160163
$data["new"]["autoresponder_text"] = str_replace("\"", "'", $data["new"]["autoresponder_text"]);
161164
$tpl->setVar('autoresponder_text', $data["new"]["autoresponder_text"]);
162165

163-
if (! defined($address_str)) {
166+
if (!isset($address_str)) {
164167
//* Set alias addresses for autoresponder
165168
$sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = ?";
166169
$records = $app->db->queryAllRecords($sql, $data["new"]["email"]);

‎server/plugins-available/nginx_plugin.inc.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function ssl($event_name, $data) {
101101
// load the server configuration options
102102
$app->uses('getconf');
103103
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
104-
if ($web_config['CA_path']!='' && !file_exists($web_config['CA_path'].'/openssl.cnf'))
104+
if (isset($web_config['CA_path']) && $web_config['CA_path'] != '' && !file_exists($web_config['CA_path'].'/openssl.cnf'))
105105
$app->log("CA path error, file does not exist:".$web_config['CA_path'].'/openssl.cnf', LOGLEVEL_ERROR);
106106

107107
//* Only vhosts can have a ssl cert
@@ -693,7 +693,7 @@ function update($event_name, $data) {
693693

694694
// Get the client ID
695695
$client = $app->dbmaster->queryOneRecord('SELECT client_id FROM sys_group WHERE sys_group.groupid = ?', $data['new']['sys_groupid']);
696-
$client_id = intval($client['client_id']);
696+
$client_id = (is_array($client)) ? intval($client['client_id']) : 0;
697697
unset($client);
698698

699699
// Remove old symlinks, if site is renamed
@@ -1277,7 +1277,7 @@ function update($event_name, $data) {
12771277
}
12781278

12791279
// folder_directive_snippets
1280-
if(trim($data['new']['folder_directive_snippets']) != ''){
1280+
if(isset($data['new']['folder_directive_snippets']) && !is_null($data['new']['folder_directive_snippets']) && trim($data['new']['folder_directive_snippets']) != ''){
12811281
$data['new']['folder_directive_snippets'] = trim($data['new']['folder_directive_snippets']);
12821282
$data['new']['folder_directive_snippets'] = str_replace("\r\n", "\n", $data['new']['folder_directive_snippets']);
12831283
$data['new']['folder_directive_snippets'] = str_replace("\r", "\n", $data['new']['folder_directive_snippets']);
@@ -1627,7 +1627,7 @@ function update($event_name, $data) {
16271627
$server_alias = array();
16281628

16291629
// get autoalias
1630-
$auto_alias = $web_config['website_autoalias'];
1630+
$auto_alias = (isset($web_config['website_autoalias']))?$web_config['website_autoalias']:'';
16311631
if($auto_alias != '') {
16321632
// get the client username
16331633
$client = $app->db->queryOneRecord("SELECT `username` FROM `client` WHERE `client_id` = ?", $client_id);
@@ -1968,7 +1968,7 @@ function update($event_name, $data) {
19681968

19691969
// create password file for stats directory
19701970
if(!is_file($data['new']['document_root'].'/' . $stats_web_folder . '/stats/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
1971-
if(trim($data['new']['stats_password']) != '') {
1971+
if(isset($data['new']['stats_password']) && !is_null($data['new']['stats_password']) && trim($data['new']['stats_password']) != '') {
19721972
$htp_file = 'admin:'.trim($data['new']['stats_password']);
19731973
$app->system->file_put_contents($data['new']['document_root'].'/' . $stats_web_folder . '/stats/.htpasswd_stats', $htp_file);
19741974
$app->system->chmod($data['new']['document_root'].'/' . $stats_web_folder . '/stats/.htpasswd_stats', 0755);
@@ -2961,7 +2961,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
29612961

29622962
// Custom php.ini settings
29632963
$final_php_ini_settings = array();
2964-
$custom_php_ini_settings = trim($data['new']['custom_php_ini']);
2964+
$custom_php_ini_settings = (isset($data['new']['custom_php_ini']) && !is_null($data['new']['custom_php_ini'])) ? trim($data['new']['custom_php_ini']) : '';
29652965

29662966
if(intval($data['new']['directive_snippets_id']) > 0){
29672967
$snippet = $app->db->queryOneRecord("SELECT * FROM directive_snippets WHERE directive_snippets_id = ? AND type = 'nginx' AND active = 'y' AND customer_viewable = 'y'", intval($data['new']['directive_snippets_id']));

‎server/plugins-available/postfix_server_plugin.inc.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ function update($event_name, $data) {
152152
$app->system->exec_safe("postconf -e ?", 'smtpd_client_restrictions = '.implode(", ", $new_options));
153153
}
154154

155-
if ($mail_config['reject_sender_login_mismatch'] != $old_ini_data['mail']['reject_sender_login_mismatch']) {
155+
if (isset($mail_config['reject_sender_login_mismatch']) && $mail_config['reject_sender_login_mismatch'] != $old_ini_data['mail']['reject_sender_login_mismatch']) {
156156
$options = preg_split("/,\s*/", exec("postconf -h smtpd_sender_restrictions"));
157157
$new_options = array();
158158
foreach ($options as $key => $value) {
@@ -185,7 +185,7 @@ function update($event_name, $data) {
185185
$app->system->exec_safe("postconf -e ?", 'smtpd_sender_restrictions = '.implode(", ", $new_options));
186186
}
187187

188-
if ($mail_config['reject_unknown']) {
188+
if (isset($mail_config['reject_unknown'])) {
189189
if (($mail_config['reject_unknown'] === 'client') || ($mail_config['reject_unknown'] === 'client_helo')) {
190190
$options = preg_split("/,\s*/", exec("postconf -h smtpd_client_restrictions"));
191191
$new_options = array();
@@ -263,7 +263,7 @@ function update($event_name, $data) {
263263
}
264264
}
265265

266-
if ($mail_config['stress_adaptive']) {
266+
if (isset($mail_config['stress_adaptive'])) {
267267
if ($mail_config['stress_adaptive'] == 'y') {
268268
if (version_compare($postfix_version , '3.0', '>=')) {
269269
$app->system->exec_safe("postconf -e ?", 'in_flow_delay = ${stress?{3}:{1}}s');
@@ -363,8 +363,8 @@ function update($event_name, $data) {
363363
}
364364
exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'");
365365

366-
$rslm = ($mail_config['reject_sender_login_mismatch'] == 'y') ? "reject_sender_login_mismatch," : "";
367-
$raslm = ($mail_config['reject_sender_login_mismatch'] == 'y') ? "reject_authenticated_sender_login_mismatch," : "";
366+
$rslm = (isset($mail_config['reject_sender_login_mismatch']) && $mail_config['reject_sender_login_mismatch'] == 'y') ? "reject_sender_login_mismatch," : "";
367+
$raslm = (isset($mail_config['reject_sender_login_mismatch']) && $mail_config['reject_sender_login_mismatch'] == 'y') ? "reject_authenticated_sender_login_mismatch," : "";
368368

369369
if($mail_config['content_filter'] == 'rspamd'){
370370
exec("postconf -X 'receive_override_options'");

‎server/plugins-available/rspamd_plugin.inc.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class rspamd_plugin {
3333
var $plugin_name = 'rspamd_plugin';
3434
var $class_name = 'rspamd_plugin';
3535
var $users_config_dir = '/etc/rspamd/local.d/users/';
36+
var $action = '';
3637

3738
//* This function is called during ispconfig installation to determine
3839
// if a symlink shall be created for this plugin.
@@ -281,7 +282,7 @@ function user_settings_update($event_name, $data, $internal = false) {
281282
$app->system->mkdirpath($this->users_config_dir);
282283
}
283284

284-
if((!$this->isValidEmail($app->functions->idn_encode($email_address))) || intval($data['new']['policy_id']) == 0 && $type == 'spamfilter_user') {
285+
if((!$this->isValidEmail($app->functions->idn_encode($email_address))) || !isset($data['new']['policy_id']) || intval($data['new']['policy_id']) == 0 && $type == 'spamfilter_user') {
285286
if(is_file($settings_file)) {
286287
unlink($settings_file);
287288
}
@@ -534,6 +535,11 @@ function server_update($event_name, $data) {
534535
$tpl->newTemplate("rspamd_{$f}.master");
535536
}
536537

538+
if(!isset($mail_config['rspamd_redis_servers'])) $mail_config['rspamd_redis_servers'] = '';
539+
if(!isset($mail_config['rspamd_redis_password'])) $mail_config['rspamd_redis_password'] = '';
540+
if(!isset($mail_config['rspamd_redis_bayes_servers'])) $mail_config['rspamd_redis_bayes_servers'] = '';
541+
if(!isset($mail_config['rspamd_redis_bayes_password'])) $mail_config['rspamd_redis_bayes_password'] = '';
542+
537543
$tpl->setVar('dkim_path', $mail_config['dkim_path']);
538544
$tpl->setVar('rspamd_redis_servers', $mail_config['rspamd_redis_servers']);
539545
$tpl->setVar('rspamd_redis_password', $mail_config['rspamd_redis_password']);

0 commit comments

Comments
 (0)