Se modifica Upgrade para Files Manager (utilizando la funcion glob)

This commit is contained in:
Daniel Rojas
2014-04-09 11:26:22 -04:00
parent 7f46be1ec8
commit 0099b9c699

View File

@@ -177,40 +177,35 @@ function upgradeFilesManager($command = "") {
PROPEL::Init ( PATH_METHODS.'dbConnections/rootDbConnections.php' );
$con = Propel::getConnection("root");
$stmt = $con->createStatement();
$sDirectory = PATH_DATA . "sites/" . $name . "/" . "mailTemplates/";
$sDirectoryPublic = PATH_DATA . "sites/" . $name . "/" . "public/";
if ($dh = opendir($sDirectory)) {
$files = Array();
while ($file = readdir($dh)) {
if ($file != "." && $file != ".." && $file[0] != '.') {
if (is_dir($sDirectory . "/" . $file)) {
$inner_files = listFiles($sDirectory . $file);
$sDirectory = glob(PATH_DATA . "sites/" . $name . "/" . "mailTemplates/*");
$sDirectoryPublic = glob(PATH_DATA . "sites/" . $name . "/" . "public/*");
$files = array();
foreach($sDirectory as $valor) {
if (is_dir($valor)) {
$inner_files = listFiles($valor);
if (is_array($inner_files)) $files = array_merge($files, $inner_files);
} else {
array_push($files, $sDirectory . $file);
}
if (is_file($valor)) {
array_push($files, $valor);
}
}
}
closedir($dh);
}
if ($dh = opendir($sDirectoryPublic)) {
while ($file = readdir($dh)) {
if ($file != "." && $file != ".." && $file[0] != '.') {
if (is_dir($sDirectoryPublic . "/" . $file)) {
$inner_files = listFiles($sDirectoryPublic . $file);
foreach($sDirectoryPublic as $valor) {
if (is_dir($valor)) {
$inner_files = listFiles($valor);
if (is_array($inner_files)) $files = array_merge($files, $inner_files);
} else {
array_push($files, $sDirectoryPublic . $file);
}
if (is_file($valor)) {
array_push($files, $valor);
}
}
}
closedir($dh);
}
$sDir = PATH_DATA . "sites/" . $name . "/" . "mailTemplates/";
$sDirPublic = PATH_DATA . "sites/" . $name . "/" . "public/";
foreach ($files as $aFile) {
if (strpos($aFile, $sDirectory) !== false){
$processUid = current(explode("/", str_replace($sDirectory,'',$aFile)));
if (strpos($aFile, $sDir) !== false){
$processUid = current(explode("/", str_replace($sDir,'',$aFile)));
} else {
$processUid = current(explode("/", str_replace($sDirectoryPublic,'',$aFile)));
$processUid = current(explode("/", str_replace($sDirPublic,'',$aFile)));
}
$sql = "SELECT PROCESS_FILES.PRF_PATH FROM PROCESS_FILES WHERE PROCESS_FILES.PRF_PATH='" . $aFile ."'";
$appRows = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
@@ -229,22 +224,18 @@ function upgradeFilesManager($command = "") {
}
}
}
}
function listFiles($dir) {
if($dh = opendir($dir)) {
$files = Array();
while ($file = readdir($dh)) {
if ($file != "." && $file != ".." && $file[0] != '.') {
if (is_dir($dir . "/" . $file)) {
$inner_files = listFiles($dir . "/" . $file);
$files = array();
$lista = glob($dir.'/*');
foreach($lista as $valor) {
if (is_dir($valor)) {
$inner_files = listFiles($valor);
if (is_array($inner_files)) $files = array_merge($files, $inner_files);
} else {
array_push($files, $dir . "/" . $file);
}
if (is_file($valor)) {
array_push($files, $valor);
}
}
}
closedir($dh);
return $files;
}
}