[Phpgroupware-cvs] wiki/lib main.php,1.9 init.php,1.9

[skwashd]

Update of wiki/lib

Modified Files:
     Branch: MAIN
            main.php lines: +61 -61
            init.php lines: +14 -5

Log Message:
merge from 16

====================================================
Index: wiki/lib/main.php
diff -u wiki/lib/main.php:1.8 wiki/lib/main.php:1.9
--- wiki/lib/main.php:1.8       Wed Jul  2 22:23:29 2003
+++ wiki/lib/main.php   Sun May 15 12:55:31 2005
@@ -6,66 +6,66 @@
 // (Which is better form in case the admin has warnings cranked all the
 // way up).

-$HTTP_REFERER = isset($HTTP_SERVER_VARS['HTTP_REFERER'])
-                ? $HTTP_SERVER_VARS['HTTP_REFERER'] : '';
-$REMOTE_ADDR  = isset($HTTP_SERVER_VARS['REMOTE_ADDR'])
-                ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : '';
-
-$action       = isset($HTTP_GET_VARS['action'])
-                ? $HTTP_GET_VARS['action'] : '';
-$page         = isset($HTTP_GET_VARS['page'])
-                ? $HTTP_GET_VARS['page'] : '';
-$ver1         = isset($HTTP_GET_VARS['ver1'])
-                ? $HTTP_GET_VARS['ver1'] : '';
-$ver2         = isset($HTTP_GET_VARS['ver2'])
-                ? $HTTP_GET_VARS['ver2'] : '';
-$find         = isset($HTTP_GET_VARS['find'])
-                ? $HTTP_GET_VARS['find'] : '';
-$version      = isset($HTTP_GET_VARS['version'])
-                ? $HTTP_GET_VARS['version'] : '';
-$full         = isset($HTTP_GET_VARS['full'])
-                ? $HTTP_GET_VARS['full'] : '';
-$min          = isset($HTTP_GET_VARS['min'])
-                ? $HTTP_GET_VARS['min'] : '';
-$days         = isset($HTTP_GET_VARS['days'])
-                ? $HTTP_GET_VARS['days'] : '';
-
-$Preview      = isset($HTTP_POST_VARS['Preview'])
-                ? $HTTP_POST_VARS['Preview'] : '';
-$Save         = isset($HTTP_POST_VARS['Save'])
-                ? $HTTP_POST_VARS['Save'] : '';
-$SaveAndContinue = isset($HTTP_POST_VARS['SaveAndContinue'])
-                ? $HTTP_POST_VARS['SaveAndContinue'] : '';
-$archive      = isset($HTTP_POST_VARS['archive'])
-                ? $HTTP_POST_VARS['archive'] : '';
-$auth         = isset($HTTP_POST_VARS['auth'])
-                ? $HTTP_POST_VARS['auth'] : '';
-$categories   = isset($HTTP_POST_VARS['categories'])
-                ? $HTTP_POST_VARS['categories'] : '';
-$cols         = isset($HTTP_POST_VARS['cols'])
-                ? $HTTP_POST_VARS['cols'] : '';
-$comment      = isset($HTTP_POST_VARS['comment'])
-                ? $HTTP_POST_VARS['comment'] : '';
-$days         = isset($HTTP_POST_VARS['days'])
-                ? $HTTP_POST_VARS['days'] : $days;
-$discard      = isset($HTTP_POST_VARS['discard'])
-                ? $HTTP_POST_VARS['discard'] : '';
-$document     = isset($HTTP_POST_VARS['document'])
-                ? $HTTP_POST_VARS['document'] : '';
-$hist         = isset($HTTP_POST_VARS['hist'])
-                ? $HTTP_POST_VARS['hist'] : '';
-$min          = isset($HTTP_POST_VARS['min'])
-                ? $HTTP_POST_VARS['min'] : $min;
-$nextver      = isset($HTTP_POST_VARS['nextver'])
-                ? $HTTP_POST_VARS['nextver'] : '';
-$rows         = isset($HTTP_POST_VARS['rows'])
-                ? $HTTP_POST_VARS['rows'] : '';
-$tzoff        = isset($HTTP_POST_VARS['tzoff'])
-                ? $HTTP_POST_VARS['tzoff'] : '';
-$user         = isset($HTTP_POST_VARS['user'])
-                ? $HTTP_POST_VARS['user'] : '';
-$referrer     = isset($HTTP_POST_VARS['referrer'])
-                ? $HTTP_POST_VARS['referrer'] : '';
+$HTTP_REFERER = isset($_SERVER['HTTP_REFERER'])
+                ? $_SERVER['HTTP_REFERER'] : '';
+$REMOTE_ADDR  = isset($_SERVER['REMOTE_ADDR'])
+                ? $_SERVER['REMOTE_ADDR'] : '';
+
+$action       = isset($_GET['action'])
+                ? $_GET['action'] : '';
+$page         = isset($_GET['page'])
+                ? $_GET['page'] : '';
+$ver1         = isset($_GET['ver1'])
+                ? $_GET['ver1'] : '';
+$ver2         = isset($_GET['ver2'])
+                ? $_GET['ver2'] : '';
+$find         = isset($_GET['find'])
+                ? $_GET['find'] : '';
+$version      = isset($_GET['version'])
+                ? $_GET['version'] : '';
+$full         = isset($_GET['full'])
+                ? $_GET['full'] : '';
+$min          = isset($_GET['min'])
+                ? $_GET['min'] : '';
+$days         = isset($_GET['days'])
+                ? $_GET['days'] : '';
+
+$Preview      = isset($_POST['Preview'])
+                ? $_POST['Preview'] : '';
+$Save         = isset($_POST['Save'])
+                ? $_POST['Save'] : '';
+$SaveAndContinue = isset($_POST['SaveAndContinue'])
+                ? $_POST['SaveAndContinue'] : '';
+$archive      = isset($_POST['archive'])
+                ? $_POST['archive'] : '';
+$auth         = isset($_POST['auth'])
+                ? $_POST['auth'] : '';
+$categories   = isset($_POST['categories'])
+                ? $_POST['categories'] : '';
+$cols         = isset($_POST['cols'])
+                ? $_POST['cols'] : '';
+$comment      = isset($_POST['comment'])
+                ? $_POST['comment'] : '';
+$days         = isset($_POST['days'])
+                ? $_POST['days'] : $days;
+$discard      = isset($_POST['discard'])
+                ? $_POST['discard'] : '';
+$document     = isset($_POST['document'])
+                ? $_POST['document'] : '';
+$hist         = isset($_POST['hist'])
+                ? $_POST['hist'] : '';
+$min          = isset($_POST['min'])
+                ? $_POST['min'] : $min;
+$nextver      = isset($_POST['nextver'])
+                ? $_POST['nextver'] : '';
+$rows         = isset($_POST['rows'])
+                ? $_POST['rows'] : '';
+$tzoff        = isset($_POST['tzoff'])
+                ? $_POST['tzoff'] : '';
+$user         = isset($_POST['user'])
+                ? $_POST['user'] : '';
+$referrer     = isset($_POST['referrer'])
+                ? $_POST['referrer'] : '';

 require('lib/init.php');
 require('parse/transforms.php');

====================================================
Index: wiki/lib/init.php
diff -u wiki/lib/init.php:1.8 wiki/lib/init.php:1.9
--- wiki/lib/init.php:1.8       Thu Mar 20 00:46:15 2003
+++ wiki/lib/init.php   Sun May 15 12:55:31 2005
@@ -6,7 +6,16 @@
 require('lib/defaults.php');
 require('config.php');         // this has to go into a admin-page

-$sessionid = 
(isset($GLOBALS['HTTP_GET_VARS']['sessionid'])?$GLOBALS['HTTP_GET_VARS']['sessionid']:(isset($GLOBALS['HTTP_COOKIE_VARS']['sessionid'])?$GLOBALS['HTTP_COOKIE_VARS']['sessionid']:''));
+$sessionid = (isset($_GET['sessionid']) ? $_GET['sessionid']
+               :(isset($_COOKIE['sessionid']) ? $_COOKIE['sessionid'] :'')
+       );
+if(empty($sessionid))
+{
+       $phpsessid = ini_get('session.name');
+       $sessionid = (isset($_GET[$phpsessid]) ? $_GET[$phpsessid]
+                       :(isset($_COOKIE[$phpsessid]) ? $_COOKIE[$phpsessid] 
:'')
+               );
+ }

 if ($sessionid || !(AnonymousSession == 'readonly' || AnonymousSession == 
'editable'))
 {
@@ -39,7 +48,7 @@
        }
        else
        {
-               
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/wiki/index.php',$GLOBALS['HTTP_SERVER_VARS']['QUERY_STRING']));
+               
$GLOBALS['phpgw']->redirect_link('/wiki/index.php',$_SERVER['QUERY_STRING']);
        }
        $GLOBALS['phpgw']->common->phpgw_exit();
 }
@@ -91,8 +100,8 @@

 // Read user preferences from cookie.

-$prefstr = isset($HTTP_COOKIE_VARS[$CookieName])
-           ? $HTTP_COOKIE_VARS[$CookieName] : '';
+$prefstr = isset($_COOKIE[$CookieName])
+           ? $_COOKIE[$CookieName] : '';

 if(!empty($prefstr))
 {