Merge branch '2.4' into develop

pull/8754/head
iglocska 2022-11-09 15:08:02 +01:00
commit 56c5b9c409
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
30 changed files with 33 additions and 33 deletions

View File

@ -68,7 +68,7 @@ class EventShell extends AppShell
$user = $this->getUser($userId);
if (!file_exists($path)) {
$this->error("File '$path' does not exists.");
$this->error("File '$path' does not exist.");
}
if (!is_readable($path)) {
$this->error("File '$path' is not readable.");
@ -632,7 +632,7 @@ class EventShell extends AppShell
{
$user = $this->User->getAuthUser($userId, true);
if (empty($user)) {
$this->error("User with ID $userId does not exists.");
$this->error("User with ID $userId does not exist.");
}
Configure::write('CurrentUserId', $user['id']); // for audit logging purposes
return $user;

View File

@ -299,7 +299,7 @@ class AttributesController extends AppController
$conditions['Attribute.type'] = array('attachment', 'malware-sample');
$attributes = $this->Attribute->fetchAttributes($this->Auth->user(), array('conditions' => $conditions, 'flatten' => true));
if (empty($attributes)) {
throw new UnauthorizedException(__('Attribute does not exists or you do not have the permission to download this attribute.'));
throw new UnauthorizedException(__('Attribute does not exist or you do not have the permission to download this attribute.'));
}
return $this->__downloadAttachment($attributes[0]['Attribute']);
}
@ -1763,7 +1763,7 @@ class AttributesController extends AppController
$conditions['Attribute.type'] = array('attachment', 'malware-sample');
$attributes = $this->Attribute->fetchAttributes($user, array('conditions' => $conditions, 'flatten' => true));
if (empty($attributes)) {
throw new UnauthorizedException(__('Attribute does not exists or you do not have the permission to download this attribute.'));
throw new UnauthorizedException(__('Attribute does not exist or you do not have the permission to download this attribute.'));
}
return $this->__downloadAttachment($attributes[0]['Attribute']);
}

View File

@ -157,7 +157,7 @@ class AttachmentTool
$filepath = $this->attachmentDir() . DS . $path;
$file = new File($filepath);
if (!is_file($file->path)) {
throw new NotFoundException("File '$filepath' does not exists.");
throw new NotFoundException("File '$filepath' does not exist.");
}
}

View File

@ -725,7 +725,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr ""
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -578,7 +578,7 @@ msgid "Workers number [%s] is not valid. Please enter a valid number"
msgstr ""
#: Plugin/CakeResque/Console/Command/CakeResqueShell.php:1282
msgid "User [%s] does not exists. Please enter a valid system user"
msgid "User [%s] does not exist. Please enter a valid system user"
msgstr ""
#: Plugin/CakeResque/Console/Command/CakeResqueShell.php:1304

View File

@ -723,7 +723,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "Neplatná Skupina sdílení nebo není autorizovaná."
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -720,7 +720,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "Ugyldig Delingsgruppe, eller ingen godkendelse."
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -848,7 +848,7 @@ msgid "Add attribute"
msgstr ""
#: Controller/AttributesController.php:287;1725
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:305

View File

@ -720,7 +720,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "Ungültige Freigabegruppe oder nicht berechtigt."
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -723,7 +723,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "Groupe de partage invalide ou non autorisé."
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -720,7 +720,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr ""
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -721,7 +721,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "Sharing Group non valido o non autorizzato."
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -719,7 +719,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "無効な共有グループ、もしくは権限がありません。"
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -720,7 +720,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "잘못된 공유 그룹이거나 권한이 없습니다"
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -720,7 +720,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "Ugyldig delingsgruppe eller ikke autorisert."
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -723,7 +723,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr ""
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -721,7 +721,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "Grupo de compartilhamento inválido ou não autorizado."
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -721,7 +721,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr ""
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -722,7 +722,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr ""
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -723,7 +723,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "වලංගු නොවන බෙදාගැනීමේ කණ්ඩායමක් හෝ අවසරයක් නැත."
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr "උපලක්ෂණයක් නොපවතී හෝ ඔබට මෙම උපලක්ෂණ බාගැනීමට අවසර නැත."
#: Controller/AttributesController.php:334

View File

@ -722,7 +722,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "Grupo de uso no válido o no autorizado."
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -722,7 +722,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "กลุ่มการแบ่งปันไม่ถูกต้องหรือไม่ได้รับอนุญาต"
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr "ไม่มีแอตทริบิวต์หรือคุณไม่ได้รับอนุญาตให้ดาวน์โหลดแอตทริบิวต์นี้"
#: Controller/AttributesController.php:334

View File

@ -719,7 +719,7 @@ msgid "Invalid Sharing Group or not authorised."
msgstr "无效的共享组或未授权."
#: Controller/AttributesController.php:316;1772
msgid "Attribute does not exists or you do not have the permission to download this attribute."
msgid "Attribute does not exist or you do not have the permission to download this attribute."
msgstr ""
#: Controller/AttributesController.php:334

View File

@ -223,7 +223,7 @@ class GalaxyClusterRelation extends AppModel
}
if (!$force) {
$targetCluster = $this->TargetCluster->fetchIfAuthorized($user, $relation['GalaxyClusterRelation']['referenced_galaxy_cluster_uuid'], 'view', $throwErrors=false, $full=false);
if (isset($targetCluster['authorized']) && !$targetCluster['authorized']) { // do not save the relation if referenced cluster is not accessible by the user (or does not exists)
if (isset($targetCluster['authorized']) && !$targetCluster['authorized']) { // do not save the relation if referenced cluster is not accessible by the user (or does not exist)
$errors[] = array(__('Invalid referenced galaxy cluster'));
return $errors;
}
@ -315,7 +315,7 @@ class GalaxyClusterRelation extends AppModel
return $errors;
}
$targetCluster = $this->TargetCluster->fetchIfAuthorized($user, $relation['GalaxyClusterRelation']['referenced_galaxy_cluster_uuid'], 'view', $throwErrors=false, $full=false);
if (isset($targetCluster['authorized']) && !$targetCluster['authorized']) { // do not save the relation if referenced cluster is not accessible by the user (or does not exists)
if (isset($targetCluster['authorized']) && !$targetCluster['authorized']) { // do not save the relation if referenced cluster is not accessible by the user (or does not exist)
$errors[] = array(__('Invalid referenced galaxy cluster'));
return $errors;
}

View File

@ -3249,7 +3249,7 @@ class Server extends AppModel
$indexDiff = array();
foreach ($expectedIndex as $tableName => $indexes) {
if (!array_key_exists($tableName, $actualIndex)) {
continue; // If table does not exists, it is covered by the schema diagnostic
continue; // If table does not exist, it is covered by the schema diagnostic
}
$tableIndexDiff = array_diff(array_keys($indexes), array_keys($actualIndex[$tableName])); // check for missing indexes
foreach ($tableIndexDiff as $columnDiff) {

View File

@ -1023,7 +1023,7 @@ class Workflow extends AppModel
$className = str_replace('.php', '', $className[count($className)-1]);
try {
if (!@include_once($filepath)) {
$message = __('Could not load module for path %s. File does not exists.', $filepath);
$message = __('Could not load module for path %s. File does not exist.', $filepath);
$this->log($message, LOG_ERR);
return $message;
}

View File

@ -1114,7 +1114,7 @@ CalHeatMap.prototype = {
}
if (d3.select(options.itemSelector)[0][0] === null) {
throw new Error("The node '" + options.itemSelector + "' specified in itemSelector does not exists");
throw new Error("The node '" + options.itemSelector + "' specified in itemSelector does not exist");
}
try {

View File

@ -886,7 +886,7 @@ function markdownItToggleRenderingRule(rulename, event) {
event.stopPropagation()
}
if (renderingRules[rulename] === undefined) {
console.log('Rule does not exists')
console.log('Rule does not exist')
return
}
renderingRules[rulename] = !renderingRules[rulename]

View File

@ -199,7 +199,7 @@
var checked = this.taskScheduled;
this.container = document.getElementById(this.config.container);
if (this.container === undefined || this.container === null) {
throw "Cannot create switch. Container does not exists";
throw "Cannot create switch. Container does not exist";
}
var temp = document.createElement('div');
this.config.checkboxLink = this.genRandom();

View File

@ -164,7 +164,7 @@ if ($apply) {
my $misp_config_path = "$misp_config_path/misp.conf.d";
unless(-d $misp_config_path) {
die "MISP Configuration Path does not exists: $misp_config_path\n";
die "MISP Configuration Path does not exist: $misp_config_path\n";
}
foreach my $fp (glob("$misp_config_path/*.conf")) {