[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.225,1.226

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv12357

Modified Files:
	lib-common.php 
Log Message:
Changes to make the User Functions block use the useroption_off.thtml template file


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.225
retrieving revision 1.226
diff -C2 -d -r1.225 -r1.226
*** lib-common.php	8 Jun 2003 18:20:06 -0000	1.225
--- lib-common.php	16 Jun 2003 17:20:45 -0000	1.226
***************
*** 2042,2051 ****
  function COM_userMenu( $help='', $title='' )
  {
!     global $_TABLES, $_USER, $_CONF, $LANG01;
  
      if( $_USER['uid'] > 1 )
      {
!         $adminmenu = new Template( $_CONF['path_layout'] );
!         $adminmenu->set_file( 'option', 'useroption.thtml' );
  
          if( empty( $title ))
--- 2042,2052 ----
  function COM_userMenu( $help='', $title='' )
  {
!     global $_TABLES, $_USER, $_CONF, $LANG01, $HTTP_SERVER_VARS;
  
      if( $_USER['uid'] > 1 )
      {
!         $usermenu = new Template( $_CONF['path_layout'] );
!         $usermenu->set_file( array( 'option' => 'useroption.thtml',
!                                     'current' => 'useroption_off.thtml' ));
  
          if( empty( $title ))
***************
*** 2054,2066 ****
          }
  
          $retval .= COM_startBlock( $title, $help, COM_getBlockTemplate( 'user_block', 'header' ));
  
          if( $_CONF['personalcalendars'] == 1 )
          {
!             $adminmenu->set_var( 'option_url', $_CONF['site_url'] . '/calendar.php?mode=personal' );
!             $adminmenu->set_var( 'option_label', $LANG01[66] );
!             $adminmenu->set_var( 'option_count', '' );
  
-             $retval .= $adminmenu->parse( 'item', 'option' );
          }
  
--- 2055,2087 ----
          }
  
+         // 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'];
+         }
+ 
          $retval .= COM_startBlock( $title, $help, COM_getBlockTemplate( 'user_block', 'header' ));
  
          if( $_CONF['personalcalendars'] == 1 )
          {
!             $url = $_CONF['site_url'] . '/calendar.php?mode=personal';
!             $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' );
!             }
  
          }
  
***************
*** 2073,2107 ****
          {
              $plg = current( $plugin_options );
!             $adminmenu->set_var( 'option_url', $plg->adminurl );
!             $adminmenu->set_var( 'option_label', $plg->adminlabel );
  
!             if( !empty($plg->numsubmissions ))
              {
!                 $adminmenu->set_var( 'option_count', '(' . $plg->numsubmissions . ')' );
              }
              else
              {
!                 $adminmenu->set_var( 'option_count', '' );
              }
  
!             $retval .= $adminmenu->parse( 'item', 'option' );
! 
              next( $plugin_options );
          }
  
!         $adminmenu->set_var( 'option_url', $_CONF['site_url'] . '/usersettings.php?mode=edit' );
!         $adminmenu->set_var( 'option_label', $LANG01[48] );
!         $adminmenu->set_var( 'option_count', '' );
!         $retval .= $adminmenu->parse( 'item', 'option' );
  
!         $adminmenu->set_var( 'option_url', $_CONF['site_url'] . '/usersettings.php?mode=preferences' );
!         $adminmenu->set_var( 'option_label', $LANG01[49] );
!         $adminmenu->set_var( 'option_count', '' );
!         $retval .= $adminmenu->parse( 'item', 'option' );
  
!         $adminmenu->set_var( 'option_url', $_CONF['site_url'] . '/users.php?mode=logout' );
!         $adminmenu->set_var( 'option_label', $LANG01[19] );
!         $adminmenu->set_var( 'option_count', '' );
!         $retval .= $adminmenu->parse( 'item', 'option' );
  
          $retval .=  COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
--- 2094,2154 ----
          {
              $plg = current( $plugin_options );
!             $usermenu->set_var( 'option_label', $plg->adminlabel );
  
!             if( !empty( $plg->numsubmissions ))
              {
!                 $usermenu->set_var( 'option_count', '(' . $plg->numsubmissions . ')' );
              }
              else
              {
!                 $usermenu->set_var( 'option_count', '' );
              }
  
!             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' );
!             }
              next( $plugin_options );
          }
  
!         $url = $_CONF['site_url'] . '/usersettings.php?mode=edit';
!         $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' );
!         }
  
!         $url = $_CONF['site_url'] . '/usersettings.php?mode=preferences';
!         $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' );
!         }
  
!         $url = $_CONF['site_url'] . '/users.php?mode=logout';
!         $usermenu->set_var( 'option_label', $LANG01[19] );
!         $usermenu->set_var( 'option_count', '' );
!         $usermenu->set_var( 'option_url', $url );
!         $retval .= $usermenu->parse( 'item', 'option' );
  
          $retval .=  COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));