[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.226,1.227
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Mon Jun 16 16:08:53 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv14220
Modified Files:
lib-common.php
Log Message:
Added new template file adminoption_off.thtml to be used to render the current Admin menu entry.
Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.226
retrieving revision 1.227
diff -C2 -d -r1.226 -r1.227
*** lib-common.php 16 Jun 2003 17:20:45 -0000 1.226
--- lib-common.php 16 Jun 2003 20:08:50 -0000 1.227
***************
*** 1928,1931 ****
--- 1928,1934 ----
$sections->set_file( array( 'option' => 'useroption.thtml',
'inactive' => 'useroption_off.thtml' ));
+ $sections->set_var( 'site_url', $_CONF['site_url'] );
+ $sections->set_var( 'layout_url', $_CONF['layout_url'] );
+ $sections->set_var( 'block_name', str_replace( '_', '-', 'section_block' ));
if( $_CONF['hide_home_link'] == 0 )
***************
*** 2049,2052 ****
--- 2052,2058 ----
$usermenu->set_file( array( 'option' => 'useroption.thtml',
'current' => 'useroption_off.thtml' ));
+ $usermenu->set_var( 'site_url', $_CONF['site_url'] );
+ $usermenu->set_var( 'layout_url', $_CONF['layout_url'] );
+ $usermenu->set_var( 'block_name', str_replace( '_', '-', 'user_block' ));
if( empty( $title ))
***************
*** 2188,2192 ****
function COM_adminMenu( $help = '', $title = '' )
{
! global $_TABLES, $_USER, $_CONF, $LANG01;
$retval = '';
--- 2194,2198 ----
function COM_adminMenu( $help = '', $title = '' )
{
! global $_TABLES, $_USER, $_CONF, $LANG01, $HTTP_SERVER_VARS;
$retval = '';
***************
*** 2202,2214 ****
if( SEC_isModerator() OR SEC_hasrights( 'story.edit,block.edit,topic.edit,link.edit,event.edit,poll.edit,user.edit,plugin.edit,user.mail', 'OR' ) OR ( $nrows > 0 ))
{
$adminmenu = new Template( $_CONF['path_layout'] );
! $adminmenu->set_file( 'option', 'adminoption.thtml' );
if( empty( $title ))
{
! $title = DB_getItem( $_TABLES['blocks'],'title',"name='admin_block'" );
}
! $retval .= COM_startBlock( $title, $help, COM_getBlockTemplate( 'admin_block', 'header' ));
if( SEC_isModerator() )
--- 2208,2237 ----
if( SEC_isModerator() OR SEC_hasrights( 'story.edit,block.edit,topic.edit,link.edit,event.edit,poll.edit,user.edit,plugin.edit,user.mail', 'OR' ) OR ( $nrows > 0 ))
{
+ // what's our current URL?
+ $thisUrl = $HTTP_SERVER_VARS['SCRIPT_URI'];
+ if( empty( $thisUrl ))
+ {
+ $thisUrl = $HTTP_SERVER_VARS['DOCUMENT_URI'];
+ }
+ if( !empty( $thisUrl ) && !empty( $HTTP_SERVER_VARS['QUERY_STRING'] ))
+ {
+ $thisUrl .= '?' . $HTTP_SERVER_VARS['QUERY_STRING'];
+ }
+
$adminmenu = new Template( $_CONF['path_layout'] );
! $adminmenu->set_file( array( 'option' => 'adminoption.thtml',
! 'current' => 'adminoption_off.thtml' ));
! $adminmenu->set_var( 'site_url', $_CONF['site_url'] );
! $adminmenu->set_var( 'layout_url', $_CONF['layout_url'] );
! $adminmenu->set_var( 'block_name', str_replace( '_', '-', 'admin_block' ));
if( empty( $title ))
{
! $title = DB_getItem( $_TABLES['blocks'], 'title',
! "name = 'admin_block'" );
}
! $retval .= COM_startBlock( $title, $help,
! COM_getBlockTemplate( 'admin_block', 'header' ));
if( SEC_isModerator() )
***************
*** 2247,2349 ****
}
! //now handle submissions for plugins
$num = $num + PLG_getSubmissionCount();
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/moderation.php' );
$adminmenu->set_var( 'option_label', $LANG01[10] );
$adminmenu->set_var( 'option_count', $num );
! $retval .= $adminmenu->parse( 'item', 'option' );
}
if( SEC_hasrights( 'story.edit' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/story.php' );
$adminmenu->set_var( 'option_label', $LANG01[11] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['stories'] ));
!
! $retval .= $adminmenu->parse('item', 'option' );
}
if( SEC_hasrights( 'block.edit' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/block.php' );
$adminmenu->set_var( 'option_label', $LANG01[12] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['blocks'] ));
! $retval .= $adminmenu->parse( 'item', 'option' );
}
if( SEC_hasrights( 'topic.edit' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/topic.php' );
$adminmenu->set_var( 'option_label', $LANG01[13] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['topics'] ));
! $retval .= $adminmenu->parse( 'item', 'option' );
}
if( SEC_hasrights( 'link.edit' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/link.php' );
$adminmenu->set_var( 'option_label', $LANG01[14] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['links'] ));
! $retval .= $adminmenu->parse( 'item', 'option' );
}
if( SEC_hasrights( 'event.edit' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/event.php') ;
$adminmenu->set_var( 'option_label', $LANG01[15] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['events'] ));
! $retval .= $adminmenu->parse( 'item', 'option' );
}
if( SEC_hasrights( 'poll.edit' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/poll.php' );
$adminmenu->set_var( 'option_label', $LANG01[16] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['pollquestions'] ));
! $retval .= $adminmenu->parse( 'item', 'option' );
}
if( SEC_hasrights( 'user.edit' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/user.php' );
$adminmenu->set_var( 'option_label', $LANG01[17] );
$adminmenu->set_var( 'option_count', ( DB_count( $_TABLES['users'] ) -1 ));
! $retval .= $adminmenu->parse( 'item', 'option' );
}
if( SEC_hasrights( 'group.edit' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/group.php' );
$adminmenu->set_var( 'option_label', $LANG01[96] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['groups'] ));
! $retval .= $adminmenu->parse( 'item', 'option' );
}
if( SEC_hasrights( 'user.mail' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/mail.php' );
$adminmenu->set_var( 'option_label', $LANG01[105] );
$adminmenu->set_var( 'option_count', 'N/A' );
! $retval .= $adminmenu->parse( 'item', 'option' );
}
if( SEC_hasrights( 'plugin.edit' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/plugins.php' );
$adminmenu->set_var( 'option_label', $LANG01[77] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['plugins'] ));
! $retval .= $adminmenu->parse( 'item', 'option' );
}
--- 2270,2393 ----
}
! // now handle submissions for plugins
$num = $num + PLG_getSubmissionCount();
! $url = $_CONF['site_admin_url'] . '/moderation.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[10] );
$adminmenu->set_var( 'option_count', $num );
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
if( SEC_hasrights( 'story.edit' ))
{
! $url = $_CONF['site_admin_url'] . '/story.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[11] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['stories'] ));
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
if( SEC_hasrights( 'block.edit' ))
{
! $url = $_CONF['site_admin_url'] . '/block.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[12] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['blocks'] ));
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
if( SEC_hasrights( 'topic.edit' ))
{
! $url = $_CONF['site_admin_url'] . '/topic.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[13] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['topics'] ));
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
if( SEC_hasrights( 'link.edit' ))
{
! $url = $_CONF['site_admin_url'] . '/link.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[14] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['links'] ));
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
if( SEC_hasrights( 'event.edit' ))
{
! $url = $_CONF['site_admin_url'] . '/event.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[15] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['events'] ));
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
if( SEC_hasrights( 'poll.edit' ))
{
! $url = $_CONF['site_admin_url'] . '/poll.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[16] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['pollquestions'] ));
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
if( SEC_hasrights( 'user.edit' ))
{
! $url = $_CONF['site_admin_url'] . '/user.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[17] );
$adminmenu->set_var( 'option_count', ( DB_count( $_TABLES['users'] ) -1 ));
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
if( SEC_hasrights( 'group.edit' ))
{
! $url = $_CONF['site_admin_url'] . '/group.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[96] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['groups'] ));
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
if( SEC_hasrights( 'user.mail' ))
{
! $url = $_CONF['site_admin_url'] . '/mail.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[105] );
$adminmenu->set_var( 'option_count', 'N/A' );
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
if( SEC_hasrights( 'plugin.edit' ))
{
! $url = $_CONF['site_admin_url'] . '/plugins.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[77] );
$adminmenu->set_var( 'option_count', DB_count( $_TABLES['plugins'] ));
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
***************
*** 2366,2370 ****
}
! $retval .= $adminmenu->parse( 'item', 'option', true );
next( $plugin_options );
--- 2410,2415 ----
}
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $plg->adminurl ) ? 'current' : 'option', true );
next( $plugin_options );
***************
*** 2373,2381 ****
if( $_CONF['allow_mysqldump'] == 1 AND SEC_inGroup( 'Root' ))
{
! $adminmenu->set_var( 'option_url', $_CONF['site_admin_url'] . '/database.php' );
$adminmenu->set_var( 'option_label', $LANG01[103] );
$adminmenu->set_var( 'option_count', 'N/A' );
! $retval .= $adminmenu->parse( 'item', 'option' );
}
--- 2418,2428 ----
if( $_CONF['allow_mysqldump'] == 1 AND SEC_inGroup( 'Root' ))
{
! $url = $_CONF['site_admin_url'] . '/database.php';
! $adminmenu->set_var( 'option_url', $url );
$adminmenu->set_var( 'option_label', $LANG01[103] );
$adminmenu->set_var( 'option_count', 'N/A' );
! $retval .= $adminmenu->parse( 'item',
! ( $thisUrl == $url ) ? 'current' : 'option' );
}
More information about the geeklog-cvs
mailing list