Fix db_get_value after mysql->mysqli upgrade

[wfpl.git] / file_run.php

diff --git a/file_run.php b/file_run.php
index 014cab5..e22e2bc 100644 (file)
--- a/file_run.php
+++ b/file_run.php
@@ -1,23 +1,9 @@
-<?
+<?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.
-#
-#  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.
+# This program is in the public domain within the United States. Additionally,
+# we waive copyright and related rights in the work worldwide through the CC0
+# 1.0 Universal public domain dedication, which can be found at
+# http://creativecommons.org/publicdomain/zero/1.0/
 
 
 # This function makes it easier to put everything in functions like you should.
@@ -33,15 +19,16 @@
 #
 # 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);
+       }
+}