maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Fix fatal error in phpErrHandler with PHP7 and suit cronjob for various PHP versions

Browse Source
This commit is contained in:
Johannes Feichtner
2015-11-06 23:39:56 +01:00
parent 73c8643218
commit 387be846f1
7 changed files with 178 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/125.cronjob.php
View File

@@ -34,7 +34,7 @@ return array(
'settinggroup' => 'system', 'settinggroup' => 'system',
'varname' => 'croncmdline', 'varname' => 'croncmdline',
'type' => 'string', 'type' => 'string',
'default' => '/usr/bin/nice -n 5 /usr/bin/php5 -q', 'default' => '/usr/bin/nice -n 5 /usr/bin/php -q',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
), ),
'system_crondreload' => array( 'system_crondreload' => array(

2
install/froxlor.sql
View File

@@ -511,7 +511,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('system', 'mailtraffic_enabled', '1'), ('system', 'mailtraffic_enabled', '1'),
('system', 'cronconfig', '/etc/cron.d/froxlor'), ('system', 'cronconfig', '/etc/cron.d/froxlor'),
('system', 'crondreload', '/etc/init.d/cron reload'), ('system', 'crondreload', '/etc/init.d/cron reload'),
('system', 'croncmdline', '/usr/bin/nice -n 5 /usr/bin/php5 -q'), ('system', 'croncmdline', '/usr/bin/nice -n 5 /usr/bin/php -q'),
('system', 'cron_allowautoupdate', '0'), ('system', 'cron_allowautoupdate', '0'),
('system', 'dns_createhostnameentry', '0'), ('system', 'dns_createhostnameentry', '0'),
('system', 'send_cron_errors', '0'), ('system', 'send_cron_errors', '0'),

2
lib/configfiles/jessie.xml
View File

@@ -3881,7 +3881,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
# #
# Please check that all following paths are correct # Please check that all following paths are correct
# #
*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php */5 * * * * root /usr/bin/nice -n 5 /usr/bin/php -q <BASE_PATH>scripts/froxlor_master_cronjob.php
]]> ]]>
</content> </content>
</file> </file>

2
lib/configfiles/precise.xml
View File

@@ -1446,7 +1446,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
# #
# Please check that all following paths are correct # Please check that all following paths are correct
# #
*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php */5 * * * * root /usr/bin/nice -n 5 /usr/bin/php -q <BASE_PATH>scripts/froxlor_master_cronjob.php
]]> ]]>
</content> </content>
</file> </file>

2
lib/configfiles/trusty.xml
View File

@@ -1449,7 +1449,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
# #
# Please check that all following paths are correct # Please check that all following paths are correct
# #
*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php */5 * * * * root /usr/bin/nice -n 5 /usr/bin/php -q <BASE_PATH>scripts/froxlor_master_cronjob.php
]]> ]]>
</content> </content>
</file> </file>

2
lib/configfiles/wheezy.xml
View File

@@ -4962,7 +4962,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
# #
# Please check that all following paths are correct # Please check that all following paths are correct
# #
*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php */5 * * * * root /usr/bin/nice -n 5 /usr/bin/php -q <BASE_PATH>scripts/froxlor_master_cronjob.php
]]> ]]>
</content> </content>
</file> </file>

2
lib/functions/froxlor/function.phpErrHandler.php
View File

@@ -11,7 +11,7 @@
* *
* @return void|boolean * @return void|boolean
*/ */
function phpErrHandler($errno, $errstr, $errfile, $errline, array $errcontext) { function phpErrHandler($errno, $errstr, $errfile, $errline, $errcontext) {
if (!(error_reporting() & $errno)) { if (!(error_reporting() & $errno)) {
// This error code is not included in error_reporting // This error code is not included in error_reporting