Added check for file size to prevent loading deprecated include files (which are...

[mailer.git] / inc / inc-functions.php

diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index ee808594438db16295ca8c916ad7f772bfc504de..ece36ddfa9c31c2e05614f64cd10d55c0f5e08ec 100644 (file)
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -118,7 +116,7 @@ function loadInclude ($inc) {
        // Do we have cache?
        if (!isset($GLOBALS['inc_loaded'][$inc])) {
                // Add the path. This is why we need a trailing slash in config.php
-               $GLOBALS['inc_loaded'][$inc] = getConfig('PATH') . $inc;
+               $GLOBALS['inc_loaded'][$inc] = getPath() . $inc;
 
                // Is the include file there?
                if (!isIncludeReadable($inc)) {
@@ -133,9 +131,6 @@ function loadInclude ($inc) {
 
 // Loads an include file once
 function loadIncludeOnce ($inc) {
-       // Remove double path
-       $inc = str_replace(getConfig('PATH'), '', $inc);
-
        // Is it not loaded?
        if (!isset($GLOBALS['load_once'][$inc])) {
                // Mark it as loaded
@@ -150,14 +145,11 @@ function loadIncludeOnce ($inc) {
 function isIncludeReadable ($inc) {
        // Do we have cache?
        if (!isset($GLOBALS['inc_readable'][$inc])) {
-               // Remove double path
-               $inc = str_replace(getConfig('PATH'), '', $inc);
-
                // Construct FQFN
-               $FQFN = getConfig('PATH') . $inc;
+               $FQFN = getPath() . $inc;
 
-               // Is it readable?
-               $GLOBALS['inc_readable'][$inc] = isFileReadable($FQFN);
+               // Is it readable and at least 50 byte large? Include file sizes < 50 byte are always deprecated
+               $GLOBALS['inc_readable'][$inc] = ((isFileReadable($FQFN)) && (filesize($FQFN) >= 50));
        } // END - if
 
        // Return result