[Phpslash-commit] CVS: phpslash-ft/class Comment.class,1.24,1.25 Poll.class,1.15,1.16

[nathan h. <nh...@us...>]

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

Modified Files:
	Comment.class Poll.class 
Log Message:
fix parse error, unquoted strings and finish last commit


Index: Comment.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Comment.class	10 Apr 2002 03:03:43 -0000	1.24
--- Comment.class	28 Apr 2002 02:08:26 -0000	1.25
***************
*** 42,46 ****
        $this->order = $ary['order'];
  
!       if ($ary[mode] == "") {
           $this->mode = $this->psl['comment_defaultmode'];
        } else {
--- 42,46 ----
        $this->order = $ary['order'];
  
!       if ($ary['mode'] == "") {
           $this->mode = $this->psl['comment_defaultmode'];
        } else {
***************
*** 52,56 ****
  
        /* Templates */
!       $this->ctempl = new Template($this->psl['templatedir'], remove);
        $this->ctempl->debug = 0;
        $this->ctempl->set_file(array(
--- 52,56 ----
  
        /* Templates */
!       $this->ctempl = new Template($this->psl['templatedir'], 'remove');
        $this->ctempl->debug = 0;
        $this->ctempl->set_file(array(
***************
*** 321,325 ****
       }
  
!      $this->ctempl->set_block(maincomment, each_mode, modes);
       while (list($key,$val) = each($this->comment_mode_array)) {
          $this->ctempl->set_var(array(
--- 321,325 ----
       }
  
!      $this->ctempl->set_block('maincomment', 'each_mode', 'modes');
       while (list($key,$val) = each($this->comment_mode_array)) {
          $this->ctempl->set_var(array(
***************
*** 358,365 ****
     function nested($parent_id, $lvl) {
     
!       $templ = new Template($this->psl[templatedir], remove);
        $templ->debug = 0;
        $templ->set_file(array(
!          'nestcomment'    => "commentNest.tpl"
        ));
  
--- 358,365 ----
     function nested($parent_id, $lvl) {
     
!       $templ = new Template($this->psl['templatedir'], 'remove');
        $templ->debug = 0;
        $templ->set_file(array(
!          'nestcomment'    => 'commentNest.tpl'
        ));
  
***************
*** 375,381 ****
                 'THREAD'   => $thread
              ));
!             $templ->parse(OUT, array("nestcomment"));
              $all_comments .= $templ->get('OUT');
!             $templ->set_var('THREAD',"");
           }
        }
--- 375,381 ----
                 'THREAD'   => $thread
              ));
!             $templ->parse('OUT', array("nestcomment"));
              $all_comments .= $templ->get('OUT');
!             $templ->set_var('THREAD','');
           }
        }

Index: Poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Poll.class	28 Apr 2002 01:55:08 -0000	1.15
--- Poll.class	28 Apr 2002 02:08:26 -0000	1.16
***************
*** 217,221 ****
           return false;
        }  elseif (empty($ary['choice_ary'][0]) || empty($ary['choice_ary'][1])) {
!          $this->message = 'You need to have at least 2 possible answers, otherwise it wouldn't be a very effective poll, would it?';
           return false;
        }
--- 217,221 ----
           return false;
        }  elseif (empty($ary['choice_ary'][0]) || empty($ary['choice_ary'][1])) {
!          $this->message = 'You need to have at least 2 possible answers, otherwise it wouldn\'t be a very effective poll, would it?';
           return false;
        }
***************
*** 466,470 ****
     function getResults($question_id) {
  
!       if (!question_id) {
           $question_id = getCurrent();
        }
--- 466,470 ----
     function getResults($question_id) {
  
!       if (!$question_id) {
           $question_id = getCurrent();
        }
***************
*** 552,556 ****
        $this->db->query($q);
     
!       titlebar('100%', $this->psl[site_name] . ' Polls');
     
        $this->templ->set_block('listpoll', 'newpollbutton');
--- 552,556 ----
        $this->db->query($q);
     
!       titlebar('100%', $this->psl['site_name'] . ' Polls');
     
        $this->templ->set_block('listpoll', 'newpollbutton');