Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test result of dir() #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

test result of dir() #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
993ae23
refs @fiasco/Archimedes-Library#1 - test the dir() call
xurizaemon Dec 7, 2011
0afdd2d
Test readability of files / dirs before. Untested commit.
xurizaemon May 4, 2012
4bb479a
If the Archimedes server responds with an HTTP error, we should pass …
xurizaemon May 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 47 additions & 40 deletions php/archimedes.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ protected function getEncrypted() {

public function __toString() {
return base64_encode($this->getEncrypted());
}
}

/**
* Post the data directly to the Archimedes Server.
Expand Down Expand Up @@ -174,7 +174,7 @@ public function postXML($server_url) {
case 307: // Moved temporarily
break;
default:
return FALSE;
throw new Exception('Unable to submit data. Archimedes server returned HTTP code ' . $code . ', ' . $text);
}
$status = json_decode($result);
return $status->success;
Expand Down Expand Up @@ -542,45 +542,52 @@ function archimedes_directory_hash($dir, $ignore) {
}

$filemd5s = array();
$d = dir($dir);

while (($entry = $d->read()) !== false) {
if (in_array($entry, array('.', '..'))) {
continue;
}
$path = realpath($dir . '/' . $entry);
// If the begining of the path does not match exactly then
// this directory does not lead deeper but to somewhere else which
// may create a recursive loop.
if (strpos($path, $dir) !== 0) {
$symlinks[] = $path;
continue;
}
// Symlinks may introduce recursive loops.
if (is_link($path)) {
$symlinks[] = $path;
continue;
}
$ignore_entry = FALSE;
foreach($ignore as $pattern) {
if(preg_match($pattern, $path)) {
$ignore_entry = TRUE;
break;

if ($d = dir($dir)) {
while (($entry = $d->read()) !== false) {
if (in_array($entry, array('.', '..'))) {
continue;
}
$path = realpath($dir . '/' . $entry);
// If the begining of the path does not match exactly then
// this directory does not lead deeper but to somewhere else which
// may create a recursive loop.
if (strpos($path, $dir) !== 0) {
$symlinks[] = $path;
continue;
}
// Symlinks may introduce recursive loops.
if (is_link($path)) {
$symlinks[] = $path;
continue;
}
$ignore_entry = FALSE;
foreach($ignore as $pattern) {
if(preg_match($pattern, $path) || !is_readable($path)) {
$ignore_entry = TRUE;
break;
}
}
if ($ignore_entry) {
continue;
}
if (is_dir($path)) {
$filemd5s[] = archimedes_directory_hash($path, $ignore);
}
elseif (is_file($path)) {
$filemd5s[] = md5_file($path);
}
}
if ($ignore_entry) {
continue;
}
if (is_dir($path)) {
$filemd5s[] = archimedes_directory_hash($path, $ignore);
}
elseif (is_file($path)) {
$filemd5s[] = md5_file($path);
}
}

$d->close();
//sort the md5s before concat so ensure order of files doesn't affect it.
asort($filemd5s);
return md5(implode('', $filemd5s) . implode('', $symlinks));
$d->close();
//sort the md5s before concat so ensure order of files doesn't affect it.
asort($filemd5s);
return md5(implode('', $filemd5s) . implode('', $symlinks));
}
else {
/**
* return an error usefully - if we weren't in an external library
* then this would be a watchdog() statement
*/
}
}