X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=file_run.php;h=e5016688c514b09b61a1b944fc70cc09ea36ebf0;hp=409cb4b190ced6549a60e0d47b9cb4e6dee8394a;hb=062d46e16429f2e55573567518cb01c83b319ac4;hpb=22d5fb7ab7d4ee86bd59e194387dca268bd577a1

diff --git a/file_run.php b/file_run.php
index 409cb4b..e501668 100644
--- a/file_run.php
+++ b/file_run.php
@@ -1,22 +1,19 @@
-<?
+<?php
 
 #  Copyright (C) 2005 Jason Woofenden
 #
-#  This file is part of wfpl.
-#
-#  wfpl is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, or (at your option)
-#  any later version.
-#
-#  wfpl is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
-#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#  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
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # This function makes it easier to put everything in functions like you should.
@@ -32,15 +29,18 @@
 #
 # the file db_password.php would be like so:
 #
-#     function db_password() {
+#     function db_password_main() {
 #           return array('me', 'secret');
 #     }
 
-function file_run($filename) {
-    require_once($filename);
-    ereg_replace('.*/', '', $filename);
-    $func = basename($filename, '.php');
-    return $func();
+function file_run($filename /* args... */) {
+	$args = array_slice(func_get_args(), 1);
+	require_once($filename);
+	$func = basename($filename, '.php') . '_main';
+
+	if(function_exists($func)) {
+		return call_user_func_array($func, $args);
+	}
 }
 
 ?>