[Phpgroupware-cvs] folders/inc/class.uifolders.inc.php, 1.5

[nomail]

Update of /folders/inc
Modified Files:
        Branch: 
          class.uifolders.inc.php

date: 2004/04/23 09:34:44;  author: fipsfuchs;  state: Exp;  lines: +9 -9

Log Message:
merge with 0.9.16 branch
=====================================================================
Index: folders/inc/class.uifolders.inc.php
diff -u folders/inc/class.uifolders.inc.php:1.4 
folders/inc/class.uifolders.inc.php:1.5
--- folders/inc/class.uifolders.inc.php:1.4     Thu Jan  8 10:02:00 2004
+++ folders/inc/class.uifolders.inc.php Fri Apr 23 09:34:44 2004
@@ -51,8 +51,8 @@
                 */
                function enableFolders()
                {
-                       $GLOBALS['phpgw']->session->appsession('folders', 
'mode', 'enabled');
-                       Header('Location: 
'.$GLOBALS['phpgw']->session->appsession('folders', 'link'));
+                       $GLOBALS['phpgw']->session->appsession('mode', 
'folders', 'enabled');
+                       Header('Location: 
'.$GLOBALS['phpgw']->session->appsession('link', 'folders'));
                }
 
                /**
@@ -61,8 +61,8 @@
                 */
                function disableFolders()
                {
-                       $GLOBALS['phpgw']->session->appsession('folders', 
'mode', 'disabled');
-                       Header('Location: 
'.$GLOBALS['phpgw']->session->appsession('folders', 'link'));
+                       $GLOBALS['phpgw']->session->appsession('mode', 
'folders', 'disabled');
+                       Header('Location: 
'.$GLOBALS['phpgw']->session->appsession('link', 'folders'));
                }
 
                /**
@@ -116,14 +116,14 @@
                        {
                                $httpMode = 'http://';
                        }
-                       $GLOBALS['phpgw']->session->appsession('folders', 
'link', $httpMode.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']); 
+                       $GLOBALS['phpgw']->session->appsession('link', 
'folders', $httpMode.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']); 
                        /* end of workaround */
                        
                        $this->t->set_root(PHPGW_SERVER_ROOT . 
'/folders/templates/default/'); // hardcoded path :-(
                        $this->t->set_file(array('helpers_t' => 'helpers.tpl'));
                        $this->t->set_block('helpers_t','link');
                        
-                       if ($GLOBALS['phpgw']->session->appsession('folders', 
'mode') == 'enabled')
+                       if 
(substr($GLOBALS['phpgw']->session->appsession('mode', 'folders'),0,7) == 
'enabled')
                        {
                                $var['linkvalue'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=folders.uifolders.disablefolders');
                                $var['linkname']  = lang('modules');
@@ -146,7 +146,7 @@
                 */
                function get_folderMode()
                {
-                       if ( $GLOBALS['phpgw']->session->appsession('folders', 
'mode') == 'enabled' )
+                       if ( 
substr($GLOBALS['phpgw']->session->appsession('mode', 'folders'),0,7) == 
'enabled' )
                        {
                                return 'enabled';
                        }
@@ -155,4 +155,4 @@
                                return 'disabled';
                        }
                }
-       }
\ No newline at end of file
+       }