- Added a new simple template system: Hooks + IT = HIT.

[software/bife/bife-all.git] / src / BIFE / AlbumPhoto.php

diff --git a/src/BIFE/AlbumPhoto.php b/src/BIFE/AlbumPhoto.php
index 7d7548dece65c25dd707576073b580592755d548..084088df3d44f549ed654204dfb763c9c117cd4e 100644 (file)
--- a/src/BIFE/AlbumPhoto.php
+++ b/src/BIFE/AlbumPhoto.php
@@ -37,22 +37,6 @@ require_once 'BIFE/Widget.php';
  * @access public
  */
 class BIFE_AlbumPhoto extends BIFE_Widget {
-    /**
-     * Photo filename.
-     *
-     * @var    string $file
-     * @access protected
-     */
-    var $file;
-
-    /**
-     * Photo Description.
-     *
-     * @var    string $desc
-     * @access protected
-     */
-    var $desc;
-
     // ~X2C
 
     // +X2C Operation 106
@@ -81,8 +65,9 @@ class BIFE_AlbumPhoto extends BIFE_Widget {
      */
     function __construct($attrs) // ~X2C
     {
-        $this->file = @$attrs['FILE'] ? $attrs['FILE'] : @$_REQUEST['BIFE_AlbumPhoto_FILE'];
-        $this->desc = @$attrs['DESC'] ? $attrs['DESC'] : basename($this->file);
+        $new_attrs['FILE'] = @$attrs['FILE'] ? $attrs['FILE'] : @$_REQUEST['BIFE_ALBUM_FILE'];
+        $new_attrs['DESC'] = @$attrs['DESC'] ? $attrs['DESC'] : basename($new_attrs['FILE']);
+        parent::__construct($new_attrs);
     }
     // -X2C
 
@@ -97,14 +82,8 @@ class BIFE_AlbumPhoto extends BIFE_Widget {
      */
     function render(&$template) // ~X2C
     {
-        $template->loadTemplateFile('bife_albumphoto.html');
-        $template->setVariable(
-            array(
-                'FILE' => $this->file,
-                'DESC' => $this->desc,
-            )
-        );
-        return $template->get();
+        $template->group = 'album';
+        return $template->parse('photo', $this->attrs);
     }
     // -X2C