CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-01 18:39:57 +12:00
Code Issues Projects Releases Wiki Activity

Some code cleanups

Browse source
This commit is contained in:
eldadfux 2019-08-09 17:11:22 +03:00
parent 968cc58ee6
commit 823a4ea3bd
4 changed files with 27 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/controllers/storage.php
View file

@ -217,20 +217,6 @@ $utopia->get('/v1/storage/files/:fileId/preview')
if (!file_exists($path)) {
throw new Exception('File not found in ' . $path, 404);
}
/*
if(1 === 1 || !$libreOffice->supported($convertExt)) {
if (array_key_exists($mimeType, $fileLogos)) {
$path = realpath('./images/file-types/' . $fileLogos[$mimeType]);
$type = 'jpg';
$cipher = '';
$algorithm = '';
} elseif (!in_array($mimeType, $inputs)) {
$path = realpath('./images/file-types/default.gif');
$type = 'jpg';
$cipher = '';
$algorithm = '';
}
}*/
$cache = new Cache(new Filesystem('/storage/cache/app-' . $project->getUid())); // Limit file number or size
$data = $cache->load($key, 60 * 60 * 24 * 30 * 3 /* 3 months */);
@ -620,24 +606,4 @@ $utopia->get('/v1/storage/files/:fileId/scan')
//$response->json($antiVirus->continueScan($device->getRoot()));
}
);
/*
$utopia->get('/v1/storage/scan')
->desc('Scan Storage')
->label('scope', 'storage.scan')
->label('sdk.namespace', 'storage')
->label('sdk.method', 'scan')
->label('sdk.hide', true)
->action(
function() use ($response)
{
$device = Storage::getDevice('local');
$antiVirus = new Network('clamav', 3310);
//var_dump($antiVirus->ping());
//var_dump($antiVirus->version());
//var_dump($antiVirus->fileScan('/storage/uploads/app-1/5/9/f/e/59fecaed49645.pdf'));
$response->json($antiVirus->continueScan($device->getRoot()));
}
);*/
);

2
public/dist/styles/default-ltr.css vendored
View file

File diff suppressed because one or more lines are too long

3
public/styles/forms.less
View file

@ -448,6 +448,9 @@ fieldset {
border: none;
height: auto;
width: auto;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
&:hover {
border: none;

59
src/Database/Database.php
View file

@ -60,24 +60,24 @@ class Database
'legalCity' => '',
'legalAddress' => '',
'legalTaxId' => '',
'usersOauthBitbucketAppid' => '',
'usersOauthBitbucketSecret' => '',
// 'usersOauthBitbucketAppid' => '',
// 'usersOauthBitbucketSecret' => '',
'usersOauthFacebookAppid' => '',
'usersOauthFacebookSecret' => '',
'usersOauthGithubAppid' => '',
'usersOauthGithubSecret' => '',
'usersOauthGitlabAppid' => '',
'usersOauthGitlabSecret' => '',
'usersOauthGoogleAppid' => '',
'usersOauthGoogleSecret' => '',
'usersOauthInstagramAppid' => '',
'usersOauthInstagramSecret' => '',
// 'usersOauthGitlabAppid' => '',
// 'usersOauthGitlabSecret' => '',
// 'usersOauthGoogleAppid' => '',
// 'usersOauthGoogleSecret' => '',
// 'usersOauthInstagramAppid' => '',
// 'usersOauthInstagramSecret' => '',
'usersOauthLinkedinAppid' => '',
'usersOauthLinkedinSecret' => '',
'usersOauthMicrosoftAppid' => '',
'usersOauthMicrosoftSecret' => '',
'usersOauthTwitterAppid' => '',
'usersOauthTwitterSecret' => '',
// 'usersOauthMicrosoftAppid' => '',
// 'usersOauthMicrosoftSecret' => '',
// 'usersOauthTwitterAppid' => '',
// 'usersOauthTwitterSecret' => '',
],
self::SYSTEM_COLLECTION_COLLECTIONS => [
'$collection' => self::SYSTEM_COLLECTION_COLLECTIONS,
@ -94,7 +94,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -104,7 +103,6 @@ class Database
'default' => false,
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -136,7 +134,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -146,7 +143,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -156,7 +152,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -166,7 +161,6 @@ class Database
'default' => '',
'required' => false,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -176,7 +170,6 @@ class Database
'default' => true,
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -186,7 +179,6 @@ class Database
'default' => true,
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -218,7 +210,6 @@ class Database
'default' => '',
'required' => false,
'array' => true,
],
],
],
@ -237,7 +228,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -247,7 +237,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -257,7 +246,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -267,7 +255,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -277,7 +264,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -287,7 +273,6 @@ class Database
'default' => '',
'required' => false,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -297,7 +282,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -307,7 +291,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -523,7 +506,6 @@ class Database
'default' => null,
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -533,7 +515,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -543,7 +524,6 @@ class Database
'default' => 0,
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -553,7 +533,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -563,7 +542,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
],
],
@ -654,7 +632,6 @@ class Database
'default' => '',
'required' => true,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -664,7 +641,6 @@ class Database
'default' => '',
'required' => false,
'array' => false,
],
[
'$collection' => self::SYSTEM_COLLECTION_RULES,
@ -674,7 +650,6 @@ class Database
'default' => '',
'required' => false,
'array' => false,
],
],
],
@ -1707,6 +1682,16 @@ class Database
return $results;
}
/**
* @param string $key
* @param string $value
* @return array
*/
public function setMock($key, $value) {
$this->mocks[$key] = $value;
return $this;
}
/**
* @return array
*/