Index: branches/unlabeled/unlabeled-1.1.2/core/kernel/fonts/monofont_read_me.txt =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/kernel/fonts/monofont_read_me.txt (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/kernel/fonts/monofont_read_me.txt (revision 6887) @@ -0,0 +1,103 @@ +The fonts contained in this archive are Freeware. +No payment is required for the use of these fonts. They're free! +Commercial use? Sure, but a donation or a product sample would be +appreciated. + +$40 US is the usual amount per font for commercial use but any amount is +appreciated. + +I make all the fonts (around 450 of them) on my web page and they're all free. +I offer Deluxe versions of some of my fonts for sale. They contain several +weights and styles of each font. http://www.larabiefonts.com/deluxe.html + +The page is called Larabie Fonts + +try: +http://www.larabiefonts.com or search for Larabie Fonts in a search Engine + +I've provided the world with about 450 free fonts, if you'd like to make a donation +I'd be more than happy to accept it. + +No donation is too small! Music and artwork are good too. +If you have some CD's you're not listening to anymore, send 'em along! + +Send anything at all to + +Ray Larabie +61 Wesley Ave. +Port Credit +Ontario, CANADA +L5H 2M8 + +If you decide to send a cheque (that's how we spell it in Canada) +make it payable to Ray Larabie. If you want to double check the address +have a look at the donation section on any of my webpages. + +Canadian or US funds? Any funds are fine with me. +Whatever's easy for you. + +Double-check the following URL and learn about alternate forms or payment +such as gift certificates and credit card donations. + http://www.larabiefonts.com/donation.html + +Ray Larabie +lf@typodermic.com or check http://www.larabiefonts.com/email.html + + + +Font installation in Windows: Unzip the font using a program such as Winzip then drag & drop the font into your font folder (usually c:\windows\fonts) +Font installation on a Mac: You must have STUFFIT EXPANDER 5.1.2 (or better) +to expand the archive. + +------------------------------- +Larabie Fonts End-user license agreement software product from Larabie Fonts +--------------------------------------------------- + +SOFTWARE PRODUCT LICENSE + +The SOFTWARE PRODUCT is protected by copyright laws and international copyright treaties, +as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, +not sold. + +1. GRANT OF LICENSE. This document grants you the following rights: + +- Installation and Use. You may install and use an unlimited number of copies of the +SOFTWARE PRODUCT. You may copy and distribute unlimited copies of the SOFTWARE PRODUCT as you receive them, in any medium, provided that you publish on each copy an appropriate copyright notice. Keep intact all the notices that refer to this License. And give any other recipients of the fonts a copy of this License along with the fonts. + +2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. + +- You may modify your copy or copies of the fonts or any portion +of it, provided that you also meet all of these rules: + + a) Do not alter in any way alphamumerics(eq. a-z, 1-9) contained in the font. An exception is converting between formats, here is allowed the nominal distortion that occurs during conversion from second order to third order quadratic curves (TrueType to Postscript) and vice versa. + + b) Extra characters may be added, here it is allowed to use curves from alphanumerics in fonts under same license. + + c) It is allowed to modify and remove analpahbetics (punctuation, special characters, ligatures and symbols). + + d) The original font name must remain but can be augmented. (ie. Blue Highway Cyrillic, Blue Highway ANSI, Blue Highway Fudge) + + e) Character mapping may be altered. + + f) If the kerning information is damaged or discarded please state that in the user notes or documentation. + + g) All modifications must be released under this license. + +LIMITED WARRANTY +NO WARRANTIES. Larabie Fonts expressly disclaims any warranty for the SOFTWARE PRODUCT. The +SOFTWARE PRODUCT and any related documentation is provided "as is" without warranty of any +kind, either express or implied, including, without limitation, the implied warranties or +merchantability, fitness for a particular purpose, or noninfringement. The entire risk +arising out of use or performance of the SOFTWARE PRODUCT remains with you. + +NO LIABILITY FOR CONSEQUENTIAL DAMAGES. In no event shall Larabie Fonts be liable for any +damages whatsoever (including, without limitation, damages for loss of business profits, +business interruption, loss of business information, or any other pecuniary loss) arising +out of the use of or inability to use this product, even if Larabie Fonts has been advised +of the possibility of such damages. + +3. MISCELLANEOUS + +Should you have any questions concerning this document, or if you desire to contact +Larabie Fonts for any reason, please contact lf@typodermic.com , or write: Ray Larabie, +61 Wesley Ave. Mississauga, ON Canada L5H 2M8 \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/themes/default/captcha_image.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/themes/default/captcha_image.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/themes/default/captcha_image.tpl (revision 6887) @@ -0,0 +1 @@ + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/themes/default/recommend/captcha.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/themes/default/recommend/captcha.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/themes/default/recommend/captcha.tpl (revision 6887) @@ -0,0 +1,116 @@ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +



+ + + + + + + + + + + +

+ + + + + + +

+ + + + + + + +
" width="18" height="12" alt="" />
   
+
+ +

+ + + + + + + + +

+
+ + "> + + + + + + + + + + + + + + + + + + + + + +



 
+
+
+ " />
+ + + " size="6" /> +



+
+ " class="button"> +
+
+ + +
+
+ + + Index: branches/unlabeled/unlabeled-1.1.2/core/units/general/helpers/captcha_helper.php =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/units/general/helpers/captcha_helper.php (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/units/general/helpers/captcha_helper.php (revision 6887) @@ -0,0 +1,110 @@ +width = $w; + $this->height = $h; + } + + function GenerateCaptchaImage($rand, $width, $height, $filter_blur = false) + { + global $site_font_path; + global $site_font_validation; + + $image = imagecreate($width, $height); + $bgColor = imagecolorallocate ($image, 255, 255, 255); + $textColor = imagecolorallocate ($image, 0, 0, 0); + + // add random noise + for ($i = 0; $i < 20; $i++) { + $rx1 = rand(0, $width); + $rx2 = rand(0, $width); + $ry1 = rand(0, $height); + $ry2 = rand(0, $height); + $rcVal = rand(0, 255); + $rc1 = imagecolorallocate($image, rand(0, 255), rand(0, 255), rand(100, 255)); + imageline($image, $rx1, $ry1, $rx2, $ry2, $rc1); + } + + // write the random number + + $dimensions = imagettfbbox($height*0.75, 0, KERNEL_PATH.'/fonts/monofont.ttf', $rand ); + + imagettftext($image, $height*0.75, 0, floor(($width - $dimensions[4])/2), floor(($height - $dimensions[5])/2), $textColor, KERNEL_PATH.'/fonts/monofont.ttf', $rand); + +// $font = imageloadfont(KERNEL_PATH.'/fonts/monofont.ttf'); +// imagestring($image, $font, 3, 0, $rand, $textColor); + + if ($filter_blur) $this->blur($image, 3); + + // send several headers to make sure the image is not cached + // date in the past + header("Expires: Mon, 23 Jul 1993 05:00:00 GMT"); + + // always modified + header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); + + // HTTP/1.1 + header("Cache-Control: no-store, no-cache, must-revalidate"); + header("Cache-Control: post-check=0, pre-check=0", false); + + // HTTP/1.0 + header("Pragma: no-cache"); + + // send the content type header so the image is displayed properly + header('Content-type: image/jpeg'); + + imagejpeg($image); + imagedestroy($image); + } + + function blur(&$gdimg, $radius = 5.0) { + // Taken from Torstein H�nsi's phpUnsharpMask (see phpthumb.unsharp.php) + + $radius = round(max(0, min($radius, 50)) * 2); + if (!$radius) { + return false; + } + + $w = ImageSX($gdimg); + $h = ImageSY($gdimg); + if ($imgBlur = ImageCreateTrueColor($w, $h)) { + // Gaussian blur matrix: + // 1 2 1 + // 2 4 2 + // 1 2 1 + + // Move copies of the image around one pixel at the time and merge them with weight + // according to the matrix. The same matrix is simply repeated for higher radii. + for ($i = 0; $i < $radius; $i++) { + ImageCopy ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1); // up left + ImageCopyMerge($imgBlur, $gdimg, 1, 1, 0, 0, $w, $h, 50.00000); // down right + ImageCopyMerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h, 33.33333); // down left + ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 1, $w, $h - 1, 25.00000); // up right + ImageCopyMerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h, 33.33333); // left + ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 0, $w, $h, 25.00000); // right + ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 1, $w, $h - 1, 20.00000); // up + ImageCopyMerge($imgBlur, $gdimg, 0, 1, 0, 0, $w, $h, 16.666667); // down + ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 0, $w, $h, 50.000000); // center + ImageCopy ($gdimg, $imgBlur, 0, 0, 0, 0, $w, $h); + } + return true; + } + return false; + } + +} \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/kernel/fonts/monofont.ttf =================================================================== diff -u Binary files differ