Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com>2020-09-18 18:07:33 +0300
committerArtjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com>2020-09-21 09:14:11 +0300
commit0c0f20ba851d281e143efac176ecedb588156dff (patch)
tree063070bccb75a9f266db5e62c6f751763efb9d6c
parent7c8cc13cee6dcf4a09e6222cc411fdd0608cb478 (diff)
..F....... [DEV-1693] fixed code spelling in ui
-rw-r--r--ui/app/controllers/CControllerHost.php4
-rw-r--r--ui/app/controllers/CControllerPopupGeneric.php2
-rw-r--r--ui/app/controllers/CControllerPopupItemTestEdit.php2
-rw-r--r--ui/app/controllers/CControllerPopupItemTestGetValue.php2
-rw-r--r--ui/app/controllers/CControllerPopupItemTestSend.php2
-rw-r--r--ui/app/controllers/CControllerUsergroupEdit.php4
-rw-r--r--ui/app/views/popup.condition.common.php2
-rw-r--r--ui/host_discovery.php2
-rw-r--r--ui/hosts.php2
-rw-r--r--ui/include/classes/api/services/CHostInterface.php2
-rw-r--r--ui/include/classes/core/CModuleManager.php2
-rw-r--r--ui/include/classes/core/ZBase.php2
-rw-r--r--ui/include/classes/db/DbBackend.php2
-rw-r--r--ui/include/classes/import/converters/C44ImportConverter.php6
-rw-r--r--ui/include/classes/mvc/CRouter.php2
-rw-r--r--ui/include/classes/widgets/fields/CWidgetFieldNavTree.php2
-rw-r--r--ui/include/func.inc.php2
-rw-r--r--ui/include/views/js/configuration.host.discovery.edit.overr.js.php2
-rw-r--r--ui/js/class.tab-indicators.js6
-rw-r--r--ui/js/dashboard.grid.js4
-rw-r--r--ui/js/main.js2
-rw-r--r--ui/js/vendors/jquery-ui.js8
-rw-r--r--ui/js/vendors/jquery.js2
-rw-r--r--ui/tests/api_json/testAuditLog.php2
-rw-r--r--ui/tests/include/web/elements/CInputGroupElement.php2
-rw-r--r--ui/tests/integration/testGoAgentDataCollection.php42
-rw-r--r--ui/tests/selenium/common/testFormItemTest.php2
-rw-r--r--ui/tests/selenium/common/testFormMacros.php2
-rw-r--r--ui/tests/selenium/dashboard/testDashboardGraphWidget.php10
-rw-r--r--ui/tests/selenium/dashboard/testDashboardHostAvailabilityWidget.php6
-rw-r--r--ui/tests/selenium/dashboard/testDashboardProblemsBySeverityWidget.php2
-rw-r--r--ui/tests/selenium/testFormAdministrationGeneralAutoregistration.php2
-rw-r--r--ui/tests/selenium/testFormAdministrationMediaTypeMessageTemplates.php8
-rw-r--r--ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php6
-rw-r--r--ui/tests/selenium/testFormUserMedia.php4
-rw-r--r--ui/tests/selenium/testPageDashboardList.php2
-rw-r--r--ui/tests/selenium/testPageLowLevelDiscovery.php2
-rw-r--r--ui/tests/selenium/testPageTemplates.php2
-rw-r--r--ui/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php6
-rw-r--r--ui/vendor/php-saml/README.md6
-rw-r--r--ui/vendor/php-saml/advanced_settings_example.php2
-rw-r--r--ui/vendor/php-saml/src/Saml2/LogoutRequest.php2
-rw-r--r--ui/vendor/php-saml/src/Saml2/LogoutResponse.php2
-rw-r--r--ui/vendor/php-saml/src/Saml2/Response.php8
-rw-r--r--ui/vendor/php-saml/src/Saml2/Settings.php4
-rw-r--r--ui/vendor/php-saml/src/Saml2/Utils.php6
-rw-r--r--ui/vendor/xmlseclibs/README.md2
-rw-r--r--ui/vendor/xmlseclibs/src/XMLSecurityDSig.php2
-rw-r--r--ui/vendor/xmlseclibs/src/XMLSecurityKey.php8
49 files changed, 104 insertions, 104 deletions
diff --git a/ui/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php
index 8de30e98e04..5ef368dd2c1 100644
--- a/ui/app/controllers/CControllerHost.php
+++ b/ui/app/controllers/CControllerHost.php
@@ -38,7 +38,7 @@ abstract class CControllerHost extends CController {
* @param string $filter['evaltype'] Filter hosts by tags.
* @param string $filter['tags'] Filter hosts by tag names and values.
* @param string $filter['severities'] Filter problems on hosts by severities.
- * @param string $filter['show_suppressed'] Filter supressed problems.
+ * @param string $filter['show_suppressed'] Filter suppressed problems.
* @param int $filter['maintenance_status'] Filter hosts by maintenance.
* @param int $filter['page'] Page number.
* @param string $sort Sorting field.
@@ -122,7 +122,7 @@ abstract class CControllerHost extends CController {
// Split result array and create paging.
$paging = CPagerHelper::paginate($filter['page'], $hosts, $sortorder, $view_curl);
- // Get additonal data to limited host amount.
+ // Get additional data to limited host amount.
$hosts = API::Host()->get([
'output' => ['hostid', 'name', 'status', 'maintenance_status', 'maintenanceid', 'maintenance_type',
'available', 'snmp_available', 'jmx_available', 'ipmi_available', 'error', 'ipmi_error', 'snmp_error',
diff --git a/ui/app/controllers/CControllerPopupGeneric.php b/ui/app/controllers/CControllerPopupGeneric.php
index bc2ce4318fc..09620e23c47 100644
--- a/ui/app/controllers/CControllerPopupGeneric.php
+++ b/ui/app/controllers/CControllerPopupGeneric.php
@@ -768,7 +768,7 @@ class CControllerPopupGeneric extends CController {
$this->group_preselect_required = in_array($this->source_table, self::POPUPS_HAVING_GROUP_FILTER);
$this->page_options = $this->getPageOptions();
- // Make control filters. Must be called bedore extending groupids.
+ // Make control filters. Must be called before extending groupids.
$filters = $this->makeFilters();
// Select subgroups.
diff --git a/ui/app/controllers/CControllerPopupItemTestEdit.php b/ui/app/controllers/CControllerPopupItemTestEdit.php
index b99aeca954b..d0a88187b1b 100644
--- a/ui/app/controllers/CControllerPopupItemTestEdit.php
+++ b/ui/app/controllers/CControllerPopupItemTestEdit.php
@@ -252,7 +252,7 @@ class CControllerPopupItemTestEdit extends CControllerPopupItemTest {
}
elseif ($usermacros['macros'][$macro_name] === ZBX_SECRET_MASK) {
/*
- * Macro values were not set by user, so this means form was openened for the first time. So in this
+ * Macro values were not set by user, so this means form was opened for the first time. So in this
* case check if there are secret macros. If there are, clear the values and show warning message box.
*/
diff --git a/ui/app/controllers/CControllerPopupItemTestGetValue.php b/ui/app/controllers/CControllerPopupItemTestGetValue.php
index 245a016c305..c24029cb7ea 100644
--- a/ui/app/controllers/CControllerPopupItemTestGetValue.php
+++ b/ui/app/controllers/CControllerPopupItemTestGetValue.php
@@ -146,7 +146,7 @@ class CControllerPopupItemTestGetValue extends CControllerPopupItemTest {
// Get post data for particular item type.
$data = $this->getItemTestProperties($this->getInputAll());
- // Apply efective macros values to properties.
+ // Apply effective macros values to properties.
$data = $this->resolveItemPropertyMacros($data);
if ($this->item_type != ITEM_TYPE_AGGREGATE && $this->item_type != ITEM_TYPE_CALCULATED) {
diff --git a/ui/app/controllers/CControllerPopupItemTestSend.php b/ui/app/controllers/CControllerPopupItemTestSend.php
index a04ebad281b..3954801e26d 100644
--- a/ui/app/controllers/CControllerPopupItemTestSend.php
+++ b/ui/app/controllers/CControllerPopupItemTestSend.php
@@ -262,7 +262,7 @@ class CControllerPopupItemTestSend extends CControllerPopupItemTest {
// Get post data for particular item type.
$item_test_data = $this->getItemTestProperties($this->getInputAll());
- // Apply efective macros values to properties.
+ // Apply effective macros values to properties.
$item_test_data = $this->resolveItemPropertyMacros($item_test_data);
// Rename fields according protocol.
diff --git a/ui/app/controllers/CControllerUsergroupEdit.php b/ui/app/controllers/CControllerUsergroupEdit.php
index 35cc9599b30..9ad870e4c25 100644
--- a/ui/app/controllers/CControllerUsergroupEdit.php
+++ b/ui/app/controllers/CControllerUsergroupEdit.php
@@ -156,7 +156,7 @@ class CControllerUsergroupEdit extends CController {
}
/**
- * Returs all needed host groups formatted for multiselector.
+ * Returns all needed host groups formatted for multiselector.
*
* @param array $groupids
*
@@ -178,7 +178,7 @@ class CControllerUsergroupEdit extends CController {
}
/**
- * Returs all needed user formatted for multiselector.
+ * Returns all needed user formatted for multiselector.
*
* @return array
*/
diff --git a/ui/app/views/popup.condition.common.php b/ui/app/views/popup.condition.common.php
index 3c158688c94..0a0ad3e79a4 100644
--- a/ui/app/views/popup.condition.common.php
+++ b/ui/app/views/popup.condition.common.php
@@ -269,7 +269,7 @@ switch ($data['type']) {
->addRow(_('Host groups'), $hostgroup_multiselect);
break;
- // Problem is supressed form elements.
+ // Problem is suppressed form elements.
case CONDITION_TYPE_SUPPRESSED:
$operator = (new CRadioButtonList('operator', CONDITION_OPERATOR_NO))->setModern(true);
foreach ($combobox_options[CONDITION_TYPE_SUPPRESSED] as $key => $value) {
diff --git a/ui/host_discovery.php b/ui/host_discovery.php
index e0e0ef44f79..61654ae9e77 100644
--- a/ui/host_discovery.php
+++ b/ui/host_discovery.php
@@ -783,7 +783,7 @@ if (hasRequest('form')) {
$data['conditions'] = $item['filter']['conditions'];
$data['lld_macro_paths'] = $item['lld_macro_paths'];
$data['overrides'] = $item['overrides'];
- // Sort overides to be listed in step order.
+ // Sort overrides to be listed in step order.
CArrayHelper::sort($data['overrides'], [
['field' => 'step', 'order' => ZBX_SORT_UP]
]);
diff --git a/ui/hosts.php b/ui/hosts.php
index eec5f87f2e9..14659536af7 100644
--- a/ui/hosts.php
+++ b/ui/hosts.php
@@ -748,7 +748,7 @@ elseif (hasRequest('add') || hasRequest('update')) {
continue;
}
- // Proccess SNMP interface fields.
+ // Process SNMP interface fields.
if ($interface['type'] == INTERFACE_TYPE_SNMP) {
if (!array_key_exists('details', $interface)) {
unset($interface[$key]);
diff --git a/ui/include/classes/api/services/CHostInterface.php b/ui/include/classes/api/services/CHostInterface.php
index 5b6256b4147..39c2ee4e69a 100644
--- a/ui/include/classes/api/services/CHostInterface.php
+++ b/ui/include/classes/api/services/CHostInterface.php
@@ -525,7 +525,7 @@ class CHostInterface extends CApiService {
$interface['type'] = INTERFACE_TYPE_SNMP;
}
- // Merge details with db values or set only vaules from db.
+ // Merge details with db values or set only values from db.
$interface['details'] = array_key_exists('details', $interface)
? $interface['details'] + $db_interfaces[$interfaceid]['details']
: $db_interfaces[$interfaceid]['details'];
diff --git a/ui/include/classes/core/CModuleManager.php b/ui/include/classes/core/CModuleManager.php
index dbadd1f9429..fef8e450abc 100644
--- a/ui/include/classes/core/CModuleManager.php
+++ b/ui/include/classes/core/CModuleManager.php
@@ -183,7 +183,7 @@ final class CModuleManager {
/**
* Check, instantiate and initialize all added modules.
*
- * @return array List of initalized modules.
+ * @return array List of initialized modules.
*/
public function initModules(): array {
[
diff --git a/ui/include/classes/core/ZBase.php b/ui/include/classes/core/ZBase.php
index b20c1701233..20fd29f80db 100644
--- a/ui/include/classes/core/ZBase.php
+++ b/ui/include/classes/core/ZBase.php
@@ -174,7 +174,7 @@ class ZBase {
$this->initLocales(CSettingsHelper::getGlobal(CSettingsHelper::DEFAULT_LANG));
- // Start sesion only after DB initilized.
+ // Start sesion only after DB initialized.
new CEncryptedCookieSession();
$this->authenticateUser();
diff --git a/ui/include/classes/db/DbBackend.php b/ui/include/classes/db/DbBackend.php
index cde49c1c41a..3e48f7134dd 100644
--- a/ui/include/classes/db/DbBackend.php
+++ b/ui/include/classes/db/DbBackend.php
@@ -76,7 +76,7 @@ abstract class DbBackend {
protected $tls_cipher_list = '';
/**
- * Set TLS specific options for db conection.
+ * Set TLS specific options for db connection.
*
* @param string $key_file Path to TLS key file.
* @param string $cert_file Path to TLS cert file.
diff --git a/ui/include/classes/import/converters/C44ImportConverter.php b/ui/include/classes/import/converters/C44ImportConverter.php
index a942a792761..98e877bab38 100644
--- a/ui/include/classes/import/converters/C44ImportConverter.php
+++ b/ui/include/classes/import/converters/C44ImportConverter.php
@@ -423,19 +423,19 @@ class C44ImportConverter extends CConverter {
function(array $iface) use ($item, $parent_interface): bool {
// If item port differs from interface ports it is 100% new interface.
if ($item['port'] === '') {
- // Item port not set and interface port not equel parent port.
+ // Item port not set and interface port not equal parent port.
if ($iface['port'] !== $parent_interface['port']) {
return false;
}
}
else {
- // If item port not equel interface ports it is 100% new interface.
+ // If item port not equal interface ports it is 100% new interface.
if ($iface['port'] !== $item['port']) {
return false;
}
}
- // If interface community string is equel with item it is our interface.
+ // If interface community string is equal with item it is our interface.
if ($item['type'] === CXmlConstantName::SNMPV1
|| $item['type'] === CXmlConstantName::SNMPV2) {
return ($iface['details']['community'] === $item['community']);
diff --git a/ui/include/classes/mvc/CRouter.php b/ui/include/classes/mvc/CRouter.php
index ad901204013..56e817f5e4f 100644
--- a/ui/include/classes/mvc/CRouter.php
+++ b/ui/include/classes/mvc/CRouter.php
@@ -302,7 +302,7 @@ class CRouter {
];
/**
- * Add new actions (potentially overwritting the existing ones).
+ * Add new actions (potentially overwriting the existing ones).
*
* @param array $actions List of actions.
* @param string $actions['action_name'] Definition of the 'action_name' action.
diff --git a/ui/include/classes/widgets/fields/CWidgetFieldNavTree.php b/ui/include/classes/widgets/fields/CWidgetFieldNavTree.php
index d9b943f3556..a9adbde48e5 100644
--- a/ui/include/classes/widgets/fields/CWidgetFieldNavTree.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldNavTree.php
@@ -63,7 +63,7 @@ class CWidgetFieldNavTree extends CWidgetField {
'value' => $val['name']
];
- // Add default values to avoid check of key existance.
+ // Add default values to avoid check of key existence.
$val = array_merge([
'order' => 1,
'parent' => 0,
diff --git a/ui/include/func.inc.php b/ui/include/func.inc.php
index e004d55624d..52938a79441 100644
--- a/ui/include/func.inc.php
+++ b/ui/include/func.inc.php
@@ -1322,7 +1322,7 @@ function make_sorting_header($obj, $tabfield, $sortField, $sortOrder, $link = nu
* @param string $number Valid number in decimal or scientific notation.
* @param int|null $precision Max number of significant digits to take into account. Default: ZBX_FLOAT_DIG.
* @param int|null $decimals Max number of first non-zero decimals decimals to display. Default: 0.
- * @param bool $exact Display exaclty this number of decimals instead of first non-zeros.
+ * @param bool $exact Display exactly this number of decimals instead of first non-zeros.
*
* Note: $decimals must be less than $precision.
*
diff --git a/ui/include/views/js/configuration.host.discovery.edit.overr.js.php b/ui/include/views/js/configuration.host.discovery.edit.overr.js.php
index 7ff3432434c..0ca2ea8e863 100644
--- a/ui/include/views/js/configuration.host.discovery.edit.overr.js.php
+++ b/ui/include/views/js/configuration.host.discovery.edit.overr.js.php
@@ -683,7 +683,7 @@ insert_javascript_for_visibilitybox();
delete this.data.filter;
/*
- * Used to add propper letter, when creating new dynamic row for filter. If no filters are configured,
+ * Used to add proper letter, when creating new dynamic row for filter. If no filters are configured,
* one empty row is created by View.
*/
this.filter_counter = (this.data.overrides_filters.length > 0) ? this.data.overrides_filters.length : 1;
diff --git a/ui/js/class.tab-indicators.js b/ui/js/class.tab-indicators.js
index fa9e24fc0b4..d3664b55b1a 100644
--- a/ui/js/class.tab-indicators.js
+++ b/ui/js/class.tab-indicators.js
@@ -324,7 +324,7 @@ class MacrosTabIndicatorItem extends TabIndicatorItem {
const observer_options = {
childList: true,
attributes: true,
- attributeFilter: ['value', 'style'], // Use style because textarea dont have value attribute.
+ attributeFilter: ['value', 'style'], // Use style because textarea don't have value attribute.
subtree: true
};
@@ -417,7 +417,7 @@ class TagsTabIndicatorItem extends TabIndicatorItem {
const observer_options = {
childList: true,
attributes: true,
- attributeFilter: ['value', 'style'], // Use style because textarea dont have value attribute.
+ attributeFilter: ['value', 'style'], // Use style because textarea don't have value attribute.
subtree: true
};
@@ -730,7 +730,7 @@ class LldMacrosTabIndicatorItem extends TabIndicatorItem {
const observer_options = {
childList: true,
attributes: true,
- attributeFilter: ['value', 'style'], // Use style because textarea dont have value attribute.
+ attributeFilter: ['value', 'style'], // Use style because textarea don't have value attribute.
subtree: true
};
diff --git a/ui/js/dashboard.grid.js b/ui/js/dashboard.grid.js
index ab9b5591a2e..ada986d3aba 100644
--- a/ui/js/dashboard.grid.js
+++ b/ui/js/dashboard.grid.js
@@ -2482,7 +2482,7 @@
}
/**
- * Find first empty position in gived size.
+ * Find first empty position in given size.
*
* @param {object} $obj Dashboard object.
* @param {object} data Dashboard 'dashboardGrid' object.
@@ -2615,7 +2615,7 @@
};
/**
- * Get jQuery obejct of the new widget placeholder.
+ * Get jQuery object of the new widget placeholder.
*
* @returns {jQuery}
*/
diff --git a/ui/js/main.js b/ui/js/main.js
index 71c2734343b..6f8b02b2fc5 100644
--- a/ui/js/main.js
+++ b/ui/js/main.js
@@ -428,7 +428,7 @@ var hintBox = {
hint_height = target.hintBoxItem.outerHeight(),
/*
Fix popup width and height since browsers will tend to reduce the size of the popup, if positioned further
- than the width of window when horizontal scolling is active.
+ than the width of window when horizontal scrolling is active.
*/
css = {
width: target.hintBoxItem.width(),
diff --git a/ui/js/vendors/jquery-ui.js b/ui/js/vendors/jquery-ui.js
index b8da6ad3b50..ea52366751e 100644
--- a/ui/js/vendors/jquery-ui.js
+++ b/ui/js/vendors/jquery-ui.js
@@ -1708,7 +1708,7 @@ var widgetsMouse = $.widget( "ui.mouse", {
return this.mouseDelayMet;
},
- // These are placeholder methods, to be overriden by extending plugin
+ // These are placeholder methods, to be overridden by extending plugin
_mouseStart: function( /* event */ ) {},
_mouseDrag: function( /* event */ ) {},
_mouseStop: function( /* event */ ) {},
@@ -2713,7 +2713,7 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
sortable._trigger( "out", event, sortable._uiHash( sortable ) );
sortable._mouseStop( event, true );
- // Restore sortable behaviors that were modfied
+ // Restore sortable behaviors that were modified
// when the draggable entered the sortable area (#9481)
sortable.options.revert = sortable.options._revert;
sortable.options.helper = sortable.options._helper;
@@ -6354,7 +6354,7 @@ var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
//Various things done here to improve the performance:
// 1. we create a setTimeout, that calls refreshPositions
- // 2. on the instance, we have a counter variable, that get's higher after every append
+ // 2. on the instance, we have a counter variable, that gets higher after every append
// 3. on the local scope, we copy the counter variable, and check in the timeout,
// if it's still the same
// 4. this lets only the last addition to the timeout stack through
@@ -7123,7 +7123,7 @@ $.widget( "ui.tabs", {
// tab is already loading
tab.hasClass( "ui-tabs-loading" ) ||
- // can't switch durning an animation
+ // can't switch during an animation
this.running ||
// click on active header, but not collapsible
diff --git a/ui/js/vendors/jquery.js b/ui/js/vendors/jquery.js
index 9b5206bcc60..2345e076643 100644
--- a/ui/js/vendors/jquery.js
+++ b/ui/js/vendors/jquery.js
@@ -5742,7 +5742,7 @@ function domManip( collection, args, callback, ignored ) {
if ( hasScripts ) {
doc = scripts[ scripts.length - 1 ].ownerDocument;
- // Reenable scripts
+ // Re-enable scripts
jQuery.map( scripts, restoreScript );
// Evaluate executable scripts on first document insertion
diff --git a/ui/tests/api_json/testAuditLog.php b/ui/tests/api_json/testAuditLog.php
index 129627f385f..1bf9f847699 100644
--- a/ui/tests/api_json/testAuditLog.php
+++ b/ui/tests/api_json/testAuditLog.php
@@ -81,7 +81,7 @@ class testAuditLog extends CAPITest {
],
'expected_error' => null
],
- // Extend selectDetails and ouptut.
+ // Extend selectDetails and output.
[
'api_request' => [
'userids' => '1',
diff --git a/ui/tests/include/web/elements/CInputGroupElement.php b/ui/tests/include/web/elements/CInputGroupElement.php
index 3c49e9a7a6a..ade33b87bfc 100644
--- a/ui/tests/include/web/elements/CInputGroupElement.php
+++ b/ui/tests/include/web/elements/CInputGroupElement.php
@@ -42,7 +42,7 @@ class CInputGroupElement extends CElement {
/**
* Select the type of InputGroup element.
*
- * @param string $new_type vlaue field type to be selected
+ * @param string $new_type value field type to be selected
*
* @return $this
*/
diff --git a/ui/tests/integration/testGoAgentDataCollection.php b/ui/tests/integration/testGoAgentDataCollection.php
index f51aa42107f..ae9aee37bf8 100644
--- a/ui/tests/integration/testGoAgentDataCollection.php
+++ b/ui/tests/integration/testGoAgentDataCollection.php
@@ -219,100 +219,100 @@ class testGoAgentDataCollection extends CIntegrationTest {
'key' => 'system.cpu.util[,,avg1]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_FLOAT,
- 'treshold' => 0.5
+ 'threshold' => 0.5
],
[
'key' => 'system.cpu.load[,avg1]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_FLOAT,
- 'treshold' => 0.5
+ 'threshold' => 0.5
],
[
'key' => 'vfs.dev.read[,operations]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_UINT64,
- 'treshold' => 10
+ 'threshold' => 10
],
[
'key' => 'vfs.dev.write[,operations]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_UINT64,
- 'treshold' => 20
+ 'threshold' => 20
],
[
'key' => 'proc.cpu.util[,,,,avg1]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_FLOAT,
- 'treshold' => 10.0,
+ 'threshold' => 10.0,
'compareType' => COMPARE_AVERAGE
],
[
'key' => 'system.swap.in[,pages]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_UINT64,
- 'treshold' => 100
+ 'threshold' => 100
],
[
'key' => 'system.swap.out[,pages]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_UINT64,
- 'treshold' => 100
+ 'threshold' => 100
],
[
'key' => 'proc.mem[zabbix_server,zabbix,avg]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_FLOAT,
- 'treshold' => 100.0
+ 'threshold' => 100.0
],
[
'key' => 'web.page.perf[http://localhost]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_FLOAT,
- 'treshold' => 1.0,
+ 'threshold' => 1.0,
'compareType' => COMPARE_AVERAGE
],
[
'key' => 'net.tcp.service.perf[ssh]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_FLOAT,
- 'treshold' => 0.05
+ 'threshold' => 0.05
],
[
'key' => 'net.udp.service.perf[ntp]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_FLOAT,
- 'treshold' => 0.05
+ 'threshold' => 0.05
],
[
'key' => 'system.swap.size[,total]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_UINT64,
- 'treshold' => 100
+ 'threshold' => 100
],
[
'key' => 'vfs.fs.inode[/,pfree]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_FLOAT,
- 'treshold' => 0.1
+ 'threshold' => 0.1
],
[
'key' => 'vfs.fs.size[/tmp,free]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_UINT64,
- 'treshold' => 16384
+ 'threshold' => 16384
],
[
'key' => 'vm.memory.size[free]',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_UINT64,
- 'treshold' => 10000000
+ 'threshold' => 10000000
],
[// Should be treated as a special case, since this metric returns JSON object.
// Maybe, it should e pulled to separate test suite. At this point we just compare it as string.
'key' => 'zabbix.stats[127.0.0.1,'.PHPUNIT_PORT_PREFIX.self::SERVER_PORT_SUFFIX.']',
'type' => ITEM_TYPE_ZABBIX,
'valueType' => ITEM_VALUE_TYPE_TEXT,
- 'treshold' => 50
+ 'threshold' => 50
]
];
@@ -536,9 +536,9 @@ class testGoAgentDataCollection extends CIntegrationTest {
$a = end($values[self::COMPONENT_AGENT]);
$b = end($values[self::COMPONENT_AGENT2]);
- if (array_key_exists('treshold', $item) && $item['treshold'] !== 0) {
- $a = substr($a, 0, $item['treshold']);
- $b = substr($b, 0, $item['treshold']);
+ if (array_key_exists('threshold', $item) && $item['threshold'] !== 0) {
+ $a = substr($a, 0, $item['threshold']);
+ $b = substr($b, 0, $item['threshold']);
}
$this->assertEquals($a, $b, 'Strings do not match for '.$item['key']);
@@ -566,8 +566,8 @@ class testGoAgentDataCollection extends CIntegrationTest {
}
$diff = abs(abs($a) - abs($b));
- $this->assertTrue($diff < $item['treshold'], 'Difference for '.$item['key'].
- ' is more than defined treshold '.$diff.' > '.$item['treshold']
+ $this->assertTrue($diff < $item['threshold'], 'Difference for '.$item['key'].
+ ' is more than defined threshold '.$diff.' > '.$item['threshold']
);
break;
}
diff --git a/ui/tests/selenium/common/testFormItemTest.php b/ui/tests/selenium/common/testFormItemTest.php
index 3810935c83f..0aad4d80698 100644
--- a/ui/tests/selenium/common/testFormItemTest.php
+++ b/ui/tests/selenium/common/testFormItemTest.php
@@ -649,7 +649,7 @@ class testFormItemTest extends CWebTest {
// Check value fields.
$this->checkValueFields($data);
- // Change interface fileds in testing form.
+ // Change interface fields in testing form.
if (CTestArrayHelper::get($data, 'interface')) {
$elements['address']->fill($data['interface']['address']);
$elements['port']->fill($data['interface']['port']);
diff --git a/ui/tests/selenium/common/testFormMacros.php b/ui/tests/selenium/common/testFormMacros.php
index 3b34430e200..f3f0e86afe0 100644
--- a/ui/tests/selenium/common/testFormMacros.php
+++ b/ui/tests/selenium/common/testFormMacros.php
@@ -420,7 +420,7 @@ abstract class testFormMacros extends CWebTest {
// Switch to tab with inherited and instance macros and verify that the value is secret but is still accessible.
$this->checkInheritedTab($data['macro_fields'], true);
- // Check that macro value is hidden but is still accessible after swithing back to instance macros list.
+ // Check that macro value is hidden but is still accessible after switching back to instance macros list.
$value_field = $this->getValueField($data['macro_fields']['macro']);
$this->assertEquals(CInputGroupElement::TYPE_SECRET, $value_field->getInputType());
diff --git a/ui/tests/selenium/dashboard/testDashboardGraphWidget.php b/ui/tests/selenium/dashboard/testDashboardGraphWidget.php
index 73400a5cd00..52c6aa9066a 100644
--- a/ui/tests/selenium/dashboard/testDashboardGraphWidget.php
+++ b/ui/tests/selenium/dashboard/testDashboardGraphWidget.php
@@ -151,7 +151,7 @@ class testDashboardGraphWidget extends CWebTest {
$form->selectTab($tab);
$this->fillOverrides(CTestArrayHelper::get($data, 'Overrides'));
- // Remove all overide options.
+ // Remove all override options.
if (CTestArrayHelper::get($data, 'remove_override_options', false)) {
$form->query('xpath://button[@class="subfilter-disable-btn"]')->all()->click();
}
@@ -419,7 +419,7 @@ class testDashboardGraphWidget extends CWebTest {
$data[] = $item;
}
- // Add aditional test cases to data provider.
+ // Add additional test cases to data provider.
return array_merge($data, [
// Empty host and/or item field.
[
@@ -1442,7 +1442,7 @@ class testDashboardGraphWidget extends CWebTest {
'check_form' => true
]
],
- // All posible fields.
+ // All possible fields.
[
[
'main_fields' => [
@@ -1729,7 +1729,7 @@ class testDashboardGraphWidget extends CWebTest {
'check_form' => true
]
],
- // All posible fields.
+ // All possible fields.
[
[
'main_fields' => [
@@ -2129,7 +2129,7 @@ class testDashboardGraphWidget extends CWebTest {
[
[
'main_fields' => [
- 'Name' => 'Add new graph widget and cancle dashboard update'
+ 'Name' => 'Add new graph widget and cancel dashboard update'
],
'Data set' => [
'host' => 'Zabbix*, new widget',
diff --git a/ui/tests/selenium/dashboard/testDashboardHostAvailabilityWidget.php b/ui/tests/selenium/dashboard/testDashboardHostAvailabilityWidget.php
index 3b737b592cc..5c187ccb0a3 100644
--- a/ui/tests/selenium/dashboard/testDashboardHostAvailabilityWidget.php
+++ b/ui/tests/selenium/dashboard/testDashboardHostAvailabilityWidget.php
@@ -727,7 +727,7 @@ class testDashboardHostAvailabilityWidget extends CWebTest {
/*
* Get the number of interfaces by their type or status, depending on the layout of the HA widget.
- * For horizontal layout interface type is passed to the function, but for vertical layout - iterface status.
+ * For horizontal layout interface type is passed to the function, but for vertical layout - interface status.
*/
private function getExpectedInterfaceCountFromDB($data, $header) {
$db_interfaces = [
@@ -756,7 +756,7 @@ class testDashboardHostAvailabilityWidget extends CWebTest {
// Construct sql for horizontal widget layout.
if (CTestArrayHelper::get($data, 'fields.Layout', 'Horizontal') === 'Horizontal') {
$total_sql = $interfaces_sql.$db_interfaces['type'][$header].' AND hostid IN ('.$hosts_sql;
- // Filter out hosts in maintenence if the flag 'Show hosts in maintenance' is not set.
+ // Filter out hosts in maintenance if the flag 'Show hosts in maintenance' is not set.
if (CTestArrayHelper::get($data['fields'], 'Show hosts in maintenance', false) === false) {
$total_sql = $total_sql.' AND maintenance_status=0';
}
@@ -770,7 +770,7 @@ class testDashboardHostAvailabilityWidget extends CWebTest {
}
// Construct sql for vertical widget layout.
else {
- // Filter out hosts in maintenence if the flag 'Show hosts in maintenance' is not set.
+ // Filter out hosts in maintenance if the flag 'Show hosts in maintenance' is not set.
if (CTestArrayHelper::get($data['fields'], 'Show hosts in maintenance', false) === false) {
$hosts_sql = $hosts_sql.' AND maintenance_status=0';
}
diff --git a/ui/tests/selenium/dashboard/testDashboardProblemsBySeverityWidget.php b/ui/tests/selenium/dashboard/testDashboardProblemsBySeverityWidget.php
index c758031e9cd..27ce9781b35 100644
--- a/ui/tests/selenium/dashboard/testDashboardProblemsBySeverityWidget.php
+++ b/ui/tests/selenium/dashboard/testDashboardProblemsBySeverityWidget.php
@@ -587,7 +587,7 @@ class testDashboardProblemsBySeverityWidget extends CWebTest {
[
'widget to update' => 'Reference widget 2',
'fields' => [
- 'Name' => 'Hide timeline and groupt without problems',
+ 'Name' => 'Hide timeline and grouped without problems',
'Refresh interval' => 'Default (1 minute)',
'Hide groups without problems' => true,
'Show operational data' => 'With problem name',
diff --git a/ui/tests/selenium/testFormAdministrationGeneralAutoregistration.php b/ui/tests/selenium/testFormAdministrationGeneralAutoregistration.php
index 58308e1d097..e0ca30bab24 100644
--- a/ui/tests/selenium/testFormAdministrationGeneralAutoregistration.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralAutoregistration.php
@@ -33,7 +33,7 @@ class testFormAdministrationGeneralAutoregistration extends CWebTest {
$this->page->login()->open('zabbix.php?action=gui.edit');
$this->query('id:page-title-general')->asPopupButton()->one()->select('Autoregistration');
- // Check elements dafault state.
+ // Check elements default state.
$form = $this->query('id:autoreg-form')->asForm()->one();
$this->assertEquals(['No encryption'], $form->getField('Encryption level')->getValue());
$this->assertFalse($form->query('id:tls_psk_identity')->one()->isDisplayed());
diff --git a/ui/tests/selenium/testFormAdministrationMediaTypeMessageTemplates.php b/ui/tests/selenium/testFormAdministrationMediaTypeMessageTemplates.php
index cdd9fb34fa0..a03dafb4b78 100644
--- a/ui/tests/selenium/testFormAdministrationMediaTypeMessageTemplates.php
+++ b/ui/tests/selenium/testFormAdministrationMediaTypeMessageTemplates.php
@@ -74,7 +74,7 @@ class testFormAdministrationMediaTypeMessageTemplates extends CWebTest {
public function getDefaultMessageTemplateData() {
return [
- // Defult messages for plain text Email media type
+ // Default messages for plain text Email media type
[
[
'media_type' => [
@@ -145,7 +145,7 @@ class testFormAdministrationMediaTypeMessageTemplates extends CWebTest {
]
]
],
- // Defult messages for HTML text Email media type
+ // Default messages for HTML text Email media type
[
[
'media_type' => [
@@ -210,7 +210,7 @@ class testFormAdministrationMediaTypeMessageTemplates extends CWebTest {
]
]
],
- // Defult messages for SMS media type
+ // Default messages for SMS media type
[
[
'media_type' => [
@@ -652,7 +652,7 @@ class testFormAdministrationMediaTypeMessageTemplates extends CWebTest {
case 'Edit':
case 'Add':
case 'Skip':
- // Open the correspondig message template and check its content according to the values in data provider.
+ // Open the corresponding message template and check its content according to the values in data provider.
$templates_list->findRow('Message type', $template['Message type'])->query('button:Edit')->one()->click();
COverlayDialogElement::find()->one()->waitUntilReady();
$form = $this->query('id:mediatype_message_form')->asForm()->one();
diff --git a/ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php b/ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php
index 6cd3980c4b1..8798cb1a809 100644
--- a/ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php
+++ b/ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php
@@ -837,9 +837,9 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
}
/**
- * Function used to popullate fields located in the Operations tab.
+ * Function used to populate fields located in the Operations tab.
* Field concurrent sessions has two input elelents - one of them is displayed only if concurrent sessions = Custom.
- * Therefore, fill() method cannot be used for this field, and it needs to be popullated separately.
+ * Therefore, fill() method cannot be used for this field, and it needs to be populated separately.
*/
private function fillOperationsTab($data, $form) {
if (CTestArrayHelper::get($data, 'options', false)) {
@@ -885,7 +885,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
* the values obtained from the media type configuration form.
*/
private function checkParameters($data) {
- // Check creation, update and deletion of webhook parameters, or check that all default prameters are present.
+ // Check creation, update and deletion of webhook parameters, or check that all default parameters are present.
$expected_params = [
['name' => 'HTTPProxy', 'value' => ''],
['name' => 'Message', 'value' => '{ALERT.MESSAGE}'],
diff --git a/ui/tests/selenium/testFormUserMedia.php b/ui/tests/selenium/testFormUserMedia.php
index a1516e9b488..3c28f71fec0 100644
--- a/ui/tests/selenium/testFormUserMedia.php
+++ b/ui/tests/selenium/testFormUserMedia.php
@@ -146,7 +146,7 @@ class testFormUserMedia extends CWebTest {
'error_message' => 'Invalid email address "Mr Person person@zabbix.com".'
]
],
- // Email address without the recepient specified - just the domain.
+ // Email address without the recipient specified - just the domain.
[
[
'expected' => TEST_BAD,
@@ -551,7 +551,7 @@ class testFormUserMedia extends CWebTest {
private function setMediaValues($data) {
$media_form = $this->query('id:media_form')->waitUntilVisible()->asForm()->one();
$media_form->fill($data['fields']);
- // Check that there is posibility to add only multiple emails to media.
+ // Check that there is possibility to add only multiple emails to media.
$clickable = ($data['fields']['Type'] === 'Email');
$this->assertEquals($clickable, $media_form->query('id:email_send_to_add')->one()->isClickable());
$this->assertEquals($clickable, $media_form->query('button:Remove')->one()->isClickable());
diff --git a/ui/tests/selenium/testPageDashboardList.php b/ui/tests/selenium/testPageDashboardList.php
index 14f0d1998a3..7cfb5857ddf 100644
--- a/ui/tests/selenium/testPageDashboardList.php
+++ b/ui/tests/selenium/testPageDashboardList.php
@@ -156,7 +156,7 @@ class testPageDashboardList extends CWebTest {
}
/**
- * Check that My and Sharing tags displays corectly in Dashboard Lists for Admin.
+ * Check that My and Sharing tags displays correctly in Dashboard Lists for Admin.
*/
public function testPageDashboardList_CheckOwners() {
$this->page->login()->open('zabbix.php?action=dashboard.list');
diff --git a/ui/tests/selenium/testPageLowLevelDiscovery.php b/ui/tests/selenium/testPageLowLevelDiscovery.php
index 1ad6f8c0b12..e1fc9f5023a 100644
--- a/ui/tests/selenium/testPageLowLevelDiscovery.php
+++ b/ui/tests/selenium/testPageLowLevelDiscovery.php
@@ -116,7 +116,7 @@ class testPageLowLevelDiscovery extends CWebTest {
$form->fill(['Name' => 'Discovery rule 3']);
$form->submit();
- // Check that filtered count mathces expected.
+ // Check that filtered count matches expected.
$this->assertEquals(1, $table->getRows()->count());
$this->assertRowCount(1);
diff --git a/ui/tests/selenium/testPageTemplates.php b/ui/tests/selenium/testPageTemplates.php
index d9c4bc82d16..be072dae97f 100644
--- a/ui/tests/selenium/testPageTemplates.php
+++ b/ui/tests/selenium/testPageTemplates.php
@@ -259,7 +259,7 @@ class testPageTemplates extends CLegacyWebTest {
$this->page->login()->open('templates.php?groupid=0');
// Reset Templates filter from possible previous scenario.
$this->resetFilter();
- // Click on Hosts link in Temlate row.
+ // Click on Hosts link in Template row.
$table = $this->query('class:list-table')->asTable()->one();
$table->findRow('Name', $template)->query('link:Hosts')->one()->click();
// Check that Hosts page is opened.
diff --git a/ui/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php b/ui/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php
index ba0979dd986..61851ad6a56 100644
--- a/ui/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php
@@ -119,14 +119,14 @@ class CHtmlUrlValidatorTest extends PHPUnit_Framework_TestCase {
// Invalid URLs.
['http:?abc', [], false], // Scheme with no host.
['http:/', [], false], // Special case where single "/" is not allowed in path.
- ['http://', [], false], // url_parse() returs false.
- ['http:///', [], false], // url_parse() returs false.
+ ['http://', [], false], // url_parse() returns false.
+ ['http:///', [], false], // url_parse() returns false.
['http:', [], false], // Scheme with no host.
['http://?', [], false], // url_parse() returns false.
['javascript:alert(]', [], false], // Invalid scheme.
['protocol://{$INVALID!MACRO}', [], false], // Invalid scheme. Also macro is not valid, but that's secondary.
['', [], false], // Cannot be empty.
- ['ftp://user@host:port', [], false], // Scheme is allowed, but "port" is not a valid number and url_parse() returs false.
+ ['ftp://user@host:port', [], false], // Scheme is allowed, but "port" is not a valid number and url_parse() returns false.
['vbscript:msgbox(]', [], false], // Invalid scheme.
['notexist://localhost', [], false] // Invalid scheme.
];
diff --git a/ui/vendor/php-saml/README.md b/ui/vendor/php-saml/README.md
index 7ad8b48e035..76db165059d 100644
--- a/ui/vendor/php-saml/README.md
+++ b/ui/vendor/php-saml/README.md
@@ -528,7 +528,7 @@ $advancedSettings = array(
),
// Organization information template, the info in en_US lang is
- // recomended, add more if required.
+ // recommended, add more if required.
'organization' => array(
'en-US' => array(
'name' => '',
@@ -1076,7 +1076,7 @@ if (isset($_GET['sso'])) { // SSO action. Will send an AuthNRequest to the I
echo '<p>' . implode(', ', $errors) . '</p>';
}
// This check if the response was
- if (!$auth->isAuthenticated()) { // sucessfully validated and the user
+ if (!$auth->isAuthenticated()) { // successfully validated and the user
echo '<p>Not authenticated</p>'; // data retrieved or not
exit();
}
@@ -1089,7 +1089,7 @@ if (isset($_GET['sso'])) { // SSO action. Will send an AuthNRequest to the I
$auth->processSLO(); // Process the Logout Request & Logout Response
$errors = $auth->getErrors(); // Retrieves possible validation errors
if (empty($errors)) {
- echo '<p>Sucessfully logged out</p>';
+ echo '<p>Successfully logged out</p>';
} else {
echo '<p>' . implode(', ', $errors) . '</p>';
}
diff --git a/ui/vendor/php-saml/advanced_settings_example.php b/ui/vendor/php-saml/advanced_settings_example.php
index 1d1552cece7..44d5fb0736b 100644
--- a/ui/vendor/php-saml/advanced_settings_example.php
+++ b/ui/vendor/php-saml/advanced_settings_example.php
@@ -129,7 +129,7 @@ $advancedSettings = array(
),
),
- // Organization information template, the info in en_US lang is recomended, add more if required
+ // Organization information template, the info in en_US lang is recommended, add more if required
'organization' => array(
'en-US' => array(
'name' => '',
diff --git a/ui/vendor/php-saml/src/Saml2/LogoutRequest.php b/ui/vendor/php-saml/src/Saml2/LogoutRequest.php
index d540c22e3e4..02407176b13 100644
--- a/ui/vendor/php-saml/src/Saml2/LogoutRequest.php
+++ b/ui/vendor/php-saml/src/Saml2/LogoutRequest.php
@@ -345,7 +345,7 @@ LOGOUTREQUEST;
}
/**
- * Checks if the Logout Request recieved is valid.
+ * Checks if the Logout Request received is valid.
*
* @param bool $retrieveParametersFromServer True if we want to use parameters from $_SERVER to validate the signature
*
diff --git a/ui/vendor/php-saml/src/Saml2/LogoutResponse.php b/ui/vendor/php-saml/src/Saml2/LogoutResponse.php
index 700feb021f7..93d2d9e41e1 100644
--- a/ui/vendor/php-saml/src/Saml2/LogoutResponse.php
+++ b/ui/vendor/php-saml/src/Saml2/LogoutResponse.php
@@ -162,7 +162,7 @@ class LogoutResponse
}
}
- // Check if the InResponseTo of the Logout Response matchs the ID of the Logout Request (requestId) if provided
+ // Check if the InResponseTo of the Logout Response matches the ID of the Logout Request (requestId) if provided
if (isset($requestId) && $this->document->documentElement->hasAttribute('InResponseTo')) {
$inResponseTo = $this->document->documentElement->getAttribute('InResponseTo');
if ($requestId != $inResponseTo) {
diff --git a/ui/vendor/php-saml/src/Saml2/Response.php b/ui/vendor/php-saml/src/Saml2/Response.php
index b34297f4258..5cf36974a4e 100644
--- a/ui/vendor/php-saml/src/Saml2/Response.php
+++ b/ui/vendor/php-saml/src/Saml2/Response.php
@@ -207,7 +207,7 @@ class Response
);
}
- // Check if the InResponseTo of the Response matchs the ID of the AuthNRequest (requestId) if provided
+ // Check if the InResponseTo of the Response matches the ID of the AuthNRequest (requestId) if provided
if (isset($requestId) && $requestId != $responseInResponseTo) {
if ($responseInResponseTo == null) {
throw new ValidationError(
@@ -994,9 +994,9 @@ class Response
$responseTag = '{'.Constants::NS_SAMLP.'}Response';
$assertionTag = '{'.Constants::NS_SAML.'}Assertion';
- $ocurrence = array_count_values($signedElements);
- if ((in_array($responseTag, $signedElements) && $ocurrence[$responseTag] > 1)
- || (in_array($assertionTag, $signedElements) && $ocurrence[$assertionTag] > 1)
+ $occurrence = array_count_values($signedElements);
+ if ((in_array($responseTag, $signedElements) && $occurrence[$responseTag] > 1)
+ || (in_array($assertionTag, $signedElements) && $occurrence[$assertionTag] > 1)
|| !in_array($responseTag, $signedElements) && !in_array($assertionTag, $signedElements)
) {
return false;
diff --git a/ui/vendor/php-saml/src/Saml2/Settings.php b/ui/vendor/php-saml/src/Saml2/Settings.php
index 3c953fc91a2..2d68ba48cd0 100644
--- a/ui/vendor/php-saml/src/Saml2/Settings.php
+++ b/ui/vendor/php-saml/src/Saml2/Settings.php
@@ -730,7 +730,7 @@ class Settings
/**
* Returns the x509 public of the SP that is
- * planed to be used soon instead the other
+ * planned to be used soon instead the other
* public cert
*
* @return string SP public cert New
@@ -989,7 +989,7 @@ class Settings
}
/**
- * Formats the Multple IdP certs.
+ * Formats the Multiple IdP certs.
*/
public function formatIdPCertMulti()
{
diff --git a/ui/vendor/php-saml/src/Saml2/Utils.php b/ui/vendor/php-saml/src/Saml2/Utils.php
index 50d3d41b9ac..76c9b13b149 100644
--- a/ui/vendor/php-saml/src/Saml2/Utils.php
+++ b/ui/vendor/php-saml/src/Saml2/Utils.php
@@ -204,7 +204,7 @@ class Utils
/**
* Returns a x509 cert (adding header & footer if required).
*
- * @param string $cert A x509 unformated cert
+ * @param string $cert A x509 unformatted cert
* @param bool $heads True if we want to include head and footer
*
* @return string $x509 Formatted cert
@@ -1025,7 +1025,7 @@ class Utils
}
/**
- * Formates a fingerprint.
+ * Formats a fingerprint.
*
* @param string $fingerprint fingerprint
*
@@ -1545,7 +1545,7 @@ class Utils
$objKey = Utils::castKey($objKey, $signAlg, 'public');
} catch (Exception $e) {
$ex = new ValidationError(
- "Invalid signAlg in the recieved ".$strMessageType,
+ "Invalid signAlg in the received ".$strMessageType,
ValidationError::INVALID_SIGNATURE
);
if (count($multiCerts) == 1) {
diff --git a/ui/vendor/xmlseclibs/README.md b/ui/vendor/xmlseclibs/README.md
index 1a83735ba5f..0b3fd7ac0c9 100644
--- a/ui/vendor/xmlseclibs/README.md
+++ b/ui/vendor/xmlseclibs/README.md
@@ -8,7 +8,7 @@ The author of xmlseclibs is Rob Richards.
Master is currently the only actively maintained branch.
* master: Removes mcrypt usage requiring 5.4+ (5.6.24+ recommended for security reasons)
* 2.0: Contains namespace support requiring 5.3+
-* 1.4: Contains auto-loader support while also maintaining backwards compatiblity with the older 1.3 version using the xmlseclibs.php file. Supports PHP 5.2+
+* 1.4: Contains auto-loader support while also maintaining backwards compatibility with the older 1.3 version using the xmlseclibs.php file. Supports PHP 5.2+
# Requirements
diff --git a/ui/vendor/xmlseclibs/src/XMLSecurityDSig.php b/ui/vendor/xmlseclibs/src/XMLSecurityDSig.php
index d032b2647ac..cefde6257f5 100644
--- a/ui/vendor/xmlseclibs/src/XMLSecurityDSig.php
+++ b/ui/vendor/xmlseclibs/src/XMLSecurityDSig.php
@@ -797,7 +797,7 @@ class XMLSecurityDSig
* Returns:
* Bool when verifying HMAC_SHA1;
* Int otherwise, with following meanings:
- * 1 on succesful signature verification,
+ * 1 on successful signature verification,
* 0 when signature verification failed,
* -1 if an error occurred during processing.
*
diff --git a/ui/vendor/xmlseclibs/src/XMLSecurityKey.php b/ui/vendor/xmlseclibs/src/XMLSecurityKey.php
index 6c01f0cc7a7..b7649bf64c6 100644
--- a/ui/vendor/xmlseclibs/src/XMLSecurityKey.php
+++ b/ui/vendor/xmlseclibs/src/XMLSecurityKey.php
@@ -506,7 +506,7 @@ class XMLSecurityKey
* Verifies the given data (string) belonging to the given signature using the openssl-extension
*
* Returns:
- * 1 on succesful signature verification,
+ * 1 on successful signature verification,
* 0 when signature verification failed,
* -1 if an error occurred during processing.
*
@@ -528,7 +528,7 @@ class XMLSecurityKey
}
/**
- * Encrypts the given data (string) using the regarding php-extension, depending on the library assigned to algorithm in the contructor.
+ * Encrypts the given data (string) using the regarding php-extension, depending on the library assigned to algorithm in the constructor.
*
* @param string $data
* @return mixed|string
@@ -548,7 +548,7 @@ class XMLSecurityKey
}
/**
- * Decrypts the given data (string) using the regarding php-extension, depending on the library assigned to algorithm in the contructor.
+ * Decrypts the given data (string) using the regarding php-extension, depending on the library assigned to algorithm in the constructor.
*
* @param string $data
* @return mixed|string
@@ -587,7 +587,7 @@ class XMLSecurityKey
* Verifies the data (string) against the given signature using the extension assigned to the type in the constructor.
*
* Returns in case of openSSL:
- * 1 on succesful signature verification,
+ * 1 on successful signature verification,
* 0 when signature verification failed,
* -1 if an error occurred during processing.
*