From 9ea2507fefacbbf51ba7d04d6367d2697a5252b8 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 29 Oct 2012 06:18:08 -0400 Subject: [PATCH] minor changes --- lib/server/appcache.js | 4 ++-- lib/server/auth.js | 13 ++++++++----- lib/server/object.js | 6 +++--- lib/server/socket.js | 8 ++++---- server.js | 2 -- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/lib/server/appcache.js b/lib/server/appcache.js index cf2fe399..97307f4d 100644 --- a/lib/server/appcache.js +++ b/lib/server/appcache.js @@ -1,6 +1,6 @@ var fs = require('fs'), - DIR = process.cwd(), - SRVDIR = DIR + '/lib/server/', + DIR = process.cwd() + '/', + SRVDIR = DIR + 'lib/server/', srvfunc = require(SRVDIR + 'srvfunc'), /* varible contain all watched file names diff --git a/lib/server/auth.js b/lib/server/auth.js index 06777cee..87457c9a 100644 --- a/lib/server/auth.js +++ b/lib/server/auth.js @@ -16,6 +16,13 @@ var https = require('https'), method: "POST" }; + +/** + * function do authentication + * @param pCode + * @param pCallBack + */ + exports.auth = function(pCode, pCallBack){ pCode = pCode.replace('code=',''); @@ -28,11 +35,7 @@ exports.auth = function(pCode, pCallBack){ }); }; -/** - * function do authentication - * @param pCode - * @param pCallBack - */ + function authenticate(pCode, pCallBack) { var data = qs.stringify({ client_id : Config.oauth_client_id, diff --git a/lib/server/object.js b/lib/server/object.js index b3347091..7f80b632 100644 --- a/lib/server/object.js +++ b/lib/server/object.js @@ -5,10 +5,10 @@ * - Minify */ -var DIR = process.cwd(), - SRVDIR = DIR + '/lib/server/', +var DIR = process.cwd() + '/', + SRVDIR = DIR + 'lib/server/', - srvfunc = require(SRVDIR + '/srvfunc'); + srvfunc = require(SRVDIR + 'srvfunc'); /* * Обьект для работы с кэшем diff --git a/lib/server/socket.js b/lib/server/socket.js index 2935c7ac..b5bee888 100644 --- a/lib/server/socket.js +++ b/lib/server/socket.js @@ -1,9 +1,9 @@ /* module make possible connectoin thrue socket.io on a server */ -var DIR = process.cwd(), - SRVDIR = DIR + '/lib/server/', +var DIR = process.cwd() + '/', + SRVDIR = DIR + 'lib/server/', - srvfunc = require(SRVDIR + '/srvfunc'), + srvfunc = require(SRVDIR + 'srvfunc'), io = srvfunc.require('socket.io'), exec = require('child_process').exec, @@ -14,7 +14,7 @@ var DIR = process.cwd(), Win32_b = process.platform === 'win32'; /** - * Function listen on servers port + * function listen on servers port * @pServer {Object} started server object */ exports.listen = function(pServer){ diff --git a/server.js b/server.js index 721e0483..a2b73a9d 100644 --- a/server.js +++ b/server.js @@ -79,8 +79,6 @@ var CloudServer = { /* КОНСТАНТЫ */ INDEX : 'index.html', - LIBDIR : './lib/', - SRVDIR : './lib/server/', Extensions :{ '.css' : 'text/css', '.js' : 'text/javascript',