';
- lData = lData.replace(lReplace_s, lReplace_s + lAdditional)
- .replace('
Cloud Commander',
- '
' + CloudFunc.getTitle() + '');
+ lData = Util.render(lData, {
+ title : CloudFunc.getTitle(),
+ fm : lAdditional
+ });
if(!Config.appcache)
lData = Util.removeStr(lData, ' manifest="/cloudcmd.appcache"');
diff --git a/html/index.html b/html/index.html
index c775c8b1..92e0e0dc 100644
--- a/html/index.html
+++ b/html/index.html
@@ -4,15 +4,14 @@
-
Cloud Commander
+
{title}
-
-
-
+
+
{fm}
diff --git a/lib/server/rest.js b/lib/server/rest.js
index 71803252..2d9c14a7 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -27,24 +27,17 @@
* @pParams {request, responce}
*/
exports.api = function(pParams){
- var lRet,
- lReq = pParams.request,
- lRes = pParams.response,
- lUrl = pParams.name,
- lMethod = lReq.method,
- lAPIURL = main.config.api_url;
-
- if( Util.isContainStr(lUrl, lAPIURL) ){
- lRet = true;
- var lCommand = Util.removeStr(lUrl, lAPIURL);
- getData({
- command : lCommand,
- method : lMethod,
- request : lReq,
- response : lRes
- });
+ var lRet = main.checkParams(pParams);
+ if(lRet){
+ var lAPIURL = main.config.api_url,
+ p = pParams;
+
+ lRet = Util.isContainStr(p.name, lAPIURL);
+ if( lRet ){
+ p.name = Util.removeStr(p.name, lAPIURL);
+ sendData( pParams);
+ }
}
-
return lRet;
};
@@ -68,49 +61,42 @@
*
* @param pParams {command, method, body, requrest, response}
*/
- function getData(pParams){
- var lResult,
- lCmd = pParams.command,
- lMethod = pParams.method;
- pParams.name = lCmd
+ function sendData(pParams){
+ var lRet = main.checkParams(pParams);
+ if(lRet){
+ var p = pParams;
- if( Util.isContainStr(lCmd, CloudFunc.FS) )
- lResult = onFS({
- request : pParams.request,
- response: pParams.response,
- method : lMethod,
- });
-
- if(lCmd[0] === '/'){
- lCmd = Util.removeStr(lCmd, '/');
- pParams.command = lCmd;
+ if( Util.isContainStr(p.name, CloudFunc.FS) )
+ lRet = onFS(pParams);
+
+ if(p.name[0] === '/')
+ p.command = Util.removeStr(p.name, '/');
+
+ if(!lRet)
+ switch(p.request.method){
+ case 'GET':
+ lRet = onGET(pParams);
+ break;
+
+ case 'PUT':
+ getBody(pParams.request, function(pBody){
+ pParams.body = pBody;
+ onPUT(pParams);
+ });
+ break;
+ }
}
-
- if(!lResult)
- switch(lMethod){
- case 'GET':
- lResult = onGET(pParams);
- break;
-
- case 'PUT':
- getBody(pParams.request, function(pBody){
- pParams.body = pBody;
- onPUT(pParams);
- });
- break;
- }
-
- return lResult;
+ return lRet;
}
function onFS(pParams){
- var lRet = main.checkParams(pParams, ['method']);
+ var lRet = main.checkParams(pParams);
if(lRet){
var p = pParams,
lQuery = main.getQuery(p.request);
p.name = Util.removeStr(p.name, [CloudFunc.FS, '?dir']) || '/';
- switch(p.method){
+ switch(p.request.method){
case 'GET':
fs.stat(p.name, function(pError, pStat){
if(!pError)
@@ -158,6 +144,7 @@
}
break;
case 'DELETE':
+ console.log('1111111111111')
if(lQuery === 'dir')
fs.rmdir(p.name, function(pError){
if(!pError)