Changeset 136

Timestamp:

06/28/09 18:06:25 (8 months ago)

Author:

remi

Message:

committing some changes before going on vacation -- some things not working 100%

Location:

branches/pre-1.0

Files:

• . (copied) (copied from trunk)
• README (copied) (copied from trunk/README)
• cfg/config.sample.php (copied) (copied from trunk/cfg/config.sample.php) (1 diff)
• cron/cron.php (copied) (copied from trunk/cron/cron.php)
• lib/Pubwich.php (copied) (copied from trunk/lib/Pubwich.php) (5 diffs)
• lib/Services/Atom.php (copied) (copied from trunk/lib/Services/Atom.php) (2 diffs)
• lib/Services/Delicious.php (copied) (copied from trunk/lib/Services/Delicious.php) (2 diffs)
• lib/Services/Facebook.php (modified) (2 diffs)
• lib/Services/Flickr.php (copied) (copied from trunk/lib/Services/Flickr.php) (2 diffs)
• lib/Services/Lastfm.php (copied) (copied from trunk/lib/Services/Lastfm.php) (3 diffs)
• lib/Services/RSS.php (copied) (copied from trunk/lib/Services/RSS.php)
• lib/Services/Readernaut.php (copied) (copied from trunk/lib/Services/Readernaut.php) (2 diffs)
• lib/Services/Service.php (modified) (2 diffs)
• lib/Services/Twitter.php (copied) (copied from trunk/lib/Services/Twitter.php)
• lib/Services/Vimeo.php (copied) (copied from trunk/lib/Services/Vimeo.php)
• lib/Services/Youtube.php (copied) (copied from trunk/lib/Services/Youtube.php)
• themes/default/functions.php (added)
• themes/default/index.tpl.php (copied) (copied from trunk/themes/default/index.tpl.php) (1 diff)

branches/pre-1.0/cfg/config.sample.php

@@ -3 +3 @@
         // @@@ Renommer ce fichier en `config.php`
 
-        // À changer en production
-        error_reporting( E_ALL ^ E_NOTICE );
-        // error_reporting( 0 );
-
-        define( 'PUBWICH_LOGLEVEL', 0 );
-
-        define('PUBWICH_URL', 'http://localhost/pubwich/');
-        define('PUBWICH_THEME', 'default');
-
-        // Localisation
-        date_default_timezone_set( 'America/Montreal' );
-        setlocale( LC_ALL, 'fr_CA.UTF8', 'fr_FR.UTF8', 'fr.UTF8', 'fr_FR.UTF-8', 'fr.UTF-8' ); 
-
-        // Configuration de Pubwich et des services utilisés
-
-        define( 'FLICKR_KEY',            '__________________' );
-        define( 'FLICKR_USERID',         '__________________' ); // http://idgettr.com
-        define( 'FLICKR_USERNAME'        '__________________' );
-        define( 'FLICKR_TOTAL',          12 );
-
-        define( 'LASTFM_KEY',            '__________________' );
-        define( 'LASTFM_USERNAME',       '__________________' );
-        define( 'LASTFM_TOTAL',          10 );
-
-        define( 'DELICIOUS_USERNAME',    '__________________' );
-        define( 'DELICIOUS_TOTAL',       10 );
-
-        define( 'TWITTER_USERID',        '__________________' ); // cliquer sur le lien "RSS feed of _____'s updates" pour trouver votre identifiant numérique
-        define( 'TWITTER_USERNAME',      '__________________' ); 
-        define( 'TWITTER_TOTAL',         10 ); 
-
-        define( 'READERNAUT_USERNAME',   '__________________' );
-        define( 'READERNAUT_TOTAL',      10 );
-
-        define( 'YOUTUBE_USERNAME',      '__________________' );
-        define( 'YOUTUBE_TOTAL',         10 );
-
-        Pubwich::setServices(
-                array(
-                        array('Flickr', 'photos', array( FLICKR_KEY, FLICKR_USERID, FLICKR_USERNAME, FLICKR_TOTAL ) ),
-                        array('Lastfm', 'albums', array ( LASTFM_KEY, LASTFM_USERNAME, LASTFM_TOTAL ) ),
-                        array('Delicious', 'liens', array( DELICIOUS_USERNAME, DELICIOUS_TOTAL ) ),
-                        array('Twitter', 'etats', array( TWITTER_USERID, TWITTER_USERNAME, TWITTER_TOTAL ) ),
-                        array('Readernaut', 'livres', array( READERNAUT_USERNAME, READERNAUT_TOTAL ) ),
-                        array('Atom', 'billets', array( 'http://remiprevost.com/atom/', 10 ) ),
-                        array('Youtube', 'videos', array( YOUTUBE_USERNAME, YOUTUBE_TOTAL ) ),
-                )
-        );
-
-        // Système de cache
-        define( 'CACHE_LOCATION', dirname(__FILE__) . '/../cache/' );
-        define( 'CACHE_LIMIT', 20 * 60 ); // On définit une limite de temps pour la cache, au cas où la cronjob ne fonctionnerait pas
-
+        // En cours de ré-écriture!

branches/pre-1.0/lib/Pubwich.php

@@ -21 +21 @@
                  */
                 static private $classes;
+
+                static private $columns;
 
                 static private $theme_url;
@@ -74 +76 @@
                 static public function setClasses() {
                         require('Services/Service.php');
-                        foreach ( self::getServices() as $service ) {
-                                list($nom, $variable, $config) = $service;
-                                $service_instance = strtolower( $nom . '_' . $variable );
-                                ${$service_instance} = Pubwich::loadService( $nom, $config );
-                                ${$service_instance}->variable = $variable;
-                                self::$classes[] = ${$service_instance};
+                        $columnCounter = 0;
+                        foreach ( self::getServices() as $column ) {
+                                $columnCounter++;
+                                self::$columns[$columnCounter] = array();
+                                foreach( $column as $service ) {
+
+                                        list($nom, $variable, $config) = $service;
+                                        $service_instance = strtolower( $nom . '_' . $variable );
+                                        ${$service_instance} = Pubwich::loadService( $nom, $config );
+                                        ${$service_instance}->variable = $variable;
+                                        self::$classes[] = ${$service_instance};
+                                        self::$columns[$columnCounter][] = &${$service_instance};
+
+                                }
                         }
                 }
@@ -92 +102 @@
                         // Création de l'objet Savant3
                         $tpl =& new Savant3();
-                        $tpl->addPath('template', self::getThemePath());
-                        if (!file_exists(self::getThemePath()."/index.tpl.php")) {
+                        $tpl->addPath( 'template', self::getThemePath() );
+
+                        if ( !file_exists(self::getThemePath()."/index.tpl.php") ) {
                                 throw new PubwichErreur('Le fichier <code>/themes/'.PUBWICH_THEME.'/index.tpl.php</code> n\'a pas été trouvé. Il doit être présent.');
+                        }
+
+                        if ( file_exists( self::getThemePath()."/functions.php" ) ) {
+                                require( self::getThemePath()."/functions.php" );
+                                self::applyTheme();
                         }
 
@@ -108 +124 @@
                 }
 
+                /**
+                 * Définit le chemin vers les fichiers du thème
+                 *
+                 * @return string
+                 */
                 static public function getThemePath() {
                         return self::$theme_path;
                 }
 
+                /**
+                 * Définit l'URL  vers les fichiers du thème
+                 *
+                 * @return string
+                 */
                 static public function getThemeUrl() {
                         return self::$theme_url;
@@ -174 +200 @@
                         }
 
+                }
+
+                /**
+                 * Applique les différents filtres du thème courant
+                 *
+                 * return void
+                 */
+                static private function applyTheme() {
+                        foreach( self::$classes as $classe ) {
+                                
+                                $classFunction = get_class( $classe ) . '_itemTemplate';
+                                if ( function_exists( $classFunction ) ) {
+                                        $classe->setItemTemplate( call_user_func( $classFunction ) );
+                                }
+
+                                $variableFunction = get_class( $classe ) . '_'.$classe->getVariable().'_itemTemplate';
+                                if ( function_exists( $variableFunction ) ) {
+                                        $classe->setItemTemplate( call_user_func( $variableFunction ) );
+                                }
+                        }
+                }
+
+                /**
+                 * Affiche les données
+                 *
+                 * return string
+                 */
+                static public function getLoop() {
+                        $output = '';
+                        foreach( self::$columns as $col => $classes ) {
+                                $output .= '<div class="col'.$col.'">'; 
+                                foreach( $classes as $classe ) {
+                                        $output .= self::renderBox( $classe );
+                                }
+                                $output .= '</div>';
+                        }
+                        return $output;
+                }
+
+                /*
+                 * Affiche la boite d'une classe spécifique
+                 *
+                 * return string
+                 */
+                static private function renderBox( &$classe ) {
+                        $output = '';
+                        $output .= '<div class="boite '.strtolower(get_class($classe)).'" id="'.$classe->getVariable().'">'."\n";
+                        $output .= '    <h2><a rel="me" href="'.$classe->urlTemplate.'">'.$classe->title.'</a> <span>'.$classe->description.'</span></h2>'."\n";
+                        $output .= '    <ul class="clearfix">'."\n";
+                        $compteur = 0;
+                        foreach( $classe->getData() as $item ) {
+                                $compteur++;
+                                if ($classe->total && $compteur > $classe->total) { break; }  
+                                $template = $classe->getItemTemplate();
+                                $output .= '            '.$classe->renderItemTemplate( $template, $classe->populateItemTemplate( $item ) );
+                        }
+                        $output .= '    </ul>'."\n";
+                        $output .= '</div>'."\n\n";
+                        return $output;
                 }
 

branches/pre-1.0/lib/Services/Atom.php

@@ -3 +3 @@
         class Atom extends Service {
         
-                private $url_template = '%s';
-                public $feed_url;
+                public function __construct( $config ){
+                        $this->setURL( $config['url'] );
+                        $this->total = $total;
 
-                public function __construct( $config ){
-                        list($url, $total) = $config;
-                        $this->setURL( sprintf( $this->url_template, $url ) );
-                        $this->feed_url = $url;
-                        $this->total = $total;
+                        $this->title = $config['title'];
+                        $this->description = $config['description'];
+                        $this->setItemTemplate('<li><a href="{%link%}">{%title%}</a> {%date%}</li>'."\n");
+                        $this->setURLTemplate( $config['link'] );
+
                         parent::__construct();
                 }
@@ -24 +25 @@
                 }
 
+                public function populateItemTemplate( &$item ) {
+                        $link = $item->link->attributes();
+                        $link = $link->href;
+                        return array(
+                                                'link' => htmlspecialchars( $link ),
+                                                'title' => SmartyPants( $item->title ),
+                                                'date' => Pubwich::time_since( $item->published )
+                        );
+                }
+
         }

branches/pre-1.0/lib/Services/Delicious.php

@@ -3 +3 @@
         class Delicious extends Service {
         
-                private $url_template = 'http://feeds.delicious.com/v2/rss/%s?count=%s';
                 public $username;
 
                 public function __construct( $config ){
-                        list($username, $total) = $config;
-                        $this->setURL( sprintf( $this->url_template, $username, $total ) );
-                        $this->username = $username;
+                        $this->setURL( sprintf( 'http://feeds.delicious.com/v2/rss/%s?count=%s', $config['username'], $config['total'] ) );
+                        $this->username = $config['username'];
+
+                        $this->title = $config['title'];
+                        $this->description = $config['description'];
+                        $this->setItemTemplate('<li><a href="{%link%}">{%title%}</a></li>'."\n");
+                        $this->setURLTemplate('http://del.icio.us/'.$config['username'].'/');
+                        
                         parent::__construct();
+
                 }
 
@@ -22 +27 @@
                         return $data->channel->item;
                 }
+
+                public function populateItemTemplate( &$item ) {
+                        return array(
+                                                'link' => htmlspecialchars( $item->link ),
+                                                'title' => SmartyPants( $item->title )
+                        );
+                }
                         
         }

branches/pre-1.0/lib/Services/Facebook.php

@@ -7 +7 @@
 
                 public function __construct( $config ){
-                        list($id, $key, $total) = $config;
-                        $this->setURL( sprintf( $this->url_template, $id, $id, $key ) );
-                        $this->total = $total;
+                        $this->setURL( sprintf( 'http://www.facebook.com/feeds/status.php?id=%d&viewer=%d&key=%s&format=rss20', $config['id'], $config['id'], $config['key'] ) );
+                        $this->total = $config['total'];
+                        $this->username = $config['username'];
+
+                        $this->title = $config['title'];
+                        $this->description = $config['description'];
+                        $this->setItemTemplate('<li><a href="{%link%}">{%title%}</a> {%date%}</li>'."\n");
+                        $this->setURLTemplate('http://www.facebook.com/'.$config['username'].'/');
+
                         parent::__construct();
                 }
@@ -22 +28 @@
                         return $data->channel->item;
                 }
+
+                public function populateItemTemplate( &$item ) {
+                        return array(
+                                                'link' => htmlspecialchars( $item->link ),
+                                                'title' => $item->title,
+                                                'date' => Pubwich::time_since( $item->pubDate )
+                                                );
+                }
                         
         }
-

branches/pre-1.0/lib/Services/Flickr.php

@@ -3 +3 @@
         class Flickr extends Service {
 
-                private $url_template = 'http://api.flickr.com/services/rest/?method=flickr.photos.search&api_key=%s&user_id=%s&per_page=%d';
                 public $username;
+                private $compteur, $row;
 
                 public function __construct( $config ){
-                        list($key, $id, $username, $total) = $config;
-                        $this->setURL( sprintf( $this->url_template, $key, $id, $total ) );
-                        $this->username = $username;
+                        $this->compteur = 0;
+                        $this->setURL( sprintf( 'http://api.flickr.com/services/rest/?method=flickr.photos.search&api_key=%s&user_id=%s&per_page=%d', $config['key'], $config['userid'], $config['total'] ) );
+                        $this->username = $config['username'];
+                        $this->row = $config['row'];
+
+                        $this->title = $config['title'];
+                        $this->description = $config['description'];
+                        $this->setItemTemplate('<li{%classe%}><a href="{%link%}"><img src="{%photo%}" alt="{%title%}" /></a></li>'."\n");
+                        $this->setURLTemplate('http://www.flickr.com/photos/'.$config['username'].'/');
+
                         parent::__construct();
                 }
@@ -21 +28 @@
                         $data = parent::getData();
                         return $data->photos->photo;
+                }
+
+                public function populateItemTemplate( &$item ) {
+                        $this->compteur++;
+                        return array(
+                                                'link' => $this->urlTemplate . $item['id'].'/',
+                                                'title' => htmlspecialchars( $item['title'] ),
+                                                'photo' => $this->getAbsoluteUrl( $item ),
+                                                'classe' => ($this->compteur % $this->row == 0 ) ? ' class="derniere"' : ''
+                                                );
                 }
 

branches/pre-1.0/lib/Services/Lastfm.php

@@ -3 +3 @@
         class LastFM extends Service {
 
-                private $url_template = 'http://ws.audioscrobbler.com/2.0/?method=user.getweeklyalbumchart&api_key=%s&user=%s';
-                public $username;
+                public $username, $size;
+                private $compteur, $key, $classes;
 
                 public function __construct( $config ){
-                        list($key, $username, $total) = $config;
-                        $this->setURL( sprintf( $this->url_template, $key, $username ) );
-                        $this->total = $total;
-                        $this->username = $username;
+                        $this->setURL( sprintf( 'http://ws.audioscrobbler.com/2.0/?method=user.getweeklyalbumchart&api_key=%s&user=%s', $config['key'], $config['username'] ) );
+                        $this->total = $config['total'];
+                        $this->username = $config['username'];
+                        $this->size = $config['size'];
+                        $this->key = $config['key'];
+                        $this->compteur = 0;
+                        $this->classes = array( 'premier', 'deuxieme', 'troisieme', 'quatrieme' );
+
+                        $this->title = $config['title'];
+                        $this->description = $config['description'];
+                        $this->setItemTemplate('<li{%classe%}><a href="{%link%}"><img src="{%image%}" width="{%size%}" height="{%size%}" alt="{%title%}"><strong><span>{%artist%}</span> {%album%}</strong></a></li>'."\n");
+                        $this->setURLTemplate('http://www.last.fm/user/'.$config['username'].'/');
+
                         parent::__construct();
+                }
+
+                public function populateItemTemplate( &$item ) {
+                        $album = Smartypants( $item->name );
+                        $artist = Smartypants( $item->artist );
+                        $this->compteur++;
+                        return array(
+                                                'link' => htmlspecialchars( $item->url ),
+                                                'title' => htmlspecialchars( $artist . ' — ' . $album ),
+                                                'artist' => $artist,
+                                                'album' => $album,
+                                                'image' => $this->getImage( $item ),
+                                                'size' => $this->size,
+                                                'classe' => isset($this->classes[$this->compteur-1]) ? ' class="'.$this->classes[$this->compteur-1].'"' : '',
+                                                );
                 }
 
@@ -92 +116 @@
                         } else {
                                 $Cache_Lite->get( $id );
-                                $url = sprintf( "http://ws.audioscrobbler.com/2.0/?method=album.getinfo&api_key=%s&artist=%s&album=%s", LASTFM_KEY, urlencode( $album->artist ), urlencode( $album->name ) );
+                                $url = sprintf( "http://ws.audioscrobbler.com/2.0/?method=album.getinfo&api_key=%s&artist=%s&album=%s", $this->key, urlencode( $album->artist ), urlencode( $album->name ) );
                                 $data = FileFetcher::get( $url );
                                 $Cache_Lite->save( $data );
@@ -108 +132 @@
                 public function buildAlbumCache( $rebuildCache ) {
                         $data = $this->getData();
+                        $compteur = 0;
                         if ( $data ) {
                                 foreach ( $this->getData() as $album ) {
+                                        $compteur++;
+                                        if ($compteur > $this->total) { break; }
                                         $this->fetchAlbum( $album, $rebuildCache );
                                 }

branches/pre-1.0/lib/Services/Readernaut.php

@@ -3 +3 @@
         class Readernaut extends Service {
                 
-                private $url_template   = 'http://readernaut.com/api/v1/xml/%s/books/?order_by=-created';
                 public $username;
+                private $size;
 
                 public function __construct( $config ){
-                        list($username, $total) = $config;
-                        $this->setURL( sprintf( $this->url_template, $username ) );
-                        $this->total = $total;
-                        $this->username = $username;
+                        $this->setURL( sprintf( 'http://readernaut.com/api/v1/xml/%s/books/?order_by=-created', $config['username'] ) );
+                        $this->total = $config['total'];
+                        $this->username = $config['username'];
+                        $this->size = $config['size'];
+
+                        $this->title = $config['title'];
+                        $this->description = $config['description'];
+                        $this->setItemTemplate('<li><a href="{%link%}"><img src="{%image%}" width="{%size%}" alt="{%title%}" /><strong><span>{%title%}</span> {%author%}</strong></a></li>'."\n");
+                        $this->setURLTemplate('http://www.readernaut.com/'.$config['username'].'/');
+
                         parent::__construct();
                 }
@@ -23 +29 @@
                         return $data->reader_book;
                 }
+
+                public function populateItemTemplate( &$item ) {
+                        return array(
+                                                'link' => $item->book_edition->permalink, 
+                                                'title' => SmartyPants( $item->book_edition->title ),
+                                                'author' => SmartyPants( $item->book_edition->authors->author ), 
+                                                'image' => $item->book_edition->covers->cover_small,
+                                                'size' => $this->size
+                                                );
+                }
                         
         }

branches/pre-1.0/lib/Services/Service.php

@@ -8 +8 @@
         class Service {
                 
-                public $data, $cache_id, $cache_options;
+                public $data, $cache_id, $cache_options, $itemTemplate, $title, $description, $urlTemplate;
                 private $url;
 
@@ -103 +103 @@
                 }
 
+                /**
+                 * Retourne le nom de la variable de l'instance
+                 *
+                 * return string
+                 */
                 public function getVariable() {
                         return $this->variable;
                 }
+
+                /**
+                 * Définit le template de l'URL de profil du service
+                 *
+                 * return void
+                 */
+                public function setURLTemplate( $template ) {
+                        $this->urlTemplate = $template;
+                }
+
+                /**
+                 *
+                 *
+                 *
+                 */
+                public function setItemTemplate($template) {
+                        $this->itemTemplate = $template;
+                }
+
+                /**
+                 *
+                 *
+                 *
+                 */
+                public function getItemTemplate() {
+                        return $this->itemTemplate;
+                }
+
+                /**
+                 * Retourne un item selon un template et des données
+                 *
+                 * @param string $template
+                 * @param array $data
+                 *
+                 * return string
+                 */
+                public function renderItemTemplate( $template, $data ) {
+                        foreach ($data as $key=>$value) {
+                                $template = str_replace( '{%'.$key.'%}', $value, $template );
+                        }
+                        return $template;
+                }
         
         }

branches/pre-1.0/themes/default/index.tpl.php

@@ -14 +14 @@
                         <div class="clearfix">
 
-                                <div class="col1">
-                                        <div class="boite wtf">
-                                                <h2>Introduction</h2>
-                                                <div> <?php 
-echo SmartyPants('
-                                                        <p>
-                                                                Voici mon petit texte d’introduction amusant.
-                                                        </p>
-                                                        ');
-?>
-
-                                                </div>
-                                        </div>
-
-                                        <div class="boite flickr" id="flickr">
-                                                <h2><a rel="me" href="http://flickr.com/photos/<?=$this->photos->username?>/">Flick<em>r</em></a> <span>dernières photos postées</span></h2>
-<?php 
-                                                if ( !$this->photos->getData() ) { ?>
-                                                <div class="erreur">
-                                                        L’API public de <a href="http://flickr.com/">flickr.com</a> semble éprouver des problèmes.
-                                                </div>                          
-<?      
-                                                } else {
-?>
-                                                <ul class="clearfix">
-<?
-                                                        $compteur = 0;
-                                                        foreach ($this->photos->getData() as $photo) {
-                                                                $compteur++;
-                                                        ?>
-                                                        <li<?=($compteur%4 == 0)?' class="derniere"':''?>><a title="<?=$photo['title']?>" href="http://www.flickr.com/photos/<?=$this->photos->username?>/<?=$photo['id']?>"><img alt="<?=$photo['title']?>" src="<?=$this->photos->getAbsoluteUrl($photo, 's')?>" width="75" height="75"></a></li>
-<? } ?>
-                                                </ul>
-<?
-                                                }
-?>
-                                        </div>
-
-                                        <div class="boite lastfm" id="lastfm">
-                                                <h2><a rel="me" href="http://last.fm/user/<?=$this->albums->username?>/">last.fm</a> <span>albums les plus écoutés durant la dernière semaine</span></h2>
-<?php 
-                                                if ( !$this->albums->getData() ) { ?>
-                                                <div class="erreur">
-                                                        L’API public de <a href="http://last.fm/">last.fm</a> semble éprouver des problèmes.
-                                                </div>                          
-<?      
-                                                } else {
-?>
-                                                <ul>
-<?php
-                                                $classes = array('premier', 'deuxieme', 'troisieme', 'quatrieme');
-                                                        $compteur = 0;
-                                                        foreach ( $this->albums->getData() as $album ) {
-                                                                $compteur++;
-                                                                if ( $compteur > $this->albums->total ) { break; }
-                                                                $image = $this->albums->getImage($album);
-                                                        ?>
-                                                        <li class="<?=$classes[$compteur-1]?>">
-                                                                <a href="<?=$album->url?>"><img height="64" width="64" src="<?=$image?>" alt=""><strong><span><?=Smartypants($album->artist)?></span> <?=Smartypants($album->name)?></strong></a>
-                                                        </li>
-<?                                                      } ?>
-                                                </ul>
-<? } ?>
-                                        </div>
-                                </div>
-
-                                <div class="col2">
-                                        <div class="boite twitter" id="twitter">
-                                                <h2><a rel="me" href="http://twitter.com/<?=$this->etats->username?>/">Twitter</a> <span>derniers états postés</span></h2>
-<?php 
-                                                if ( !$this->etats->getData() ) { ?>
-                                                <div class="erreur">
-                                                        L’API public de <a href="http://twitter.com/">Twitter</a> semble éprouver des problèmes.
-                                                </div>                          
-<?
-                                                } else {
-?>
-                                                <ul class="clearfix">
-<?php
-                                                        foreach ( $this->etats->getData() as $etat ) {
-                                                        $date = Pubwich::time_since( $etat->created_at );
-                                                        $text = $this->etats->filterContent( $etat->text );
-                                                                ?>
-                                                        <li class="clearfix">
-                                                                <span class="date"><a href="http://twitter.com/<?=$this->etats->username?>/statuses/<?=$etat->id?>"><?=$date?></a></span>
-                                                                <?=$text?>
-                                                        </li>
-<? } ?>
-                                                </ul>
-<? } ?>
-                                        </div>
-
-                                        <div class="boite rss" id="rss-1">
-                                                <h2><a rel="me" href="<?=$this->billets->feed_url?>">Fil RSS</a> <span>derniers billets</span></h2>
-<?php 
-                                                if ( !$this->billets->getData() ) { ?>
-                                                <div class="erreur">
-                                                        Le fil RSS <?=$this->billets->feed_url?> semble éprouver des problèmes.
-                                                </div>                          
-<?      } else { ?>
-                                                <ul>
-<?php
-                                                        $compteur = 0;
-                                                        foreach ( $this->billets->getData() as $billet ) {
-                                                                $compteur++;
-                                                                if ( $compteur > $this->billets->total ) { break; }
-                                                        ?>
-                                                        <li>
-                                                        <a href="<?=$billet->link?>"><?=$billet->title?></a> <small>(<?=Pubwich::time_since( $billet->published )?>)</small>
-                                                        </li>
-<? } ?>
-                                                </ul>
-<? } ?>
-                                        </div>
-                                </div>
-
-                                <div class="col3">
-                                        <div class="boite delicious" id="delicious">
-                                                <h2><a rel="me" href="http://del.icio.us/<?=$this->liens->username?>/">del.icio.us</a> <span>derniers liens partagés</span></h2>
-<?php 
-                                                if ( !$this->liens->getData() ) { ?>
-                                                <div class="erreur">
-                                                        L’API public de <a href="http://delicious.com/">del.icio.us</a> semble éprouver des problèmes.
-                                                </div>                          
-<?      
-                                                } else {
-?>
-                                                <ul>
-<?php                                           foreach ( $this->liens->getData() as $lien ) { ?>
-                                                        <li><a href="<?=htmlspecialchars( $lien->link )?>"><?=$lien->title ?></a></li>
-<?                                                      } ?>
-                                                </ul>
-<?                                                      } ?>
-                                        </div>
-
-                                        <div class="boite readernaut" id="readernaut">
-                                                <h2><a rel="me" href="http://readernaut.com/<?=$this->livres->username?>/">Readernaut</a> <span>derniers livres ajoutés</span></h2>
-<?php 
-                                                if ( !$this->livres->getData() ) { ?>
-                                                <div class="erreur">
-                                                        L'API public de <a href="http://readernaut.com/">Readernaut</a> semble éprouver des problèmes.
-                                                </div>                          
-<?      
-                                                } else {
-?>
-                                                <ul class="clearfix">
-<?php
-                                                                $compteur = 0;
-                                                                foreach ( $this->livres->getData() as $livre ) {
-                                                                        $compteur++;
-                                                                        if ( $compteur > $this->livres->total ) { break; }
-                                                        ?>
-                                                        <li>
-                                                                <a href="<?=$livre->book_edition->permalink?>"><img src="<?=$livre->book_edition->covers->cover_small?>" width="50" alt=""><strong><span><?=Smartypants($livre->book_edition->title)?></span> <?=Smartypants($livre->book_edition->authors->author)?></strong></a>
-                                                        </li>
-<? } ?>
-                                                </ul>
-<? } ?>
-                                        </div>
-                                        <div class="boite youtube" id="youtube">
-                                                <h2><a rel="me" href="http://youtube.com/user/<?=$this->videos->username?>/">Youtube</a> <span>derniers vidéos ajoutés</span></h2>
-<?php 
-                                                if ( !$this->videos->getData() ) { ?>
-                                                <div class="erreur">
-                                                        L’API public de <a href="http://youtube.com/">Youtube</a> semble éprouver des problèmes.
-                                                </div>                          
-<?      
-                                                } else {
-?>
-                                                <ul class="clearfix">
-<?php
-                                                                $compteur = 0;
-                                                                foreach ( $this->videos->getData() as $video ) {
-                                                                        $compteur++;
-                                                                        if ( $compteur > $this->videos->total ) { break; }
-                                                        ?>
-                                                        <li>
-                                                        <? 
-                                                                $media = $video->children('http://search.yahoo.com/mrss/');
-                                                                $attrs = $media->group->thumbnail[0]->attributes();
-                                                                $img = $attrs['url'];
-                                                                $title = (string) $media->group->title;
-                                                                $url_attrs = $media->group->player->attributes();
-                                                                $url = $url_attrs['url'];
-                                                        ?>
-                                                                <a href="<?=$url?>"><img src="<?=$img?>" alt="<?=htmlspecialchars($title)?>" /><strong><?=$title?></strong></a>
-                                                        </li>
-<? } ?>
-                                                </ul>
-<? } ?>
-                                        </div>
-                                        <div class="boite credits">
-                                                <h2>Crédits</h2>
-                                                <p>Propulsé par <a href="http://pubwich.com/" class="pubwich"><strong>Pubwich</strong></a>, <a href="http://php.net">PHP&nbsp;5</a>, <a href="http://ca2.php.net/simplexml">SimpleXML</a>, <a href="http://phpsavant.com/yawiki/index.php?area=Savant3">Savant3</a>, <a href="http://pear.php.net/package/Cache_Lite/">Cache_Lite</a>, <a href="http://michelf.com/projets/php-smartypants/">PHP Smartypants</a> et <a href="http://michelf.com/projets/php-markdown/">PHP Markdown</a>.
-                                        </div>
-                                </div>
+                        <?=Pubwich::getLoop()?>
 
                         </div>