部分js插件更换为cdn，减少项目大小；

我的日历应用更新

Author: hooray

index.php

@@ -46,11 +46,11 @@
 	<meta name="description" content="<?php echo $setting['description']; ?>" />
 	<meta name="keywords" content="<?php echo $setting['keywords']; ?>" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<link href="//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+	<link href="//cdn.bootcss.com/sweetalert/1.1.3/sweetalert.min.css" rel="stylesheet">
+	<link href="//at.alicdn.com/t/font_2dkt72ag040io1or.css" rel="stylesheet">
 	<link rel="stylesheet" href="static/plugins/HoorayLibs/hooraylibs.css">
-	<link rel="stylesheet" href="static/plugins/font-awesome-4.7.0/css/font-awesome.min.css">
-	<link rel="stylesheet" href="//at.alicdn.com/t/font_3qtd7uxnh21n61or.css">
 	<link rel="stylesheet" href="static/plugins/artDialog-7.0.0/css/dialog.css">
-	<link rel="stylesheet" href="static/plugins/sweetalert-1.1.1/dist/sweetalert.css">
 	<link rel="stylesheet" href="libs/clicaptcha/css/captcha.css">
 	<link rel="stylesheet" href="static/css/index.css">
 	<link rel="stylesheet" href="static/css/skins/<?php echo getSkin(); ?>.css" id="window-skin">
@@ -326,13 +326,13 @@
 			<p>购买或定制请联系 QQ：<a href="http://wpa.qq.com/msgrd?v=3&uin=304327508&site=qq&menu=yes" target="_blank">304327508</a></p>
 		</div>
 	</div>
-	<script src="static/plugins/jquery-2.2.4.min.js"></script>
+	<script src="//cdn.bootcss.com/jquery/2.2.4/jquery.min.js"></script>
+	<script src="//cdn.bootcss.com/sugar/2.0.4/sugar.min.js"></script>
+	<script src="//cdn.bootcss.com/sweetalert/1.1.3/sweetalert.min.js"></script>
 	<script src="static/plugins/HoorayLibs/hooraylibs.js"></script>
 	<script src="static/plugins/Validform_v5.3.2/Validform_v5.3.2_min.js"></script>
-	<script src="libs/clicaptcha/clicaptcha.js"></script>
-	<script src="static/plugins/Sugar-2.0.2/dist/sugar.min.js"></script>
 	<script src="static/plugins/artDialog-7.0.0/dist/dialog-plus.js"></script>
-	<script src="static/plugins/sweetalert-1.1.1/dist/sweetalert.min.js"></script>
+	<script src="libs/clicaptcha/clicaptcha.js"></script>
 	<!-- 通过js目录下的两个批处理文件，可以合并并压缩js代码 -->
 	<script src="static/js/hros.core.js"></script>
 	<script src="static/js/hros.app.js"></script>

libs/clicaptcha/clicaptcha.class.php

@@ -7,7 +7,7 @@ function __construct(){
 		}
 		public function creat(){
 			$imagePathArr = array('image/1.jpg', 'image/2.jpg', 'image/3.jpg');
-			$imagePath = $imagePathArr[rand(0, 2)];
+			$imagePath = $imagePathArr[rand(0, count($imagePathArr) - 1)];
 			$fontPath = 'font/SourceHanSansCN-Normal.otf';
 			foreach($this->randChars() as $v){
 				$fontSize = rand(15, 30);
@@ -38,7 +38,7 @@ public function creat(){
 			//创建图片的实例
 			$image = imagecreatefromstring(file_get_contents($imagePath));
 			foreach($textArr['text'] as $v){
-				list($r, $g, $b) = $this->getImageColor($imagePath, $v['x'] + $v['width'] / 2, $v['y'] + $v['height'] / 2);
+				list($r, $g, $b) = $this->getImageColor($imagePath, $v['x'] + $v['width'] / 2, $v['y'] - $v['height'] / 2);
 				//字体颜色
 				$color = imagecolorallocate($image, $r, $g, $b);
 				//阴影字体颜色
@@ -47,16 +47,16 @@ public function creat(){
 				$b = $b > 127 ? 0 : 255;
 				$shadowColor = imagecolorallocate($image, $r, $g, $b);
 				//绘画阴影
-				imagefttext($image, $v['size'], 0, $v['x'] + 1, $v['y'], $shadowColor, $fontPath, $v['text']);
-				imagefttext($image, $v['size'], 0, $v['x'], $v['y'] + 1, $shadowColor, $fontPath, $v['text']);
-				imagefttext($image, $v['size'], 0, $v['x'] - 1, $v['y'], $shadowColor, $fontPath, $v['text']);
-				imagefttext($image, $v['size'], 0, $v['x'], $v['y'] - 1, $shadowColor, $fontPath, $v['text']);
-				imagefttext($image, $v['size'], 0, $v['x'] + 1, $v['y'] + 1, $shadowColor, $fontPath, $v['text']);
-				imagefttext($image, $v['size'], 0, $v['x'] + 1, $v['y'] - 1, $shadowColor, $fontPath, $v['text']);
-				imagefttext($image, $v['size'], 0, $v['x'] - 1, $v['y'] - 1, $shadowColor, $fontPath, $v['text']);
-				imagefttext($image, $v['size'], 0, $v['x'] - 1, $v['y'] + 1, $shadowColor, $fontPath, $v['text']);
+				imagettftext($image, $v['size'], 0, $v['x'] + 1, $v['y'], $shadowColor, $fontPath, $v['text']);
+				imagettftext($image, $v['size'], 0, $v['x'], $v['y'] + 1, $shadowColor, $fontPath, $v['text']);
+				imagettftext($image, $v['size'], 0, $v['x'] - 1, $v['y'], $shadowColor, $fontPath, $v['text']);
+				imagettftext($image, $v['size'], 0, $v['x'], $v['y'] - 1, $shadowColor, $fontPath, $v['text']);
+				imagettftext($image, $v['size'], 0, $v['x'] + 1, $v['y'] + 1, $shadowColor, $fontPath, $v['text']);
+				imagettftext($image, $v['size'], 0, $v['x'] + 1, $v['y'] - 1, $shadowColor, $fontPath, $v['text']);
+				imagettftext($image, $v['size'], 0, $v['x'] - 1, $v['y'] - 1, $shadowColor, $fontPath, $v['text']);
+				imagettftext($image, $v['size'], 0, $v['x'] - 1, $v['y'] + 1, $shadowColor, $fontPath, $v['text']);
 				//绘画文字
-				imagefttext($image, $v['size'], 0, $v['x'], $v['y'], $color, $fontPath, $v['text']);
+				imagettftext($image, $v['size'], 0, $v['x'], $v['y'], $color, $fontPath, $v['text']);
 			}
 			//生成图片
 			switch($imageType){
@@ -145,6 +145,7 @@ private function randPosition($textArr, $imgW, $imgH, $fontW, $fontH){
 			$return = array();
 			$x = rand(0, $imgW - $fontW);
 			$y = rand($fontH, $imgH);
+			//碰撞验证
 			if(!$this->checkPosition($textArr, $x, $y, $fontW, $fontH)){
 				$return = $this->randPosition($textArr, $imgW, $imgH, $fontW, $fontH);
 			}else{

static/css/index.css

@@ -12,17 +12,6 @@
 .title-bar .title{text-shadow:0 1px 1px #fff}
 /*窗口右上角操作按钮*/
 .title-handle a{color:#505050}
-.title-handle .ha-hide .hide-b{border-bottom:2px solid #505050}
-.title-handle .ha-max .max-b{border:1px solid #505050;border-top-width:3px;top:8px}
-.title-handle .ha-revert .revert-b{border:1px solid #505050;border-top-width:3px}
-.title-handle .ha-revert .revert-t{border:1px solid #505050;border-top-width:3px;background:#D2D2D2}
-.title-handle .ha-hide:hover b,
-.title-handle .ha-max:hover b,
-.title-handle .ha-revert:hover b{border-color:#2492FF}
-.title-handle .ha-fullscreen{color:#505050}
-.title-handle .ha-fullscreen:hover{color:#2492FF}
-.title-handle .ha-close{color:#BF160B}
-.title-handle .ha-close:hover{color:#BF160B}
 /*窗口内部iframe*/
 .window-frame{border-top:1px solid #666;border-bottom:1px solid #666}
 /*底部*/

static/css/skins/mac.css

@@ -111,7 +111,7 @@ HROS.base = (function(){
 		setSkin: function(skin, callback){
 			//将原样式修改id，并载入新样式
 			$('#window-skin').attr('id', 'window-skin-ready2remove');
-			var stylesheet = loadCSS('static/img/skins/' + skin + '.css?' + version);
+			var stylesheet = loadCSS('static/css/skins/' + skin + '.css?' + version);
 			onloadCSS(stylesheet, function(){
 				$('body link').last().attr('id', 'window-skin');
 				$('#window-skin-ready2remove').remove();