From 0f6ffb8270bcbae29222f86756293c25d3df1367 Mon Sep 17 00:00:00 2001 From: CriimBow Date: Tue, 8 Nov 2022 16:13:14 +0100 Subject: [PATCH] does not exists => does not exist --- app/Console/Command/EventShell.php | 4 ++-- app/Controller/AttributesController.php | 4 ++-- app/Lib/Tools/AttachmentTool.php | 2 +- app/Locale/ara/LC_MESSAGES/default.po | 2 +- app/Locale/cake_resque.pot | 2 +- app/Locale/cze/LC_MESSAGES/default.po | 2 +- app/Locale/dan/LC_MESSAGES/default.po | 2 +- app/Locale/default.pot | 2 +- app/Locale/deu/LC_MESSAGES/default.po | 2 +- app/Locale/fra/LC_MESSAGES/default.po | 2 +- app/Locale/hun/LC_MESSAGES/default.po | 2 +- app/Locale/ita/LC_MESSAGES/default.po | 2 +- app/Locale/jpn/LC_MESSAGES/default.po | 2 +- app/Locale/kor/LC_MESSAGES/default.po | 2 +- app/Locale/no/LC_MESSAGES/default.po | 2 +- app/Locale/pol/LC_MESSAGES/default.po | 2 +- app/Locale/pt_BR/LC_MESSAGES/default.po | 2 +- app/Locale/ro/LC_MESSAGES/default.po | 2 +- app/Locale/rus/LC_MESSAGES/default.po | 2 +- app/Locale/si-LK/LC_MESSAGES/default.po | 2 +- app/Locale/spa/LC_MESSAGES/default.po | 2 +- app/Locale/th_TH/LC_MESSAGES/default.po | 2 +- app/Locale/zh-s/LC_MESSAGES/default.po | 2 +- app/Model/GalaxyClusterRelation.php | 4 ++-- app/Model/Server.php | 2 +- app/Model/Workflow.php | 2 +- app/webroot/js/cal-heatmap.js | 2 +- app/webroot/js/markdownEditor/event-report.js | 2 +- app/webroot/js/taskScheduler.js | 2 +- tools/misp-config | 2 +- 30 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/Console/Command/EventShell.php b/app/Console/Command/EventShell.php index 1398bd476..88c6739ed 100644 --- a/app/Console/Command/EventShell.php +++ b/app/Console/Command/EventShell.php @@ -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."); @@ -637,7 +637,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; diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php index d73c479b3..c525ed153 100644 --- a/app/Controller/AttributesController.php +++ b/app/Controller/AttributesController.php @@ -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']); } @@ -1770,7 +1770,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']); } diff --git a/app/Lib/Tools/AttachmentTool.php b/app/Lib/Tools/AttachmentTool.php index 52f227832..d95cdd6cd 100644 --- a/app/Lib/Tools/AttachmentTool.php +++ b/app/Lib/Tools/AttachmentTool.php @@ -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."); } } diff --git a/app/Locale/ara/LC_MESSAGES/default.po b/app/Locale/ara/LC_MESSAGES/default.po index d669fcdb5..ccaa20c24 100644 --- a/app/Locale/ara/LC_MESSAGES/default.po +++ b/app/Locale/ara/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/cake_resque.pot b/app/Locale/cake_resque.pot index fdbc5ab59..a105801bb 100644 --- a/app/Locale/cake_resque.pot +++ b/app/Locale/cake_resque.pot @@ -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 diff --git a/app/Locale/cze/LC_MESSAGES/default.po b/app/Locale/cze/LC_MESSAGES/default.po index b1c6c1d00..fa32e5969 100644 --- a/app/Locale/cze/LC_MESSAGES/default.po +++ b/app/Locale/cze/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/dan/LC_MESSAGES/default.po b/app/Locale/dan/LC_MESSAGES/default.po index 073394e95..8de07eca4 100644 --- a/app/Locale/dan/LC_MESSAGES/default.po +++ b/app/Locale/dan/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/default.pot b/app/Locale/default.pot index 40c15ea69..8800c29b4 100644 --- a/app/Locale/default.pot +++ b/app/Locale/default.pot @@ -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 diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po index a447de5b5..0704a865b 100644 --- a/app/Locale/deu/LC_MESSAGES/default.po +++ b/app/Locale/deu/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/fra/LC_MESSAGES/default.po b/app/Locale/fra/LC_MESSAGES/default.po index ece0e4027..4383c9239 100644 --- a/app/Locale/fra/LC_MESSAGES/default.po +++ b/app/Locale/fra/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/hun/LC_MESSAGES/default.po b/app/Locale/hun/LC_MESSAGES/default.po index 29959ad24..060ff002d 100644 --- a/app/Locale/hun/LC_MESSAGES/default.po +++ b/app/Locale/hun/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/ita/LC_MESSAGES/default.po b/app/Locale/ita/LC_MESSAGES/default.po index 83ce00e04..3fd797c47 100644 --- a/app/Locale/ita/LC_MESSAGES/default.po +++ b/app/Locale/ita/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/jpn/LC_MESSAGES/default.po b/app/Locale/jpn/LC_MESSAGES/default.po index ba835e83c..8d8b227ac 100644 --- a/app/Locale/jpn/LC_MESSAGES/default.po +++ b/app/Locale/jpn/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/kor/LC_MESSAGES/default.po b/app/Locale/kor/LC_MESSAGES/default.po index d8348242d..702b70330 100644 --- a/app/Locale/kor/LC_MESSAGES/default.po +++ b/app/Locale/kor/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/no/LC_MESSAGES/default.po b/app/Locale/no/LC_MESSAGES/default.po index 1615ea775..2ebb74bc6 100644 --- a/app/Locale/no/LC_MESSAGES/default.po +++ b/app/Locale/no/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/pol/LC_MESSAGES/default.po b/app/Locale/pol/LC_MESSAGES/default.po index 275617176..348da1637 100644 --- a/app/Locale/pol/LC_MESSAGES/default.po +++ b/app/Locale/pol/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/pt_BR/LC_MESSAGES/default.po b/app/Locale/pt_BR/LC_MESSAGES/default.po index 14425a49e..e78b80293 100644 --- a/app/Locale/pt_BR/LC_MESSAGES/default.po +++ b/app/Locale/pt_BR/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/ro/LC_MESSAGES/default.po b/app/Locale/ro/LC_MESSAGES/default.po index 00e817fce..0032d1140 100644 --- a/app/Locale/ro/LC_MESSAGES/default.po +++ b/app/Locale/ro/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/rus/LC_MESSAGES/default.po b/app/Locale/rus/LC_MESSAGES/default.po index b3bfb931e..12d435b47 100644 --- a/app/Locale/rus/LC_MESSAGES/default.po +++ b/app/Locale/rus/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/si-LK/LC_MESSAGES/default.po b/app/Locale/si-LK/LC_MESSAGES/default.po index 53160e3aa..ba4d74a52 100644 --- a/app/Locale/si-LK/LC_MESSAGES/default.po +++ b/app/Locale/si-LK/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/spa/LC_MESSAGES/default.po b/app/Locale/spa/LC_MESSAGES/default.po index 548973e37..618975630 100644 --- a/app/Locale/spa/LC_MESSAGES/default.po +++ b/app/Locale/spa/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/th_TH/LC_MESSAGES/default.po b/app/Locale/th_TH/LC_MESSAGES/default.po index 45589c869..c22c08e09 100644 --- a/app/Locale/th_TH/LC_MESSAGES/default.po +++ b/app/Locale/th_TH/LC_MESSAGES/default.po @@ -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 diff --git a/app/Locale/zh-s/LC_MESSAGES/default.po b/app/Locale/zh-s/LC_MESSAGES/default.po index 9d554618d..b8a044794 100644 --- a/app/Locale/zh-s/LC_MESSAGES/default.po +++ b/app/Locale/zh-s/LC_MESSAGES/default.po @@ -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 diff --git a/app/Model/GalaxyClusterRelation.php b/app/Model/GalaxyClusterRelation.php index 7fb182064..6f20fba88 100644 --- a/app/Model/GalaxyClusterRelation.php +++ b/app/Model/GalaxyClusterRelation.php @@ -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; } diff --git a/app/Model/Server.php b/app/Model/Server.php index 0bdbd0b08..854447068 100644 --- a/app/Model/Server.php +++ b/app/Model/Server.php @@ -3182,7 +3182,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) { diff --git a/app/Model/Workflow.php b/app/Model/Workflow.php index c1f99b9ff..70c8d1888 100644 --- a/app/Model/Workflow.php +++ b/app/Model/Workflow.php @@ -1008,7 +1008,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; } diff --git a/app/webroot/js/cal-heatmap.js b/app/webroot/js/cal-heatmap.js index 0ce105e7b..96ffcc948 100644 --- a/app/webroot/js/cal-heatmap.js +++ b/app/webroot/js/cal-heatmap.js @@ -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 { diff --git a/app/webroot/js/markdownEditor/event-report.js b/app/webroot/js/markdownEditor/event-report.js index 7e9b6d23c..9096de7a6 100644 --- a/app/webroot/js/markdownEditor/event-report.js +++ b/app/webroot/js/markdownEditor/event-report.js @@ -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] diff --git a/app/webroot/js/taskScheduler.js b/app/webroot/js/taskScheduler.js index a871b5cc6..c5e6e972d 100644 --- a/app/webroot/js/taskScheduler.js +++ b/app/webroot/js/taskScheduler.js @@ -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(); diff --git a/tools/misp-config b/tools/misp-config index d06a53772..ff9f4ff3d 100755 --- a/tools/misp-config +++ b/tools/misp-config @@ -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")) {