# HG changeset patch
# User Dan
# Date 1232323169 18000
# Node ID 202c37a8713a50362eed399c5519b2a6036f78e4
# Parent  2563685556bccbef18cbb6a382ef4dbb64071835
Added license block to AmigaLink captcha engine and set this engine as the default; clarified licensing situation for this module in licenses/index.html

diff -r 2563685556bc -r 202c37a8713a includes/captcha.php
--- a/includes/captcha.php	Sun Jan 18 18:13:48 2009 -0500
+++ b/includes/captcha.php	Sun Jan 18 18:59:29 2009 -0500
@@ -158,6 +158,21 @@
       unset($image);
       unset($_png);
     } elseif(defined('ENANO_CAPTCHA_BIGNFAT')) {
+      
+      /**************************************************************************
+       *                            usercp_confirm.php
+       *                            -------------------
+       *   begin                : Feb 23, 2006
+       *   copyright            : (C) 2006 AmigaLink
+       *   website              : www.AmigaLink.de
+       *
+       *   $Id: usercp_confirm.php,v 2.0.9.0 2006/03/29 14:03:00 AmigaLink Exp $
+       * ************************************************************************
+       * CAPTCHA engine by AmigaLink - Copyright (C) 2006
+       * Released under the GNU General Public License
+       * Modified for use in Enano approximately October 7, 2006
+       */
+      
       // Prefs
       $total_width = $this->captcha_config['width'];
       $total_height = $this->captcha_config['height'];
@@ -743,6 +758,6 @@
     
 }
 
-// define('ENANO_CAPTCHA_BIGNFAT', '');
+define('ENANO_CAPTCHA_BIGNFAT', '');
   
 ?>
diff -r 2563685556bc -r 202c37a8713a licenses/index.html
--- a/licenses/index.html	Sun Jan 18 18:13:48 2009 -0500
+++ b/licenses/index.html	Sun Jan 18 18:59:29 2009 -0500
@@ -82,7 +82,7 @@
 <ul>
   <li><a href="http://phpwiki.sourceforge.net/">phpWiki</a> - just the diff engine, which is also used in MediaWiki</li>
   <li><a href="http://www.mediawiki.org/">MediaWiki</a>'s table parsing engine (the Text_Wiki one doesn't work in PHP 5.2.0)</li>
-  <li>One of the CAPTCHA easter eggs was ported from the phpBB <a href="http://phpbbhacks.com/download/6276">Advanced Visual Confirmation Mod</a>. The strange thing here is this: The installation instructions expressly state that the MOD is distributed under the GPL, but immediately afterwards it says that the MOD "can be freely used, but not distributed, without permission." Sorry buddy, but I'm with the FSF on this one, I'm legally allowed to distribute/modify it under the GPL.</li>
+  <li>The primary CAPTCHA engine as of Enano 1.0.7 was written by <a href="http://www.amigalink.de/">AmigaLink</a> and ported from the <a href="http://phpbbhacks.com/download/6276">Advanced Visual Confirmation Mod</a>. There were some licensing issues with the phpBB hack including a copy of the GPL not being included, but the actual CAPTCHA engine file had the GPLv2 or later header.</li>
   <li>The <a href="http://www.jracademy.com/~jtucek/">e-mail address encryption</a> routine was originally written by Jim Tucek, and ported to PHP by Dan Fuhry. Jim allowed the code to be released under the GPL specifically for Enano.</li>
   <li><a href="http://www.softcomplex.com/products/tigra_tree_menu/">Tigra Tree Menu</a> - a modified version that remembers the state of the tree. The license terms are stated <a href="http://www.softcomplex.com/products/tigra_tree_menu/docs/#terms_cond">here</a>. After <a href="tigra-menu.html">contacting the author</a>, I was given permission to use the Tigra Tree Menu code as if it were under the GNU GPL. Therefore, you may use this code unde the terms of the GPL, however if you're making commercial use of it, the Softcomplex guys would appreciate if (but not require that) you would contact them first.</li>
   <li><a href="http://youngpup.net/projects/dom-drag/">youngpup</a>'s DOM-Drag class - the unmodified version is <a href="http://youngpup.net/projects/dom-drag/license.txt">in the public domain</a>; we chose to relicense it as of Enano 1.0.4 to clear up any potential legal complications</li>