Changeset 46

Timestamp:

06/07/07 16:46:38 (1 year ago)

Author:

digitalspaghetti

Message:

Updated video controller, some other minor changes.

Files:

• branch/controllers/playlists_controller.php (modified) (1 diff)
• branch/controllers/videos_controller.php (modified) (1 diff)
• branch/models/behaviors/simple_results.php (added)
• branch/models/playlist.php (modified) (1 diff)
• branch/models/playlists_track.php (modified) (1 diff)
• branch/models/track.php (modified) (1 diff)
• branch/views/elements/topnav.ctp (modified) (1 diff)
• branch/views/helpers/tree_menu.php (modified) (2 diffs)
• branch/views/playlists/admin_orderlist.ctp (added)
• branch/views/tracks/admin_add.ctp (modified) (1 diff)
• branch/views/videos/youtube.ctp (modified) (1 diff)
• branch/webrocket.sql (modified) (19 diffs)

branch/controllers/playlists_controller.php

@@ -139 +139 @@
-                }
-        }
+        
+        function admin_orderlist($id = null)
+        {
+                $this->Session->setFlash('This method is currently disabled');
+                $this->redirect(array('action'=>'index'), null, true);
+                /*if (!$id && empty($this->data))
+                {
+                        $this->Session->setFlash('Invalid id for Playlist');
+                        $this->redirect(array('action'=>'index'), null, true);
+                }
+                if (!empty($this->data))
+                {
+                        pr($this->data);
+                        $this->Playlist->PlaylistsTrack->save($this->data);
+                        //$this->Session->setFlash('Order updated');
+                        //$this->redirect(array('action'=>'index'), null, true);
+                }
+                $playlist = $this->Playlist->PlaylistsTrack->findAll(array('PlaylistsTrack.playlist_id' => $id));
+                $this->set(compact('playlist'));*/
+        }
-
-}

branch/controllers/videos_controller.php

@@ -12 +12 @@
-                
-                $youtube =& new phpYoutube($dev_id);
-
+0
-        }
-        

branch/models/playlist.php

@@ -6 +6 @@
-        var $hasAndBelongsToMany = array(
-                        'Track' => array('className' => 'Track',
+                                                'joinTable' => 'playlists_tracks',
+                                                'foreignKey' => 'playlist_id',
+                                                'associationForeignKey' => 'track_id',
-                                                'with' => 'PlaylistsTrack',
-                                                'associationForeignKey' => 'playlist_id',
-                                                'order' => 'PlaylistsTrack.position ASC'),
-        );
-        
-        /*function beforeSave()
-        {
-                if ($this->data)
-                {
-                        foreach ($this->data['Track']['Track'] as $key => $track) 
-                        {
-                                $this->data['PlaylistsTrack']['position'] = $key;
-                        }
-                }
-        }*/
-        
-        /*function afterSave()
-        {
-                $playlist = $this->getLastInsertID();
-                
-                
-        }*/
-
-}

branch/models/playlists_track.php

@@ -4 +4 @@
-{
-        var $belongsTo = array('Playlist', 'Track');
+        
+        var $actsAs = array('SimpleResults' => array('simplifyIfJoins' => true));
+
+        var $useSimpleResults = true;
-}
-

branch/models/track.php

@@ -22 +22 @@
-        var $hasAndBelongsToMany = array(
-                        'Playlist' => array('className' => 'Playlist',
-
-
+
+
+
+
-                                                'order' => 'PlaylistsTrack.position ASC'),
-                        'Tag' => array('className' => 'Tag',

branch/views/elements/topnav.ctp

@@ -1 +1 @@
-<?php $menus = $this->requestAction('/menus/index/1');?>
-<div id="topnav" class="primarynav">
-
+, 'jd_menu', true
-</div>

branch/views/helpers/tree_menu.php

@@ -5 +5 @@
-        var $helpers = array('Html','othAuth');
-
-$include_login = 0
+ $include_login = false
-        {
-                $output = '<ul class="' . $class .  '">';
@@ -18 +18 @@
-                                $output .= '</li>';
-                        }
-
+
+
+
+
+
+
+
+
+
-                $output .= '</ul>';
-                return $output;

branch/views/tracks/admin_add.ctp

@@ -13 +13 @@
-        <fieldset>
-                <legend>Meta Information</legend>
+                <?php e($form->input('infourl'));?>
-                <?php e($form->input('tags'));?>
-                <?php e($form->input('image_id', array('options'=>$images)));?>

branch/views/videos/youtube.ctp

@@ -1 @@
-print_
-
+//p
+
-<?php foreach($youtube['video'] as $video) : ?>
-
-
-
-
-
-
-
+
+
+
+
+
-<?php endforeach;?>
+</ul>

branch/webrocket.sql

@@ -4 +4 @@
--- 
--- Host: localhost
-4, 2007 at 11:22
+7, 2007 at 05:43
--- Server version: 5.0.38
--- PHP Version: 5.2.1
@@ -29 +29 @@
-
-INSERT INTO `cake_sessions` (`id`, `data`, `expires`) VALUES 
-e8331bf8cc87191dd20a10e1b69cfce', 'Config|a:3:{s:9:"userAgent";s:32:"268042ced84746041c45b952d0ba6110";s:4:"time";i:1180995396;s:4:"rand";i:205194849;}othAuth|a:1:{s:41:"ADYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi";a:2:{s:4:"User";a:17:{s:2:"id";s:1:"1";s:8:"username";s:14:"WebrocketAdmin";s:6:"passwd";s:32:"fdfedc01c66e9ea2817508ca1097df2f";s:4:"name";s:15:"Webrocket Admin";s:5:"email";s:19:"admin@webrocket.com";s:10:"last_visit";s:19:"2007-06-04 16:00:00";s:8:"group_id";s:1:"1";s:10:"profile_id";s:1:"1";s:11:"posts_count";s:1:"4";s:11:"pages_count";s:1:"2";s:14:"comments_count";s:1:"2";s:12:"videos_count";s:1:"0";s:6:"active";s:1:"1";s:7:"created";s:19:"2007-03-26 00:00:00";s:8:"modified";s:19:"0000-00-00 00:00:00";s:10:"login_hash";s:32:"9959667d54c2bb525ab6b832bdd90c14";s:7:"hashkey";s:41:"ADYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi";}s:5:"Group";a:8:{s:2:"id";s:1:"1";s:4:"name";s:11:"Site Admins";s:5:"level";s:3:"999";s:8:"redirect";s:0:"";s:9:"perm_type";s:5:"allow";s:7:"created";s:19:"2007-03-26 00:00:00";s:8:"modified";s:19:"0000-00-00 00:00:00";s:10:"Permission";a:1:{i:0;a:4:{s:2:"id";s:1:"1";s:4:"name";s:1:"*";s:7:"created";s:19:"2007-03-26 00:00:00";s:8:"modified";s:19:"0000-00-00 00:00:00";}}}}}Message|a:0:{}', 1180995396
+3fa13175a022e6d7d1c445c9a39185b', 'Config|a:3:{s:9:"userAgent";s:32:"268042ced84746041c45b952d0ba6110";s:4:"time";i:1181230718;s:4:"rand";i:1380475676;}othAuth|a:1:{s:41:"ADYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi";a:2:{s:4:"User";a:18:{s:2:"id";s:1:"1";s:8:"username";s:14:"WebrocketAdmin";s:6:"passwd";s:32:"fdfedc01c66e9ea2817508ca1097df2f";s:4:"name";s:15:"Webrocket Admin";s:5:"email";s:19:"admin@webrocket.com";s:10:"last_visit";s:19:"2007-06-07 14:30:54";s:8:"group_id";s:1:"1";s:10:"profile_id";s:1:"1";s:11:"posts_count";s:1:"4";s:11:"pages_count";s:1:"2";s:14:"comments_count";s:1:"2";s:12:"videos_count";s:1:"0";s:4:"tags";s:0:"";s:6:"active";s:1:"1";s:7:"created";s:19:"2007-03-26 00:00:00";s:8:"modified";s:19:"0000-00-00 00:00:00";s:10:"login_hash";s:32:"9959667d54c2bb525ab6b832bdd90c14";s:7:"hashkey";s:41:"ADYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi";}s:5:"Group";a:9:{s:2:"id";s:1:"1";s:4:"name";s:11:"Site Admins";s:5:"level";s:3:"999";s:8:"redirect";s:0:"";s:9:"perm_type";s:5:"allow";s:11:"users_count";s:1:"0";s:7:"created";s:19:"2007-03-26 00:00:00";s:8:"modified";s:19:"0000-00-00 00:00:00";s:10:"Permission";a:1:{i:0;a:4:{s:2:"id";s:1:"1";s:4:"name";s:1:"*";s:7:"created";s:19:"2007-03-26 00:00:00";s:8:"modified";s:19:"0000-00-00 00:00:00";}}}}}', 1181230718
-
--- --------------------------------------------------------
@@ -556 +556 @@
-  `redirect` varchar(50) character set utf8 collate utf8_unicode_ci NOT NULL,
-  `perm_type` enum('allow','deny') NOT NULL default 'allow',
+  `users_count` int(8) unsigned NOT NULL,
-  `created` datetime NOT NULL default '0000-00-00 00:00:00',
-  `modified` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -565 +566 @@
--- 
-
-
-
-
-
-
+users_count`, `
+0, 
+0, 
+0, 
+0, 
-
--- --------------------------------------------------------
@@ -620 +621 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
-4
+6
-
--- 
@@ -626 +627 @@
--- 
-
+INSERT INTO `images` (`id`, `filename`, `dir`, `thumb`, `mimetype`, `alt`, `subject_id`, `copyright_owner`, `copyright_id`, `image_location`, `image_date`, `image_notes`, `filesize`, `tags`, `user_id`, `created`, `modified`) VALUES 
+(45, 'TheHedrons_Group1.jpg', 'files/Image', 'thumb.TheHedrons_Group1.jpg', 'image/jpeg', 'The Hedrons Group', 1, 'The Hedrons', 1, 'None', '2007-06-05', 'The Hedrons', 146539, 'The Hedrons', 1, '2007-06-05 15:47:17', '2007-06-05 15:47:17');
-
--- --------------------------------------------------------
@@ -647 +650 @@
-(37, 30),
-(38, 29),
-
+
+
-
--- --------------------------------------------------------
@@ -820 +824 @@
-  `id` int(8) unsigned NOT NULL auto_increment,
-  `title` varchar(255) collate utf8_unicode_ci NOT NULL,
-
-
+
+
+
-
--- 
@@ -827 +832 @@
--- 
-
-
-
+
+
+
-
--- --------------------------------------------------------
@@ -838 +844 @@
-CREATE TABLE `playlists_tracks` (
-  `playlist_id` int(8) unsigned NOT NULL,
-
+
+
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
@@ -845 +852 @@
--- 
-
-
-
-
+
+
+
+
+
+
+
+
+
-
--- --------------------------------------------------------
@@ -1072 +1085 @@
-
-INSERT INTO `subjects` (`id`, `title`, `posts_count`, `pages_count`, `events_count`, `feeds_count`, `images_count`, `galleries_count`, `videos_count`, `created`, `modified`) VALUES 
-0
+1
-
--- --------------------------------------------------------
@@ -1141 +1154 @@
-
-INSERT INTO `tags_tracks` (`tag_id`, `track_id`) VALUES 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
--- --------------------------------------------------------
@@ -1186 +1217 @@
-  `dir` varchar(255) collate utf8_unicode_ci NOT NULL,
-  `mimetype` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `filesize` int(8) unsigned NOT NULL,
+  `trackname` varchar(255) collate utf8_unicode_ci NOT NULL,
-  `artist` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `infourl` varchar(255) collate utf8_unicode_ci NOT NULL,
-  `tags` varchar(255) collate utf8_unicode_ci NOT NULL,
-  `image_id` int(8) unsigned NOT NULL,
@@ -1192 +1226 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
-3
+7
-
--- 
@@ -1198 +1232 @@
--- 
-
-
-
-
+
+
+
+
+
-
--- --------------------------------------------------------
@@ -1241 +1277 @@
-  `comments_count` int(4) NOT NULL,
-  `videos_count` int(4) NOT NULL,
+  `tags` varchar(255) NOT NULL,
-  `active` tinyint(1) unsigned NOT NULL default '0',
-  `created` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -1254 +1291 @@
--- 
-
-
-4 22:52:42', 1, 1, 4, 2, 2, 0
-
-
-
+tags`, `
+7 16:11:33', 1, 1, 4, 2, 2, 0, ''
+'', 
+'', 
+'', 
-
--- --------------------------------------------------------
@@ -1290 +1327 @@
-INSERT INTO `videos` (`id`, `title`, `url`, `video_location`, `video_date`, `body`, `copyright_owner`, `copyright_id`, `published`, `user_id`, `subject_id`, `tags`, `created`, `modified`) VALUES 
-(20, 'The Hedrons EPK', 'http://www.youtube.com/v/28u-swVWo9Q', 'N/A', '2007-05-17', 'The Hedrons EPK', 'The Hedrons', 1, 0, 0, 1, 'The Hedrons, Video, Epk, Biography, Be My Friend, I Need You, Couldnt Leave Her Alone, Heatseeker', '2007-05-17 16:18:11', '2007-05-17 16:24:36');
-