Commit 515de029 authored by Till Brehm's avatar Till Brehm

- Removed SQL mode check from installer. The check is not needed anymore.

- Fixed #5027 add support for PHP 7.1 and 7.2 on nginx servers in apps vhost.
- suppress some warnings in simplepie.inc.php
parent 165e6af1
...@@ -225,14 +225,14 @@ class installer_base { ...@@ -225,14 +225,14 @@ class installer_base {
global $conf; global $conf;
//* check sql-mode //* 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') { 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 "Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION. Add\n\n";
echo " sql-mode=\"NO_ENGINE_SUBSTITUTION\"\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"; echo"to the mysqld-section in your mysql-config on this server and restart mysqld afterwards\n";
die(); die();
} }*/
$unwanted_sql_plugins = array('validate_password'); $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); $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 { ...@@ -2093,7 +2093,12 @@ class installer_base {
$content = str_replace('{fpm_socket}', $fpm_socket, $content); $content = str_replace('{fpm_socket}', $fpm_socket, $content);
$content = str_replace('{cgi_socket}', $cgi_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_tcp = '#';
$use_socket = ''; $use_socket = '';
} else { } else {
......
...@@ -13338,7 +13338,7 @@ class SimplePie_Parse_Date ...@@ -13338,7 +13338,7 @@ class SimplePie_Parse_Date
} }
// Convert the number of seconds to an integer, taking decimals into account // 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; return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
} }
......
...@@ -169,7 +169,12 @@ class apps_vhost_plugin { ...@@ -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_port}', $web_config['php_fpm_start_port']+1, $content);
$content = str_replace('{fpm_socket}', $fpm_socket, $content); $content = str_replace('{fpm_socket}', $fpm_socket, $content);
$content = str_replace('{cgi_socket}', $cgi_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_tcp = '#';
$use_socket = ''; $use_socket = '';
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment