secure functions

Array to allow more than one file containing secure functions

Author: alexweissman

models/authorization.php

@@ -334,12 +334,16 @@ function securePage($file){
 }
 
 function fetchSecureFunctions(){
+    global $files_secure_functions;
     # The Regular Expression for Function Declarations
     $functionFinder = '/function[\s\n]+(\S+)[\s\n]*\(/';
     # Init an Array to hold the Function Names
     $functionArray = array();
-    # Load the Content of the PHP File
-    $fileContents = file_get_contents( FILE_SECURE_FUNCTIONS );
+    # Load the Content of the secure function files   
+    $fileContents = "";
+    foreach($files_secure_functions as $file){
+        $fileContents .= file_get_contents( $file );
+    }
 
     # Apply the Regular Expression to the PHP File Contents
     preg_match_all( $functionFinder , $fileContents , $functionArray );

models/config.php

@@ -84,8 +84,10 @@ function logAllErrors($errno, $errstr, $errfile, $errline, array $errcontext) {
 defined("MAIL_TEMPLATES")
 	or define("MAIL_TEMPLATES", dirname(__FILE__) . "/mail-templates/");
 
-defined("FILE_SECURE_FUNCTIONS")
-	or define("FILE_SECURE_FUNCTIONS", dirname(__FILE__) . "/secure_functions.php");	
+// Include paths for files containing secure functions
+$files_secure_functions = array(
+	dirname(__FILE__) . "/secure_functions.php"
+);
 
 // Include paths for pages to add to site page management
 $page_include_paths = array(