scratch – Diff between revs 115 and 116

Subversion Repositories:
Rev:
Show entire file – Regard whitespace
Rev 115 Rev 116
Line 18... Line 18...
18 http_response_code(500); 18 http_response_code(500);
19 die('Internal server error.'); 19 die('Internal server error.');
20 } 20 }
Line 21... Line 21...
21   21  
-   22 echo json_encode(
-   23 array_values(
22 echo json_encode( 24 array_filter(
23 array_map( 25 array_map(
24 function ($file) use ($config, $finfo) { 26 function ($file) use ($config, $finfo) {
25 #### Get the file hash. 27 #### Get the file hash.
Line 36... Line 38...
36 38
37 #### If the extension is not allowed then skip this file. 39 #### If the extension is not allowed then skip this file.
38 $fileExtension = pathinfo($userPath, PATHINFO_EXTENSION); 40 $fileExtension = pathinfo($userPath, PATHINFO_EXTENSION);
39 if (!isset($fileExtension) || 41 if (!isset($fileExtension) ||
40 !in_array(strtoupper($fileExtension), 42 !in_array(strtoupper($fileExtension),
41 array_map('strtoupper', $config['ALLOWED_FILE_EXTENSIONS']))) { 43 array_map('strtoupper', $config['ALLOWED_FILE_EXTENSIONS'])))
42 return; -  
Line 43... Line 44...
43 } 44 return null;
44 45
45 #### Hook for various file extensions. 46 #### Hook for various file extensions.
46 $opengraph = FALSE; 47 $opengraph = FALSE;
Line 86... Line 87...
86 $frame->save($previewFile.'.'.'jpg'); 87 $frame->save($previewFile.'.'.'jpg');
87 $opengraph = TRUE; 88 $opengraph = TRUE;
88 break; 89 break;
89 case "GIF": 90 case "GIF":
90 $opengraph = TRUE; 91 $opengraph = TRUE;
-   92 case "PNG":
-   93 case "HTML":
-   94 case "HTM":
-   95 case "TGA":
-   96 case "SVG":
-   97 case "JPEG":
91 $previewHash = $fileHash; 98 $previewHash = $fileHash;
92 break; 99 break;
93 default: 100 default:
94 $previewHash = $fileHash; 101 return null;
95 break; -  
96 } 102 }
97 return array( 103 return array(
98 'url' => $fileHash, 104 'url' => $fileHash,
99 'type' => finfo_file($finfo, $userPath), 105 'type' => finfo_file($finfo, $userPath),
100 'preview' => $previewHash, 106 'preview' => $previewHash,
Line 115... Line 121...
115 ); 121 );
116 } 122 }
117 ) 123 )
118 ) 124 )
119 ) 125 )
-   126 )
-   127 )
120 ); 128 );
Line 121... Line 129...
121   129