New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index e5965bb874812f163e0bea20355d013908e03de2..7dc1946e0c7583b519c993f494cf07d6eb013d6f 100644 (file)
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -35,6 +35,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
+
 // Some security stuff...
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
@@ -42,12 +43,12 @@ if (!defined('__SECURITY')) {
 }
 
 // Check if our config file is writeable or not
-function IS_INC_WRITEABLE ($inc) {
+function isIncludeWriteable ($inc) {
        // Generate FQFN
        $FQFN = sprintf("%sinc/%s.php", constant('PATH'), $inc);
 
        // Abort by simple test
-       if ((FILE_READABLE($FQFN)) && (!is_writeable($FQFN))) {
+       if ((isFileReadable($FQFN)) && (!is_writeable($FQFN))) {
                return false;
        } // END - if
 
@@ -56,7 +57,7 @@ function IS_INC_WRITEABLE ($inc) {
 }
 
 // Reads a directory with PHP files in and gets only files back
-function GET_DIR_AS_ARRAY ($baseDir, $prefix, $includeDirs = false, $addBaseDir = true, $excludePattern = '@(\.|\.\.)$@') {
+function getArrayFromDirectory ($baseDir, $prefix, $includeDirs = false, $addBaseDir = true, $excludePattern = '@(\.|\.\.)$@') {
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix} - Entered!");
        // Init includes
        $INCs = array();
@@ -69,7 +70,7 @@ function GET_DIR_AS_ARRAY ($baseDir, $prefix, $includeDirs = false, $addBaseDir
                // Steps over this returned $baseFile-Name, when it matches the $excludePattern
                if (preg_match($excludePattern, $baseFile, $match)) {
                        // These Lines are only for debugging!!
-                   //$INC = $baseDir . "/" . $baseFile;
+                   //$INC = $baseDir . '/' . $baseFile;
                        //$FQFN = constant('PATH') . $INC;
                        //echo '<pre>$baseDir:'.print_r($baseDir, true).'</pre>';
                        //echo '<pre>$baseDir:'.print_r(constant('PATH') . $baseDir, true).'</pre>';
@@ -79,7 +80,7 @@ function GET_DIR_AS_ARRAY ($baseDir, $prefix, $includeDirs = false, $addBaseDir
                } // END - if
 
                // Construct include filename and FQFN
-               $INC = $baseDir . "/" . $baseFile;
+               $INC = $baseDir . '/' . $baseFile;
                $FQFN = constant('PATH') . $INC;
 
                // repalecment of // to / is needed, whenn $baseDir is an emty String
@@ -87,7 +88,7 @@ function GET_DIR_AS_ARRAY ($baseDir, $prefix, $includeDirs = false, $addBaseDir
 
                // Is this a valid reset file?
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix},baseFile={$baseFile}");
-               if (((FILE_READABLE($FQFN)) && (substr($baseFile, 0, strlen($prefix)) == $prefix) && (substr($baseFile, -4, 4) == ".php")) || (($includeDirs) && (isDirectory($FQFN)))) {
+               if (((isFileReadable($FQFN)) && (substr($baseFile, 0, strlen($prefix)) == $prefix) && (substr($baseFile, -4, 4) == ".php")) || (($includeDirs) && (isDirectory($FQFN)))) {
                        // Remove both for extension name
                        $extName = substr($baseFile, strlen($prefix), -4);