|
| From: | skwashd |
| Subject: | [Phpgroupware-cvs] filemanager/inc class.uifilemanager.inc.php, 1.33 class.bofilemanager.inc.php, 1.25 |
| Date: | Mon, 11 Jul 2005 02:56:00 +0200 |
Update of filemanager/inc
Modified Files:
Branch: MAIN
class.uifilemanager.inc.php lines: +50 -50
class.bofilemanager.inc.php lines: +6 -7
Log Message:
fix currentapp which break fm when called from another app
====================================================
Index: filemanager/inc/class.uifilemanager.inc.php
diff -u filemanager/inc/class.uifilemanager.inc.php:1.32
filemanager/inc/class.uifilemanager.inc.php:1.33
--- filemanager/inc/class.uifilemanager.inc.php:1.32 Thu Apr 28 20:45:53 2005
+++ filemanager/inc/class.uifilemanager.inc.php Mon Jul 11 00:56:28 2005
@@ -5,7 +5,7 @@
* @author Mark A Peters <address@hidden>
* @author Jonathon Sim <address@hidden>
* @author Bettina Gille <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc
http://www.fsf.org/
+ * @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$
@@ -26,13 +26,13 @@
{
var $public_functions = array
(
- 'index' => True,
- 'action' => True,
- 'history' => True,
- 'view' => True,
- 'edit' => True,
+ 'index' => True,
+ 'action' => True,
+ 'history' => True,
+ 'view' => True,
+ 'edit' => True,
'preferences' => True,
- 'admin' => True,
+ 'admin' => True,
'edit_actions' => True
);
@@ -40,43 +40,43 @@
var $browser;
var $mime_ico = array
(
- 'application/pdf' =>
'pdf',
- 'application/postscript' => 'postscript',
- 'application/msword' => 'word',
- 'application/vnd.ms-excel' => 'excel',
+ 'application/pdf' => 'pdf',
+ 'application/postscript' => 'postscript',
+ 'application/msword' => 'word',
+ 'application/vnd.ms-excel' => 'excel',
'application/vnd.ms-powerpoint' => 'ppt',
- 'application/x-gzip' => 'tgz',
- 'application/x-bzip' => 'tgz',
- 'application/zip' =>
'tgz',
+ 'application/x-gzip' => 'tgz',
+ 'application/x-bzip' => 'tgz',
+ 'application/zip' => 'tgz',
'application/x-debian-package' => 'deb',
- 'application/x-rpm' =>
'rpm',
- 'application' =>
'document',
- 'application/octet-stream' => 'unknown',
- 'audio'
=> 'sound',
- 'audio/mpeg' =>
'sound',
- 'Directory'
=> 'folder',
- 'exe'
=> 'exe',
- 'image'
=> 'image',
- 'text'
=> 'txt',
- 'text/html'
=> 'html',
- 'text/plain' =>
'txt',
- 'text/xml'
=> 'html',
- 'text/x-vcalendar' =>
'vcalendar',
- 'text/calendar' =>
'vcalendar',
- 'text/x-vcard' =>
'vcard',
- 'text/x-tex' =>
'tex',
- 'unknown'
=> 'unknown',
- 'video'
=> 'video',
- 'message'
=> 'message'
+ 'application/x-rpm' => 'rpm',
+ 'application' => 'document',
+ 'application/octet-stream' => 'unknown',
+ 'audio' => 'sound',
+ 'audio/mpeg' => 'sound',
+ 'Directory' => 'folder',
+ 'exe' => 'exe',
+ 'image' => 'image',
+ 'text' => 'txt',
+ 'text/html' => 'html',
+ 'text/plain' => 'txt',
+ 'text/xml' => 'html',
+ 'text/x-vcalendar' => 'vcalendar',
+ 'text/calendar' => 'vcalendar',
+ 'text/x-vcard' => 'vcard',
+ 'text/x-tex' => 'tex',
+ 'unknown' => 'unknown',
+ 'video' => 'video',
+ 'message' => 'message'
);
function uifilemanager()
{
- $this->action =
CreateObject('filemanager.uiaction_base');
+ $this->action =
CreateObject('filemanager.uiaction_base');
$this->bofilemanager = $this->action->bofilemanager;
- $this->fileman =
$this->bofilemanager->fileman;
- $this->path =
$this->bofilemanager->path;
- $this->homedir =
$this->bofilemanager->homedir;
+ $this->fileman = $this->bofilemanager->fileman;
+ $this->path = $this->bofilemanager->path;
+ $this->homedir = $this->bofilemanager->homedir;
$this->check_access();
$this->bofilemanager->f_update();
@@ -190,7 +190,7 @@
$link_data = array
(
- 'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index',
+ 'menuaction' =>
'filemanager.uifilemanager.index',
'path' =>
urlencode($this->bofilemanager->path)
);
@@ -228,7 +228,7 @@
}
break;
case 'edit':
-
$link_data['menuaction'] = $this->bofilemanager->appname.'.uiaction_edit.edit';
+
$link_data['menuaction'] = 'filemanager.uiaction_edit.edit';
break;
case 'go':
$link_data['path'] = urlencode($this->bofilemanager->todir);
@@ -246,7 +246,7 @@
if($action == 'newfile' && !is_array($msg))
{
-
$link_data['menuaction'] =
$this->bofilemanager->appname.'.uiaction_edit.edit';
+
$link_data['menuaction'] = 'filemanager.uiaction_edit.edit';
$link_data['edit_file'] = urlencode($this->bofilemanager->createfile);
}
elseif(is_array($msg))
@@ -530,7 +530,7 @@
$link_data = array
(
- 'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index',
+ 'menuaction' =>
'filemanager.uifilemanager.index',
'path' =>
$this->bofilemanager->path
);
@@ -598,8 +598,8 @@
{
$href = '#';
$onClick = "open_popup('" . $GLOBALS['phpgw']->link('/index.php',array(
-
'menuaction' =>
$this->bofilemanager->appname.'.ui'
-
.$this->bofilemanager->appname.'.view',
+
'menuaction' => 'filemanager.ui'
+
.'filemanager.view',
'path' => urlencode($this->bofilemanager->path),
'file' => urlencode($file['name']))) .
"','600','600');";
}
@@ -607,7 +607,7 @@
'href' => $href,'onClick' => $onClick));
if($mime_parts[0] == 'text')
{
-
$link_data['menuaction'] =
$this->bofilemanager->appname.'.uiaction_edit.edit';
+
$link_data['menuaction'] = 'filemanager.uiaction_edit.edit';
$link_data['edit_file'] = urlencode($file['name']);
$file_output[$i]['name']['edit'] = array('widget' => array( 'type' =>
'image',
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'pencil'),
@@ -669,7 +669,7 @@
'file'
=> $file_output
),
'form' => array('action' =>
$GLOBALS['phpgw']->link('/index.php',array(
-
'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.action',
+
'menuaction' => 'filemanager.uifilemanager.action',
'path' =>
urlencode($this->bofilemanager->path))),
'id' => 'form_files',
'name' => 'files',
@@ -680,7 +680,7 @@
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'folder_large'),
'title' => lang('go to your home directory'),
'link' =>
$GLOBALS['phpgw']->link('/index.php',Array(
-
'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index',
+
'menuaction' =>
'filemanager.uifilemanager.index',
'path' =>
urlencode($this->bofilemanager->homedir))))),
'help_home' => array('widget' =>
array('type' => 'help','onClick' => $this->bofilemanager->build_help('home'))),
'current_dir' => $this->bofilemanager->path,
@@ -697,7 +697,7 @@
/*'add_moz_sidebar' => array
(
'url' =>
$GLOBALS['phpgw']->link('/index.php',array(
-
'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index',
+
'menuaction' => 'filemanager.uifilemanager.index',
'path' => urlencode($this->bofilemanager->path)
)),
'label' =>
lang('phpgroupware files'),
@@ -711,7 +711,7 @@
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'up'),
'title' => lang('up'),
'link' => $GLOBALS['phpgw']->link('/index.php',Array(
-
'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index',
+
'menuaction' => 'filemanager.uifilemanager.index',
'path' =>
urlencode($this->bofilemanager->lesspath)))));
$data['help_up'] = array('widget' =>
array('type' => 'help','onClick' => $this->bofilemanager->build_help('up')));
@@ -765,7 +765,7 @@
{
$data['show_upload_boxes'][] =
array('widget' => array('type' => 'link','caption' => $box,
'href'
=> $GLOBALS['phpgw']->link('/index.php',array(
-
'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.action',
+
'menuaction' => 'filemanager.uifilemanager.action',
'show_upload_boxes' => $box))));
}
$data['uploads'] =
$this->display_uploads();
====================================================
Index: filemanager/inc/class.bofilemanager.inc.php
diff -u filemanager/inc/class.bofilemanager.inc.php:1.24
filemanager/inc/class.bofilemanager.inc.php:1.25
--- filemanager/inc/class.bofilemanager.inc.php:1.24 Thu Apr 28 20:45:53 2005
+++ filemanager/inc/class.bofilemanager.inc.php Mon Jul 11 00:56:27 2005
@@ -5,7 +5,7 @@
* @author Mark A Peters <address@hidden>
* @author Jonathon Sim <address@hidden>
* @author Bettina Gille <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc
http://www.fsf.org/
+ * @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$
@@ -111,8 +111,7 @@
$this->basedir = $GLOBALS['phpgw']->vfs->basedir;
$this->fakebase = $GLOBALS['phpgw']->vfs->fakebase;
- $this->appname =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $this->settings =
$GLOBALS['phpgw_info']['user']['preferences'][$this->appname];
+ $this->settings =
$GLOBALS['phpgw_info']['user']['preferences']['filemanager'];
if(stristr($this->basedir,PHPGW_SERVER_ROOT))
{
@@ -249,7 +248,7 @@
$applications =
CreateObject('phpgwapi.applications',$groups[$i]['account_id']);
$apps =
$applications->read_account_specific();
//_debug_array($apps);
- if(!$apps[$this->appname])
+ if(!$apps['filemanager'])
{
unset($groups[$i]);
}
@@ -692,7 +691,7 @@
'string' =>
$this->bo->path.SEP.$this->bo->fileman[$i],
'relatives' => Array(RELATIVE_NONE))))
{
-
execmethod($this->appname.'.ui'.$this->appname.'.view_file',
+
execmethod('filemanager.uifilemanager.view_file',
Array(
'path' => $this->path,
'file' =>
$this->fileman[$i]
@@ -901,7 +900,7 @@
{
if($this->settings['show_help'])
{
- $link =
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
$this->appname.'.uiaction_base.help','help_name' =>
urlencode($help_option)));
+ $link =
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'filemanager.uiaction_base.help','help_name' => urlencode($help_option)));
if(strlen($text)>0)
{
| [Prev in Thread] | Current Thread | [Next in Thread] |