metaform only sends .sql file if you check 'db'. added string_array()

diff --git a/binary.php b/binary.php
new file mode 100644 (file)
index 0000000..bc0a3aa
--- /dev/null
+++ b/binary.php
@@ -0,0 +1,47 @@
+<?php
+
+#  Copyright (C) 2007 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 file contains code to work with "raw" binary numbers in big-endian format
+
+
+# return a 4 byte string that represent the passed integer as a big-endian binary number
+function to_raw_int($int) {
+       return chr($int >> 24) . chr(($int >> 16) & 0xff) . chr(($int >> 8) & 0xff) . chr($int & 0xff);
+}
+
+# return a php number from the string you pass in. The first 4 bytes of the
+# string are read in as a binary value in big-endian format.
+function from_raw_int($quad) {
+       return (ord(substr($quad, 0, 1)) << 24) + (ord(substr($quad, 1, 1)) << 16) + (ord(substr($quad, 2, 1)) << 8) + ord(substr($quad, 3, 1));
+}
+
+function int_at($string, $index) {
+       return from_raw_int(substr($string, $index * 4, 4));
+}
+
+# remove the first 4 bytes of the string, and return them as an int
+function pop_int(&$string) {
+       $int = from_raw_int(substr($string, 0, 4));
+       $string = substr($string, 4);
+       return $int;
+}
+
+?>

diff --git a/fdb.php b/fdb.php
index 99f63cb..a9bb59f 100644 (file)
--- a/fdb.php
+++ b/fdb.php
@@ -33,6 +33,7 @@
 
 
 require_once('code/wfpl/file.php');
+require_once('code/wfpl/binary.php');
 
 # call this to set what directory is used to store the files
 function fdb_set_dir($dir) {

diff --git a/metaform.php b/metaform.php
index b32c87e..656d4e0 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -357,8 +357,10 @@ function download_tar() {
                ".htaccess" => make_htaccess(),
                "run.php ->" => 'code/wfpl/run.php',
                "$name.html" => make_html(),
-               "$name.sql" => make_sql(),
                "$name.php" => make_php());
+       if($GLOBALS['opt_db'] == 'Yes') {
+               $data["$name.sql"] = make_sql();
+       }
        if($GLOBALS['opt_email'] == 'Yes') {
                $data["$name.email.txt"] = make_email();
        }

diff --git a/string_array.php b/string_array.php
new file mode 100644 (file)
index 0000000..99168a1
--- /dev/null
+++ b/string_array.php
@@ -0,0 +1,46 @@
+<?php
+
+#  Copyright (C) 2007 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 file contains code to convert an array into a string, and back again.
+
+require_once('code/wfpl/binary.php');
+
+function string_to_array($data) {
+       $header_count = pop_int($data);
+       $out = array();
+       while($header_count--) {
+               $size = pop_int($data);
+               $out[] = substr($data, 0, $size);
+               $data = substr($data, $size);
+       }
+       return $out;
+}
+
+function array_to_string($array) {
+       $ret = to_raw_int(count($array));
+       foreach($array as $element) {
+               $ret .= to_raw_int(strlen($element));
+               $ret .= $element;
+       }
+       return $ret;
+}
+
+?>