fix: address copilot review feedback on PR Cacti#283

- LICENSE: remove stale conflict markers
- database.php: restore backward-compat optional param on syslog_db_fetch_insert_id
- js/functions.js: fix missing var declaration, #test->#term, prop('disabled'), remove empty .each()
- CI workflow: authenticate MySQL healthcheck, remove password echo
- populate script: INSERT -> REPLACE INTO for idempotent reruns
- README.md: fix malformed code fence
- locales: add exit after redirect, fix sed -i for macOS compat
- es-ES.po: fix 'Cactus' -> 'Cacti', 'Depuraración' -> 'Depuración'

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

Author: somethingwithproof

.github/workflows/plugin-ci-workflow.yml

@@ -52,7 +52,7 @@ jobs:
         ports:
           - 3306:3306
         options: >-
-          --health-cmd="mysqladmin ping"
+          --health-cmd="mysqladmin ping -h 127.0.0.1 -uroot -pcactiroot"
           --health-interval=10s
           --health-timeout=5s
           --health-retries=3
@@ -104,7 +104,6 @@ jobs:
     - name: Create MySQL Config
       run: |
         echo -e "[client]\nuser = root\npassword = cactiroot\nhost = 127.0.0.1\n" > ~/.my.cnf
-        cat ~/.my.cnf
     
     - name: Initialize Cacti Database
       env:

.github/workflows/populate_syslog_incoming.sh

@@ -5,10 +5,10 @@
 ITERATIONS=100
 
 
-SQL_ALERT_RULE_INSERT="INSERT INTO syslog_alert (id,hash,name,severity,method,level,num,type,enabled,repeat_alert,open_ticket,message,body,user,date,email,notify,command,notes)
+SQL_ALERT_RULE_INSERT="REPLACE INTO syslog_alert (id,hash,name,severity,method,level,num,type,enabled,repeat_alert,open_ticket,message,body,user,date,email,notify,command,notes)
                         VALUES (1,'8f440030d3425e37cb66e5df54902bb0','interface down alert',1,0,1,1,'messageb','on',0,'','interface down','admin',1767376990,NULL,0,NULL,NULL);"
 
-SQL_REMOVAL_RULE_INSERT="INSERT INTO syslog_remove (id,hash,name,type,enabled,method,message,user,date,notes)
+SQL_REMOVAL_RULE_INSERT="REPLACE INTO syslog_remove (id,hash,name,type,enabled,method,message,user,date,notes)
                           VALUES (1,'0faf589f7b6b7da1bcec40b92340487d','exploded','messageb','on','del',
                           'the box exploded','admin',1767376604,NULL);"
 

LICENSE

@@ -277,7 +277,4 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-<<<<<<< Updated upstream
-=======
                      END OF TERMS AND CONDITIONS
->>>>>>> Stashed changes

README.md

@@ -86,9 +86,9 @@ To use a dedicated DB first create a database in mysql and assign a user you wil
 $use_cacti_db = true; 
 ```
 
-to 
+to
 
-``console
+```console
 $use_cacti_db = false;
 ```
 

database.php

@@ -174,9 +174,12 @@ function syslog_db_fetch_assoc_prepared($sql, $params = array(), $log = TRUE) {
  *
  * @return the id of the last auto incriment row that was created
  */
-function syslog_db_fetch_insert_id() {
-	global $syslog_cnn;
-	return  db_fetch_insert_id($syslog_cnn);
+function syslog_db_fetch_insert_id($syslog_cnn = null) {
+	if ($syslog_cnn === null) {
+		global $syslog_cnn;
+	}
+
+	return db_fetch_insert_id($syslog_cnn);
 }
 
 /**

js/functions.js

@@ -11,7 +11,7 @@
  * Clear filter for statistics view
  */
 function clearFilterStats() {
-	strURL = 'syslog.php?tab=stats&clear=1&header=false';
+	var strURL = 'syslog.php?tab=stats&clear=1&header=false';
 	loadPageNoHeader(strURL);
 }
 
@@ -196,7 +196,7 @@ function initSyslogMain(config) {
 				$(this).multiselect('widget').find(':checkbox:first').each(function() {
 					$(this).prop('checked', true);
 				});
-				$('#test').trigger('keyup');
+				$('#term').trigger('keyup');
 			},
 			checkAll: function() {
 				$(this).multiselect('widget').find(':checkbox').not(':first').each(function() {
@@ -253,7 +253,7 @@ function initSyslogMain(config) {
 					if (checked > 0) {
 						$(this).multiselect('widget').find(':checkbox:first').each(function() {
 							$(this).click();
-							$(this).prop('disable', true);
+							$(this).prop('disabled', true);
 						});
 					}
 				}
@@ -658,7 +658,7 @@ function initSyslogAutocomplete(formName, callback, onChange) {
 			}, 800);
 		});
 
-		$('ul[id^="ui-id"] > li').each().on('mouseenter', function() {
+		$('ul[id^="ui-id"] > li').on('mouseenter', function() {
 			$(this).addClass('ui-state-hover');
 		}).on('mouseleave', function() {
 			$(this).removeClass('ui-state-hover');

locales/LC_MESSAGES/index.php

@@ -23,4 +23,5 @@
 */
 
 header('Location:../index.php');
+exit;
 

locales/build_gettext.sh

@@ -54,9 +54,9 @@ cd ${BASE_PATH}
 
 ${XGETTEXT_BIN} --no-wrap --copyright-holder="The Cacti Group" --package-name="Cacti" --package-version=`cat include/cacti_version` --msgid-bugs-address="developers@cacti.net" -F -k__gettext -k__ -k__n:1,2 -k__x:1c,2 -k__xn:1c,2,3 -k__esc -k__esc_n:1,2 -k__esc_x:1c,2 -k__esc_xn:1c,2,3 -k__date -o locales/po/cacti.pot `find . -maxdepth 2 -name \*.php`
 
-sed -i 's/FULL NAME <EMAIL@ADDRESS\>/Cacti Developers <developers@cacti.net>/g' locales/po/cacti.pot
-sed -i 's/LANGUAGE <LL@li.org>/Cacti Developers <developers@cacti.net>/g' locales/po/cacti.pot
-sed -i 's/CHARSET/UTF-8/g' locales/po/cacti.pot
+sed -i '' 's/FULL NAME <EMAIL@ADDRESS\>/Cacti Developers <developers@cacti.net>/g' locales/po/cacti.pot
+sed -i '' 's/LANGUAGE <LL@li.org>/Cacti Developers <developers@cacti.net>/g' locales/po/cacti.pot
+sed -i '' 's/CHARSET/UTF-8/g' locales/po/cacti.pot
 
 # Merge any changes to POT file into language files
 echo "Merging updates to language files..."

locales/index.php

@@ -23,4 +23,5 @@
 */
 
 header('Location:../index.php');
+exit;
 

locales/po/es-ES.po

@@ -20,7 +20,7 @@ msgstr ""
 
 #: functions.php:72
 msgid "Save Failed.  Remote Data Collectors in Sync Mode are not allowed to Save Rules.  Save from the Main Cacti Server instead."
-msgstr "Error al guardar.  Los recopiladores de datos remotos en modo de sincronización no pueden guardar reglas.  En su lugar, guarde desde el servidor principal de Cactus."
+msgstr "Error al guardar.  Los recopiladores de datos remotos en modo de sincronización no pueden guardar reglas.  En su lugar, guarde desde el servidor principal de Cacti."
 
 #: functions.php:116
 msgid "Please use an HTML Email Client"
@@ -951,7 +951,7 @@ msgstr "Información"
 
 #: syslog.php:1633 syslog.php:1699
 msgid "Debug"
-msgstr "Depuraración"
+msgstr "Depuración"
 
 #: syslog.php:1638
 msgid "Record Type"