Fixes/cleanup:

- added missing curly braces (and some absent caused parser errors)
- <include|require>[_once] are keywords, so don't use them as such
- removed/added empty lines

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/bin/daemon.php b/bin/daemon.php
index 6b0e377a3a1bfa0126c8a4bfe9b5d25efebd603c..b51dd392ef7fdd1e7c831871ab15a55f38df4575 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -38,7 +38,7 @@ if (substr($directory, 0, 1) != "/") {
 }
 $directory = realpath($directory."/..");
 
-@include($directory."/.htconfig.php");
+include $directory."/.htconfig.php";
 
 if (!isset($pidfile)) {
        die('Please specify a pid file in the variable $pidfile in the .htconfig.php. For example:'."\n".

diff --git a/mod/admin.php b/mod/admin.php
index 7eadbb79edc893f6b5763f74d35a1e9b3871bbd2..d195128a39d74b455b531522a50f7b3933960a31 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -64,7 +64,7 @@ function admin_post(App $a)
                        case 'addons':
                                if ($a->argc > 2 &&
                                        is_file("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php")) {
-                                       @include_once("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php");
+                                       include_once "addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php";
                                        if (function_exists($a->argv[2] . '_addon_admin_post')) {
                                                $func = $a->argv[2] . '_addon_admin_post';
                                                $func($a);
@@ -1922,7 +1922,7 @@ function admin_page_addons(App $a)
 
                $admin_form = "";
                if (in_array($addon, $a->addons_admin)) {
-                       @require_once("addon/$addon/$addon.php");
+                       require_once "addon/$addon/$addon.php";
                        $func = $addon . '_addon_admin';
                        $func($a, $admin_form);
                }