[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site config.inc.php,1.1,1.2 functions.inc.php,1.4,1.5 htaccess,1.2,1.3 relocate.php,1.3,NONE

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/sitemgr-site
In directory subversions:/tmp/cvs-serv10379

Modified Files:
        config.inc.php functions.inc.php htaccess 
Removed Files:
        relocate.php 
Log Message:
use Rewrite instead of ErrorDocument for pretifying URLs


Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/config.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** config.inc.php      17 Jan 2003 03:37:52 -0000      1.1
--- config.inc.php      4 Feb 2003 15:46:51 -0000       1.2
***************
*** 7,11 ****
                // add trailing slash
                'phpgw_path'           => '../../',
!               'htaccess_404'         => 'disabled'
        );
  
--- 7,11 ----
                // add trailing slash
                'phpgw_path'           => '../../',
!               'htaccess_rewrite'         => 'enabled'
        );
  

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/functions.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** functions.inc.php   17 Jan 2003 03:37:52 -0000      1.4
--- functions.inc.php   4 Feb 2003 15:46:51 -0000       1.5
***************
*** 39,45 ****
  
                if (!$page_name == '' &&
!                       $GLOBALS['sitemgr_info']['htaccess_404']=='enabled')
                {
!                       $url = '/'.$page_name.'/';
                        $newextravars=array();
                        while (list($key,$value) = each($extravars))
--- 39,45 ----
  
                if (!$page_name == '' &&
!                       $GLOBALS['sitemgr_info']['htaccess_rewrite']=='enabled')
                {
!                       $url = '/'.$page_name;
                        $newextravars=array();
                        while (list($key,$value) = each($extravars))
***************
*** 51,55 ****
                        }
                        $extravars = $newextravars;
- 
                }
  
--- 51,54 ----

Index: htaccess
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/htaccess,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** htaccess    14 Sep 2002 07:25:21 -0000      1.2
--- htaccess    4 Feb 2003 15:46:51 -0000       1.3
***************
*** 1,21 ****
  # If you want your URLs to look like this:
! #   http://mymachine.com/page1/
  # instead of like this:
  #   http://mymachine.com/index.php?page_name=page1
  # and you're running Apache, then customize and add
! # the below line to your .htaccess file, or
  # copy this file to .htaccess.  Note that your
  # Apache web server needs to be setup to read
! # .htaccess files and allow use of the ErrorDocument
! # directive.  If it doesn't work for you, don't
! # start asking me questions about it....
! # 
! # The other thing you need to do is to edit the
! # relocate.php file's top two lines.  
! #
! # Also, if you want your links to be pretty, change
! # the htaccess_404 link in config.inc.php to 'enabled'
  # from 'disabled'.
! #
! # mr_e
! ErrorDocument 404 /path/to/sitemgr-site/relocate.php
--- 1,17 ----
  # If you want your URLs to look like this:
! #   http://mymachine.com/page1
  # instead of like this:
  #   http://mymachine.com/index.php?page_name=page1
  # and you're running Apache, then customize and add
! # the below lines to your .htaccess file, or
  # copy this file to .htaccess.  Note that your
  # Apache web server needs to be setup to read
! # .htaccess files and allow use of the RewriteEngine
! # directive (AllowOverride FileInfo). 
! # you have to change the RewriteBase directive to the URI 
! # of your sitemgr install, and you have to change
! # the htaccess_rewrite variable in config.inc.php to 'enabled'
  # from 'disabled'.
! RewriteEngine On
! RewriteBase /
! RewriteRule ^([^/]*)/$ index.php?page_name=$1&%{QUERY_STRING}

--- relocate.php DELETED ---