[Phpgroupware-cvs] CVS: wiki/lib main.php,1.5,1.6 url.php,1.2,1.3

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/wiki/lib
In directory subversions:/tmp/cvs-serv15670/lib

Modified Files:
        main.php url.php 
Log Message:
wiki works now with session in cookie's on AND off


Index: main.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/lib/main.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** main.php    4 Mar 2003 22:55:29 -0000       1.5
--- main.php    6 Mar 2003 17:38:20 -0000       1.6
***************
*** 9,14 ****
  $HTTP_REFERER = isset($HTTP_SERVER_VARS['HTTP_REFERER'])
                  ? $HTTP_SERVER_VARS['HTTP_REFERER'] : '';
- $QUERY_STRING = isset($HTTP_SERVER_VARS['QUERY_STRING'])
-                 ? $HTTP_SERVER_VARS['QUERY_STRING'] : '';
  $REMOTE_ADDR  = isset($HTTP_SERVER_VARS['REMOTE_ADDR'])
                  ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : '';
--- 9,12 ----
***************
*** 88,94 ****
                );
  
- // Default action and page names.
- if(empty($page) && empty($action))
-   { $page = $QUERY_STRING; }
  if(empty($action))
    { $action = 'view'; }
--- 86,89 ----

Index: url.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/lib/url.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** url.php     3 Mar 2003 13:37:05 -0000       1.2
--- url.php     6 Mar 2003 17:38:20 -0000       1.3
***************
*** 1,31 ****
  <?php
! // Users may redefine these functions if they wish to change the
! // URL scheme, e.g., to enable links like:
! //
! //     http://somewiki.org/PageName
! //
! // The new versions of the relevant functions should be defined in
! // config.php.  Those functions that are redefined will not be
! // redefined here.
! if(!isset($ViewBase))
!   { $ViewBase    = $ScriptBase . '?page='; }
! if(!isset($EditBase))
!   { $EditBase    = $ScriptBase . '?action=edit&page='; }
! if(!isset($HistoryBase))
!   { $HistoryBase = $ScriptBase . '?action=history&page='; }
! if(!isset($FindScript))
!   { $FindScript  = $ScriptBase . '?action=find'; }
! if(!isset($FindBase))
    { $FindBase    = $FindScript . '&find='; }
! if(!isset($SaveBase))
!   { $SaveBase    = $ScriptBase . '?action=save&page='; }
! if(!isset($DiffScript))
!   { $DiffScript  = $ScriptBase . '?action=diff'; }
! if(!isset($PrefsScript))
!   { $PrefsScript = $ScriptBase . '?action=prefs'; }
! if(!isset($StyleScript))
!   { $StyleScript = $ScriptBase . '?action=style'; }
  
! if(!function_exists('viewURL'))
  {
  function viewURL($page, $version = '', $full = '')
--- 1,31 ----
  <?php
! /* $Id$ */
! 
! // Under phpgw these URL's are NOT configurable, you can set the phpgw 
install-patch in setup
! 
! $ScriptBase = $GLOBALS['phpgw']->link('/wiki/index.php');
! $ScriptBase .= strstr($ScriptBase,'?') ? '&' : '?';
! $AdminScript = $GLOBALS['phpgw']->link('/wiki/admin/index.php');
! 
! //if(!isset($ViewBase))
!   { $ViewBase    = $ScriptBase . 'page='; }
! //if(!isset($EditBase))
!   { $EditBase    = $ScriptBase . 'action=edit&page='; }
! //if(!isset($HistoryBase))
!   { $HistoryBase = $ScriptBase . 'action=history&page='; }
! //if(!isset($FindScript))
!   { $FindScript  = $ScriptBase . 'action=find'; }
! //if(!isset($FindBase))
    { $FindBase    = $FindScript . '&find='; }
! //if(!isset($SaveBase))
!   { $SaveBase    = $ScriptBase . 'action=save&page='; }
! //if(!isset($DiffScript))
!   { $DiffScript  = $ScriptBase . 'action=diff'; }
! //if(!isset($PrefsScript))
!   { $PrefsScript = $ScriptBase . 'action=prefs'; }
! //if(!isset($StyleScript))
!   { $StyleScript = $ScriptBase . 'action=style'; }
  
! //if(!function_exists('viewURL'))
  {
  function viewURL($page, $version = '', $full = '')
***************
*** 39,43 ****
  }
  
! if(!function_exists('editURL'))
  {
  function editURL($page, $version = '')
--- 39,43 ----
  }
  
! //if(!function_exists('editURL'))
  {
  function editURL($page, $version = '')
***************
*** 50,54 ****
  }
  
! if(!function_exists('historyURL'))
  {
  function historyURL($page, $full = '')
--- 50,54 ----
  }
  
! //if(!function_exists('historyURL'))
  {
  function historyURL($page, $full = '')
***************
*** 61,65 ****
  }
  
! if(!function_exists('findURL'))
  {
  function findURL($page)
--- 61,65 ----
  }
  
! //if(!function_exists('findURL'))
  {
  function findURL($page)
***************
*** 71,75 ****
  }
  
! if(!function_exists('saveURL'))
  {
  function saveURL($page)
--- 71,75 ----
  }
  
! //if(!function_exists('saveURL'))
  {
  function saveURL($page)
***************
*** 81,83 ****
  }
  
! ?>
--- 81,83 ----
  }
  
! ?>
\ No newline at end of file