- Moved some Generic functionality to Widget (attrs property).

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

diff --git a/src/BIFE/AlbumPhoto.php b/src/BIFE/AlbumPhoto.php
index 6a348763469186f1e7e8829d143a67c15dde01ad..ab4cc53e9cef1afdb7f4801a1c9ce03c42f4cb8e 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
 
@@ -98,12 +83,7 @@ class BIFE_AlbumPhoto extends BIFE_Widget {
     function render(&$template) // ~X2C
     {
         $template->loadTemplateFile('bife_albumphoto.html');
-        $template->setVariable(
-            array(
-                'FILE' => $this->file,
-                'DESC' => $this->desc,
-            )
-        );
+        $template->setVariable($this->attrs);
         return $template->get();
     }
     // -X2C