fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/HOR-3900 (pull request #6140)

Browse Source 
HOR-3900

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-10-27 16:38:28 +00:00
committed by Julio Cesar Laura Avendaño
parent 35cee79b46 dc5d17241a
commit 8b550cfca3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gulliver/system/class.g.php
View File

@@ -2579,13 +2579,15 @@ class G
} }
/** /**
* Funtion used to fix 32K issue related to ext3 max subdirectory storage, but checking Version first. * Function used to fix 32K issue related to ext3 max subdirectory storage, but checking Version first.
*
* @param string $uid * @param string $uid
* @param int $splitSize * @param int $splitSize
* @param int $pieces * @param int $pieces
*
* @return string xxx/xxx/xxx/xxxxxxxxxxxxxxxxxxxxx * @return string xxx/xxx/xxx/xxxxxxxxxxxxxxxxxxxxx
*/ */
public function getPathFromUID($uid, $splitSize = 3, $pieces = 3) public static function getPathFromUID($uid, $splitSize = 3, $pieces = 3)
{ {
if (! G::gotDirectoryStructureVer2()) { if (! G::gotDirectoryStructureVer2()) {
return $uid; return $uid;
@@ -2600,7 +2602,7 @@ class G
* @param int $pieces * @param int $pieces
* @return string xxx/xxx/xxx/xxxxxxxxxxxxxxxxxxxxx * @return string xxx/xxx/xxx/xxxxxxxxxxxxxxxxxxxxx
*/ */
public function getPathFromUIDPlain($uid, $splitSize = 3, $pieces = 3) public static function getPathFromUIDPlain($uid, $splitSize = 3, $pieces = 3)
{ {
$dirArray = array(); $dirArray = array();
if (is_string($uid) && strlen($uid) >= 32 && $uid != G::getBlackHoleDir()) { if (is_string($uid) && strlen($uid) >= 32 && $uid != G::getBlackHoleDir()) {
@@ -2620,7 +2622,7 @@ class G
* @param string $path * @param string $path
* @return string * @return string
*/ */
public function getUIDfromPath($path) public static function getUIDfromPath($path)
{ {
$uid = ''; $uid = '';
$item = explode($path, '/'); $item = explode($path, '/');
@@ -2642,7 +2644,7 @@ class G
* @param int $pieces * @param int $pieces
* @return array index:0 got the path, index:1 got the filename * @return array index:0 got the path, index:1 got the filename
*/ */
public function getPathFromFileUID($appUid, $fileUid, $splitSize = 3, $pieces = 3) public static function getPathFromFileUID($appUid, $fileUid, $splitSize = 3, $pieces = 3)
{ {
if (! G::gotDirectoryStructureVer2()) { if (! G::gotDirectoryStructureVer2()) {
$response = array(); $response = array();