[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.231,1.232
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Fri Jun 27 14:29:32 EDT 2003
- Previous message (by thread): [geeklog-cvs] geeklog-1.3/plugins/staticpages/language czech.php,1.2,1.3 danish.php,1.5,1.6 english.php,1.8,1.9 german.php,1.9,1.10 polish.php,1.5,1.6 spanish.php,1.5,1.6
- Next message (by thread): [geeklog-cvs] geeklog-1.3/docs install.html,1.12,1.13 theme.html,1.23,1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv14407
Modified Files:
lib-common.php
Log Message:
Fix: Topic links (in the Topics block) should become active again on page 2.
Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.231
retrieving revision 1.232
diff -C2 -d -r1.231 -r1.232
*** lib-common.php 22 Jun 2003 22:07:42 -0000 1.231
--- lib-common.php 27 Jun 2003 18:29:29 -0000 1.232
***************
*** 1974,2040 ****
$A = DB_fetchArray( $result );
! if( $A['tid'] == $topic )
{
! $sections->set_var( 'option_url', '' );
! $sections->set_var( 'option_label', stripslashes( $A['topic'] ));
! $countstring = '';
! if( $_CONF['showstorycount'] + $_CONF['showsubmissioncount'] > 0 )
{
! $countstring .= '(';
if( $_CONF['showstorycount'] )
{
! $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}')" . COM_getPermSQL( 'AND' ));
! $T = DB_fetchArray( $rcount );
! $countstring .= $T['count'];
}
! if( $_CONF['showsubmissioncount'] )
! {
! if( $_CONF['showstorycount'] )
! {
! $countstring .= '/';
! }
! $countstring .= DB_count( $_TABLES['storysubmission'],
! 'tid', $A['tid'] );
! }
! $countstring .= ')';
! }
! $sections->set_var( 'option_count', $countstring );
$retval .= $sections->parse( 'item', 'inactive' );
}
else
{
- $sections->set_var( 'option_url', $_CONF['site_url']
- . '/index.php?topic=' . $A['tid'] );
- $sections->set_var( 'option_label', stripslashes( $A['topic'] ));
-
- $countstring = '';
- if( $_CONF['showstorycount'] + $_CONF['showsubmissioncount'] > 0 )
- {
- $countstring .= '(';
-
- if( $_CONF['showstorycount'] )
- {
- $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}')" . COM_getPermSQL( 'AND' ));
- $T = DB_fetchArray( $rcount );
- $countstring .= $T['count'];
- }
-
- if( $_CONF['showsubmissioncount'] )
- {
- if( $_CONF['showstorycount'] )
- {
- $countstring .= '/';
- }
- $countstring .= DB_count( $_TABLES['storysubmission'],
- 'tid', $A['tid'] );
- }
-
- $countstring .= ')';
- }
- $sections->set_var( 'option_count', $countstring );
$retval .= $sections->parse( 'item', 'option' );
}
--- 1974,2013 ----
$A = DB_fetchArray( $result );
! $sections->set_var( 'option_url', $_CONF['site_url']
! . '/index.php?topic=' . $A['tid'] );
! $sections->set_var( 'option_label', stripslashes( $A['topic'] ));
!
! $countstring = '';
! if( $_CONF['showstorycount'] + $_CONF['showsubmissioncount'] > 0 )
{
! $countstring .= '(';
! if( $_CONF['showstorycount'] )
{
! $rcount = DB_query( "SELECT count(*) AS count FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid = '{$A['tid']}')" . COM_getPermSQL( 'AND' ));
! $T = DB_fetchArray( $rcount );
! $countstring .= $T['count'];
! }
+ if( $_CONF['showsubmissioncount'] )
+ {
if( $_CONF['showstorycount'] )
{
! $countstring .= '/';
}
+ $countstring .= DB_count( $_TABLES['storysubmission'],
+ 'tid', $A['tid'] );
+ }
! $countstring .= ')';
! }
! $sections->set_var( 'option_count', $countstring );
! if(( $A['tid'] == $topic ) && ( $page == 1 ))
! {
$retval .= $sections->parse( 'item', 'inactive' );
}
else
{
$retval .= $sections->parse( 'item', 'option' );
}
***************
*** 2108,2125 ****
$usermenu->set_var( 'option_label', $LANG01[66] );
$usermenu->set_var( 'option_count', '' );
if( $thisUrl == $url )
{
- $usermenu->set_var( 'option_url', '' );
$retval .= $usermenu->parse( 'item', 'current' );
}
else
{
- $usermenu->set_var( 'option_url', $url );
$retval .= $usermenu->parse( 'item', 'option' );
}
-
}
! // This function will show the user options for all installed plugins (if any)
$plugin_options = PLG_getUserOptions();
--- 2081,2097 ----
$usermenu->set_var( 'option_label', $LANG01[66] );
$usermenu->set_var( 'option_count', '' );
+ $usermenu->set_var( 'option_url', $url );
if( $thisUrl == $url )
{
$retval .= $usermenu->parse( 'item', 'current' );
}
else
{
$retval .= $usermenu->parse( 'item', 'option' );
}
}
! // This function will show the user options for all installed plugins
! // (if any)
$plugin_options = PLG_getUserOptions();
***************
*** 2140,2151 ****
}
if( $thisUrl == $plg->adminurl )
{
- $usermenu->set_var( 'option_url', '' );
$retval .= $usermenu->parse( 'item', 'current' );
}
else
{
- $usermenu->set_var( 'option_url', $plg->adminurl );
$retval .= $usermenu->parse( 'item', 'option' );
}
--- 2112,2122 ----
}
+ $usermenu->set_var( 'option_url', $plg->adminurl );
if( $thisUrl == $plg->adminurl )
{
$retval .= $usermenu->parse( 'item', 'current' );
}
else
{
$retval .= $usermenu->parse( 'item', 'option' );
}
***************
*** 2156,2167 ****
$usermenu->set_var( 'option_label', $LANG01[48] );
$usermenu->set_var( 'option_count', '' );
if( $thisUrl == $url )
{
- $usermenu->set_var( 'option_url', '' );
$retval .= $usermenu->parse( 'item', 'current' );
}
else
{
- $usermenu->set_var( 'option_url', $url );
$retval .= $usermenu->parse( 'item', 'option' );
}
--- 2127,2137 ----
$usermenu->set_var( 'option_label', $LANG01[48] );
$usermenu->set_var( 'option_count', '' );
+ $usermenu->set_var( 'option_url', $url );
if( $thisUrl == $url )
{
$retval .= $usermenu->parse( 'item', 'current' );
}
else
{
$retval .= $usermenu->parse( 'item', 'option' );
}
***************
*** 2170,2181 ****
$usermenu->set_var( 'option_label', $LANG01[49] );
$usermenu->set_var( 'option_count', '' );
if( $thisUrl == $url )
{
- $usermenu->set_var( 'option_url', '' );
$retval .= $usermenu->parse( 'item', 'current' );
}
else
{
- $usermenu->set_var( 'option_url', $url );
$retval .= $usermenu->parse( 'item', 'option' );
}
--- 2140,2150 ----
$usermenu->set_var( 'option_label', $LANG01[49] );
$usermenu->set_var( 'option_count', '' );
+ $usermenu->set_var( 'option_url', $url );
if( $thisUrl == $url )
{
$retval .= $usermenu->parse( 'item', 'current' );
}
else
{
$retval .= $usermenu->parse( 'item', 'option' );
}
- Previous message (by thread): [geeklog-cvs] geeklog-1.3/plugins/staticpages/language czech.php,1.2,1.3 danish.php,1.5,1.6 english.php,1.8,1.9 german.php,1.9,1.10 polish.php,1.5,1.6 spanish.php,1.5,1.6
- Next message (by thread): [geeklog-cvs] geeklog-1.3/docs install.html,1.12,1.13 theme.html,1.23,1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the geeklog-cvs
mailing list