Changeset 1313 in ExiteCMS
- Timestamp:
- 02/27/08 12:37:15 (4 years ago)
- Location:
- trunk
- Files:
-
- 53 added
- 2 deleted
- 8 edited
-
administration/upgrade/rev01311.php (added)
-
contact.php (modified) (3 diffs)
-
includes/captcha.php (deleted)
-
includes/comments_include.php (modified) (2 diffs)
-
includes/core_functions.php (modified) (1 diff)
-
includes/secureimage-1.0.3 (added)
-
includes/secureimage-1.0.3/LICENSE.txt (added)
-
includes/secureimage-1.0.3/audio (added)
-
includes/secureimage-1.0.3/audio/en (added)
-
includes/secureimage-1.0.3/audio/en/0.wav (added)
-
includes/secureimage-1.0.3/audio/en/1.wav (added)
-
includes/secureimage-1.0.3/audio/en/2.wav (added)
-
includes/secureimage-1.0.3/audio/en/3.wav (added)
-
includes/secureimage-1.0.3/audio/en/4.wav (added)
-
includes/secureimage-1.0.3/audio/en/5.wav (added)
-
includes/secureimage-1.0.3/audio/en/6.wav (added)
-
includes/secureimage-1.0.3/audio/en/7.wav (added)
-
includes/secureimage-1.0.3/audio/en/8.wav (added)
-
includes/secureimage-1.0.3/audio/en/9.wav (added)
-
includes/secureimage-1.0.3/audio/en/A.wav (added)
-
includes/secureimage-1.0.3/audio/en/B.wav (added)
-
includes/secureimage-1.0.3/audio/en/C.wav (added)
-
includes/secureimage-1.0.3/audio/en/D.wav (added)
-
includes/secureimage-1.0.3/audio/en/E.wav (added)
-
includes/secureimage-1.0.3/audio/en/F.wav (added)
-
includes/secureimage-1.0.3/audio/en/G.wav (added)
-
includes/secureimage-1.0.3/audio/en/H.wav (added)
-
includes/secureimage-1.0.3/audio/en/I.wav (added)
-
includes/secureimage-1.0.3/audio/en/J.wav (added)
-
includes/secureimage-1.0.3/audio/en/K.wav (added)
-
includes/secureimage-1.0.3/audio/en/L.wav (added)
-
includes/secureimage-1.0.3/audio/en/M.wav (added)
-
includes/secureimage-1.0.3/audio/en/N.wav (added)
-
includes/secureimage-1.0.3/audio/en/O.wav (added)
-
includes/secureimage-1.0.3/audio/en/P.wav (added)
-
includes/secureimage-1.0.3/audio/en/Q.wav (added)
-
includes/secureimage-1.0.3/audio/en/R.wav (added)
-
includes/secureimage-1.0.3/audio/en/S.wav (added)
-
includes/secureimage-1.0.3/audio/en/T.wav (added)
-
includes/secureimage-1.0.3/audio/en/U.wav (added)
-
includes/secureimage-1.0.3/audio/en/V.wav (added)
-
includes/secureimage-1.0.3/audio/en/W.wav (added)
-
includes/secureimage-1.0.3/audio/en/X.wav (added)
-
includes/secureimage-1.0.3/audio/en/Y.wav (added)
-
includes/secureimage-1.0.3/audio/en/Z.wav (added)
-
includes/secureimage-1.0.3/elephant.ttf (added)
-
includes/secureimage-1.0.3/gdfonts (added)
-
includes/secureimage-1.0.3/gdfonts/automatic.gdf (added)
-
includes/secureimage-1.0.3/gdfonts/bubblebath.gdf (added)
-
includes/secureimage-1.0.3/gdfonts/caveman.gdf (added)
-
includes/secureimage-1.0.3/gdfonts/crass.gdf (added)
-
includes/secureimage-1.0.3/images (added)
-
includes/secureimage-1.0.3/images/reload.gif (added)
-
includes/secureimage-1.0.3/images/sound.gif (added)
-
includes/secureimage-1.0.3/securimage.php (added)
-
includes/secureimage-1.0.3/securimage_play.php (added)
-
includes/secureimage-1.0.3/securimage_show.php (added)
-
includes/template-plugins/function.make_captcha.php (deleted)
-
includes/templates/include.comments.tpl (modified) (1 diff)
-
includes/templates/main.contact.tpl (modified) (1 diff)
-
includes/templates/main.register.tpl (modified) (1 diff)
-
includes/theme_functions.php (modified) (1 diff)
-
register.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/contact.php
r1185 r1313 15 15 require_once dirname(__FILE__)."/includes/core_functions.php"; 16 16 require_once PATH_ROOT."/includes/theme_functions.php"; 17 18 // include the secureimage class 19 require_once PATH_INCLUDES."secureimage-1.0.3/secureimage.php"; 17 20 18 21 // temp storage for template variables … … 34 37 35 38 // captcha check 36 $cic = (isset($_POST['captcha_encode']) && !check_captcha($_POST['captcha_encode'], $_POST['captcha_code'])) ? "&cic=1" : ""; 39 $cic = ""; 40 $securimage = new Securimage(); 41 if ($securimage->check($_POST['captcha_code']) == false) { 42 $cic = "&cic=1"; 43 } 37 44 $variables['cic'] = $cic; 38 45 … … 52 59 // captcha check ok and message posted? 53 60 if ($cic == "" && isset($_POST['sendmessage'])) { 54 $result = dbquery("DELETE FROM ".$db_prefix."captcha WHERE captcha_datestamp<'".(time()-900)."'");55 61 $errors = array(); 56 62 if ($mailname == "") { -
trunk/includes/comments_include.php
r1184 r1313 28 28 if ((iMEMBER || $settings['guestposts'] == "1") && isset($_POST['post_comment'])) { 29 29 30 $result = dbquery("DELETE FROM ".$db_prefix."captcha WHERE captcha_datestamp<'".(time()-900)."'");31 32 30 $flood = false; 33 31 if (dbrows(dbquery("SELECT $ccol FROM ".$db_prefix."$cdb WHERE $ccol='$comment_id'"))==0) { … … 43 41 44 42 // captcha check for guest posts 45 $cic = (iGUEST && !check_captcha($_POST['captcha_encode'], $_POST['captcha_code'])) ? "&cic=1" : ""; 43 $cic = ""; 44 if (iGUEST) { 45 // load the secureimage include 46 require_once PATH_INCLUDES."secureimage-1.0.3/secureimage.php"; 47 $securimage = new Securimage(); 48 if ($securimage->check($_POST['captcha_code']) == false) { 49 $cic = "&cic=1"; 50 } 51 } 46 52 47 53 $comment_message = trim(stripinput(censorwords($_POST['comment_message']))); -
trunk/includes/core_functions.php
r1295 r1313 631 631 } 632 632 633 // check captcha634 function check_captcha($captchs_encode, $captcha_string) {635 global $db_prefix;636 637 if (preg_match("/^[0-9a-z]+$/", $captchs_encode) && preg_match("/^[0-9a-z]+$/", $captcha_string)) {638 $result = dbquery("SELECT * FROM ".$db_prefix."captcha WHERE captcha_ip='".USER_IP."' AND captcha_encode='".$captchs_encode."' AND captcha_string='".$captcha_string."'");639 if (dbrows($result)) {640 $result = dbquery("DELETE FROM ".$db_prefix."captcha WHERE captcha_ip='".USER_IP."' AND captcha_encode='".$captchs_encode."' AND captcha_string='".$captcha_string."'");641 return true;642 } else {643 return false;644 }645 } else {646 return false;647 }648 }649 650 633 // Replace offensive words with the defined replacement word 651 634 function censorwords($text) { -
trunk/includes/templates/include.comments.tpl
r1184 r1313 107 107 </td> 108 108 <td align='left' width='50%' class='tbl1'> 109 {make_captcha}109 <img id="captcha" src="{$smarty.const.INCLUDES}securimage-1.0.3/securimage_show.php" alt="CAPTCHA Image" /> 110 110 </td> 111 111 </tr> -
trunk/includes/templates/main.contact.tpl
r1185 r1313 60 60 {$locale.411} 61 61 <br /><br /> 62 {$locale.412} {make_captcha}62 {$locale.412} <img id="captcha" src="{$smarty.const.INCLUDES}securimage-1.0.3/securimage_show.php" alt="CAPTCHA Image" /> 63 63 {$locale.413} <input type='text' name='captcha_code' class='textbox' style='vertical-align:top;width:100px' /> 64 64 <br /><br /> -
trunk/includes/templates/main.register.tpl
r1121 r1313 103 103 </td> 104 104 <td class='tbl'> 105 {make_captcha}105 <img id="captcha" src="{$smarty.const.INCLUDES}securimage-1.0.3/securimage_show.php" alt="CAPTCHA Image" /> 106 106 </td> 107 107 </tr> -
trunk/includes/theme_functions.php
r1311 r1313 455 455 // thread notifies: set to 14 days 456 456 $result = dbquery("DELETE FROM ".$db_prefix."thread_notify WHERE notify_datestamp < '".(time() - $day * 14)."'"); 457 // captcha images: set to 6 minutes458 $result = dbquery("DELETE FROM ".$db_prefix."captcha WHERE captcha_datestamp < '".(time() - $minute * 6)."'");459 457 // new registered users: set to 3 days 460 458 $result = dbquery("DELETE FROM ".$db_prefix."new_users WHERE user_datestamp < '".(time() - $day * 3)."'"); -
trunk/register.php
r1286 r1313 23 23 24 24 // include the DNS functions include 25 include PATH_INCLUDES."dns_functions.php";25 require_once PATH_INCLUDES."dns_functions.php"; 26 26 27 27 // load the locales for this module … … 134 134 135 135 if ($settings['display_validation'] == "1") { 136 if (!isset($_POST['captcha_encode']) || !isset($_POST['captcha_code']) || !check_captcha($_POST['captcha_encode'], $_POST['captcha_code'])) { 136 // include the secureimage class 137 require_once PATH_INCLUDES."secureimage-1.0.3/secureimage.php"; 138 $securimage = new Securimage(); 139 if ($securimage->check($_POST['captcha_code']) == false) { 140 // the code was incorrect 137 141 $error .= $locale['410']."<br />\n"; 138 } 142 } 139 143 } 140 144
Note: See TracChangeset
for help on using the changeset viewer.
