[geeklog-cvs] geeklog-1.3/system lib-story.php,1.6,1.7

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/system
In directory www:/tmp/cvs-serv6153

Modified Files:
	lib-story.php 
Log Message:
Allowed / introduced more comment-related variables ...


Index: lib-story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-story.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** lib-story.php	27 Aug 2004 10:08:39 -0000	1.6
--- lib-story.php	27 Aug 2004 12:36:49 -0000	1.7
***************
*** 204,217 ****
          if( $A['commentcode'] >= 0 )
          {
              if( $A['comments'] > 0 )
              {
-                 $commentsUrl = COM_buildUrl( $_CONF['site_url']
-                         . '/article.php?story=' . $A['sid'] ) . '#comments';
-                 $article->set_var( 'comments_url', $commentsUrl );
-                 $article->set_var( 'comments_text', $A['comments'] . ' '
-                         . $LANG01[3] );
-                 $article->set_var( 'comments_count', $A['comments'] );
-                 $article->set_var( 'lang_comments', $LANG01[3] );
- 
                  $result = DB_query( "SELECT UNIX_TIMESTAMP(date) AS day,username FROM {$_TABLES['comments']},{$_TABLES['users']} WHERE {$_TABLES['users']}.uid = {$_TABLES['comments']}.uid AND sid = '{$A['sid']}' ORDER BY date desc LIMIT 1" );
                  $C = DB_fetchArray( $result );
--- 204,217 ----
          if( $A['commentcode'] >= 0 )
          {
+             $commentsUrl = COM_buildUrl( $_CONF['site_url']
+                     . '/article.php?story=' . $A['sid'] ) . '#comments';
+             $article->set_var( 'comments_url', $commentsUrl );
+             $article->set_var( 'comments_text', $A['comments'] . ' '
+                                                 . $LANG01[3] );
+             $article->set_var( 'comments_count', $A['comments'] );
+             $article->set_var( 'lang_comments', $LANG01[3] );
+ 
              if( $A['comments'] > 0 )
              {
                  $result = DB_query( "SELECT UNIX_TIMESTAMP(date) AS day,username FROM {$_TABLES['comments']},{$_TABLES['users']} WHERE {$_TABLES['users']}.uid = {$_TABLES['comments']}.uid AND sid = '{$A['sid']}' ORDER BY date desc LIMIT 1" );
                  $C = DB_fetchArray( $result );
***************
*** 231,237 ****
                          . '&pid=0&type=article">' . $LANG01[60] . '</a>';
              }
              $article->set_var( 'post_comment_link',' <a href="'
!                     . $_CONF['site_url'] . '/comment.php?sid=' . $A['sid']
!                     . '&pid=0&type=article">' . $LANG01[60] . '</a>' );
          }
  
--- 231,242 ----
                          . '&pid=0&type=article">' . $LANG01[60] . '</a>';
              }
+             $postCommentUrl = $_CONF['site_url'] . '/comment.php?sid='
+                             . $A['sid'] . '&pid=0&type=article';
              $article->set_var( 'post_comment_link',' <a href="'
!                     . $postCommentUrl . '">' . $LANG01[60] . '</a>' );
!             $article->set_var( 'lang_post_comment', $LANG01[60] );
!             $article->set_var( 'start_post_comment_anchortag',
!                                ' <a href="' . $postCommentUrl . '">' );
!             $article->set_var( 'end_post_comment_anchortag', '</a>' );
          }
  
***************
*** 250,253 ****
--- 255,259 ----
              $article->set_var( 'email_story_url', $emailUrl );
              $article->set_var( 'lang_email_story', $LANG11[2] );
+             $article->set_var( 'lang_email_story_alt', $LANG01[64] );
          }
          $printUrl = COM_buildUrl( $_CONF['site_url'] . '/article.php?story='
***************
*** 265,268 ****
--- 271,275 ----
              $article->set_var( 'print_story_url', $printUrl );
              $article->set_var( 'lang_print_story', $LANG11[3] );
+             $article->set_var( 'lang_print_story_alt', $LANG01[65] );
          }
          if( $_CONF['pdf_enabled'] == 1 )
***************
*** 274,277 ****
--- 281,285 ----
              $article->set_var( 'pdf_story_url', $pdfUrl );
              $article->set_var( 'lang_pdf_story', $LANG11[5] );
+             $article->set_var( 'lang_pdf_story_alt', $LANG01[111] );
          }
          else