Merge branch 'develop' into rector

Cacti · Feb 23, 2025 · f4de6fd · f4de6fd
2 parents 50bcc87 + 048f2ab
commit f4de6fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/install/install.js b/install/install.js
@@ -479,7 +479,7 @@ function processStepCheckTables(StepData) {
 
 }
 
-function processStepNoticesRecomendations(StepData) {
+function processStepNoticesRecommendations(StepData) {
 	if ($('#confirm').length) {
 		$('#confirm').click(function() {
 			if ($(this).is(':checked')) {
@@ -690,7 +690,7 @@ function performStep(installStep, suppressRefresh, forceReload) {
 			} else if (data.Step == STEP_BINARY_LOCATIONS) {
 				processStepBinaryLocations(data.StepData);
 			} else if (data.Step == STEP_INPUT_VALIDATION) {
-				processStepNoticesRecomendations(data.StepData);
+				processStepNoticesRecommendations(data.StepData);
 			} else if (data.Step == STEP_PROFILE_AND_AUTOMATION) {
 				processStepProfileAndAutomation(data.StepData);
 			} else if (data.Step == STEP_TEMPLATE_INSTALL) {

diff --git a/lib/html_filter.php b/lib/html_filter.php
@@ -280,7 +280,7 @@ private function initialize_filter() {
 			}
 		}
 
-		// Make common adjustements
+		// Make common adjustments
 		if ($this->has_refresh) {
 			if (isset_request_var('refresh')) {
 				$value = get_nfilter_request_var('refresh');
@@ -462,7 +462,7 @@ private function create_filter() {
 			foreach($this->filter_array['rows'] as $index => $row) {
 				if ($index > 0 && !$text_appended) {
 					print "<div class='filterColumnButton' id='text'></div>";
-					$text_appened = true;
+					$text_appended = true;
 				}
 
 				print "<div class='filterTable even'>";

diff --git a/lib/installer.php b/lib/installer.php
@@ -2599,7 +2599,7 @@ public function processStepPermissionCheck() {
 		return $output;
 	}
 
-	public function processStepNoticesRecomendations() {
+	public function processStepNoticesRecommendations() {
 		$output  = Installer::sectionTitle(__('Linux kernel security modules'));
 		$output .= Installer::sectionNormal(__('Cacti needs to establish network connections, execute binaries and write files to work. Linux security features such as <b>SELinux</b>, <b>AppArmor</b> or <b>ModSecurity</b> may cause Cacti to become inoperable in some configurations. If problems occur, check the settings of these security tools.<br/><br/>'));
 

diff --git a/lib/reports.php b/lib/reports.php
@@ -2128,7 +2128,7 @@ function reports_graphs_action_execute($action) {
  * @param  string    $oput_raw     - The Raw HTML output without CSS
  * @param  string    $oput_html    - The Report Output with CSS
  * @param  string    $oput_text    - The text output if any
- * @param  array     $attachements - The attachments required to reproduce the report
+ * @param  array     $attachments - The attachments required to reproduce the report
  * @param  array     $headers      - Any report specific Email headers
  */
 function reports_log_and_notify($id, $start_time, $report_type, $source, $source_id, $subject,