[Phpslash-commit] CVS: phpslash-ft/public_html poll.php3,1.8,1.9 comment.php3,1.9,1.10 config.php3,1.123,1.124

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

Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv4830/phpslash-ft/public_html

Modified Files:
	poll.php3 comment.php3 config.php3 
Log Message:
removed deprecated variables

Index: poll.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/poll.php3,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** poll.php3	2002/02/03 22:09:12	1.8
--- poll.php3	2002/02/06 19:55:46	1.9
***************
*** 50,54 ****
        titlebar ("100%", pslgetText("View Pollbooth"));
        echo "<center>\n";
!       fancybox (210, sprintf(pslgetText("%s Poll"), $sitename), $poll->getPollBooth($question_id), "nc");
        echo "</center>\n";
        break;
--- 50,54 ----
        titlebar ("100%", pslgetText("View Pollbooth"));
        echo "<center>\n";
!       fancybox (210, sprintf(pslgetText("%s Poll"), $_PSL['site_name']), $poll->getPollBooth($question_id), "nc");
        echo "</center>\n";
        break;

Index: comment.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/comment.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** comment.php3	2001/11/09 16:58:54	1.9
--- comment.php3	2002/02/06 19:55:46	1.10
***************
*** 82,86 ****
           email       => $email,
           content     => $content,
!          siteowner   => $siteowner,
           comment_text => $comment_text
        );
--- 82,86 ----
           email       => $email,
           content     => $content,
!          siteowner   => $_PSL['site_owner'],
           comment_text => $comment_text
        );

Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** config.php3	2002/02/03 22:09:12	1.123
--- config.php3	2002/02/06 19:55:46	1.124
***************
*** 359,364 ****
  // TODO: nh: Re-write this in a for loop
  
- # require($_PSL['classdir'] . "/Variable.class");
- 
  if ($_PSL['module']['Comment']) {
     require($_PSL['classdir'] . "/Comment.class");
--- 359,362 ----
***************
*** 403,406 ****
--- 401,407 ----
     require($_PSL['classdir'] . "/MailingList.class");
  }
+ if ($_PSL['module']['Variable']) {
+    require($_PSL['classdir'] . "/Variable.class");
+ }
  
  
***************
*** 441,467 ****
  
  // ----------------------------------------------------------
- // Ref'ed in poll.php3 and admin/pollAdmin.php3
- if ($sitename=="") $sitename = $_PSL['site_name'];
- 
- // ----------------------------------------------------------
- // Ref'ed in comment.php3
- if ($siteowner=="") $siteowner = $_PSL['site_owner'];
- 
- // ----------------------------------------------------------
  // Ref'ed in Block_i
  $templatedir = $_PSL['templatedir'];
  
  // ----------------------------------------------------------
- // Ref'ed in Variable.class but isn't that toast?
- $rootdir     = $_PSL['rooturl'];
- 
- // ----------------------------------------------------------
- // both ref'ed in functions.inc
- $debug       = $_PSL['debug'];
- $debug_type  = $_PSL['debug_type'];
- 
- // ----------------------------------------------------------
  // The following can be deleted
  // ----------------------------------------------------------
  // $infolog_enable       = $_PSL['use_infolog'];
  // $default_pending      = $_PSL['default_pending'];
--- 442,456 ----
  
  // ----------------------------------------------------------
  // Ref'ed in Block_i
  $templatedir = $_PSL['templatedir'];
  
  // ----------------------------------------------------------
  // The following can be deleted
  // ----------------------------------------------------------
+ // if ($sitename=="") $sitename = $_PSL['site_name'];
+ // if ($siteowner=="") $siteowner = $_PSL['site_owner'];
+ // $rootdir     = $_PSL['rooturl'];
+ // $debug       = $_PSL['debug'];
+ // $debug_type  = $_PSL['debug_type'];
  // $infolog_enable       = $_PSL['use_infolog'];
  // $default_pending      = $_PSL['default_pending'];