Merge branch 'master' of git@github.com:JasonWoof/wfpl

diff --git a/format.php b/format.php
index a481011..f395491 100644 (file)
--- a/format.php
+++ b/format.php
@@ -45,7 +45,7 @@ function format_int($str) {
        return ereg_replace('^0*([0-9])', '\1', $str);
 }
 
-function format_decimal($str) {
+function format_positive_decimal($str) {
        $str = ereg_replace('[^0-9.]', '', $str);
        $pos = strpos($str, '.');
        if($pos !== false) {
@@ -61,6 +61,19 @@ function format_decimal($str) {
        return $str;
 }
 
+function format_decimal($str) {
+       $str = ereg_replace('[^0-9.-]', '', $str);
+       if(substr($str, 0, 1) == '-') {
+               $str = format_positive_decimal(substr($str, 1));
+               if($str !== '' && $str !== '0' && $str != '0.0') {
+                       $str = '-' . $str;
+               }
+               return $str;
+       } else {
+               return format_positive_decimal($str);
+       }
+}
+
 # return 0 of there's no digits
 function format_int_0($str) {
        $str = format_int($str);

diff --git a/metaform.php b/metaform.php
index 65343ea..9f0bfa6 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -46,9 +46,10 @@ $GLOBALS['types'] = array(
        'html' =>       array('html',        'unix',       'text'),
        'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
        'radio' =>      array('radio',       'oneline',    'varchar(200)'),
-       'leftcheck' =>  array('leftcheck',   'yesno',      'varchar(3)'),
-       'checkbox' =>   array('checkbox',    'bool',       'int(1)'),
-       'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
+       'checkbox' =>   array('leftcheck',   'bool',       'int(1)'),
+       'rightcheck' => array('checkbox',    'bool',       'int(1)'),
+       'rightyesno' => array('checkbox',    'yesno',      'varchar(3)'),
+       'yesno' =>      array('leftcheck',   'yesno',      'varchar(3)'),
        'delete' =>     array('checkbox',    'yesno',      'n/a'),
        'image' =>      array('image',       'oneline',    'varchar(200)'),
        'submit' =>     array('submit',      'oneline',    'n/a')