WordPress.org
Get WordPress

Plugin Directory

Changeset 193355


Ignore:
Timestamp:
01/12/2010 09:20:07 PM (16 years ago)
Author:
zeeg
Message:

GitHub IDs are now id + repository for grouping. Added Ustream extension. Some more syntax cleanup

Location:
lifestream/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • lifestream/trunk/CHANGES

    r191702 r193355  
    88* Upon activating the plugin the default feed is now owned by the user performing the activation.
    99* Added much needed "less suck" to the GitHub extension.
     10* Added Ustream extension.
    1011
    11120.99.9.5

  • lifestream/trunk/extensions/github/extension.inc.php

    r191702 r193355  
    4444            $data['branch'] = $repo[0];
    4545            $data['repository'] = $repo[1];
     46            $data['id'] = $data['id'].':'.$data['repository'];
    4647            return $data;
    4748        }

  • lifestream/trunk/extensions/goodreads/extension.inc.php

    r191677 r193355  
    6161    function fetch()
    6262    {
    63         $response = $this->lifestream->file_get_contents($this->get_url());
     63        $url = $this->get_url();
     64        $response = $this->lifestream->file_get_contents($url);
    6465       
    6566        if ($response)
    … …  
    7475            return $items;
    7576        }
    76     }}
     77    }
     78}
    7779$lifestream->register_feed('Lifestream_GoodReadsFeed');
    7880?>

  • lifestream/trunk/extensions/lastfm/extension.inc.php

    r191677 r193355  
    5757    function fetch()
    5858    {
    59         $response = $this->lifestream->file_get_contents($this->get_url());
     59        $url = $this->get_url();
     60        $response = $this->lifestream->file_get_contents($url);
    6061        if ($response)
    6162        {

  • lifestream/trunk/extensions/upcoming/extension.inc.php

    r191677 r193355  
    6565    function fetch()
    6666    {
    67         $response = $this->lifestream->file_get_contents($this->get_url());
     67        $url = $this->get_url();
     68        $response = $this->lifestream->file_get_contents($url);
    6869        if ($response)
    6970        {

  • lifestream/trunk/extensions/xboxlive/extension.inc.php

    r191677 r193355  
    4646    function fetch()
    4747    {
    48         $response = $this->lifestream->file_get_contents($this->get_url());
     48        $url = $this->get_url();
     49        $response = $this->lifestream->file_get_contents($url);
    4950
    5051        if ($response)

  • lifestream/trunk/extensions/youtube/extension.inc.php

    r191677 r193355  
    3232    }
    3333
    34     function get_posted_url() {
     34    function get_posted_url()
     35    {
    3536        return 'http://gdata.youtube.com/feeds/api/users/'.$this->get_option('username').'/uploads?v=2';
    36         }
     37    }
    3738
    38     function get_favorited_url() {
     39    function get_favorited_url()
     40    {
    3941        return 'http://gdata.youtube.com/feeds/api/users/'.$this->get_option('username').'/favorites?v=2';
    40         }
     42    }
    4143
    42     function get_url() {
     44    function get_url()
     45    {
    4346        $urls = array();
    4447        $urls[] = array($this->get_posted_url(), 'video');

  • lifestream/trunk/inc/core.php

    r191704 r193355  
    2020function lifestream_array_key_pop($array, $key)
    2121{
    22     $value = $array[$key];
     22    $value = @$array[$key];
    2323    unset($array[$key]);
    2424    return $value;
    … …  
    11191119                            $values['feed_label'] = $_POST['feed_label'];
    11201120                            $values['icon_url'] = $_POST['icon_url'];
    1121                             $values['auto_icon'] = $_POST['auto_icon'];
     1121                            $values['auto_icon'] = @$_POST['auto_icon'];
    11221122                            if (current_user_can('manage_options'))
    11231123                            {

  • lifestream/trunk/inc/labels.php

    r191707 r193355  
    781781    }
    782782}
     783class Lifestream_StreamLabel extends Lifestream_Label
     784{
     785    const TEMPLATE = 'photo';
     786   
     787    function get_label_single()
     788    {
     789        return $this->lifestream->__('Started streaming %2$s.', $this->get_feed_label(), $this->get_single_link());
     790    }
     791    function get_label_single_user()
     792    {
     793        return $this->lifestream->__('%1$s started streaming %3$s.', $this->get_user_label(), $this->get_feed_label(), $this->get_single_link());
     794    }
     795
     796    function get_label_plural()
     797    {
     798        return $this->lifestream->__('Streamed %s events.', $this->_get_show_details_link(), $this->get_feed_label());
     799    }
     800   
     801    function get_label_plural_user()
     802    {
     803        return $this->lifestream->__('%s streamed %s events.', $this->get_user_label(), $this->_get_show_details_link(), $this->get_feed_label());
     804    }
     805}
    783806?>
Note: See TracChangeset for help on using the changeset viewer.