[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] filemanager/inc class.uifilemanager.inc.php, 1.27 cla
From: |
ceb |
Subject: |
[Phpgroupware-cvs] filemanager/inc class.uifilemanager.inc.php, 1.27 class.uiaction_edit.inc.php, 1.10 |
Date: |
Sat, 12 Feb 2005 01:36:00 +0100 |
Update of filemanager/inc
Modified Files:
Branch: MAIN
class.uifilemanager.inc.php lines: +14 -13
class.uiaction_edit.inc.php lines: +2 -2
Log Message:
update
====================================================
Index: filemanager/inc/class.uifilemanager.inc.php
diff -u filemanager/inc/class.uifilemanager.inc.php:1.26
filemanager/inc/class.uifilemanager.inc.php:1.27
--- filemanager/inc/class.uifilemanager.inc.php:1.26 Fri Feb 11 00:29:41 2005
+++ filemanager/inc/class.uifilemanager.inc.php Sat Feb 12 00:36:23 2005
@@ -577,16 +577,21 @@
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,$file_icon)));
if ($file['mime_type']=='Directory')
{
-
$href = array('menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index',
-
'path' =>
$this->bofilemanager->path . $this->bofilemanager->dispsep . $file['name']);
+
$href = $GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
$this->bofilemanager->appname.'.ui'.
+
$this->bofilemanager->appname.'.index',
+
'path'
=> $this->bofilemanager->path . $this->bofilemanager->dispsep . $file['name']));
}
else
{
-
$href = Array( 'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.view',
-
'path' =>
urlencode($this->bofilemanager->path),'file' => urlencode($file['name']));
+
$href = '#';
+
$onClick = "open_popup('" . $GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction' =>
$this->bofilemanager->appname.'.ui'
+
.$this->bofilemanager->appname.'.view',
+
'path' => urlencode($this->bofilemanager->path),
+
'file' => urlencode($file['name']))) .
"','600','600');";
}
$file_output[$i]['name']['link'] = array('widget' => array('type' =>
'link','caption' => $file['name'],
-
'href'
=> $GLOBALS['phpgw']->link('/index.php', $href)));
+
'href' => $href,'onClick' => $onClick));
if($mime_parts[0] == 'text')
{
$href['menuaction'] =
$this->bofilemanager->appname.'.uiaction_edit.edit';
@@ -823,15 +828,11 @@
}
$this->index($edit);
}
+
function view()
{
- Header('Location: '.$GLOBALS['phpgw']->link(
- 'view.php',
- Array('path' =>
urlencode($this->bofilemanager->path),
- 'file' =>
urlencode($this->bofilemanager->file))
- )
- );
-
+ $GLOBALS['phpgw_info']['flags']['noframework'] = True;
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' =>
$GLOBALS['phpgw']->vfs->view(array('string' => $this->path.'/'.
$this->bofilemanager->file,'relatives' => array (RELATIVE_NONE)))));
}
function history()
====================================================
Index: filemanager/inc/class.uiaction_edit.inc.php
diff -u filemanager/inc/class.uiaction_edit.inc.php:1.9
filemanager/inc/class.uiaction_edit.inc.php:1.10
--- filemanager/inc/class.uiaction_edit.inc.php:1.9 Fri Feb 11 00:29:41 2005
+++ filemanager/inc/class.uiaction_edit.inc.php Sat Feb 12 00:36:23 2005
@@ -109,7 +109,7 @@
$vars = array();
if($_POST['preview'])
{
- $vars['preview'] = $content;
+ $vars['preview'] = nl2br($content);
$v[] = array('widget' => array('type' =>
'hidden','name'=> 'edit_file_content','value'=> $content));
}
elseif ($_POST['save'])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] filemanager/inc class.uifilemanager.inc.php, 1.27 class.uiaction_edit.inc.php, 1.10,
ceb <=