修改一些小细节

FlxSNX · Dec 18, 2020 · 6610777 · 6610777
1 parent e5c98ed
commit 6610777
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/controller/index.php b/app/controller/index.php
@@ -12,7 +12,7 @@ public function __init(){
 
     public function index($url,$dirid=false){
         $project = teambition::get_project($this->projectId,$this->cookie);
-        if($project){
+        if($project && $project['_id']){
             if(!$dirid){
                 $dirid = $project['_rootCollectionId'];
                 $root = true;
@@ -42,7 +42,6 @@ public function getDownload($url,$id){
         $type = authstr($_GET['type']) ?: 302;
         $result = teambition::get_download_url($id,$this->cookie);
         if($result){
-            $result = json_decode($result,true);
             if($result['fileType'] == 'mp4' and $_SERVER['HTTP_RANGE'] == NULL){
                 assign('item',$result);
                 view('index/_play');

diff --git a/extend/teambition.php b/extend/teambition.php
@@ -151,8 +151,8 @@ public static function get_files($projectId,$dirId,$cookie,$page=1){
     public static function get_download_url($parentId,$cookie){
         $result = self::get('https://www.teambition.com/api/works/'.$parentId,$cookie);
         if($result){
-            $resultArray = json_decode($result,true);
-            if($resultArray['downloadUrl']){
+            $result = json_decode($result,true);
+            if($result['downloadUrl']){
                 return $result;
             }else{
                 return false;
@@ -179,6 +179,7 @@ protected static function get($url,$cookie=false,$post=false,$header=false){
             curl_setopt($ch, CURLOPT_POSTFIELDS,$post);
             curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
         }
+        curl_setopt($ch, CURLOPT_TIMEOUT,10);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 	    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);