[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] filemanager/inc class.bofilemanager.inc.php cla...
From: |
Caeies |
Subject: |
[Phpgroupware-cvs] filemanager/inc class.bofilemanager.inc.php cla... |
Date: |
Wed, 24 Jan 2007 17:15:54 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: filemanager
Changes by: Caeies <Caeies> 07/01/24 17:15:53
Modified files:
inc : class.bofilemanager.inc.php
class.uifilemanager.inc.php
hook_preferences.inc.php
Log message:
some call to link() fixed
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/filemanager/inc/class.bofilemanager.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/filemanager/inc/class.uifilemanager.inc.php?cvsroot=phpgroupware&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/filemanager/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.18&r2=1.19
Patches:
Index: class.bofilemanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/class.bofilemanager.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.bofilemanager.inc.php 29 Nov 2006 15:32:21 -0000 1.31
+++ class.bofilemanager.inc.php 24 Jan 2007 17:15:53 -0000 1.32
@@ -8,7 +8,7 @@
* @copyright Portions Copyright (C) 2000-2005 Free Software
Foundation, Inc http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package filemanager
- * @version $Id: class.bofilemanager.inc.php,v 1.31 2006/11/29 15:32:21
Caeies Exp $
+ * @version $Id: class.bofilemanager.inc.php,v 1.32 2007/01/24 17:15:53
Caeies Exp $
* @internal Based on phpWebhosting
*/
@@ -837,14 +837,14 @@
return $result;
}
- $ls_array = $GLOBALS['phpgw']->vfs->ls(array(
- 'string' =>
$this->path.SEP.$this->createdir,
+ $dir_to_check = array(
+ 'string' =>
$this->path.SEP.$this->createdir.SEP,
'relatives' =>
array(RELATIVE_NONE),
'checksubdirs' => False,
- 'nofiles' => True));
+ 'nofiles' => True);
+ $ls_array =
$GLOBALS['phpgw']->vfs->ls($dir_to_check);
$fileinfo = (is_array($ls_array) &&
isset($ls_array[0])) ? $ls_array[0] : array();
-
if (is_array($fileinfo) &&
isset($fileinfo['name']))
{
if ($fileinfo['mime_type'] !=
'Directory')
Index: class.uifilemanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/class.uifilemanager.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- class.uifilemanager.inc.php 22 Dec 2006 23:52:48 -0000 1.38
+++ class.uifilemanager.inc.php 24 Jan 2007 17:15:53 -0000 1.39
@@ -8,7 +8,7 @@
* @copyright Portions Copyright (C) 2000-2005 Free Software Foundation,
Inc http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package filemanager
- * @version $Id: class.uifilemanager.inc.php,v 1.38 2006/12/22 23:52:48
Caeies Exp $
+ * @version $Id: class.uifilemanager.inc.php,v 1.39 2007/01/24 17:15:53
Caeies Exp $
* @internal Based on phpWebhosting
*/
@@ -1416,7 +1416,7 @@
$data = array
(
'error' => '',
- 'action_url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.preferences'),
+ 'action_url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'filemanager.uifilemanager.preferences')),
'table' => array('width' =>
'50%','table_head' => $table_head ,'table_row' => $table_rows,'table_footer' =>
$table_footer)
);
//_debug_array($data);
@@ -1553,7 +1553,7 @@
$data = array
(
'error' => $errormsg,
- 'action_url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.admin'),
+ 'action_url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'filemanager.uifilemanager.admin')),
'table' => array('width' =>
'50%','table_head' => $table_head ,'table_row' => $table_rows,'table_footer' =>
$table_footer)
);
//_debug_array($data);
@@ -1724,7 +1724,7 @@
$data = array
(
'error' => $errormsg,
- 'action_url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.edit_actions'),
+ 'action_url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'filemanager.uifilemanager.edit_actions')),
'table' => array('width' =>
'50%','table_head' => $table_head ,'table_row' => $table_rows,'table_footer' =>
$table_footer)
);
//_debug_array($data);
Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/hook_preferences.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- hook_preferences.inc.php 18 Sep 2006 09:31:02 -0000 1.18
+++ hook_preferences.inc.php 24 Jan 2007 17:15:53 -0000 1.19
@@ -5,12 +5,12 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package filemanager
- * @version $Id: hook_preferences.inc.php,v 1.18 2006/09/18 09:31:02
sigurdne Exp $
+ * @version $Id: hook_preferences.inc.php,v 1.19 2007/01/24 17:15:53
Caeies Exp $
*/
{
$file = array('Preferences' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'filemanager.uifilemanager.preferences')));
- //'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname));
+ //'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'preferences.uiaclprefs.index', 'acl_app' => $appname)));
//Do not modify below this line
display_section($appname,$file);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] filemanager/inc class.bofilemanager.inc.php cla...,
Caeies <=