Change Freeradius to FreeRADIUS

3 files changed, 18 insertions, 18 deletions

diff --git a/freeradius3-controller.lua b/freeradius3-controller.lua
index f268fb4..29748d7 100644
--- a/freeradius3-controller.lua
+++ b/freeradius3-controller.lua
@@ -19,11 +19,11 @@ function mymodule.editfile(self)
 end
 
 function mymodule.createfile(self)
-	return self.handle_form(self, self.model.getnewfile, self.model.createfile, self.clientdata, "Create", "Create New Freeradius File", "Freeradius File Created")
+	return self.handle_form(self, self.model.getnewfile, self.model.createfile, self.clientdata, "Create", "Create New FreeRADIUS File", "FreeRADIUS File Created")
 end
 
 function mymodule.deletefile(self)
-	return self.handle_form(self, self.model.getdeletefile, self.model.deletefile, self.clientdata, "Delete", "Delete Freeradius File", "Freeradius File Deleted")
+	return self.handle_form(self, self.model.getdeletefile, self.model.deletefile, self.clientdata, "Delete", "Delete FreeRADIUS File", "FreeRADIUS File Deleted")
 end
 
 function mymodule.listpasswdfiles(self)
diff --git a/freeradius3-model.lua b/freeradius3-model.lua
index b5e2f82..e3b1261 100644
--- a/freeradius3-model.lua
+++ b/freeradius3-model.lua
@@ -168,7 +168,7 @@ local mksalt = function()
 end
 
 local get_passwd_file = function(self, clientdata, readonly)
-	local retval = cfe({ type="group", value={}, label="Freeradius passwd file" })
+	local retval = cfe({ type="group", value={}, label="FreeRADIUS passwd file" })
 	retval.value.filename = cfe({ type="select", label="File name", option ={}, key=true, seq=1 })
 	local files,configs,passwdconfig
 	files,retval.errtxt,configs = get_passwd_files()
@@ -196,7 +196,7 @@ end
 
 local get_passwd_entry_private = function(self, clientdata, create)
 	local retval,passwdconfig = get_passwd_file(self, clientdata, true)
-	retval.label = "Freeradius passwd entry"
+	retval.label = "FreeRADIUS passwd entry"
 	if retval.value.mode and string.find(retval.value.mode.value, "^.%-") then
 		retval.value.filename.errtxt = "Readonly file"
 		return retval
@@ -355,7 +355,7 @@ end
 -- PUBLIC FUNCTIONS
 
 function mymodule.get_status()
-	return modelfunctions.getstatus(processname, packagename, "Freeradius Status")
+	return modelfunctions.getstatus(processname, packagename, "FreeRADIUS Status")
 end
 
 function mymodule.get_startstop(self, clientdata)
@@ -390,12 +390,12 @@ function mymodule.list_files()
 		end
 	end
 	table.sort(retval, function(a,b) return a.filename < b.filename end)
-	return cfe({ type="structure", value=retval, label="List of Freeradius files" })
+	return cfe({ type="structure", value=retval, label="List of FreeRADIUS files" })
 end
 
 function mymodule.getnewfile()
 	local filename = cfe({ label="File Name", descr="Must be in "..baseurl })
-	return cfe({ type="group", value={filename=filename}, label="Freeradius File" })
+	return cfe({ type="group", value={filename=filename}, label="FreeRADIUS File" })
 end
 
 function mymodule.createfile(self, filedetails)
@@ -428,11 +428,11 @@ end
 function mymodule.getdeletefile(self, clientdata)
 	local retval = {}
 	retval.filename = cfe({ label="File Name", value=clientdata.filename or "" })
-	return cfe({ type="group", value=retval, label="Delete Freeradius File" })
+	return cfe({ type="group", value=retval, label="Delete FreeRADIUS File" })
 end
 
 function mymodule.deletefile(self, delfile)
-	delfile.errtxt = "Failed to delete Freeradius File - invalid filename"
+	delfile.errtxt = "Failed to delete FreeRADIUS File - invalid filename"
 	for i,file in ipairs(mymodule.list_files().value) do
 		if delfile.value.filename.value == file.filename then
 			delfile.errtxt = nil
@@ -456,7 +456,7 @@ function mymodule.list_passwd_files()
 		table.sort(retval, function(a,b) return a.filename < b.filename end)
 	end
 
-	return cfe({ type="structure", value=retval, label="List of Freeradius passwd files", errtxt=errtxt })
+	return cfe({ type="structure", value=retval, label="List of FreeRADIUS passwd files", errtxt=errtxt })
 end
 
 function mymodule.view_passwd_file(self, clientdata)
@@ -491,7 +491,7 @@ end
 
 function mymodule.get_delete_passwd_entry(self, clientdata)
 	local retval,passwdconfig = get_passwd_file(self, clientdata)
-	retval.label = "Delete Freeradius passwd entry"
+	retval.label = "Delete FreeRADIUS passwd entry"
 	if retval.value.mode and string.find(retval.value.mode.value, "^.%-") then
 		retval.value.filename.errtxt = "Readonly file"
 		return retval
@@ -522,7 +522,7 @@ end
 
 function mymodule.get_passwd(self, clientdata)
 	local retval,passwdconfig = get_passwd_file(self, clientdata, true)
-	retval.label = "Freeradius password"
+	retval.label = "FreeRADIUS password"
 	if retval.value.mode and string.find(retval.value.mode.value, "^.%-") then
 		retval.value.filename.errtxt = "Readonly file"
 		return retval
@@ -629,7 +629,7 @@ function mymodule.list_macauth_files()
 		table.sort(retval, function(a,b) return a.filename < b.filename end)
 	end
 
-	return cfe({ type="structure", value=retval, label="List of Freeradius MAC authentication files", errtxt=errtxt })
+	return cfe({ type="structure", value=retval, label="List of FreeRADIUS MAC authentication files", errtxt=errtxt })
 end
 
 function mymodule.get_macauth_file(self, clientdata)
diff --git a/freeradius3.menu b/freeradius3.menu
index 7095aa1..553885a 100644
--- a/freeradius3.menu
+++ b/freeradius3.menu
@@ -1,7 +1,7 @@
 # Prefix and controller are already known at this point
 # Cat		Group			Tab		Action
-Applications	15Freeradius	Status		status
-Applications	15Freeradius	Passwd		listpasswdfiles
-Applications	15Freeradius	MAC_Auth	listmacauthfiles
-Applications	15Freeradius	Expert		listfiles
-Applications	15Freeradius	Logfile		logfile
+Applications	15FreeRADIUS	Status		status
+Applications	15FreeRADIUS	Passwd		listpasswdfiles
+Applications	15FreeRADIUS	MAC_Auth	listmacauthfiles
+Applications	15FreeRADIUS	Expert		listfiles
+Applications	15FreeRADIUS	Logfile		logfile