version bump

WillyXJ · Sep 30, 2024 · bb79bb4 · bb79bb4
1 parent b98b6c3
commit bb79bb4
Show file tree

Hide file tree

Showing 19 changed files with 42 additions and 42 deletions.
diff --git a/client/facileManager/fmDHCP/client.php b/client/facileManager/fmDHCP/client.php
@@ -29,7 +29,7 @@
  */
 
 /** Client version */
-$data['server_client_version'] = '0.9.0-beta1';
+$data['server_client_version'] = '0.9.0';
 
 error_reporting(0);
 

diff --git a/client/facileManager/fmDNS/client.php b/client/facileManager/fmDNS/client.php
@@ -29,7 +29,7 @@
  */
 
 /** Client version */
-$data['server_client_version'] = '6.1.0-beta1';
+$data['server_client_version'] = '6.1.0';
 
 error_reporting(0);
 

diff --git a/client/facileManager/fmFirewall/client.php b/client/facileManager/fmFirewall/client.php
@@ -29,7 +29,7 @@
  */
 
 /** Client version */
-$data['server_client_version'] = '3.1.0-beta1';
+$data['server_client_version'] = '3.1.0';
 
 error_reporting(0);
 

diff --git a/client/facileManager/fmWifi/client.php b/client/facileManager/fmWifi/client.php
@@ -29,7 +29,7 @@
  */
 
 /** Client version */
-$data['server_client_version'] = '0.6.0-beta1';
+$data['server_client_version'] = '0.6.0';
 
 error_reporting(0);
 

diff --git a/server/fm-includes/version.php b/server/fm-includes/version.php
@@ -24,7 +24,7 @@
  *
  * @global string $fm_version
  */
-$fm_version = '4.7.0-beta1';
+$fm_version = '4.7.0';
 
 /**
  * Holds the facileManager DB revision, increments when changes are made to the facileManager DB schema.

diff --git a/server/fm-modules/facileManager/change.log b/server/fm-modules/facileManager/change.log
@@ -1,5 +1,5 @@
-4.7.0-beta1 (2024-08-27)
-========================
+4.7.0 (2024-09-30)
+==================
 * Server - [security] Added authentication logging.
 * Server - [improvement] Added graphic highlighting to bulk actions. (Issue #604)
 * Server - [improvement] Updated database tables to the INNODB storage engine. (Issue #607)

diff --git a/server/fm-modules/facileManager/upgrade.php b/server/fm-modules/facileManager/upgrade.php
@@ -49,7 +49,7 @@ function fmUpgrade($database) {
 	<div id="window"><table class="form-table">' . "\n", $branding_logo, _('Upgrade'));
 
 	/** Checks to support older versions (ie n-3 upgrade scenarios */
-	$success = ($GLOBALS['running_db_version'] < $fm_db_version) ? fmUpgrade_470_b1($database) : true;
+	$success = ($GLOBALS['running_db_version'] < $fm_db_version) ? fmUpgrade_470($database) : true;
 
 	if ($success) {
 		$success = upgradeConfig('fm_db_version', $fm_db_version);
@@ -848,8 +848,8 @@ function fmUpgrade_460($database) {
 }
 
 
-/** fM v4.7.0-beta1 **/
-function fmUpgrade_470_b1($database) {
+/** fM v4.7.0 **/
+function fmUpgrade_470($database) {
 	global $fmdb;
 
 	$success = true;

diff --git a/server/fm-modules/fmDHCP/change.log b/server/fm-modules/fmDHCP/change.log
@@ -1,5 +1,5 @@
-0.9.0-beta1 (2024-08-27)
-========================
+0.9.0 (2024-09-30)
+==================
 * Server - [improvement] Updated database tables to the INNODB storage engine. (Issue #607)
 * Server - [improvement] Form validations now trims and sanitizes all fields.
 * Server - [improvement] Added form validation to input fields.

diff --git a/server/fm-modules/fmDHCP/upgrade.php b/server/fm-modules/fmDHCP/upgrade.php
@@ -30,7 +30,7 @@ function upgradefmDHCPSchema($module_name) {
 	$running_version = getOption('version', 0, 'fmDHCP');
 
 	/** Checks to support older versions (ie n-3 upgrade scenarios */
-	$success = version_compare($running_version, '0.9.0-beta1', '<') ? upgradefmDHCP_090_b1($__FM_CONFIG, $running_version) : true;
+	$success = version_compare($running_version, '0.9.0', '<') ? upgradefmDHCP_090($__FM_CONFIG, $running_version) : true;
 	if (!$success) return $fmdb->last_error;
 
 	setOption('client_version', $__FM_CONFIG['fmDHCP']['client_version'], 'auto', false, 0, 'fmDHCP');
@@ -223,8 +223,8 @@ function upgradefmDHCP_047($__FM_CONFIG, $running_version) {
 	return true;
 }
 
-/** 0.9.0-beta1 */
-function upgradefmDHCP_090_b1($__FM_CONFIG, $running_version) {
+/** 0.9.0 */
+function upgradefmDHCP_090($__FM_CONFIG, $running_version) {
 	global $fmdb;
 
 	$success = version_compare($running_version, '0.4.7', '<') ? upgradefmDHCP_047($__FM_CONFIG, $running_version) : true;
@@ -256,7 +256,7 @@ function upgradefmDHCP_090_b1($__FM_CONFIG, $running_version) {
 	}
 
 	/** Handle updating table with module version **/
-	setOption('version', '0.9.0-beta1', 'auto', false, 0, 'fmDHCP');
+	setOption('version', '0.9.0', 'auto', false, 0, 'fmDHCP');
 
 	return true;
 }

diff --git a/server/fm-modules/fmDHCP/variables.inc.php b/server/fm-modules/fmDHCP/variables.inc.php
@@ -31,12 +31,12 @@
 
 /** Module Version */
 $__FM_CONFIG['fmDHCP'] = array(
-		'version'							=> '0.9.0-beta1',
-		'client_version'					=> '0.9.0-beta1',
+		'version'							=> '0.9.0',
+		'client_version'					=> '0.9.0',
 		'description'						=> __('Easily manage one or more ISC DHCP servers through a web interface. No longer edit configuration files manually.', 'fmDHCP'),
 		'prefix'							=> 'dhcp_',
 		'required_daemon_version'			=> '4.1',
-		'required_fm_version'				=> '4.7.0-beta1',
+		'required_fm_version'				=> '4.7.0',
 		'min_client_auto_upgrade_version'	=> '0.1'
 	);
 if($_SESSION['module'] == 'fmDHCP' && !defined('NO_DASH')) define('NO_DASH', true);

diff --git a/server/fm-modules/fmDNS/change.log b/server/fm-modules/fmDNS/change.log
@@ -1,5 +1,5 @@
-6.1.0-beta1 (2024-08-27)
-========================
+6.1.0 (2024-09-30)
+==================
 * Server - [improvement] Added graphic highlighting to bulk actions. (Issue #604)
 * Server - [improvement] Updated database tables to the INNODB storage engine. (Issue #607)
 * Server - [improvement] Form validations now trims and sanitizes all fields.

diff --git a/server/fm-modules/fmDNS/upgrade.php b/server/fm-modules/fmDNS/upgrade.php
@@ -32,7 +32,7 @@ function upgradefmDNSSchema($running_version) {
 	}
 
 	/** Checks to support older versions (ie n-3 upgrade scenarios */
-	$success = version_compare($running_version, '6.1.0-beta1', '<') ? upgradefmDNS_610_b1($__FM_CONFIG, $running_version) : true;
+	$success = version_compare($running_version, '6.1.0', '<') ? upgradefmDNS_610($__FM_CONFIG, $running_version) : true;
 	if (!$success) return $fmdb->last_error;
 
 	setOption('client_version', $__FM_CONFIG['fmDNS']['client_version'], 'auto', false, 0, 'fmDNS');
@@ -2659,8 +2659,8 @@ function upgradefmDNS_603($__FM_CONFIG, $running_version) {
 	return true;
 }
 
-/** 6.1.0-beta1 */
-function upgradefmDNS_610_b1($__FM_CONFIG, $running_version) {
+/** 6.1.0 */
+function upgradefmDNS_610($__FM_CONFIG, $running_version) {
 	global $fmdb;
 
 	$success = version_compare($running_version, '6.0.3', '<') ? upgradefmDNS_603($__FM_CONFIG, $running_version) : true;
@@ -2692,7 +2692,7 @@ function upgradefmDNS_610_b1($__FM_CONFIG, $running_version) {
 		}
 	}
 
-	setOption('version', '6.1.0-beta1', 'auto', false, 0, 'fmDNS');
+	setOption('version', '6.1.0', 'auto', false, 0, 'fmDNS');
 
 	return true;
 }
diff --git a/server/fm-modules/fmDNS/variables.inc.php b/server/fm-modules/fmDNS/variables.inc.php
@@ -31,12 +31,12 @@
 
 /** Module Information */
 $__FM_CONFIG['fmDNS'] = array(
-		'version'							=> '6.1.0-beta1',
-		'client_version'					=> '6.1.0-beta1',
+		'version'							=> '6.1.0',
+		'client_version'					=> '6.1.0',
 		'description'						=> __('Easily manage one or more ISC BIND servers through a web interface. No more editing configuration and zone files manually.', 'fmDNS'),
 		'prefix'							=> 'dns_',
 		'required_dns_version'				=> '9.3',
-		'required_fm_version'				=> '4.7.0-beta1',
+		'required_fm_version'				=> '4.7.0',
 		'min_client_auto_upgrade_version'	=> '2.2'
 	);
 

diff --git a/server/fm-modules/fmFirewall/change.log b/server/fm-modules/fmFirewall/change.log
@@ -1,5 +1,5 @@
-3.1.0-beta1 (2024-08-27)
-========================
+3.1.0 (2024-09-30)
+==================
 * Server - [improvement] Updated database tables to the INNODB storage engine. (Issue #607)
 * Server - [improvement] Form validations now trims and sanitizes all fields.
 * Server - [bug] Configuration can no longer be built when the server does not have a

diff --git a/server/fm-modules/fmFirewall/variables.inc.php b/server/fm-modules/fmFirewall/variables.inc.php
@@ -31,11 +31,11 @@
 
 /** Module Version */
 $__FM_CONFIG['fmFirewall'] = array(
-		'version'							=> '3.1.0-beta1',
-		'client_version'					=> '3.1.0-beta1',
+		'version'							=> '3.1.0',
+		'client_version'					=> '3.1.0',
 		'description'						=> __('Managing software firewalls should not be difficult. Manage one or more software firewall servers (iptables, ipfw, ipf, pf) through a web interface rather than configuration files individually.', 'fmFirewall'),
 		'prefix'							=> 'fw_',
-		'required_fm_version'				=> '4.7.0-beta1',
+		'required_fm_version'				=> '4.7.0',
 		'min_client_auto_upgrade_version'	=> '1.3'
 	);
 

diff --git a/server/fm-modules/fmSQLPass/change.log b/server/fm-modules/fmSQLPass/change.log
@@ -1,5 +1,5 @@
-1.9.0-beta1 (2024-08-27)
-========================
+1.9.0 (2024-09-30)
+==================
 * Server - [improvement] Updated database tables to the INNODB storage engine. (Issue #607)
 * Server - [bug] Fixed an issue where some JavaScript would not run.
 

diff --git a/server/fm-modules/fmSQLPass/variables.inc.php b/server/fm-modules/fmSQLPass/variables.inc.php
@@ -31,10 +31,10 @@
 
 /** Module Version */
 $__FM_CONFIG['fmSQLPass'] = array(
-		'version'				=> '1.9.0-beta1',
+		'version'				=> '1.9.0',
 		'description'			=> __('Change database user passwords across a server farm running multiple database server types. Password complexity requirements are enforced to ensure secure passwords. Currently supported database servers include MySQL and PostgreSQL.', 'fmSQLPass'),
 		'prefix'				=> 'sqlpass_',
-		'required_fm_version'	=> '4.7.0-beta1'
+		'required_fm_version'	=> '4.7.0'
 	);
 
 /** Default values */

diff --git a/server/fm-modules/fmWifi/change.log b/server/fm-modules/fmWifi/change.log
@@ -1,5 +1,5 @@
-0.6.0-beta1 (2024-08-27)
-========================
+0.6.0 (2024-09-30)
+==================
 * Server - [improvement] Updated database tables to the INNODB storage engine. (Issue #607)
 * Server - [improvement] Form validations now trims and sanitizes all fields.
 * Server - [improvement] Added additional logging.

diff --git a/server/fm-modules/fmWifi/variables.inc.php b/server/fm-modules/fmWifi/variables.inc.php
@@ -31,11 +31,11 @@
 
 /** Module Version */
 $__FM_CONFIG['fmWifi'] = array(
-		'version'							=> '0.6.0-beta1',
-		'client_version'					=> '0.6.0-beta1',
+		'version'							=> '0.6.0',
+		'client_version'					=> '0.6.0',
 		'description'						=> __('Manage wifi access points with hostapd.', 'fmWifi'),
 		'prefix'							=> 'wifi_',
-		'required_fm_version'				=> '4.7.0-beta1',
+		'required_fm_version'				=> '4.7.0',
 		'required_daemon_version'			=> '2.4',
 		'min_client_auto_upgrade_version'	=> '0.1'
 	);