[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.247,1.248

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

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv1339

Modified Files:
	lib-common.php 
Log Message:
Changes to enable highlighting of current menu selection on IIS.


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.247
retrieving revision 1.248
diff -C2 -d -r1.247 -r1.248
*** lib-common.php	18 Aug 2003 14:34:31 -0000	1.247
--- lib-common.php	21 Aug 2003 21:19:46 -0000	1.248
***************
*** 1900,1908 ****
          if( empty( $thisUrl ))
          {
              $firstslash = strpos( $_CONF['site_url'], '/' );
              if( $firstslash + 1 == strrpos( $_CONF['site_url'], '/' ))
              {
                  // site is in the document root
!                 $thisUrl = $_CONF['site_url'] . $HTTP_SERVER_VARS['REQUEST_URI'];
              }
              else
--- 1900,1918 ----
          if( empty( $thisUrl ))
          {
+             $requestUri = $HTTP_SERVER_VARS['REQUEST_URI'];
+             if( empty( $HTTP_SERVER_VARS['REQUEST_URI'] ))
+             {
+                 $requestUri = $HTTP_SERVER_VARS['SCRIPT_NAME'];
+                 if( !empty( $HTTP_SERVER_VARS['QUERY_STRING'] ))
+                 {
+                     $requestUri .= '?' . $HTTP_SERVER_VARS['QUERY_STRING'];     
+                 }
+             }
+ 
              $firstslash = strpos( $_CONF['site_url'], '/' );
              if( $firstslash + 1 == strrpos( $_CONF['site_url'], '/' ))
              {
                  // site is in the document root
!                 $thisUrl = $_CONF['site_url'] . $requestUri;
              }
              else
***************
*** 1910,1915 ****
                  // extract server name first
                  $pos = strpos( $_CONF['site_url'], '/', $firstslash + 2 );
!                 $thisUrl = substr( $_CONF['site_url'], 0, $pos )
!                          . $HTTP_SERVER_VARS['REQUEST_URI'];
              }
          }
--- 1920,1924 ----
                  // extract server name first
                  $pos = strpos( $_CONF['site_url'], '/', $firstslash + 2 );
!                 $thisUrl = substr( $_CONF['site_url'], 0, $pos ) . $requestUri;
              }
          }
***************
*** 2061,2069 ****
          if( empty( $thisUrl ))
          {
              $firstslash = strpos( $_CONF['site_url'], '/' );
              if( $firstslash + 1 == strrpos( $_CONF['site_url'], '/' ))
              {
                  // site is in the document root
!                 $thisUrl = $_CONF['site_url'] . $HTTP_SERVER_VARS['REQUEST_URI'];
              }
              else
--- 2070,2088 ----
          if( empty( $thisUrl ))
          {
+             $requestUri = $HTTP_SERVER_VARS['REQUEST_URI'];
+             if( empty( $HTTP_SERVER_VARS['REQUEST_URI'] ))
+             {
+                 $requestUri = $HTTP_SERVER_VARS['SCRIPT_NAME'];
+                 if( !empty( $HTTP_SERVER_VARS['QUERY_STRING'] ))
+                 {
+                     $requestUri .= '?' . $HTTP_SERVER_VARS['QUERY_STRING'];     
+                 }
+             }
+ 
              $firstslash = strpos( $_CONF['site_url'], '/' );
              if( $firstslash + 1 == strrpos( $_CONF['site_url'], '/' ))
              {
                  // site is in the document root
!                 $thisUrl = $_CONF['site_url'] . $requestUri;
              }
              else
***************
*** 2071,2076 ****
                  // extract server name first
                  $pos = strpos( $_CONF['site_url'], '/', $firstslash + 2 );
!                 $thisUrl = substr( $_CONF['site_url'], 0, $pos )
!                          . $HTTP_SERVER_VARS['REQUEST_URI'];
              }
          }
--- 2090,2094 ----
                  // extract server name first
                  $pos = strpos( $_CONF['site_url'], '/', $firstslash + 2 );
!                 $thisUrl = substr( $_CONF['site_url'], 0, $pos ) . $requestUri;
              }
          }