Cosmetig things and undelete debug

basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIService.java

@@ -128,13 +128,13 @@ public interface LTIService extends LTISubstitutionsFilter {
             "allowlineitems:checkbox:label=bl_allowlineitems",
             "allowroster:checkbox:label=bl_allowroster",
 
+            "debug:radio:label=bl_debug:choices=off,on,content",
             "siteinfoconfig:radio:label=bl_siteinfoconfig:advanced:choices=bypass,config",
             "splash:textarea:label=bl_splash:rows=5:cols=25:maxlength=16384",
 
             // LTI 1.x user-entered custom
             "custom:textarea:label=bl_custom:rows=5:cols=25:maxlength=16384",
             "rolemap:textarea:label=bl_rolemap:rows=5:cols=25:maxlength=16384:role=admin",
-
             "lti13:radio:label=bl_lti13:choices=off,on,both:role=admin",
 
             // LTI 1.3 security values from the tool
@@ -143,7 +143,7 @@ public interface LTIService extends LTISubstitutionsFilter {
             "lti13_oidc_endpoint:text:label=bl_lti13_oidc_endpoint:maxlength=1024:role=admin",  // From the tool - keep legacy field name
             "lti13_oidc_redirect:text:label=bl_lti13_oidc_redirect:maxlength=1024:role=admin",  // From the tool - keep legacy field name
 
-	        // LTI 1.3 security values from the LMS
+            // LTI 1.3 security values from the LMS
             "lti13_lms_security:header:fields=lti13_lms_issuer,lti13_client_id,lti13_lms_keyset,lti13_lms_endpoint,lti13_lms_token",
             "lti13_lms_issuer:text:label=bl_lti13_lms_issuer:readonly=true:persist=false:maxlength=1024:role=admin",
             "lti13_client_id:text:label=bl_lti13_client_id:readonly=true:maxlength=1024:role=admin",
@@ -152,15 +152,14 @@ public interface LTIService extends LTISubstitutionsFilter {
             "lti13_lms_endpoint:text:label=bl_lti13_lms_endpoint:readonly=true:persist=false:maxlength=1024:role=admin",
             "lti13_lms_token:text:label=bl_lti13_lms_token:readonly=true:persist=false:maxlength=1024:role=admin",
 
-	        // LTI 1.1 security arrangement
+            // LTI 1.1 security arrangement
             "lti11_security:header:fields=consumerkey,allowconsumerkey,secret,allowsecret",
             "consumerkey:text:label=bl_consumerkey:maxlength=1024",
 
             "secret:text:label=bl_secret:maxlength=1024",
 
             "lti13_settings:textarea:hidden=true:maxlength=1M:role=admin",
 
-            "lti11_launch_type:radio:label=bl_lti11_launch_type:role=admin:choices=inherit,legacy,lti112:hidden=true",
             "xmlimport:textarea:hidden=true:maxlength=1M",
             "lti13_auto_token:text:hidden=true:maxlength=1024",
             "lti13_auto_state:integer:hidden=true",
@@ -272,7 +271,7 @@ public interface LTIService extends LTISubstitutionsFilter {
     String LTI13_TOOL_ENDPOINT = "lti13_oidc_endpoint";
     String LTI13_TOOL_REDIRECT = "lti13_oidc_redirect";
 
-	// Not persisted - generated dynamically
+    // Not persisted - generated dynamically
     String LTI13_LMS_ISSUER = "lti13_lms_issuer";
     String LTI13_LMS_DEPLOYMENT_ID = "lti13_lms_deployment_id";
     String LTI13_LMS_KEYSET = "lti13_lms_keyset";

basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/Foorm.java

@@ -861,11 +861,6 @@ public void formOutputEnd(StringBuffer sb, String field, String label, Object lo
 
 	/**
 	 *
-	 * @param value
-	 * @param field
-	 * @param label
-	 * @param loader
-	 * @return
 	 */
 	public String formOutputHeader(String field, String label, Object loader) {
 		StringBuffer sb = new StringBuffer();
@@ -1953,7 +1948,7 @@ public String[] formAdjustTable(String table, String[] formDefinition, String ve
 			Properties info = parseFormString(formField);
 			String field = info.getProperty("field", null);
 			String persist = info.getProperty("persist", null);
-            if (Boolean.valueOf(persist)) continue;
+			if (Boolean.valueOf(persist)) continue;
 			String type = info.getProperty("type", null);
 			if ( "header".equals(type) ) continue;
 			String maxs = adjustMax(info.getProperty("maxlength", null));
@@ -2112,7 +2107,7 @@ public String formSqlFields(String[] formDefinition, String vendor) {
 		for (String formField : formDefinition) {
 			Properties info = parseFormString(formField);
 			String persist = info.getProperty("persist", null);
-            if (Boolean.valueOf(persist)) continue;
+			if (Boolean.valueOf(persist)) continue;
 			String retval = formSql(formField, vendor);
 			if (retval == null)
 				continue;

basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/DBLTIService.java

@@ -180,7 +180,7 @@ public Map<String, Object> getToolDao(Long key, String siteId, boolean isAdminRo
 		// This is quicker than a patch and can be used while a patch is being developed and/or for
 		// testing to see if the deleted columns caused a regression
 		// This entire block of code can be removed after Sakai 25.2 if it is not needed by then
-        String ltiFakeDeprecated = serverConfigurationService.getString("sakai-sak-50328-fake-deprecated-values", "false");
+		String ltiFakeDeprecated = serverConfigurationService.getString("sakai-sak-50328-fake-deprecated-values", "false");
 		if ( "true".equals(ltiFakeDeprecated) ) {
 
 			// Fields removed from the model

lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/BltiEntity.java

@@ -501,9 +501,6 @@ public String doImportTool(String launchUrl, String bltiTitle, String strXml, St
 		}
 		props.setProperty(LTIService.LTI_CONSUMERKEY, LTIService.LTI_SECRET_INCOMPLETE);
 		props.setProperty(LTIService.LTI_SECRET, LTIService.LTI_SECRET_INCOMPLETE);
-		// props.setProperty(LTIService.LTI_ALLOWLAUNCH, "1");  // SAK-50378 - Delete before release after Sakai-25
-		// props.setProperty(LTIService.LTI_ALLOWTITLE, "1");   // SAK-50378 - Delete before release after Sakai-25
-		// props.setProperty(LTIService.LTI_ALLOWPAGETITLE, "1");   // SAK-50378 - Delete before release after Sakai-25
 		props.setProperty(LTIService.LTI_ALLOWOUTCOMES, "1");
 		props.setProperty(LTIService.LTI_SENDNAME, "1");
 		props.setProperty(LTIService.LTI_SENDEMAILADDR, "1");