更新clicaptcha

hooray · hooray · commit 7142ade5b1e4 · 2017-06-15T10:20:38.000+08:00
diff --git a/libs/clicaptcha/clicaptcha.class.php b/libs/clicaptcha/clicaptcha.class.php
@@ -8,12 +8,12 @@ function __construct(){
 		public function creat(){
 			$imagePathArr = array('image/1.jpg', 'image/2.jpg', 'image/3.jpg');
 			$imagePath = $imagePathArr[rand(0, 2)];
-			$fontPath = 'font/iYuanTi.ttf';
+			$fontPath = 'font/SourceHanSansCN-Normal.otf';
 			foreach($this->randChars() as $v){
-				$fontSize = rand(20, 40);
+				$fontSize = rand(15, 30);
 				//字符串文本框宽度和长度
 				$fontarea  = imagettfbbox($fontSize, 0, $fontPath, $v);
-				$textWidth = $fontarea[2] - $fontarea[0]; 
+				$textWidth = $fontarea[2] - $fontarea[0];
 				$textHeight = $fontarea[1] - $fontarea[7];
 				$tmp['text'] = $v;
 				$tmp['size'] = $fontSize;
@@ -209,4 +209,4 @@ private function getImageColor($img, $x, $y){
 			return array($r, $g, $b);
 		}
 	}
-?>
+?>
diff --git a/libs/clicaptcha/clicaptcha.js b/libs/clicaptcha/clicaptcha.js
@@ -44,7 +44,7 @@
 					e.preventDefault();
 					thisObj.off('mouseup').on('mouseup', function(e){
 						$('#clicaptcha-box .clicaptcha-title span:eq('+xyArr.length+')').addClass('clicaptcha-clicked');
-						xyArr.push((e.clientX - $(this).offset().left) + ',' + (e.clientY - $(this).offset().top));
+						xyArr.push(($(document).scrollLeft() + e.clientX - $(this).offset().left) + ',' + ($(document).scrollTop() + e.clientY - $(this).offset().top));
 						if(xyArr.length == text.length){
 							var captchainfo = [xyArr.join('-'), thisObj.width(), thisObj.height()].join(';');
 							$.ajax({
diff --git a/libs/clicaptcha/css/captcha.css b/libs/clicaptcha/css/captcha.css
@@ -25,6 +25,7 @@
 	line-height: 40px;
 	font-size: 14px;
 	text-align: center;
+	color: #333;
 }
 #clicaptcha-box .clicaptcha-title span{
 	font-size: 16px;
@@ -71,4 +72,4 @@
 	height: 100%;
 	opacity: 0.5;
 	background-color: rgb(0, 0, 0);
-}
+}
diff --git a/libs/clicaptcha/demo/action.php b/libs/clicaptcha/demo/action.php
@@ -0,0 +1,6 @@
+<?php
+	require('../clicaptcha.class.php');
+	
+	$clicaptcha = new clicaptcha();
+	echo $clicaptcha->check($_POST['clicaptcha-submit-info']) ? '后端二次验证成功' : '后端二次验证失败';
+?>
diff --git a/libs/clicaptcha/demo/css/main.css b/libs/clicaptcha/demo/css/main.css
@@ -0,0 +1,6 @@
+#login{width:500px;padding:50px;border:1px solid #ccc;margin:10px auto;}
+.row{height:30px;line-height:30px;padding:5px 0;}
+.row .text{width:100px;float:left;}
+.row .input{width:350px;float:left;}
+.row .input input{width:200px;height:26px;padding:0;}
+button{width:100px;height:30px;}
diff --git a/libs/clicaptcha/demo/index.html b/libs/clicaptcha/demo/index.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>clicaptcha在线演示</title>
+<link rel="stylesheet" href="../css/captcha.css">
+<link rel="stylesheet" href="css/main.css">
+<script src="jquery-1.8.3.min.js"></script>
+<script src="../clicaptcha.js"></script>
+<script>
+$(function(){
+	$('#sub').click(function(){
+		$('#clicaptcha-submit-info').clicaptcha({
+			src: '../clicaptcha.php',
+			callback: function(){
+				$('#form').submit();
+			}
+		});
+	});
+});
+</script>
+</head>
+
+<body>
+<div id="login">
+	<form action="action.php" method="post" id="form" name="form">
+		<div class="row">
+			<div class="text">用户名：</div>
+			<div class="input"><input type="text"></div>
+		</div>
+		<div class="row">
+			<div class="text">密码：</div>
+			<div class="input"><input type="password"></div>
+		</div>
+		<div class="row">
+			<button type="button" id="sub">提交</button>
+		</div>
+		<input type="hidden" id="clicaptcha-submit-info" name="clicaptcha-submit-info">
+	</form>
+</div>
+</body>
+</html>
diff --git a/libs/clicaptcha/demo/jquery-1.8.3.min.js b/libs/clicaptcha/demo/jquery-1.8.3.min.js
diff --git a/libs/clicaptcha/font/SourceHanSansCN-Normal.otf b/libs/clicaptcha/font/SourceHanSansCN-Normal.otf
diff --git a/libs/clicaptcha/font/iYuanTi.ttf b/libs/clicaptcha/font/iYuanTi.ttf
