X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=file_run.php;h=e5016688c514b09b61a1b944fc70cc09ea36ebf0;hp=014cab510a39179698270e98ba891058d950d49b;hb=9a3136a5bee66e1055ffb566373952b6054dd7bf;hpb=6efe0372c5d3b2db723ada811917b6a52f13130b

diff --git a/file_run.php b/file_run.php
index 014cab5..e501668 100644
--- a/file_run.php
+++ b/file_run.php
@@ -1,23 +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 General Public License as published by
-#  the Free Software Foundation; either version 2, 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
-#  General Public License for more details.
-#
+#  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 wfpl; see the file COPYING.  If not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-#  MA 02111-1307, USA.
+#  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.
@@ -33,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);
+	}
 }
 
 ?>