diff --git a/lib/client.js b/lib/client.js index 56fb1b57..4efd3212 100644 --- a/lib/client.js +++ b/lib/client.js @@ -455,7 +455,7 @@ var Util, DOM, CloudFunc; * используеться при первом заходе в корень */ function getJSONfromFileTable() { - var current, name, size, uid, mode, ret, + var current, name, size, owner, mode, ret, left = DOM.getById('js-left'), path = DOM.getByClass('path').textContent, @@ -473,17 +473,17 @@ var Util, DOM, CloudFunc; current = li[i]; name = DOM.getCurrentName(current); size = DOM.getCurrentSize(current); - uid = DOM.getCurrentOwner(current); + owner = DOM.getCurrentOwner(current); mode = DOM.getCurrentMode(current); mode = CloudFunc.getNumericPermissions(mode); if (name !== '..') files.push({ - name: name, - size: size, - mode: mode, - uid : uid + name : name, + size : size, + mode : mode, + owner : owner }); } diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js index 7707b3d3..b745d142 100644 --- a/lib/cloudfunc.js +++ b/lib/cloudfunc.js @@ -410,9 +410,9 @@ var Util; link = FS + lPath + lFile.name; target = lFile.size === 'dir' ? '' : "_blank"; size = lFile.size === 'dir' ? '<dir>' : CloudFunc.getShortSize( lFile.size ); - owner = !lFile.uid ? 'root' : lFile.uid; - mode = CloudFunc.getSymbolicPermissions(lFile.mode); + owner = lFile.owner ? lFile.owner : 'root'; + mode = CloudFunc.getSymbolicPermissions(lFile.mode); linkResult = Util.render(pLinkTemplate, { link : link, diff --git a/lib/server/commander.js b/lib/server/commander.js index 52221a78..d4c847c4 100644 --- a/lib/server/commander.js +++ b/lib/server/commander.js @@ -112,7 +112,7 @@ * @param pFiles - array of files of current directory */ function fillJSON(pParams) { - var name, stat, mode, isDir, size, uid, modeStr, + var name, stat, mode, isDir, size, owner, modeStr, p, i, n, file, path, json, files, ret = Util.checkObjTrue(pParams, ['files', 'stats', 'path']); @@ -132,7 +132,7 @@ for (i = 0; i < n; i++ ) { name = p.files[i]; stat = p.stats[name]; - uid = stat.uid; + owner = stat.uid; if (stat) { /* Переводим права доступа в 8-ричную систему */ @@ -145,7 +145,7 @@ file = { 'name' : name, 'size' : size, - 'uid' : uid, + 'owner' : owner, 'mode' : mode };