[frik85] 36492: RosCMS update: * several forms improved * simplified captcha: bigger font size, simpler fonts, less chars (4-6), case insensitive * include some 'vera' fonts for captcha
Author: frik85 Date: Wed Sep 24 13:04:03 2008 New Revision: 36492
URL: http://svn.reactos.org/svn/reactos?rev=36492&view=rev Log: RosCMS update:
* several forms improved * simplified captcha: bigger font size, simpler fonts, less chars (4-6), case insensitive * include some 'vera' fonts for captcha
Added: trunk/web/reactos.org/htdocs/roscms/logon/captcha/fonts.txt (with props) trunk/web/reactos.org/htdocs/roscms/logon/captcha/vera.ttf (with props) trunk/web/reactos.org/htdocs/roscms/logon/captcha/vera_copyright.txt (with props) trunk/web/reactos.org/htdocs/roscms/logon/captcha/verabd.ttf (with props) trunk/web/reactos.org/htdocs/roscms/logon/captcha/verabi.ttf (with props) trunk/web/reactos.org/htdocs/roscms/logon/captcha/verait.ttf (with props) trunk/web/reactos.org/htdocs/roscms/logon/captcha/veramono.ttf (with props) trunk/web/reactos.org/htdocs/roscms/logon/captcha/verase.ttf (with props) trunk/web/reactos.org/htdocs/roscms/logon/captcha/verasebd.ttf (with props) Modified: trunk/web/reactos.org/htdocs/roscms/logon/captcha/captcha_image.php trunk/web/reactos.org/htdocs/roscms/logon/captcha/fonts.php trunk/web/reactos.org/htdocs/roscms/logon/user_login_lost.php trunk/web/reactos.org/htdocs/roscms/logon/user_profil_edit.php trunk/web/reactos.org/htdocs/roscms/logon/user_register.php
Modified: trunk/web/reactos.org/htdocs/roscms/logon/captcha/captcha_image.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/captcha/captcha_image.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/logon/captcha/captcha_image.php [iso-8859-1] Wed Sep 24 13:04:03 2008 @@ -22,7 +22,7 @@ $s = base64_encode($s); // base64-set, but filter out unwanted chars $s = preg_replace("/[+/=IG0ODQRtl]/i", "", $s); // strips hard to discern letters, depends on used font type //$s = substr($s, 0, $characters); - $s = substr($s, 0, rand(6, $characters)); + $s = substr($s, 0, rand(4, $characters)); return $s; } @@ -33,7 +33,7 @@ $width = 240; $height = 80; - $cur_random = mt_rand(0,10); + $cur_random = mt_rand(0, count($font_data)); $font = $font_data[$cur_random][0]; $font_size_mult = $font_data[$cur_random][1];
Modified: trunk/web/reactos.org/htdocs/roscms/logon/captcha/fonts.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/captcha/fonts.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/logon/captcha/fonts.php [iso-8859-1] Wed Sep 24 13:04:03 2008 @@ -2,19 +2,33 @@ $font_data = array(); - $font_data[0][0] = "<fontname>.ttf"; - $font_data[0][1] = 0.60; - $font_data[0][2] = 9; + $font_data[0][0] = "vera.ttf"; + $font_data[0][1] = 0.50; + $font_data[0][2] = 5; - $font_data[1][0] = "<fontname>.ttf"; - $font_data[1][1] = 0.40; - $font_data[1][2] = 7; + $font_data[1][0] = "verasebd.ttf"; + $font_data[1][1] = 0.50; + $font_data[1][2] = 5; + + $font_data[2][0] = "verabd.ttf"; + $font_data[2][1] = 0.45; + $font_data[2][2] = 5;
- $font_data[2][0] = "<fontname>.ttf"; - $font_data[2][1] = 0.40; - $font_data[2][2] = 7; + $font_data[3][0] = "verabi.ttf"; + $font_data[3][1] = 0.48; + $font_data[3][2] = 5;
- // ... + $font_data[4][0] = "verait.ttf"; + $font_data[4][1] = 0.55; + $font_data[4][2] = 4; + + $font_data[5][0] = "veramono.ttf"; + $font_data[5][1] = 0.50; + $font_data[5][2] = 6; + + $font_data[6][0] = "verase.ttf"; + $font_data[6][1] = 0.60; + $font_data[6][2] = 4;
?>
Added: trunk/web/reactos.org/htdocs/roscms/logon/captcha/fonts.txt URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/captcha/fonts.txt (added) +++ trunk/web/reactos.org/htdocs/roscms/logon/captcha/fonts.txt [iso-8859-1] Wed Sep 24 13:04:03 2008 @@ -1,0 +1,5 @@ +More GPL compatible fonts: + +* http://www.gnome.org/fonts/ +* https://fedorahosted.org/liberation-fonts +* http://olegueret.googlepages.com/stixfonts-ttf
Propchange: trunk/web/reactos.org/htdocs/roscms/logon/captcha/fonts.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/web/reactos.org/htdocs/roscms/logon/captcha/vera.ttf URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== Binary file - no diff available.
Propchange: trunk/web/reactos.org/htdocs/roscms/logon/captcha/vera.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/web/reactos.org/htdocs/roscms/logon/captcha/vera_copyright.txt URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/captcha/vera_copyright.txt (added) +++ trunk/web/reactos.org/htdocs/roscms/logon/captcha/vera_copyright.txt [iso-8859-1] Wed Sep 24 13:04:03 2008 @@ -1,0 +1,124 @@ +Bitstream Vera Fonts Copyright + +The fonts have a generous copyright, allowing derivative works (as +long as "Bitstream" or "Vera" are not in the names), and full +redistribution (so long as they are not *sold* by themselves). They +can be be bundled, redistributed and sold with any software. + +The fonts are distributed under the following copyright: + +Copyright +========= + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream +Vera is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute +the Font Software, including without limitation the rights to use, +copy, merge, publish, distribute, and/or sell copies of the Font +Software, and to permit persons to whom the Font Software is furnished +to do so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Bitstream" or the word "Vera". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Bitstream Vera" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, +OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT +SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font +Software without prior written authorization from the Gnome Foundation +or Bitstream Inc., respectively. For further information, contact: +fonts at gnome dot org. + +Copyright FAQ +============= + + 1. I don't understand the resale restriction... What gives? + + Bitstream is giving away these fonts, but wishes to ensure its + competitors can't just drop the fonts as is into a font sale system + and sell them as is. It seems fair that if Bitstream can't make money + from the Bitstream Vera fonts, their competitors should not be able to + do so either. You can sell the fonts as part of any software package, + however. + + 2. I want to package these fonts separately for distribution and + sale as part of a larger software package or system. Can I do so? + + Yes. A RPM or Debian package is a "larger software package" to begin + with, and you aren't selling them independently by themselves. + See 1. above. + + 3. Are derivative works allowed? + Yes! + + 4. Can I change or add to the font(s)? + Yes, but you must change the name(s) of the font(s). + + 5. Under what terms are derivative works allowed? + + You must change the name(s) of the fonts. This is to ensure the + quality of the fonts, both to protect Bitstream and Gnome. We want to + ensure that if an application has opened a font specifically of these + names, it gets what it expects (though of course, using fontconfig, + substitutions could still could have occurred during font + opening). You must include the Bitstream copyright. Additional + copyrights can be added, as per copyright law. Happy Font Hacking! + + 6. If I have improvements for Bitstream Vera, is it possible they might get + adopted in future versions? + + Yes. The contract between the Gnome Foundation and Bitstream has + provisions for working with Bitstream to ensure quality additions to + the Bitstream Vera font family. Please contact us if you have such + additions. Note, that in general, we will want such additions for the + entire family, not just a single font, and that you'll have to keep + both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add + glyphs to the font, they must be stylistically in keeping with Vera's + design. Vera cannot become a "ransom note" font. Jim Lyles will be + providing a document describing the design elements used in Vera, as a + guide and aid for people interested in contributing to Vera. + + 7. I want to sell a software package that uses these fonts: Can I do so? + + Sure. Bundle the fonts with your software and sell your software + with the fonts. That is the intent of the copyright. + + 8. If applications have built the names "Bitstream Vera" into them, + can I override this somehow to use fonts of my choosing? + + This depends on exact details of the software. Most open source + systems and software (e.g., Gnome, KDE, etc.) are now converting to + use fontconfig (see www.fontconfig.org) to handle font configuration, + selection and substitution; it has provisions for overriding font + names and subsituting alternatives. An example is provided by the + supplied local.conf file, which chooses the family Bitstream Vera for + "sans", "serif" and "monospace". Other software (e.g., the XFree86 + core server) has other mechanisms for font substitution. +
Propchange: trunk/web/reactos.org/htdocs/roscms/logon/captcha/vera_copyright.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/web/reactos.org/htdocs/roscms/logon/captcha/verabd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== Binary file - no diff available.
Propchange: trunk/web/reactos.org/htdocs/roscms/logon/captcha/verabd.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/web/reactos.org/htdocs/roscms/logon/captcha/verabi.ttf URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== Binary file - no diff available.
Propchange: trunk/web/reactos.org/htdocs/roscms/logon/captcha/verabi.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/web/reactos.org/htdocs/roscms/logon/captcha/verait.ttf URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== Binary file - no diff available.
Propchange: trunk/web/reactos.org/htdocs/roscms/logon/captcha/verait.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/web/reactos.org/htdocs/roscms/logon/captcha/veramono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== Binary file - no diff available.
Propchange: trunk/web/reactos.org/htdocs/roscms/logon/captcha/veramono.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/web/reactos.org/htdocs/roscms/logon/captcha/verase.ttf URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== Binary file - no diff available.
Propchange: trunk/web/reactos.org/htdocs/roscms/logon/captcha/verase.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/web/reactos.org/htdocs/roscms/logon/captcha/verasebd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== Binary file - no diff available.
Propchange: trunk/web/reactos.org/htdocs/roscms/logon/captcha/verasebd.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Modified: trunk/web/reactos.org/htdocs/roscms/logon/user_login_lost.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/user_login_lost.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/logon/user_login_lost.php [iso-8859-1] Wed Sep 24 13:04:03 2008 @@ -108,7 +108,7 @@ strlen($_POST['userpwd1']) >= $rdf_register_user_pwd_min && strlen($_POST['userpwd1']) < $rdf_register_user_pwd_max && $_POST['userpwd1'] == $_POST['userpwd2'] && isset($_POST['usercaptcha']) && $_POST['usercaptcha'] != "" && - !empty($_SESSION['rdf_security_code']) && $_SESSION['rdf_security_code'] == $_POST['usercaptcha'] && + !empty($_SESSION['rdf_security_code']) && strtolower($_SESSION['rdf_security_code']) == strtolower($_POST['usercaptcha']) && $existpwdid == "true") { $sql_exist_pwdid2 = "SELECT user_id @@ -135,7 +135,7 @@ isset($_POST['useremail']) && $_POST['useremail'] != "" && preg_match($rdf_register_valid_email_regex, $_POST['useremail']) && /* check if it's a valid email address */ isset($_POST['usercaptcha']) && $_POST['usercaptcha'] != "" && - !empty($_SESSION['rdf_security_code']) && $_SESSION['rdf_security_code'] == $_POST['usercaptcha'] && + !empty($_SESSION['rdf_security_code']) && strtolower($_SESSION['rdf_security_code']) == strtolower($_POST['usercaptcha']) && $existemail) { // password activation code @@ -271,7 +271,7 @@ <img src="<?php echo $roscms_SET_path_ex."register/captcha/"; ?>" style="padding-top:10px;" alt="If you can't read this, try another one or email <?php echo $rdf_support_email_str; ?> for help." title="Are you human?" /><br /> <?php if (isset($_POST['registerpost'])) { - echo "<br /><i>Captcha code is case sensitive. <br />If you can't read it, try another one.</i>"; + echo "<br /><i>Captcha code is case insensitive. <br />If you can't read it, try another one.</i>"; } ?> </div>
Modified: trunk/web/reactos.org/htdocs/roscms/logon/user_profil_edit.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/user_profil_edit.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/logon/user_profil_edit.php [iso-8859-1] Wed Sep 24 13:04:03 2008 @@ -77,7 +77,7 @@ preg_match($rdf_register_valid_email_regex, $_POST['useremail']) && /* check if it's a valid email address */ $result_user_profil['user_email_activation'] == ($_POST['useremail'].$rdf_uri_3) && isset($_POST['usercaptcha']) && $_POST['usercaptcha'] != "" && - !empty($_SESSION['rdf_security_code']) && $_SESSION['rdf_security_code'] == $_POST['usercaptcha']) + !empty($_SESSION['rdf_security_code']) && strtolower($_SESSION['rdf_security_code']) == strtolower($_POST['usercaptcha'])) { $sql_change_email = "UPDATE users SET user_timestamp_touch2 = NOW( ) , @@ -151,7 +151,7 @@ isset($_POST['country']) && $_POST['country'] != "" && isset($_POST['tzone']) && $_POST['tzone'] != "" && isset($_POST['usercaptcha']) && $_POST['usercaptcha'] != "" && - !empty($_SESSION['rdf_security_code']) && $_SESSION['rdf_security_code'] == $_POST['usercaptcha'] && + !empty($_SESSION['rdf_security_code']) && strtolower($_SESSION['rdf_security_code']) == strtolower($_POST['usercaptcha']) && !$existemail) { // user language (browser settings) @@ -503,7 +503,7 @@ <img src="<?php echo $roscms_SET_path_ex."register/captcha/"; ?>" style="padding-top:10px;" alt="If you can't read this, try another one or email <?php echo $rdf_support_email_str; ?> for help." title="Are you human?" /><br /> <?php if (isset($_POST['registerpost'])) { - echo "<br /><i>Captcha code is case sensitive. <br />If you can't read it, try another one.</i>"; + echo "<br /><i>Captcha code is case insensitive. <br />If you can't read it, try another one.</i>"; } ?> </div>
Modified: trunk/web/reactos.org/htdocs/roscms/logon/user_register.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logon... ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/user_register.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/logon/user_register.php [iso-8859-1] Wed Sep 24 13:04:03 2008 @@ -162,7 +162,7 @@ isset($_POST['country']) && $_POST['country'] != "" && isset($_POST['tzone']) && $_POST['tzone'] != "" && isset($_POST['usercaptcha']) && $_POST['usercaptcha'] != "" && - !empty($_SESSION['rdf_security_code']) && $_SESSION['rdf_security_code'] == $_POST['usercaptcha'] && + !empty($_SESSION['rdf_security_code']) && strtolower($_SESSION['rdf_security_code']) == strtolower($_POST['usercaptcha']) && $safename == "true" && $safepwd == "true" && !$existname && !$existemail) { // user language (browser settings) @@ -170,10 +170,10 @@ $userlang2 = "en"; if (strlen($userlang[0][0]) > 0 && strlen($userlang[0][0]) <= 5) { $userlang2 = $userlang[0][0]; - echo "<h3>!!! ".$userlang[0][0]."</h3>"; + //echo "<h3>!!! ".$userlang[0][0]."</h3>"; } else { - echo "<h3>??? ".$userlang[0][0]."</h3>"; + //echo "<h3>??? ".$userlang[0][0]."</h3>"; } @@ -388,7 +388,7 @@ <img src="<?php echo $roscms_SET_path_ex."register/captcha/"; ?>" style="padding-top:10px;" alt="If you can't read this, try another one or email <?php echo $rdf_support_email_str; ?> for help." title="Are you human?" /><br /> <?php if (isset($_POST['registerpost'])) { - echo "<br /><i>Captcha code is case sensitive. <br />If you can't read it, try another one.</i>"; + echo "<br /><i>Captcha code is case insensitive. <br />If you can't read it, try another one.</i>"; } ?> </div>
-
frik85＠svn.reactos.org