[Phpslash-commit] CVS: phpslash-ft/class Block_render_quote.class,1.5,1.6 Block_render_rss.class,1.10,1.11 Block_render_section.class,1.10,1.11 Block_render_skin.class,1.6,1.7 Block_render_submission.class,1.1,1.2 Block_render_topic.class,1.8,1.9 Block_render_url.class,1.2,1.3

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv30230/phpslash-ft/class

Modified Files:
	Block_render_quote.class Block_render_rss.class 
	Block_render_section.class Block_render_skin.class 
	Block_render_submission.class Block_render_topic.class 
	Block_render_url.class 
Log Message:
Patches [ 565744 ] and [ 565749 ] Base class for Block_render_foo

Index: Block_render_quote.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_quote.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Block_render_quote.class	28 Apr 2002 01:32:39 -0000	1.5
--- Block_render_quote.class	3 Sep 2002 19:54:40 -0000	1.6
***************
*** 4,25 ****
  /* $Id$ */
  
- class Block_render_quote {
-   
-    var $type;
-    var $output;
-    var $psl;
  
     /* constructor */
     function Block_render_quote() {
!       global $_PSL;
! 
        $this->type   = 'quote';  // set the 'type' 
!       $this->output = '';       // clear the output 
!       $this->psl    = $_PSL;
!    }
! 
!    /* returns the TYPE of this class */
!    function getType() {
!       return $this->type;
     }
  
--- 4,16 ----
  /* $Id$ */
  
  
+ class Block_render_quote extends Block_render_i {
+   
     /* constructor */
     function Block_render_quote() {
!       $this->Block_render_i();
!       
        $this->type   = 'quote';  // set the 'type' 
!       $this->description = 'A block that shows a random quote';
     }
  
***************
*** 82,90 ****
  
     }
-    
-    function getFinal() {
-       return $this->output;
-    }
-    
  }
  
--- 73,76 ----

Index: Block_render_rss.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_rss.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Block_render_rss.class	20 Jun 2002 16:34:45 -0000	1.10
--- Block_render_rss.class	3 Sep 2002 19:54:40 -0000	1.11
***************
*** 296,314 ****
   */
  
! class Block_render_rss {
! 	/**
! 	* Blcok type = "rss"
! 	* @access public
! 	*/
!    var $type;
! 	/**
! 	* Output
! 	* @access public
! 	*/
!    var $output;
! 	/**
! 	* rdfparser object
! 	* @access private
! 	*/
     var $rdf;
  
--- 296,304 ----
   */
  
! class Block_render_rss extends Block_render_i {
!    /**
!    * rdfparser object
!    * @access private
!    */
     var $rdf;
  
***************
*** 317,337 ****
     */
     function Block_render_rss() {
!       global $_PSL;
! 
!       $this->type = "rss";  /* set the 'type' */
!       $this->output = "";    /* clear the output */
        $this->rdf = new rdfparser;
!       $this->psl = $_PSL;
!    }
! 
!    /**
!    * returns the TYPE of this class
!    * @return string
!    */
!    function getType() {
!       return $this->type;
     }
  
- 
     /**
     * Generates and stores html code
--- 307,317 ----
     */
     function Block_render_rss() {
!       $this->Block_render_i();
        $this->rdf = new rdfparser;
!       
!       $this->type = "rss";  /* set the 'type' */
!       $this->description = "A block that displays the headlines from another site, generated from their RDF file"; 
     }
  
     /**
     * Generates and stores html code
***************
*** 516,527 ****
        }
  
-    }
- 
-    /**
-    * Returns output
-    * @return htmlstring
-    */
-    function getFinal() {
-       return $this->output;
     }
  
--- 496,499 ----

Index: Block_render_section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_section.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Block_render_section.class	9 Jul 2002 18:14:25 -0000	1.10
--- Block_render_section.class	3 Sep 2002 19:54:40 -0000	1.11
***************
*** 20,24 ****
  
  
! class Block_render_section {
    
     /*
--- 20,24 ----
  
  
! class Block_render_section extends Block_render_i {
    
     /*
***************
*** 33,51 ****
     */
     function Block_render_section() {
!       global $_PSL;
! 
        $this->type = 'section';  /* set the 'type' */
!       $this->output = '';    /* clear the output */
!       $this->psl = $_PSL;
!  
!    }
! 
!    /**
!    * returns the TYPE of this class
!    *@return string
!    *@access public
!    */
!    function getType() {
!       return $this->type;
     }
  
--- 33,40 ----
     */
     function Block_render_section() {
!       $this->Block_render_i();
!       
        $this->type = 'section';  /* set the 'type' */
!       $this->description = "A block that displays links to all sections which contain stories";
     }
  
***************
*** 151,166 ****
     }
    
-     /**
-    * Returns the html for display
-    *
-    * Requires that parse() has already been called.
-    *
-    *@return htmlstring
-    *@access public
-    */
-   function getFinal() {
-       return $this->output;
-    }
- 
  }
  
--- 140,143 ----

Index: Block_render_skin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_skin.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Block_render_skin.class	30 May 2002 16:00:17 -0000	1.6
--- Block_render_skin.class	3 Sep 2002 19:54:40 -0000	1.7
***************
*** 2,6 ****
  
  /* Block_render_skin.class -> Methods for phpslash skin blocks */
! /* Id:$ */
  
  /** 
--- 2,6 ----
  
  /* Block_render_skin.class -> Methods for phpslash skin blocks */
! /* $Id$ */
  
  /** 
***************
*** 16,37 ****
  
  
! class Block_render_skin {
    
!    var $type;
!    var $output;
! 
!    /* constructor */
     function Block_render_skin() {
! 
!       global $_PSL;
! 
!       $this->type = "skin";  /* set the 'type' */
!       $this->output = "";    /* clear the output */
!       $this->psl = $_PSL;
!    }
! 
!    /* returns the TYPE of this class */
!    function getType() {
!       return $this->type;
     }
  
--- 16,27 ----
  
  
! class Block_render_skin extends Block_render_i {
    
!    // constructor 
     function Block_render_skin() {
!       $this->Block_render_i();
!       
!       $this->type = 'skin';  // set the 'type' 
!       $this->description = 'A block that contains links to all the available skins';
     }
  
***************
*** 112,119 ****
        return $output;
      
-    }
- 
-    function getFinal() {
-       return $this->output;
     }
  
--- 102,105 ----

Index: Block_render_submission.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_submission.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block_render_submission.class	20 May 2002 17:52:47 -0000	1.1
--- Block_render_submission.class	3 Sep 2002 19:54:40 -0000	1.2
***************
*** 2,29 ****
  
  /* Block_render_submission.class -> Methods for phpslash submission blocks */
! /* Id:$ */
  
  /* These should only be displayed to logged in admin's with Submission perms.
  */
  
! class Block_render_submission {
    
-    var $type;
-    var $output;
-    var $psl;
- 
     /* constructor */
     function Block_render_submission() {
!       global $_PSL;
  
        $this->type = "submission";  /* set the 'type' */
!       $this->output = "";    /* clear the output */
!       $this->psl = $_PSL;
!  
!    }
! 
!    /* returns the TYPE of this class */
!    function getType() {
!       return $this->type;
     }
  
--- 2,18 ----
  
  /* Block_render_submission.class -> Methods for phpslash submission blocks */
! /* $Id$ */
  
  /* These should only be displayed to logged in admin's with Submission perms.
  */
  
! class Block_render_submission extends Block_render_i {
    
     /* constructor */
     function Block_render_submission() {
!       $this->Block_render_i();
  
        $this->type = "submission";  /* set the 'type' */
!       $this->description = "Block that displays stories that have been submitted for aproval. Should only be displayed to admins with Submission perms"; 
     }
  
***************
*** 118,126 ****
        return $submissions;
     }
-   
-    function getFinal() {
-       return $this->output;
-    }
- 
  }
  
--- 107,110 ----

Index: Block_render_topic.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_topic.class,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Block_render_topic.class	27 Apr 2002 20:31:10 -0000	1.8
--- Block_render_topic.class	3 Sep 2002 19:54:40 -0000	1.9
***************
*** 16,39 ****
  */
  
! class Block_render_topic {
    
-    var $type;
-    var $output;
-    var $psl;
- 
     /* constructor */
     function Block_render_topic() {
! 
!       global $_PSL;
  
        $this->type = "topic";  /* set the 'type' */
!       $this->output = "";    /* clear the output */
!       $this->psl = $_PSL;
!  
!    }
! 
!    /* returns the TYPE of this class */
!    function getType() {
!       return $this->type;
     }
  
--- 16,27 ----
  */
  
! class Block_render_topic extends Block_render_i {
    
     /* constructor */
     function Block_render_topic() {
!       $this->Block_render_i();
  
        $this->type = "topic";  /* set the 'type' */
!       $this->description = "A block that displays the topics in a section";
     }
  
***************
*** 149,157 ****
      
     }
- 
-    function getFinal() {
-       return $this->output;
-    }
- 
  }
  
--- 137,140 ----

Index: Block_render_url.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_url.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_render_url.class	20 Jun 2002 16:34:45 -0000	1.2
--- Block_render_url.class	3 Sep 2002 19:54:40 -0000	1.3
***************
*** 4,23 ****
  /* Id:$ */
  
! class Block_render_url {
! 
!   var $type;
!   var $output;
  
!   /* constructor */
    function Block_render_url() {
  
       $this->type = "url";  /* set the 'type' */
!      $this->output = "";    /* clear the output */
!  
!   }
! 
!   /* returns the TYPE of this class */
!   function getType() {
!     return $this->type;
    }
  
--- 4,15 ----
  /* Id:$ */
  
! class Block_render_url extends Block_render_i {
  
!   // constructor 
    function Block_render_url() {
+      $this->Block_render_i();
  
       $this->type = "url";  /* set the 'type' */
!      $this->description = "A block that displays the HTML returned from the source URL"; 
    }
  
***************
*** 61,69 ****
       return true;
    }
- 
-   function getFinal() {
-     return $this->output;
-   }
- 
  }
  
--- 53,56 ----