Backup Manager

cubesql-webadmin.xojo_project

@@ -20,6 +20,9 @@ Folder=containers;webapp/containers;&h000000005859EFFF;&h0000000018D38FFF;false
 Folder=base;webapp/containers/base;&h000000000B1567FF;&h000000005859EFFF;false
 WebContainer=cntStatus;webapp/containers/cntStatus.xojo_code;&h000000000A45BFFF;&h000000005859EFFF;false
 Folder=server;webapp/containers/server;&h0000000045A527FF;&h000000005859EFFF;false
+Folder=data;webapp/containers/data;&h00000000107E37FF;&h000000005859EFFF;false
+WebContainer=cntDatabases;webapp/containers/data/cntDatabases.xojo_code;&h0000000040B4DFFF;&h00000000107E37FF;false
+WebContainer=cntBackups;webapp/containers/data/cntBackups.xojo_code;&h000000004237B7FF;&h00000000107E37FF;false
 WebContainer=cntRegistrationAction;webapp/containers/server/cntRegistrationAction.xojo_code;&h000000000788EFFF;&h0000000045A527FF;false
 Folder=security;webapp/containers/security;&h000000007FF17FFF;&h000000005859EFFF;false
 Class=cntBase;webapp/containers/base/cntBase.xojo_code;&h0000000041D557FF;&h000000000B1567FF;false
@@ -33,7 +36,6 @@ BuildSteps=Build Automation;Build Automation.xojo_code;&h000000001394FFFF;&h0000
 ColorAsset=colTextKey;styles/colTextKey.xojo_color;&h000000005870AFFF;&h00000000139DBFFF;false
 Module=modWebStyles;styles/modWebStyles.xojo_code;&h0000000002BE7FFF;&h00000000139DBFFF;false
 WebContainer=cntRegistration;webapp/containers/server/cntRegistration.xojo_code;&h000000002FA707FF;&h0000000045A527FF;false
-WebContainer=cntDatabases;webapp/containers/server/cntDatabases.xojo_code;&h0000000040B4DFFF;&h0000000045A527FF;false
 WebContainer=cntConsole;webapp/containers/server/cntConsole.xojo_code;&h000000004BD2DFFF;&h0000000045A527FF;false
 WebContainer=cntGroups;webapp/containers/security/cntGroups.xojo_code;&h0000000034036FFF;&h000000007FF17FFF;false
 WebContainer=cntUsers;webapp/containers/security/cntUsers.xojo_code;&h00000000700FF7FF;&h000000007FF17FFF;false

styles/modWebStyles.xojo_code

@@ -25,6 +25,31 @@ Protected Module modWebStyles
 		End Sub
 	#tag EndMethod
 
+	#tag Method, Flags = &h0
+		Sub ShowWithActionWarning(Extends dialog As WebMessageDialog)
+		  dialog.Show
+
+		  Timer.CallLater(1, AddressOf ShowWithActionWarningTimerAction, dialog)
+
+		End Sub
+	#tag EndMethod
+
+	#tag Method, Flags = &h21
+		Private Sub ShowWithActionWarningTimerAction(dialog As Variant)
+		  If (Not (dialog IsA WebMessageDialog)) Then Return
+
+		  Var javaScript() As String
+		  javaScript.Add("(function() {")
+		  javaScript.Add("  let button = document.getElementById('" + WebMessageDialog(dialog).ControlID + "_action');")
+		  javaScript.Add("  button.classList.remove('btn-primary');")
+		  javaScript.Add("  button.classList.add('btn-warning');")
+		  javaScript.Add("})();")
+
+		  WebMessageDialog(dialog).ExecuteJavaScript(String.FromArray(javaScript, ""))
+
+		End Sub
+	#tag EndMethod
+
 	#tag Method, Flags = &h0
 		Function StyleListboxKeyColumn() As WebStyle
 		  Var style As New WebStyle

webapp/Session.xojo_code

@@ -18,7 +18,7 @@ Inherits WebSession
 		  DB = loginDB
 
 		  Try
-		    DB.ExecuteSQL("SET CLIENT TYPE TO 'cubeSQL Web Admin " + App.Version + "'")
+		    DB.ExecuteSQL("SET CLIENT TYPE TO 'cubeSQL Web Admin " + App.Version.EscapeSqlQuotes + "'")
 
 		    Var rs As RowSet = db.SelectSQL("SHOW MY INFO")
 
@@ -289,6 +289,14 @@ Inherits WebSession
 			Type="Boolean"
 			EditorType=""
 		#tag EndViewProperty
+		#tag ViewProperty
+			Name="ClientId"
+			Visible=false
+			Group="Behavior"
+			InitialValue="-1"
+			Type="Integer"
+			EditorType=""
+		#tag EndViewProperty
 	#tag EndViewBehavior
 End Class
 #tag EndClass

webapp/containers/base/cntDatasourceBase.xojo_code

@@ -132,7 +132,7 @@ Implements WebDataSource
 
 		            If bSearchFilter And col.IsSearchable Then
 		              If rs.Column(col.DatabaseColumnName).StringValue.Contains(Me.SearchValue, ComparisonOptions.CaseInsensitive) Then
-		                'We want so see rows that contain the text of the SerachFilter
+		                'We want so see rows that contain the text of the SearchFilter
 		                bSearchFilterShowRow = True
 		              End If
 		            End If