Various fixes && Updated Translations (Cacti#1032)

Good catch on the bug fixes too. Hard to spot. _______________________________________________________ * Updated Dutch translations - Fixed i18n * Defined fields in queries * Fixed changelog * Updated Dutch translations * Various fixes All committed files: - true|false to lowercase add_perms.php: - displayGroups() was undefined add_tree.php: - duplicate case for '--quiet' repair_templates.php: - correction function call to diaplay_version() gettext.php: - PHP EOF unneeded * Updated Dutch translations - Updated Dutch translations with latest cacti.pot file * Updated Dutch translations - Fixed conflicts in translations
xmacan · Oct 15, 2017 · c3419aa · c3419aa
1 parent 0c993e8
commit c3419aa
Show file tree

Hide file tree

Showing 54 changed files with 6,197 additions and 4,596 deletions.
diff --git a/aggregate_templates.php b/aggregate_templates.php
@@ -104,7 +104,7 @@ function aggregate_form_save() {
 		return null;
 	}
 
-	cacti_log('AGGREGATE GRAPH TEMPLATE Saved ID: ' . $save1['id'] . ' Name: ' . $save1['name'], FALSE, 'AGGREGATE', POLLER_VERBOSITY_DEBUG);
+	cacti_log('AGGREGATE GRAPH TEMPLATE Saved ID: ' . $save1['id'] . ' Name: ' . $save1['name'], false, 'AGGREGATE', POLLER_VERBOSITY_DEBUG);
 
 	/* do a quick comparison to see if anything changed */
 	if ($is_new == false) {
@@ -136,7 +136,7 @@ function aggregate_form_save() {
 			array($save1['gprint_prefix'], $save1['graph_type'],
 				$save1['total'], $save1['total_prefix'],  $save1['order_type'], $id));
 
-		cacti_log('AGGREGATE GRAPH TEMPLATE Saved ID: ' . $id, FALSE, 'AGGREGATE', POLLER_VERBOSITY_DEBUG);
+		cacti_log('AGGREGATE GRAPH TEMPLATE Saved ID: ' . $id, false, 'AGGREGATE', POLLER_VERBOSITY_DEBUG);
 	} else {
 		$id = $save1['id'];
 	}

diff --git a/automation_networks.php b/automation_networks.php
@@ -863,7 +863,7 @@ function setSchedule() {
 	<?php
 }
 
-function get_networks(&$sql_where, $rows, $apply_limits = TRUE) {
+function get_networks(&$sql_where, $rows, $apply_limits = true) {
 	if (get_request_var('filter') != '') {
 		$sql_where = " WHERE (automation_networks.name LIKE '%" . get_request_var('filter') . "%')";
 	}

diff --git a/cli/add_data_query.php b/cli/add_data_query.php
@@ -40,9 +40,9 @@
 array_shift($parms);
 
 if (sizeof($parms)) {
-	$displayHosts 		= FALSE;
-	$displayDataQueries = FALSE;
-	$quietMode			= FALSE;
+	$displayHosts 		= false;
+	$displayDataQueries = false;
+	$quietMode			= false;
 
 	unset($host_id);
 	unset($data_query_id);
@@ -58,7 +58,7 @@
 
 		switch ($arg) {
 			case '-d':
-				$debug = TRUE;
+				$debug = true;
 
 				break;
 			case '--host-id':
@@ -113,13 +113,13 @@
 				display_help();
 				exit;
 			case '--list-hosts':
-				$displayHosts = TRUE;
+				$displayHosts = true;
 				break;
 			case '--list-data-queries':
-				$displayDataQueries = TRUE;
+				$displayDataQueries = true;
 				break;
 			case '--quiet':
-				$quietMode = TRUE;
+				$quietMode = true;
 				break;
 			default:
 				echo "ERROR: Invalid Argument: ($arg)\n\n";

diff --git a/cli/add_device.php b/cli/add_device.php
@@ -77,9 +77,9 @@
 	$proxy          = false;
 	$device_threads = read_config_option('device_threads');;
 
-	$displayHostTemplates = FALSE;
-	$displayCommunities   = FALSE;
-	$quietMode            = FALSE;
+	$displayHostTemplates = false;
+	$displayCommunities   = false;
+	$quietMode            = false;
 
 	foreach($parms as $parameter) {
 		if (strpos($parameter, '=')) {
@@ -91,7 +91,7 @@
 
 		switch ($arg) {
 		case '-d':
-			$debug = TRUE;
+			$debug = true;
 
 			break;
 		case '--description':
@@ -274,15 +274,15 @@
 			display_help();
 			exit;
 		case '--list-communities':
-			$displayCommunities = TRUE;
+			$displayCommunities = true;
 
 			break;
 		case '--list-host-templates':
-			$displayHostTemplates = TRUE;
+			$displayHostTemplates = true;
 
 			break;
 		case '--quiet':
-			$quietMode = TRUE;
+			$quietMode = true;
 
 			break;
 		default:

diff --git a/cli/add_graph_template.php b/cli/add_graph_template.php
@@ -39,9 +39,9 @@
 array_shift($parms);
 
 if (sizeof($parms)) {
-	$displayHosts 			= FALSE;
-	$displayGraphTemplates 	= FALSE;
-	$quietMode				= FALSE;
+	$displayHosts 			= false;
+	$displayGraphTemplates 	= false;
+	$quietMode				= false;
 	unset($host_id);
 	unset($graph_template_id);
 
@@ -55,7 +55,7 @@
 
 		switch ($arg) {
 		case '-d':
-			$debug = TRUE;
+			$debug = true;
 
 			break;
 		case '--host-id':
@@ -85,13 +85,13 @@
 			display_help();
 			exit(0);
 		case '--list-hosts':
-			$displayHosts = TRUE;
+			$displayHosts = true;
 			break;
 		case '--list-graph-templates':
-			$displayGraphTemplates = TRUE;
+			$displayGraphTemplates = true;
 			break;
 		case '--quiet':
-			$quietMode = TRUE;
+			$quietMode = true;
 			break;
 		default:
 			echo "ERROR: Invalid Argument: ($arg)\n\n";

diff --git a/cli/add_perms.php b/cli/add_perms.php
@@ -51,13 +51,13 @@
 	$itemId   = 0;
 	$hostId   = 0;
 
-	$quietMode				= FALSE;
-	$displayGroups			= FALSE;
-	$displayUsers			= FALSE;
-	$displayTrees			= FALSE;
-	$displayHosts			= FALSE;
-	$displayGraphs			= FALSE;
-	$displayGraphTemplates 	= FALSE;
+	$quietMode				= false;
+	$displayGroups			= false;
+	$displayUsers			= false;
+	$displayTrees			= false;
+	$displayHosts			= false;
+	$displayGraphs			= false;
+	$displayGraphTemplates 	= false;
 
 	foreach($parms as $parameter) {
 		if (strpos($parameter, '=')) {
@@ -92,31 +92,31 @@
 
 			break;
 		case '--list-groups':
-			$displayGroups = TRUE;
+			$displayGroups = true;
 
 			break;
 		case '--list-users':
-			$displayUsers = TRUE;
+			$displayUsers = true;
 
 			break;
 		case '--list-trees':
-			$displayTrees = TRUE;
+			$displayTrees = true;
 
 			break;
 		case '--list-hosts':
-			$displayHosts = TRUE;
+			$displayHosts = true;
 
 			break;
 		case '--list-graphs':
-			$displayGraphs = TRUE;
+			$displayGraphs = true;
 
 			break;
 		case '--list-graph-templates':
-			$displayGraphTemplates = TRUE;
+			$displayGraphTemplates = true;
 
 			break;
 		case '--quiet':
-			$quietMode = TRUE;
+			$quietMode = true;
 
 			break;
 		case '--version':
@@ -260,3 +260,10 @@ function display_help() {
 	echo "    --list-graph-templates\n";
 	echo "    --list-graphs --host-id=[ID]\n";
 }
+
+function displayGroups() {
+    /**
+     * Todo implement
+     */
+	echo 'This option has not yet been implemented';
+}
diff --git a/cli/add_tree.php b/cli/add_tree.php
@@ -54,12 +54,12 @@
 	$hostId         = 0;
 	$hostGroupStyle = 1; # 1 = Graph Template,  2 = Data Query Index
 
-	$quietMode      = FALSE;
-	$displayHosts   = FALSE;
-	$displayTrees   = FALSE;
-	$displayNodes   = FALSE;
-	$displayRRAs    = FALSE;
-	$displayGraphs  = FALSE;
+	$quietMode      = false;
+	$displayHosts   = false;
+	$displayTrees   = false;
+	$displayNodes   = false;
+	$displayRRAs    = false;
+	$displayGraphs  = false;
 
 	$hosts          = getHosts();
 
@@ -105,32 +105,28 @@
 
 			break;
 		case '--quiet':
-			$quietMode = TRUE;
+			$quietMode = true;
 
 			break;
 		case '--list-hosts':
-			$displayHosts = TRUE;
+			$displayHosts = true;
 
 			break;
 		case '--list-trees':
-			$displayTrees = TRUE;
+			$displayTrees = true;
 
 			break;
 		case '--list-nodes':
-			$displayNodes = TRUE;
+			$displayNodes = true;
 
 			break;
 		case '--list-graphs':
-			$displayGraphs = TRUE;
+			$displayGraphs = true;
 
 			break;
 		case '--host-group-style':
 			$hostGroupStyle = trim($value);
 
-			break;
-		case '--quiet':
-			$quietMode = TRUE;
-
 			break;
 		case '--version':
 		case '-V':

diff --git a/cli/analyze_database.php b/cli/analyze_database.php
@@ -38,7 +38,7 @@
 
 global $debug;
 
-$debug = FALSE;
+$debug = false;
 $form  = '';
 $start = time();
 
@@ -54,7 +54,7 @@
 		switch ($arg) {
 			case '-d':
 			case '--debug':
-				$debug = TRUE;
+				$debug = true;
 				break;
 			case '--version':
 			case '-V':

diff --git a/cli/data_template_associate_rra.php b/cli/data_template_associate_rra.php
@@ -52,7 +52,7 @@
 		switch ($arg) {
 			case '-d':
 			case '--debug':				
-				$debug = TRUE;
+				$debug = true;
 				break;
 			case '--rra':
 				$rra = trim($value);
@@ -71,7 +71,7 @@
 				display_help();
 				exit;
 			case '--quiet':
-				$quietMode = TRUE;
+				$quietMode = true;
 				break;
 			default:
 				echo "ERROR: Invalid Argument: ($arg)\n\n";

diff --git a/cli/host_update_template.php b/cli/host_update_template.php
@@ -48,7 +48,7 @@
 	exit;
 }
 
-$debug    = FALSE;
+$debug    = false;
 $template = '';
 $hostid   = '';
 
@@ -74,7 +74,7 @@
 				exit(0);
 			case '-d':
 			case '--debug':
-				$debug = TRUE;
+				$debug = true;
 				break;
 			case '--version':
 			case '-V':

diff --git a/cli/poller_data_sources_reapply_names.php b/cli/poller_data_sources_reapply_names.php
@@ -46,7 +46,7 @@
 	exit;
 }
 
-$debug   = FALSE;
+$debug   = false;
 $host_id = '';
 $filter  = '';
 
@@ -71,7 +71,7 @@
 				break;
 			case '-d' :
 			case '--debug' :
-				$debug = TRUE;
+				$debug = true;
 				break;
 			case '--version' :
 			case '-v' :

diff --git a/cli/poller_graphs_reapply_names.php b/cli/poller_graphs_reapply_names.php
@@ -39,7 +39,7 @@
 $parms = $_SERVER['argv'];
 array_shift($parms);
 
-$debug   = FALSE;
+$debug   = false;
 $host_id = '';
 $filter  = '';
 
@@ -63,7 +63,7 @@
 				break;
 			case '--debug':
 			case '-d':
-				$debug = TRUE;
+				$debug = true;
 				break;
 			case '--version':
 			case '-V':

diff --git a/cli/poller_output_empty.php b/cli/poller_output_empty.php
@@ -80,7 +80,7 @@
 $rrds_processed = 0;
 
 while (db_fetch_cell('SELECT count(*) FROM poller_output') > 0) {
-	$rrds_processed = $rrds_processed + process_poller_output($rrdtool_pipe, FALSE);
+	$rrds_processed = $rrds_processed + process_poller_output($rrdtool_pipe, false);
 }
 
 echo "There were $rrds_processed, RRD updates made this pass\n";

diff --git a/cli/poller_reindex_hosts.php b/cli/poller_reindex_hosts.php
@@ -40,7 +40,7 @@
 $parms = $_SERVER['argv'];
 array_shift($parms);
 
-$debug		= FALSE;
+$debug		= false;
 $host_id	= '';
 $query_id	= 'all';		/* just to mimic the old behaviour */
 $host_descr	= '';
@@ -69,7 +69,7 @@
 				break;
 			case '-d':
 			case '--debug':
-				$debug = TRUE;
+				$debug = true;
 				break;
 			case '--version':
 			case '-V':