[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] folders/inc class.uifolders.inc.php
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] folders/inc class.uifolders.inc.php |
Date: |
Sat, 25 Nov 2006 16:27:04 +0000 |
CVSROOT: /sources/phpgroupware
Module name: folders
Changes by: Sigurd Nes <sigurdne> 06/11/25 16:27:04
Modified files:
inc : class.uifolders.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/folders/inc/class.uifolders.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
Patches:
Index: class.uifolders.inc.php
===================================================================
RCS file: /sources/phpgroupware/folders/inc/class.uifolders.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- class.uifolders.inc.php 10 May 2005 12:21:25 -0000 1.8
+++ class.uifolders.inc.php 25 Nov 2006 16:27:04 -0000 1.9
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2003,2005 Free Software Foundation
http://www.fsf.org/
* @license http://www.fsf.org/licenses/gpl.html GNU General Public License
* @package folders
- * @version $Id: class.uifolders.inc.php,v 1.8 2005/05/10 12:21:25 powerstat
Exp $
+ * @version $Id: class.uifolders.inc.php,v 1.9 2006/11/25 16:27:04 sigurdne
Exp $
*/
/**
@@ -89,10 +89,10 @@
$this->t->set_file(array('helpers_t' => 'helpers.tpl'));
$this->t->set_block('helpers_t','iframe');
- $parameters =
'menuaction=folders.uifolders.showfolders';
+ $parameters =
array('menuaction'=>'folders.uifolders.showfolders');
foreach($iframe_linkdata as $param_name => $param_value)
{
- $parameters .= '&'.$param_name.'='.$param_value;
+ $parameters[$param_name] = $param_value;
}
$hookAppLinkData =
$GLOBALS['phpgw']->hooks->process('getFolderLinkData');
@@ -105,7 +105,7 @@
while(list($link_param_name, $link_param_value)
= each($app_linkdata))
{
- $parameters .=
'&'.$app_name.'_'.$link_param_name.'='.$link_param_value;
+
$parameters[$app_name.'_'.$link_param_name] = $link_param_value;
}
}
@@ -123,7 +123,7 @@
*/
function get_switchlink()
{
- $httpMode = $_SERVER['HTTPS'] ? 'https://' : 'http://';
+ $httpMode = (isset($_SERVER['HTTPS']) ? 'https://' :
'http://');
$GLOBALS['phpgw']->session->appsession('link',
'folders', $httpMode.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
/* end of workaround */
@@ -138,13 +138,13 @@
$logoutbutton = '<input type="button"
id="logoutlink" value="'.$logouttitle.'"
onClick="self.location.href=\''.$logouturl.'\'"> ';
$var['logoutbutton'] = $logoutbutton;
- $var['linkvalue'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=folders.uifolders.disablefolders');
+ $var['linkvalue'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'folders.uifolders.disablefolders'));
$var['linkname'] = lang('modules');
}
else
{
$var['logoutbutton'] = '';
- $var['linkvalue'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=folders.uifolders.enablefolders');
+ $var['linkvalue'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'folders.uifolders.enablefolders'));
$var['linkname'] = lang('folders');
}
$this->t->set_var($var);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] folders/inc class.uifolders.inc.php,
Sigurd Nes <=