diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 421afa3fc71584dd9ea7686df9d8b5c2f0c7dd33..f6bdcd514fc4c9b1b2f6b0bec68c820acc4db121 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -225,14 +225,14 @@ class installer_base { global $conf; //* check sql-mode - $check_sql_mode = $this->db->queryOneRecord("SELECT @@sql_mode"); + /*$check_sql_mode = $this->db->queryOneRecord("SELECT @@sql_mode"); if ($check_sql_mode['@@sql_mode'] != '' && $check_sql_mode['@@sql_mode'] != 'NO_ENGINE_SUBSTITUTION') { echo "Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION. Add\n\n"; echo " sql-mode=\"NO_ENGINE_SUBSTITUTION\"\n\n"; echo"to the mysqld-section in your mysql-config on this server and restart mysqld afterwards\n"; die(); - } + }*/ $unwanted_sql_plugins = array('validate_password'); $sql_plugins = $this->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins); @@ -2093,7 +2093,12 @@ class installer_base { $content = str_replace('{fpm_socket}', $fpm_socket, $content); $content = str_replace('{cgi_socket}', $cgi_socket, $content); - if(file_exists('/var/run/php5-fpm.sock') || file_exists('/var/run/php/php7.0-fpm.sock')){ + if( file_exists('/var/run/php5-fpm.sock') + || file_exists('/var/run/php/php7.0-fpm.sock') + || file_exists('/var/run/php/php7.1-fpm.sock') + || file_exists('/var/run/php/php7.2-fpm.sock') + || file_exists('/var/run/php/php7.3-fpm.sock') + ){ $use_tcp = '#'; $use_socket = ''; } else { diff --git a/interface/lib/classes/remote.d/dns.inc.php b/interface/lib/classes/remote.d/dns.inc.php index 66e9d988ff0df7ec145ca7a8cc52837ae98c29be..9938d7543b335a0699b7312e4e58710cde81409e 100644 --- a/interface/lib/classes/remote.d/dns.inc.php +++ b/interface/lib/classes/remote.d/dns.inc.php @@ -307,7 +307,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_aaaa.tform.php', $client_id, $params); } @@ -319,18 +319,19 @@ class remoting_dns extends remoting { return false; } $affected_rows = $this->updateQuery('../dns/form/dns_aaaa.tform.php', $client_id, $primary_id, $params); - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } //* Delete a record - public function dns_aaaa_delete($session_id, $primary_id) + public function dns_aaaa_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_aaaa_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_aaaa.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -357,7 +358,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_a.tform.php', $client_id, $params); } @@ -368,19 +369,20 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_a.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_a_delete($session_id, $primary_id) + public function dns_a_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_a_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_a.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -407,7 +409,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_alias.tform.php', $client_id, $params); } @@ -418,19 +420,20 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_alias.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_alias_delete($session_id, $primary_id) + public function dns_alias_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_alias_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_alias.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -457,7 +460,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_cname.tform.php', $client_id, $params); } @@ -468,19 +471,20 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_cname.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_cname_delete($session_id, $primary_id) + public function dns_cname_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_cname_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_cname.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -507,7 +511,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_hinfo.tform.php', $client_id, $params); } @@ -518,19 +522,20 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_hinfo.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_hinfo_delete($session_id, $primary_id) + public function dns_hinfo_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_hinfo_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_hinfo.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -557,7 +562,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_mx.tform.php', $client_id, $params); } @@ -568,19 +573,20 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_mx.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_mx_delete($session_id, $primary_id) + public function dns_mx_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_mx_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_mx.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -607,7 +613,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_ns.tform.php', $client_id, $params); } @@ -618,19 +624,20 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_ns.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_ns_delete($session_id, $primary_id) + public function dns_ns_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_ns_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_ns.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -657,7 +664,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_ptr.tform.php', $client_id, $params); } @@ -668,19 +675,20 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_ptr.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_ptr_delete($session_id, $primary_id) + public function dns_ptr_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_ptr_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_ptr.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -707,7 +715,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_rp.tform.php', $client_id, $params); } @@ -718,19 +726,20 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_rp.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_rp_delete($session_id, $primary_id) + public function dns_rp_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_rp_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_rp.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -757,7 +766,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_srv.tform.php', $client_id, $params); } @@ -768,19 +777,20 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_srv.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_srv_delete($session_id, $primary_id) + public function dns_srv_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_srv_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_srv.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -807,7 +817,7 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_txt.tform.php', $client_id, $params); } @@ -818,19 +828,20 @@ class remoting_dns extends remoting { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } - if($update_serial != false) $this->increase_serial($session_id, $client_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_txt.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_txt_delete($session_id, $primary_id) + public function dns_txt_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_txt_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_txt.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php index 5d36c09d34b62c7bf2fb1b235099b5344ac6de99..626e801e426242351a7e29034808486800332ac6 100644 --- a/interface/lib/classes/simplepie.inc.php +++ b/interface/lib/classes/simplepie.inc.php @@ -13338,7 +13338,7 @@ class SimplePie_Parse_Date } // Convert the number of seconds to an integer, taking decimals into account - $second = round($match[6] + $match[7] / pow(10, strlen($match[7]))); + $second = @round($match[6] + $match[7] / @pow(10, strlen($match[7]))); return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone; } diff --git a/interface/web/dns/dns_dmarc_edit.php b/interface/web/dns/dns_dmarc_edit.php index 7f915074d75deccbf9f3f62cbb2e75a7b8ab6da2..6b720c0f38c9486b5f901ff7ab8a21630499a70f 100644 --- a/interface/web/dns/dns_dmarc_edit.php +++ b/interface/web/dns/dns_dmarc_edit.php @@ -287,7 +287,7 @@ class page_action extends tform_actions { unset($temp); } - $fo_rec = ''; + $fo_rec = array(); if (isset($this->dataRecord['dmarc_fo0'])) $fo_rec[] = '0'; if (isset($this->dataRecord['dmarc_fo1'])) $fo_rec[] = '1'; if (isset($this->dataRecord['dmarc_fod'])) $fo_rec[] = 'd'; diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php index dd8be5aa68791472b47fa90e76a32f6e4335b5e5..5016bbc9e2a2710717ff48b8a94a5b398fb1bb64 100755 --- a/server/lib/app.inc.php +++ b/server/lib/app.inc.php @@ -117,7 +117,7 @@ class app { 2 = ERROR */ - function log($msg, $priority = 0) { + function log($msg, $priority = 0, $dblog = true) { global $conf; @@ -148,7 +148,7 @@ class app { fclose($fp); // Log to database - if(isset($this->dbmaster)) { + if($dblog === true && isset($this->dbmaster)) { $server_id = $conf['server_id']; $loglevel = $priority; $message = $msg; diff --git a/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php b/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php index d5beee70bcf1dac36ac38f1f2bf7108bd9c4e5a2..43071b83872b26048266ba9250dff926c6997d95 100644 --- a/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php +++ b/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php @@ -72,7 +72,13 @@ class cronjob_monitor_rkhunter extends cronjob { /* * Fetch the output */ - $data['output'] = shell_exec('rkhunter --update --checkall --nocolors --skip-keypress'); + + // Do not try to update rkhunter on Debian and Ubuntu, rkhunter is keept up to date with apt. + if(file_exists('/etc/debian_version')) { + $data['output'] = shell_exec('rkhunter --checkall --nocolors --skip-keypress'); + } else { + $data['output'] = shell_exec('rkhunter --update --checkall --nocolors --skip-keypress'); + } /* * At this moment, there is no state (maybe later) diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php index 9b34dc4c1f3f4d3953fcd42ea8db9ec028dbee14..424867f095840e4da8862adfaff7a70a6aa782da 100644 --- a/server/lib/classes/db_mysql.inc.php +++ b/server/lib/classes/db_mysql.inc.php @@ -476,7 +476,7 @@ class db if($this->show_error_messages && $conf['demo_mode'] === false) { echo $sErrormsg . $sAddMsg; } elseif(is_object($app) && method_exists($app, 'log') && $bNoLog == false) { - $app->log($sErrormsg . $sAddMsg . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN); + $app->log($sErrormsg . $sAddMsg . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN, false); } elseif(php_sapi_name() == 'cli') { echo $sErrormsg . $sAddMsg; } diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php index cf01df692d315540b7190779f289b04d728f1d14..88b5aa290cabb3c953b5a2e5ea10ceda14ecdcdc 100644 --- a/server/plugins-available/apps_vhost_plugin.inc.php +++ b/server/plugins-available/apps_vhost_plugin.inc.php @@ -169,7 +169,12 @@ class apps_vhost_plugin { //$content = str_replace('{fpm_port}', $web_config['php_fpm_start_port']+1, $content); $content = str_replace('{fpm_socket}', $fpm_socket, $content); $content = str_replace('{cgi_socket}', $cgi_socket, $content); - if(file_exists('/var/run/php5-fpm.sock') || file_exists('/var/run/php/php7.0-fpm.sock')){ + if( file_exists('/var/run/php5-fpm.sock') + || file_exists('/var/run/php/php7.0-fpm.sock') + || file_exists('/var/run/php/php7.1-fpm.sock') + || file_exists('/var/run/php/php7.2-fpm.sock') + || file_exists('/var/run/php/php7.3-fpm.sock') + ){ $use_tcp = '#'; $use_socket = ''; } else {