Update HTML links to the new methods

This commit is contained in:
Sébastien Lucas 2012-06-26 14:45:09 +02:00
parent 4473037ae8
commit 2d83cd6e78
4 changed files with 19 additions and 4 deletions

View File

@ -154,6 +154,17 @@ class Book extends Base {
}
}
public function getDataFormat ($format) {
foreach ($this->getDatas () as $data)
{
if ($data->format == $format)
{
return $data;
}
}
return NULL;
}
public function getFilePath ($extension, $idData = NULL, $relative = false)
{
$file = NULL;

View File

@ -24,10 +24,10 @@ $book->getLinkArray ();
</div>
<div class="download">
<?php
foreach ($book->format as $key => $format)
foreach ($book->getDatas() as $data)
{
?>
<div class="button buttonEffect"><a href="<?php echo "download/" . $format[0] . "/" . urlencode ($format[1]) ?>"><?php echo $key ?></a></div>
<div class="button buttonEffect"><a href="<?php echo $data->getHtmlLink () ?>"><?php echo $data->format ?></a></div>
<?php
}
?>

View File

@ -47,6 +47,10 @@ class Data extends Base {
return self::getLink ($this->book, $this->extension, $this->getMimeType (), $rel, $this->getFilename (), $this->id, $title);
}
public function getHtmlLink () {
return "download/" . $this->id . "/" . urlencode ($this->getFilename ());
}
public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = NULL)
{
global $config;

View File

@ -161,9 +161,9 @@
<?php
foreach ($config['cops_prefered_format'] as $format)
{
if (array_key_exists($format, $entry->book->format)) {
if ($data = $entry->book->getDataFormat ($format)) {
?>
<div class="button buttonEffect"><a href="<?php echo "download/" . $entry->book->format [$format][0] . "/" . urlencode ($entry->book->format [$format][1]) ?>"><?php echo $format ?></a></div>
<div class="button buttonEffect"><a href="<?php echo $data->getHtmlLink () ?>"><?php echo $format ?></a></div>
<?php
}
}