phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] sitemgr/sitemgr-site config.inc.php [skwashd-16-compa


From: Dave Hall
Subject: [Phpgroupware-cvs] sitemgr/sitemgr-site config.inc.php [skwashd-16-compat]
Date: Sat, 12 Aug 2006 02:18:53 +0000

CVSROOT:        /cvsroot/phpgroupware
Module name:    sitemgr
Branch:         skwashd-16-compat
Changes by:     Dave Hall <skwashd>     06/08/12 02:18:53

Modified files:
        sitemgr-site   : config.inc.php 

Log message:
        superglobals fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/sitemgr/sitemgr-site/config.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.3.2.4&r2=1.3.2.4.4.1

Patches:
Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/config.inc.php,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.4.4.1
diff -u -b -r1.3.2.4 -r1.3.2.4.4.1
--- config.inc.php      18 Jan 2004 04:11:40 -0000      1.3.2.4
+++ config.inc.php      12 Aug 2006 02:18:52 -0000      1.3.2.4.4.1
@@ -4,7 +4,8 @@
        * the site generator.                                       *
        \***********************************************************/
 
-       $sitemgr_info = array(
+       $sitemgr_info = array
+       (
                // add trailing slash
                'phpgw_path'            => '../../',
                'htaccess_rewrite'      => False,
@@ -29,7 +30,7 @@
                include(PHPGW_SERVER_ROOT . '/phpgwapi/inc/functions.inc.php');
                $GLOBALS['phpgw_info']['flags']['currentapp'] = 'sitemgr-site';
 
-               $site_url = 'http://' . 
preg_replace('/\/[^\/]*$/','',$_SERVER['SERVER_NAME'] . $_SERVER['PHP_SELF']) . 
'/';
+               $site_url = 'http://' . preg_replace('/\/[^\/]*$/', '', 
$_SERVER['SERVER_NAME'] . $_SERVER['PHP_SELF']) . '/';
 
                $GLOBALS['phpgw']->db->query("SELECT 
anonymous_user,anonymous_passwd FROM phpgw_sitemgr_sites WHERE site_url = 
'$site_url'");
                if ($GLOBALS['phpgw']->db->next_record())
@@ -39,23 +40,22 @@
                }
                else
                {
-                       die(lang('THERE IS NO WEBSITE CONFIGURED FOR URL %1.  
NOTIFY THE ADMINISTRATOR.',$site_url));
+                       die(lang('THERE IS NO WEBSITE CONFIGURED FOR URL %1.  
NOTIFY THE ADMINISTRATOR.', $site_url));
                }
                //this is useful when you changed the API session class to not 
overgeneralize the session cookies
-               if ($GLOBALS['HTTP_GET_VARS']['PHPSESSID'])
+               if ( isset($_GET['PHPSESSID']) && $_GET['PHPSESSID'] )
                {
-                       
$GLOBALS['phpgw']->session->phpgw_setcookie('PHPSESSID',$GLOBALS['HTTP_GET_VARS']['PHPSESSID']);
+                       
$GLOBALS['phpgw']->session->phpgw_setcookie('PHPSESSID', $_GET['PHPSESSID']);
                }
 
 
                if (! $GLOBALS['phpgw']->session->verify())
                {
-                       $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($anonymous_user,$anonymous_passwd, 'text');
+                       $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($anonymous_user, $anonymous_passwd, 'text');
                        if (!$GLOBALS['sessionid'])
                        {
                                die(lang('NO ANONYMOUS USER ACCOUNTS INSTALLED. 
 NOTIFY THE ADMINISTRATOR.'));
                                //exit;
                        }
-                       
//$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link($sitemgr_url . 
'index.php'));
                }
-               ?>
+?>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]