Merge git@github.com:JasonWoof/wfpl

diff --combined format.php
index 7acdde3,900e781..a481011
--- 1/format.php
--- 2/format.php
+++ b/format.php
@@@ -2,21 -2,18 +2,18 @@@
  
  #  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 file contains basic encodings
@@@ -146,14 -143,8 +143,14 @@@ function format_email($str) 
  }
  
  function format_url($str) {
 -      # FIXME
 -      return format_oneline($str);
 +      # FIXME check for TLD? encode special chars?
 +      $str = trim(format_oneline($str));
 +      if($str !== '') {
 +              if(strpos($str, ':') === false) {
 +                      $str = 'http://' . $str;
 +              }
 +      }
 +      return $str;
  }
  
  function format_money($str, $display_cents = true) {