projects
/
living-lab-site.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
basic funictionality with published videos
[living-lab-site.git]
/
application
/
models
/
videos_model.php
diff --git
a/application/models/videos_model.php
b/application/models/videos_model.php
index
59ff7d3
..
f42eb74
100644
(file)
--- a/
application/models/videos_model.php
+++ b/
application/models/videos_model.php
@@
-36,7
+36,8
@@
class Videos_model extends CI_Model {
$query = $this->db->query(
'SELECT id, name, title, duration, user_id, views, thumbs_count,
default_thumb
$query = $this->db->query(
'SELECT id, name, title, duration, user_id, views, thumbs_count,
default_thumb
- FROM `videos`');
+ FROM `videos`
+ ORDER BY name'); // TODO summary order
$videos = $query->result_array();
foreach ($videos as & $video)
$videos = $query->result_array();
foreach ($videos as & $video)
@@
-46,7
+47,7
@@
class Videos_model extends CI_Model {
$video['id'], $video['name']));
// Thumbnails
$video['id'], $video['name']));
// Thumbnails
- $video['thumbs'] = $this->get
T
humbs($video['name'],
+ $video['thumbs'] = $this->get
_t
humbs($video['name'],
$video['thumbs_count']);
}
$video['thumbs_count']);
}
@@
-97,26
+98,27
@@
class Videos_model extends CI_Model {
// Convert JSON encoded string to arrays.
$video['formats'] = json_decode($video['formats'], TRUE);
$video['tags'] = json_decode($video['tags'], TRUE);
// Convert JSON encoded string to arrays.
$video['formats'] = json_decode($video['formats'], TRUE);
$video['tags'] = json_decode($video['tags'], TRUE);
+ asort($video['tags']);
+ $video['tags'] = array_reverse($video['tags'], true);
// Torrents
$video['torrents'] = array();
foreach ($video['formats'] as $format)
{
// Torrents
$video['torrents'] = array();
foreach ($video['formats'] as $format)
{
- $pos = strpos($format, ' ');
- if($pos !== FALSE)
- $format = substr($format, 0, $pos);
+ $ext = isset($format['ext']) ?
+ $format['ext'] : $this->config->item('default_video_ext');
$video['torrents'][] = site_url('data/torrents/'. $video['name'] . '_'
$video['torrents'][] = site_url('data/torrents/'. $video['name'] . '_'
- . $format
. '.'. $this->config->item('default_video_ext')
+ . $format
['def'] . '.'. $ext
. '.'. $this->config->item('default_torrent_ext'));
}
// Thumbnails
. '.'. $this->config->item('default_torrent_ext'));
}
// Thumbnails
- $video['thumbs'] = $this->get
T
humbs($video['name'], $video['thumbs_count']);
+ $video['thumbs'] = $this->get
_t
humbs($video['name'], $video['thumbs_count']);
return $video;
}
return $video;
}
- public function get
T
humbs($name, $count)
+ public function get
_t
humbs($name, $count)
{
$thumbs = array();
{
$thumbs = array();