mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-06-05 01:13:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor url to href, to be more consistent.

Browse source
This commit is contained in:
Lars Jung 2015-05-03 19:36:17 +02:00
parent 0f0d97dab5
commit 675efd6cd3
6 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/_h5ai/server/php/inc/class-archive.php
View file

@ -15,9 +15,9 @@ class Archive {
}
public function output($type, $base_url, $urls) {
public function output($type, $base_href, $hrefs) {
$this->base_path = $this->app->to_path($base_url);
$this->base_path = $this->app->to_path($base_href);
if (!$this->app->is_managed_path($this->base_path)) {
return 500;
}
@ -25,7 +25,7 @@ class Archive {
$this->dirs = array();
$this->files = array();
$this->add_hrefs($urls);
$this->add_hrefs($hrefs);
if (count($this->dirs) === 0 && count($this->files) === 0) {
if ($type === "php-tar") {
@ -150,9 +150,9 @@ class Archive {
}
private function add_hrefs($urls) {
private function add_hrefs($hrefs) {
foreach ($urls as $href) {
foreach ($hrefs as $href) {
if (trim($href) === "") {
continue;
@ -161,7 +161,7 @@ class Archive {
$d = Util::normalize_path(dirname($href), true);
$n = basename($href);
if ($this->app->is_managed_url($d) && !$this->app->is_hidden($n)) {
if ($this->app->is_managed_href($d) && !$this->app->is_hidden($n)) {
$real_file = $this->app->to_path($href);
$archived_file = preg_replace("!^" . preg_quote(Util::normalize_path($this->base_path, true)) . "!", "", $real_file);