[Phpslash-commit] CVS: phpslash-ft/class Block_render_i.class,NONE,1.1 Block_render_cal.class,1.7,1.

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	Block_render_cal.class Block_render_html.class 
	Block_render_login.class Block_render_navbar.class 
	Block_render_poll.class Block_render_query.class 
Added Files:
	Block_render_i.class 
Log Message:
Patches [ 565744 ] and [ 565749 ] Base class for Block_render_foo

--- NEW FILE: Block_render_i.class ---
<?php
/* Block_render_skel.class -> Base class for block renderers */

/**
 * Class that defines the interface to block renderers and implements
 * common functionality
 *
 * @access public
 * @author Will Dyson, June 2002
 * @package phpslash
 */

class Block_render_i {

   var $psl;
   var $type;
   var $description;
   var $options;
   var $output;
   
   function Block_render_i() {
      global $_PSL;

      $this->psl = $_PSL;
      $this->output = "";
      $this->type = "";
      $this->description = "No description";
      $this->options = array(
            "column" => "Which of the three columns this block should display in (required: left, center, right)",
            "width" => "Width in pixels or percent (default: 100%)",
            "box_type" => "Alternate box template. When box_type is foo, foobox.tpl is used (default: fancy)",
            "perms" => "Permissions required to view block (default: any)",
            );
   }
   
   function getType() {
      return $this->type;
   }

   function getDesc() {
      return $this->description;
   }

   function getOpts() {
      return $this->options;
   }

   // should never actually be called
   function parse($block_info) {
      return 0;
   }

   function getFinal() {
      return $this->output;
   }
} 

?>

Index: Block_render_cal.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_cal.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block_render_cal.class	9 Jul 2002 19:48:46 -0000	1.7
--- Block_render_cal.class	3 Sep 2002 19:52:57 -0000	1.8
***************
*** 2,25 ****
  
  /* Block_render_cal.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
  
- class Block_render_cal {
  
!    var $type;
!    var $output;
!    var $psl;
  
     /* constructor */
     function Block_render_cal() {
!       global $_PSL;
!     
        $this->type = 'cal';   /* set the 'type' */
!       $this->output = '';    /* clear the output */
!       $this->psl = $_PSL;
!    }
! 
!    /* returns the TYPE of this class */
!    function getType() {
!      return $this->type;
     }
  
--- 2,16 ----
  
  /* Block_render_cal.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
  
  
! class Block_render_cal extends Block_render_i {
  
     /* constructor */
     function Block_render_cal() {
!       $this->Block_render_i();
!       
        $this->type = 'cal';   /* set the 'type' */
!       $this->description = 'A block that contains a calender, with links to all the stories posted each partiuclar day'; 
     }
  
***************
*** 124,132 ****
        unset($cal_q);
     }
! 
!    function getFinal() {
!      return $this->output;
!    }
! 
     function getTitle() {
        $montharray=array( "", "January", "February", "March", "April", "May", "June","July", "August", "September", "October", "November", "December");
--- 115,119 ----
        unset($cal_q);
     }
!  
     function getTitle() {
        $montharray=array( "", "January", "February", "March", "April", "May", "June","July", "August", "September", "October", "November", "December");

Index: Block_render_html.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_html.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_render_html.class	5 Mar 2002 16:50:57 -0000	1.2
--- Block_render_html.class	3 Sep 2002 19:52:57 -0000	1.3
***************
*** 2,23 ****
  
  /* Block_render_html.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
  
- class Block_render_html {
  
!    var $type;
!    var $output;
  
     /* constructor */
     function Block_render_html() {
! 
        $this->type = "html";  /* set the 'type' */
!       $this->output = "";    /* clear the output */
!  
!    }
! 
!    /* returns the TYPE of this class */
!    function getType() {
!       return $this->type;
     }
  
--- 2,16 ----
  
  /* Block_render_html.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
  
  
! class Block_render_html extends Block_render_i {
  
     /* constructor */
     function Block_render_html() {
!       $this->Block_render_i();
!       
        $this->type = "html";  /* set the 'type' */
!       $this->description = "A block that displays HTML you specify"; 
     }
  
***************
*** 43,51 ****
           
     }
- 
-    function getFinal() {
-       return $this->output;
-    }
- 
  }
  
--- 36,39 ----

Index: Block_render_login.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_login.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_render_login.class	9 Jul 2002 19:48:46 -0000	1.2
--- Block_render_login.class	3 Sep 2002 19:52:57 -0000	1.3
***************
*** 4,31 ****
  /* $Id$ */
  
! class Block_render_login {
  
-    var $type;
-    var $output;
     var $auth;
     var $perm;
-    var $psl;
  
     /* constructor */
     function Block_render_login() {
! 
!       global $auth, $perm, $_PSL;
        
-       $this->type = "login";  /* set the 'type' */
-       $this->output = "";    /* clear the output */
        $this->auth = $auth;
        $this->perm = $perm;
-       $this->psl  = $_PSL;
   
!    }
! 
!    /* returns the TYPE of this class */
!    function getType() {
!       return $this->type;
     }
  
--- 4,23 ----
  /* $Id$ */
  
! class Block_render_login extends Block_render_i {
  
     var $auth;
     var $perm;
  
     /* constructor */
     function Block_render_login() {
!       global $auth, $perm;
!       
!       $this->Block_render_i();
        
        $this->auth = $auth;
        $this->perm = $perm;
   
!       $this->type = "login";  /* set the 'type' */
!       $this->description = "A block that contains forms for username and password, so that users can login";
     }
  
***************
*** 80,87 ****
        return $output;
   
-    }
- 
-    function getFinal() {
-       return $this->output;
     }
  
--- 72,75 ----

Index: Block_render_navbar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_navbar.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block_render_navbar.class	20 May 2002 16:07:29 -0000	1.1
--- Block_render_navbar.class	3 Sep 2002 19:52:57 -0000	1.2
***************
*** 4,27 ****
  /* $Id$ */
  
! class Block_render_navbar {
! 
!    var $type;
!    var $output;
!    var $psl;
  
     /* constructor */
     function Block_render_navbar() {
! 
!       global $_PSL;
! 
        $this->type = "navbar";  /* set the 'type' */
!       $this->output = "";    /* clear the output */
!       $this->psl  = $_PSL;
!  
!    }
! 
!    /* returns the TYPE of this class */
!    function getType() {
!       return $this->type;
     }
  
--- 4,15 ----
  /* $Id$ */
  
! class Block_render_navbar extends Block_render_i {
  
     /* constructor */
     function Block_render_navbar() {
!       $this->Block_render_i();
!       
        $this->type = "navbar";  /* set the 'type' */
!       $this->description = "A block that contains all the links from the navbar that is normally at the top and bottom of each page"; 
     }
  
***************
*** 46,52 ****
     }
  
-    function getFinal() {
-       return $this->output;
-    }
     function getTitle($string = ""){
     if (empty($string)) {
--- 34,37 ----

Index: Block_render_poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_poll.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Block_render_poll.class	5 Mar 2002 16:50:57 -0000	1.3
--- Block_render_poll.class	3 Sep 2002 19:52:57 -0000	1.4
***************
*** 2,26 ****
  
  /* Block_render_poll.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
  
! class Block_render_poll {
  
-   var $type;
-   var $output;
    var $poll;
! 
    /* constructor */
    function Block_render_poll() {
! 
       $this->type = "poll";  /* set the 'type' */
!      $this->output = "";    /* clear the output */
! 
!   }
! 
!   /* returns the TYPE of this class */
!   function getType() {
!     return $this->type;
    }
  
    function parse($block_info) {
     
--- 2,20 ----
  
  /* Block_render_poll.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
  
! class Block_render_poll extends Block_render_i {
  
    var $poll;
!     
    /* constructor */
    function Block_render_poll() {
!      $this->Block_render_i();
!      
       $this->type = "poll";  /* set the 'type' */
!      $this->description = "A block that displays a poll";
    }
  
+   
    function parse($block_info) {
     
***************
*** 35,42 ****
      $this->output = $this->poll->getPollBooth($question_id);
      unset($this->poll);
-   }
- 
-   function getFinal() {
-     return $this->output;
    }
  
--- 29,32 ----

Index: Block_render_query.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_query.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block_render_query.class	27 Apr 2002 20:31:10 -0000	1.7
--- Block_render_query.class	3 Sep 2002 19:52:57 -0000	1.8
***************
*** 2,6 ****
  
  /* Block_render_query.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
  
  /* pass the query in the "Source Url" form field in the format of:
--- 2,6 ----
  
  /* Block_render_query.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
  
  /* pass the query in the "Source Url" form field in the format of:
***************
*** 23,46 ****
  */
  
! class Block_render_query {
!   
!    var $type;
!    var $output;
!    var $psl;
! 
     /* constructor */
     function Block_render_query() {
! 
!       global $_PSL;
  
        $this->type = 'query';  /* set the 'type' */
!       $this->output = '';    /* clear the output */
!       $this->psl = $_PSL;
!  
!    }
! 
!    /* returns the TYPE of this class */
!    function getType() {
!       return $this->type;
     }
  
--- 23,34 ----
  */
  
! class Block_render_query extends Block_render_i {
!    
     /* constructor */
     function Block_render_query() {
!       $this->Block_render_i();
  
        $this->type = 'query';  /* set the 'type' */
!       $this->description = 'A block that shows the results of a query against the story database';
     }
  
***************
*** 136,144 ****
  
     }
-    
-    function getFinal() {
-       return $this->output;
-    }
-    
  }
  
--- 124,127 ----

[Phpslash-commit] CVS: phpslash-ft/class Block_render_i.class,NONE,1.1 Block_render_cal.class,1.7,1.

[Phpslash-commit] CVS: phpslash-ft/class Block_render_i.class,NONE,1.1 Block_render_cal.class,1.7,1.8 Block_render_html.class,1.2,1.3 Block_render_login.class,1.2,1.3 Block_render_navbar.class,1.1,1.2 Block_render_poll.class,1.3,1.4 Block_render_query.class,1.7,1.8