Patch for 2018

Last version for Bootstrap 3.x
jmohler1970 · Jun 16, 2018 · 6f503ce · 6f503ce
1 parent 7e0f8f9
commit 6f503ce
Show file tree

Hide file tree

Showing 16 changed files with 1,367 additions and 624 deletions.
diff --git a/application.cfc b/application.cfc
@@ -4,7 +4,7 @@
 component extends="framework.one" accessors="true"	{
 
 
-this.name="bs-4-cf-355";
+this.name="bs-4-cf-358";
 this.applicationManagement = true;
 this.sessionManagement = true;
 
@@ -17,7 +17,7 @@ variables.framework	=	{
 	generateSES = true,
 	SESomitIndex = false
 	};
-	
+
 variables.framework.routes	= [
 	// PlumaCMS
 	{ "backups/delete/:id"	= "backups/delete/slug/:id"},
@@ -30,33 +30,33 @@ variables.framework.routes	= [
 	{ "logout"			= "login/logout"		},
 	{ "pages/home"			= "pages/home"			},
 	{ "wiki/:id"			= "wiki/home/slug/:id"	},
-	
+
 	// documentation
 	{ "common"			= "docs/common"		},
 	{ "theme"				= "theme/home"			},
 	{ "bootswatch/:id"		= "bootswatch/home/bootswatch/:id"	}
 	];
-	
+
 
 
 
 
 
 function setupApplication()	{
-	
+
 	application.initialized = now();
-	
+
 	local.objAppFile = fileopen(expandpath('./Application.cfc'), 'read');
-	
-	application.GSVERSION = "Version 3.3.5.#right(year(local.objAppFile.lastmodified), 2)#.#month(local.objAppFile.lastmodified)#.#day(local.objAppFile.lastmodified)#";
+
+	application.GSVERSION = "Version 3.3.7.#right(year(local.objAppFile.lastmodified), 2)#.#month(local.objAppFile.lastmodified)#.#day(local.objAppFile.lastmodified)#";
 fileclose(objAppFile);
 
 
 	// Common variables and paths
  	application.GSAUTHOR			= "James Mohler and Web World Inc";
  	application.GSSITE_FULL_NAME		= "PlumaCMS";
  	application.GSSITE_LINK_BACK_URL	= "https://github.com/jmohler1970";
-	
+
  	application.GSROOTPATH 			= getdirectoryfrompath(getBaseTemplatePath());
  	application.GSBACKUPSPATH		= application.GSROOTPATH & "backups/";
  	application.GSDATAPATH			= application.GSROOTPATH & "data/";
@@ -66,50 +66,49 @@ fileclose(objAppFile);
  	application.GSDATAUPLOADPATH		= application.GSROOTPATH & "data/uploads/";
  	application.GSUSERSPATH 			= application.GSROOTPATH & "data/users/";
  	// End Pluma
- 	
-	
+
+
 	// Support for complicated variables. This used to have to be in FW/1
 	application.objFormUtilities	= new framework.formUtilities();
 	application.GSConfig		= new model.services.settings().getWebsite();
 
 	invoke("vendor.tags.bootstrap.bootstrap", "setupApplication");
 	} // end setupApplication
-	
-	
+
+
 function setupSession()	{
-	
+
 	session.authenticated = false;
-	
+
 	session.bootswatch = "default";
-	}	
+	}
 
 
 
 function setupRequest()	{
-	
+
 	invoke("vendor.tags.bootstrap.bootstrap", "setupRequest");
 	} // end setupRequest
 
-	
+
 function after()	{
-	
-	
-	
+
+
+
 	if ( isDefined('form') ) rc.Append(application.objFormUtilities.buildFormCollections(form));
-		
-		
+
+
 	if(rc.keyExists("lang"))	{
 		application.lang = rc.lang;
 		}
-		
+
 
 	if(rc.keyExists("bootswatch") and rc.bootswatch != "assets")	{
-		
+
 		session.bootswatch = rc.bootswatch;
 		}
-		
-	
+
+
 	}
 
 }
-
diff --git a/controllers/backupsController.cfc → controllers/backups.cfc b/controllers/backupsController.cfc → controllers/backups.cfc
diff --git a/controllers/bootswatchController.cfc → controllers/bootswatch.cfc b/controllers/bootswatchController.cfc → controllers/bootswatch.cfc
diff --git a/controllers/docsController.cfc → controllers/docs.cfc b/controllers/docsController.cfc → controllers/docs.cfc
diff --git a/controllers/loginController.cfc → controllers/login.cfc b/controllers/loginController.cfc → controllers/login.cfc
diff --git a/controllers/mainController.cfc → controllers/main.cfc b/controllers/mainController.cfc → controllers/main.cfc
diff --git a/controllers/pagesController.cfc → controllers/pages.cfc b/controllers/pagesController.cfc → controllers/pages.cfc
diff --git a/controllers/settingsController.cfc → controllers/settings.cfc b/controllers/settingsController.cfc → controllers/settings.cfc
diff --git a/controllers/supportController.cfc → controllers/support.cfc b/controllers/supportController.cfc → controllers/support.cfc
diff --git a/controllers/themeController.cfc → controllers/theme.cfc b/controllers/themeController.cfc → controllers/theme.cfc
diff --git a/controllers/uploadController.cfc → controllers/upload.cfc b/controllers/uploadController.cfc → controllers/upload.cfc
diff --git a/controllers/wikiController.cfc → controllers/wiki.cfc b/controllers/wikiController.cfc → controllers/wiki.cfc