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

[Michael Totschnig <address@hidden>]

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

Modified Files:
        config.inc.php functions.inc.php htaccess 
Log Message:
Sorry: htaccess (rewriting URLS) should not be enables by default. Also: though 
a boolean could be more efficient.


Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/config.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** config.inc.php      4 Feb 2003 15:46:51 -0000       1.2
--- config.inc.php      4 Feb 2003 20:53:46 -0000       1.3
***************
*** 7,11 ****
                // add trailing slash
                'phpgw_path'           => '../../',
!               'htaccess_rewrite'         => 'enabled'
        );
  
--- 7,11 ----
                // add trailing slash
                'phpgw_path'           => '../../',
!               'htaccess_rewrite'         => False
        );
  

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/functions.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** functions.inc.php   4 Feb 2003 15:46:51 -0000       1.5
--- functions.inc.php   4 Feb 2003 20:53:47 -0000       1.6
***************
*** 39,43 ****
  
                if (!$page_name == '' &&
!                       $GLOBALS['sitemgr_info']['htaccess_rewrite']=='enabled')
                {
                        $url = '/'.$page_name;
--- 39,43 ----
  
                if (!$page_name == '' &&
!                       $GLOBALS['sitemgr_info']['htaccess_rewrite'])
                {
                        $url = '/'.$page_name;

Index: htaccess
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/htaccess,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** htaccess    4 Feb 2003 15:46:51 -0000       1.3
--- htaccess    4 Feb 2003 20:53:47 -0000       1.4
***************
*** 11,16 ****
  # 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 /
--- 11,16 ----
  # 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 True
! # from False.
  RewriteEngine On
  RewriteBase /