no commit message

include/chajian/inputChajian.php

@@ -367,7 +367,7 @@ class inputChajian extends Chajian
 		if(!$fopt && ($type=='rockcombo' || $type=='checkboxall' || $type=='radio')){
 			$_ars = explode(',', $datanum);
 			$fopt = $this->option->getselectdata($_ars[0], isset($_ars[2]));
-			$fvad = 'name';
+			$fvad = 'nameo';
 			if(isset($_ars[1])&&($_ars[1]=='value'||$_ars[1]=='id'||$_ars[1]=='num'))$fvad=$_ars[1];
 			
 			if($fopt){

include/chajian/rockeditChajian.php

@@ -78,13 +78,16 @@ class rockeditChajian extends Chajian{
 			$onlynum	= md5(''.$this->rock->jm->getRandkey().date('YmdHis').'file'.$id.'');
 			m('file')->update("`onlynum`='$onlynum'", $id);
 		}
+		$stype		= '0';//0wps,1onlyoffice
 		$urs 		= m('admin')->getone($this->adminid);
 		$barr 		= $this->getdata('file','change', array(
 			'filenum' 	=> $onlynum,
 			'optid'		=> $this->adminid,
+			'stype'		=> $stype,
 			'optname'	=> $this->rock->jm->base64encode($this->adminname),
 			'face'		=> $this->rock->jm->base64encode(m('admin')->getface($urs['face'])),
 		));
+		//$this->rock->debugs($barr,'rockedit');
 		if(!$barr['success'])return $barr;
 		$data 		= $barr['data'];
 		$type 		= $data['type'];
@@ -113,6 +116,7 @@ class rockeditChajian extends Chajian{
 			$url.= '&optid='.$this->adminid.'';
 			$url.= '&gokey='.$gokey.'';
 			$url.= '&otype='.$otype.'';
+			$url.= '&stype='.$stype.'';
 			if($otype==0){
 				$callurl = $this->rock->getouturl().'api.php?m=upload&a=upfilevb&fileid='.$id.'&adminid='.$this->adminid.'&token='.$admintoken.'';
 				$url.='&callurl='.$this->rock->jm->base64encode($callurl).'';

include/class/mysqliClass.php

@@ -6,6 +6,7 @@ class mysqliClass extends mysql{
 	protected function connect()
 	{
 		$this->errormsg	= '';
+		if(!class_exists('mysqli'))exit('操作数据库的php的扩展mysqli不存在');
 		$this->conn = @new mysqli($this->db_host,$this->db_user, $this->db_pass, $this->db_base);
 		if (mysqli_connect_errno()) {
 			$this->conn 	= null;

include/class/pdoClass.php

@@ -6,6 +6,7 @@ class pdoClass extends mysql{
 	protected function connect()
 	{
 		$this->errormsg	= '';
+		if(!class_exists('PDO'))exit('操作数据库的php的扩展PDO不存在');
 		try {
 			$this->conn = @new PDO('mysql:host='.$this->db_host.';dbname='.$this->db_base.'', $this->db_user, $this->db_pass);
 			$this->conn->query("SET NAMES 'utf8'");