Permalink
Browse files

Fixed merge conflicts with Jeffs updates to remove groups.

  • Loading branch information...
2 parents 851c2f6 + c408deb commit ebb1b0c4f78236988f6d3fd5557978f3d6313e58 @cdevroe cdevroe committed Feb 1, 2012
Showing with 12 additions and 15 deletions.
  1. +1 −0 .gitignore
  2. +3 −3 examples/getExamples.php
  3. +8 −12 phpviddler.php
View
1 .gitignore
@@ -0,0 +1 @@
+local/*
View
6 examples/getExamples.php
@@ -1,7 +1,7 @@
<?php
include('../phpviddler.php');
-$v = new Viddler_V2('01171d24e48b43444556524f45b3'); // Get an API key by going to You > Profile & API on Viddler.
+$v = new Viddler_V2('YOUR API KEY'); // Get an API key by going to You > Profile & API on Viddler.
?>
<!DOCTYPE html>
@@ -21,7 +21,7 @@
<p><?php
// Get videos (page 1, videos 5)
- $videos = $v->viddler_videos_getByUser(array('user'=>'viddlerdevtest','per_page'=>5,'page'=>1));
+ $videos = $v->viddler_videos_getByUser(array('user'=>'YOUR USERNAME','per_page'=>5,'page'=>1));
/* Debug only
echo '<pre>';
@@ -65,7 +65,7 @@
<?php
// Search videos: type=allvideos, query=iphone, videos 5
- $userInfo = $v->viddler_users_getProfile(array('user'=>'cdevroe'));
+ $userInfo = $v->viddler_users_getProfile(array('user'=>'YOUR USERNAME'));
/*
echo '<pre>';
View
20 phpviddler.php
@@ -53,12 +53,7 @@ protected function call($method, $args, $call)
'viddler.encoding.cancel',
'viddler.encoding.encode',
'viddler.encoding.setOptions',
- 'viddler.groups.addVideo',
- 'viddler.groups.join',
- 'viddler.groups.leave',
- 'viddler.groups.addVideo',
- 'viddler.groups.removeVideo',
- 'viddler.groups.removeVideo',
+ 'viddler.encoding.setSettings',
'viddler.playlists.addVideo',
'viddler.playlists.create',
'viddler.playlists.delete',
@@ -68,11 +63,7 @@ protected function call($method, $args, $call)
'viddler.users.setSettings',
'viddler.users.setProfile',
'viddler.users.setOptions',
- 'viddler.users.acceptFriendRequest',
- 'viddler.users.ignoreFriendRequest',
- 'viddler.users.sendFriendRequest',
- 'viddler.users.subscribe',
- 'viddler.users.unsubscribe',
+ 'viddler.users.register',
'viddler.videos.setDetails',
'viddler.videos.setPermalink',
'viddler.videos.comments.add',
@@ -86,7 +77,12 @@ protected function call($method, $args, $call)
'viddler.videos.setThumbnail',
'viddler.videos.setDetails',
'viddler.videos.enableAds',
- 'viddler.videos.disableAds'
+ 'viddler.videos.disableAds',
+ 'viddler.resellers.removeSubaccounts',
+ 'viddler.playlists.addVideo',
+ 'viddler.users.setPlayerBranding',
+ 'viddler.users.setProfile',
+ 'viddler.users.setSettings'
);
// Methods that require Binary transfer

0 comments on commit ebb1b0c

Please sign in to comment.