Merge branch 'dev' at v1.6.1-alpha.

Fixes: Username always being 'undefined' with LDAP auth. User's names being double escaped. Changes: Moved fonts, styles, scripts, and images dirs to static dir. Serve compiled less from less/, not styles/.
dag10 · Mar 9, 2015 · dd11fe2 · dd11fe2
2 parents 8608299 + 554e7b3
commit dd11fe2
Show file tree

Hide file tree

Showing 48 changed files with 33 additions and 16 deletions.
diff --git a/config.example.js b/config.example.js
@@ -46,6 +46,12 @@ module.exports = {
     // Secret strong used for authentication. Make this unique.
     secret: 'change me!',
 
+    // Compress css generated from less.
+    compress_css: true,
+
+    // Use minified js where possible.
+    compress_js: true,
+
     // Max upload file size (in mb).
     max_file_size: 50
   },

diff --git a/logic/auth/ldap.js b/logic/auth/ldap.js
@@ -76,7 +76,9 @@ function auth(username, password) {
           attrs[attr.type] = attr.vals[0];
         });
 
-        var user = {};
+        var user = {
+          username: username,
+        };
 
         Object.keys(config.auth.ldap.attributes).forEach(function(userAttr) {
           user[userAttr] = attrs[config.auth.ldap.attributes[userAttr]];
@@ -305,10 +307,9 @@ function handleLoginPostRequest(render, req, res) {
     };
 
     if (config.auth.ldap.strictFullName) {
-      cleanuser.fullName = sanitizer.escape(
-        user.firstName + ' ' + user.lastName);
+      cleanuser.fullName = user.firstName + ' ' + user.lastName;
     } else {
-      cleanuser.fullName = sanitizer.escape(user.fullName);
+      cleanuser.fullName = user.fullName;
     }
 
     req.session.user = cleanuser;

diff --git a/logic/web/handlers.js b/logic/web/handlers.js
@@ -36,16 +36,16 @@ exports.init = function(app) {
   app.use(lessMiddleware({
     src: base_dir + '/less',
     dest: tmpDir,
-    prefix: '/styles',
-    compress: !config.web.debug,
+    prefix: '/less',
+    compress: config.web.compress_css,
     force: config.web.debug
   }));
 
-  app.use('/styles', express.static(base_dir + '/styles'));
-  app.use('/images', express.static(base_dir + '/images'));
-  app.use('/scripts', express.static(base_dir + '/scripts'));
-  app.use('/fonts', express.static(base_dir + '/fonts'));
-  app.use('/styles', express.static(tmpDir));
+  app.use('/styles', express.static(base_dir + '/static/styles'));
+  app.use('/images', express.static(base_dir + '/static/images'));
+  app.use('/scripts', express.static(base_dir + '/static/scripts'));
+  app.use('/fonts', express.static(base_dir + '/static/fonts'));
+  app.use('/less', express.static(tmpDir));
   app.use('/artwork', express.static(upload.artwork_dir));
   app.use('/songs', express.static(upload.song_dir));
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "DJ",
   "description": "A virtual DJ website, where you can play and listen to music together. Inspired by turntable.fm.",
-  "version": "1.6.0-alpha",
+  "version": "1.6.1-alpha",
   "author": "Drew Gottlieb (dag10) <[email protected]>",
   "repository": {
     "type": "git",

diff --git a/fonts/glyphicons-halflings-regular.eot → ...ic/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot → ...ic/fonts/glyphicons-halflings-regular.eot
diff --git a/fonts/glyphicons-halflings-regular.svg → ...ic/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg → ...ic/fonts/glyphicons-halflings-regular.svg
diff --git a/fonts/glyphicons-halflings-regular.ttf → ...ic/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf → ...ic/fonts/glyphicons-halflings-regular.ttf
diff --git a/fonts/glyphicons-halflings-regular.woff → ...c/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff → ...c/fonts/glyphicons-halflings-regular.woff
diff --git a/fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/images/csh_dj_favicon.png → static/images/csh_dj_favicon.png b/images/csh_dj_favicon.png → static/images/csh_dj_favicon.png
diff --git a/images/csh_dj_logo.ai → static/images/csh_dj_logo.ai b/images/csh_dj_logo.ai → static/images/csh_dj_logo.ai
diff --git a/images/csh_dj_logo_full.png → static/images/csh_dj_logo_full.png b/images/csh_dj_logo_full.png → static/images/csh_dj_logo_full.png
diff --git a/images/soundbars.fla → static/images/soundbars.fla b/images/soundbars.fla → static/images/soundbars.fla
diff --git a/images/soundbars_grey.gif → static/images/soundbars_grey.gif b/images/soundbars_grey.gif → static/images/soundbars_grey.gif
diff --git a/images/soundbars_white.gif → static/images/soundbars_white.gif b/images/soundbars_white.gif → static/images/soundbars_white.gif
diff --git a/images/unknown_song.ai → static/images/unknown_song.ai b/images/unknown_song.ai → static/images/unknown_song.ai
diff --git a/images/unknown_song.png → static/images/unknown_song.png b/images/unknown_song.png → static/images/unknown_song.png
diff --git a/scripts/backbone-min.js → static/scripts/backbone-min.js b/scripts/backbone-min.js → static/scripts/backbone-min.js
diff --git a/scripts/bootstrap.js → static/scripts/bootstrap.js b/scripts/bootstrap.js → static/scripts/bootstrap.js
diff --git a/scripts/bootstrap.min.js → static/scripts/bootstrap.min.js b/scripts/bootstrap.min.js → static/scripts/bootstrap.min.js
diff --git a/scripts/connection.js → static/scripts/connection.js b/scripts/connection.js → static/scripts/connection.js
diff --git a/scripts/handlebars.js → static/scripts/handlebars.js b/scripts/handlebars.js → static/scripts/handlebars.js
diff --git a/scripts/jquery-1.10.2.js → static/scripts/jquery-1.10.2.js b/scripts/jquery-1.10.2.js → static/scripts/jquery-1.10.2.js
diff --git a/scripts/jquery-ui.js → static/scripts/jquery-ui.js b/scripts/jquery-ui.js → static/scripts/jquery-ui.js
diff --git a/scripts/jquery-ui.min.js → static/scripts/jquery-ui.min.js b/scripts/jquery-ui.min.js → static/scripts/jquery-ui.min.js
diff --git a/scripts/jquery.cookie.js → static/scripts/jquery.cookie.js b/scripts/jquery.cookie.js → static/scripts/jquery.cookie.js
diff --git a/scripts/jquery.fileupload.js → static/scripts/jquery.fileupload.js b/scripts/jquery.fileupload.js → static/scripts/jquery.fileupload.js
diff --git a/scripts/jquery.iframe-transport.js → static/scripts/jquery.iframe-transport.js b/scripts/jquery.iframe-transport.js → static/scripts/jquery.iframe-transport.js
diff --git a/scripts/login.js → static/scripts/login.js b/scripts/login.js → static/scripts/login.js
diff --git a/scripts/moment.min.js → static/scripts/moment.min.js b/scripts/moment.min.js → static/scripts/moment.min.js
diff --git a/scripts/room.js → static/scripts/room.js b/scripts/room.js → static/scripts/room.js
diff --git a/scripts/room_models.js → static/scripts/room_models.js b/scripts/room_models.js → static/scripts/room_models.js
diff --git a/scripts/room_views.js → static/scripts/room_views.js b/scripts/room_views.js → static/scripts/room_views.js
diff --git a/scripts/underscore-min.js → static/scripts/underscore-min.js b/scripts/underscore-min.js → static/scripts/underscore-min.js
diff --git a/styles/bootstrap-theme.css → static/styles/bootstrap-theme.css b/styles/bootstrap-theme.css → static/styles/bootstrap-theme.css
diff --git a/styles/bootstrap-theme.css.map → static/styles/bootstrap-theme.css.map b/styles/bootstrap-theme.css.map → static/styles/bootstrap-theme.css.map
diff --git a/styles/bootstrap-theme.min.css → static/styles/bootstrap-theme.min.css b/styles/bootstrap-theme.min.css → static/styles/bootstrap-theme.min.css
diff --git a/styles/bootstrap.css → static/styles/bootstrap.css b/styles/bootstrap.css → static/styles/bootstrap.css
diff --git a/styles/bootstrap.css.map → static/styles/bootstrap.css.map b/styles/bootstrap.css.map → static/styles/bootstrap.css.map
diff --git a/styles/bootstrap.min.css → static/styles/bootstrap.min.css b/styles/bootstrap.min.css → static/styles/bootstrap.min.css
diff --git a/styles/jquery-ui.css → static/styles/jquery-ui.css b/styles/jquery-ui.css → static/styles/jquery-ui.css
diff --git a/styles/jquery-ui.min.css → static/styles/jquery-ui.min.css b/styles/jquery-ui.min.css → static/styles/jquery-ui.min.css
diff --git a/styles/jquery-ui.structure.css → static/styles/jquery-ui.structure.css b/styles/jquery-ui.structure.css → static/styles/jquery-ui.structure.css
diff --git a/styles/jquery-ui.structure.min.css → static/styles/jquery-ui.structure.min.css b/styles/jquery-ui.structure.min.css → static/styles/jquery-ui.structure.min.css
diff --git a/utils/load_config.js b/utils/load_config.js
@@ -25,6 +25,8 @@ var default_values = {
     debug: true,
     title: 'CSH DJ',
     secret: 'change me!',
+    compress_css: true,
+    compress_js: true,
     max_file_size: 50,
   },
   auth: {

diff --git a/views/layouts/page.ejs b/views/layouts/page.ejs
@@ -24,12 +24,16 @@
       name="viewport"
       content="width=device-width, user-scalable=no, initial-scale=1" />
     <link
-      href='http://fonts.googleapis.com/css?family=Lato:300,400,700'
+      href='https://fonts.googleapis.com/css?family=Lato:300,400,700'
       rel='stylesheet'
       type='text/css'>
+    <% if (config.web.compress_css) { %>
+    <link rel="stylesheet" href="/styles/bootstrap.min.css" />
+    <% } else { %>
     <link rel="stylesheet" href="/styles/bootstrap.css" />
+    <% } %>
     <%- stylesheets %>
-    <link rel="stylesheet" href="/styles/style.css" />
+    <link rel="stylesheet" href="/less/style.css" />
     <link rel="shortcut icon" href="/images/csh_dj_favicon.png" />
   </head>
   <body>
@@ -92,7 +96,11 @@
     </div>
     </footer>
     <script src="/scripts/jquery-1.10.2.js"></script>
+    <% if (config.web.compress_js) { %>
+    <script src="/scripts/bootstrap.min.js"></script>
+    <% } else { %>
     <script src="/scripts/bootstrap.js"></script>
+    <% } %>
     <script>
       window.config = {
         max_file_size: <%= config.web.max_file_size*1024*1024 %>

diff --git a/views/login.ejs b/views/login.ejs
@@ -1,6 +1,6 @@
 <% layout('layouts/page') -%>
 <% block('title', 'Log In') -%>
-<% stylesheet('/styles/login.css') %>
+<% stylesheet('/less/login.css') %>
 <% script('/scripts/login.js') %>
 
 <%

diff --git a/views/room.ejs b/views/room.ejs
@@ -1,7 +1,7 @@
 <%
   layout('layouts/page');
   block('title', room.name);
-  stylesheet('/styles/room.custom.css');
+  stylesheet('/less/room.custom.css');
   script('/socket.io/socket.io.js');
   script('/scripts/underscore-min.js');
   script('/scripts/backbone-min.js');