发布v2.6.4版本

webmain/task/api/kaoqinAction.php

@@ -51,4 +51,26 @@ class kaoqinClassAction extends apiAction
 		
 		$this->showreturn($barr);
 	}
+	
+
+	
+	/**
+	*	腾讯地图地址解析api.php?m=kaoqin&a=gcoder
+	*/
+	public function gcoderAction()
+	{
+		return c('mapqq')->gcoder($this->get('lat'), $this->get('lng'));
+	}
+	
+	//地址转化
+	public function translateAction()
+	{
+		return c('mapqq')->translate($this->get('lat'), $this->get('lng'),(int)$this->get('type'));
+	}
+	
+	//搜索
+	public function suggestionAction()
+	{
+		return c('mapqq')->suggestion($this->get('key'));
+	}
 }

webmain/task/api/uploadAction.php

@@ -19,6 +19,10 @@ class uploadClassAction extends apiAction
 			$updir=str_replace('{Year}',date('Y'), $updir);
 			$updir=str_replace(array('{','}'),'', $updir);
 			$updir=str_replace(',','|', $updir);
+			
+			$bobg = preg_replace("/[a-zA-Z0-9_]/",'', $updir);
+			$bobg = str_replace(array('-','|'),'', $bobg);
+			if($bobg)exit('stop:'.$bobg.'');
 		}
 		$upimg->initupfile($uptypes, ''.UPDIR.'|'.$updir.'', $maxsize);
 		$upses	= $upimg->up('file');
@@ -323,6 +327,7 @@ class uploadClassAction extends apiAction
 			if(substr($filepath,0,4)!='http' && isempt($filepathout) && !file_exists($filepath))return returnerror('文件不存在了1');
 			if(c('upfile')->isimg($fileext)){
 				$data['url'] = m('admin')->getface($filepath);
+				if(!isempt($filepathout))$data['url'] = $filepathout;
 			}
 			//下载
 			if($type==1){