hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove baseurl

Browse Source
This commit is contained in:
Romain Neutron
2012-05-23 19:25:27 +02:00
parent 67bab92804
commit b99b01e184
14 changed files with 30 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/classes/databox/subdef.class.php
View File

@@ -35,7 +35,6 @@ class databox_subdef
protected $name;
protected $path;
protected $subdef_group;
protected $baseurl;
protected $labels = array();
protected $write_meta;
protected $downloadable;
@@ -75,8 +74,6 @@ class databox_subdef
$this->downloadable = p4field::isyes($sd->attributes()->downloadable);
$this->path = trim($sd->path) !== '' ? p4string::addEndSlash(trim($sd->path)) : '';
$this->baseurl = trim($sd->baseurl) !== '' ? p4string::addEndSlash(trim($sd->baseurl)) : false;
$this->write_meta = p4field::isyes((string) $sd->meta);
foreach ($sd->label as $label) {
@@ -137,15 +134,6 @@ class databox_subdef
return $this->devices;
}
/**
*
* @return string
*/
public function get_baseurl()
{
return $this->baseurl;
}
/**
* The current SubdefType the subdef converts documents
*
@@ -363,10 +351,10 @@ class databox_subdef
if ($sd->size) {
$video->setOptionValue(Video::OPTION_SIZE, (int) $sd->size);
}
if ($sd->a_codec) {
if ($sd->acodec) {
$video->setOptionValue(Video::OPTION_ACODEC, (string) $sd->acodec);
}
if ($sd->v_codec) {
if ($sd->vcodec) {
$video->setOptionValue(Video::OPTION_VCODEC, (string) $sd->vcodec);
}
if ($sd->fps) {