forked from froxlor/Froxlor
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request froxlor#882 from heavygale/patch-3
Fix for notices "Trying to access array offset on value of type bool" in ReportsCron.php
- Loading branch information
Showing
1 changed file
with
9 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ | |
| * @author Froxlor team <[email protected]> (2010-) | ||
| * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt | ||
| * @package Cron | ||
| * | ||
| * | ||
| */ | ||
| use Froxlor\Database\Database; | ||
| use Froxlor\Settings; | ||
|
|
@@ -111,11 +111,11 @@ public static function run() | |
| 'varname' => 'trafficmaxpercent_subject' | ||
| ); | ||
| $result2 = Database::pexecute_first($result2_stmt, $result2_data); | ||
| $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['subject']), $replace_arr)); | ||
| $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['subject']), $replace_arr)); | ||
|
|
||
| $result2_data['varname'] = 'trafficmaxpercent_mailbody'; | ||
| $result2 = Database::pexecute_first($result2_stmt, $result2_data); | ||
| $mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['mailbody']), $replace_arr)); | ||
| $mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['mailbody']), $replace_arr)); | ||
|
|
||
| $_mailerror = false; | ||
| $mailerr_msg = ""; | ||
|
|
@@ -217,11 +217,11 @@ public static function run() | |
| 'varname' => 'trafficmaxpercent_subject' | ||
| ); | ||
| $result2 = Database::pexecute_first($result2_stmt, $result2_data); | ||
| $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['subject']), $replace_arr)); | ||
| $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['subject']), $replace_arr)); | ||
|
|
||
| $result2_data['varname'] = 'trafficmaxpercent_mailbody'; | ||
| $result2 = Database::pexecute_first($result2_stmt, $result2_data); | ||
| $mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['mailbody']), $replace_arr)); | ||
| $mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['mailbody']), $replace_arr)); | ||
|
|
||
| $_mailerror = false; | ||
| $mailerr_msg = ""; | ||
|
|
@@ -424,11 +424,11 @@ private static function usageDiskspace() | |
| 'varname' => 'diskmaxpercent_subject' | ||
| ); | ||
| $result2 = Database::pexecute_first($result2_stmt, $result2_data); | ||
| $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr)); | ||
| $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr)); | ||
|
|
||
| $result2_data['varname'] = 'diskmaxpercent_mailbody'; | ||
| $result2 = Database::pexecute_first($result2_stmt, $result2_data); | ||
| $mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr)); | ||
| $mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr)); | ||
|
|
||
| $_mailerror = false; | ||
| $mailerr_msg = ""; | ||
|
|
@@ -521,11 +521,11 @@ private static function usageDiskspace() | |
| 'varname' => 'diskmaxpercent_subject' | ||
| ); | ||
| $result2 = Database::pexecute_first($result2_stmt, $result2_data); | ||
| $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr)); | ||
| $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr)); | ||
|
|
||
| $result2_data['varname'] = 'diskmaxpercent_mailbody'; | ||
| $result2 = Database::pexecute_first($result2_stmt, $result2_data); | ||
| $mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr)); | ||
| $mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr)); | ||
|
|
||
| $_mailerror = false; | ||
| $mailerr_msg = ""; | ||
|
|
||