|
| From: | ceb |
| Subject: | [Phpgroupware-cvs] filemanager/inc class.uifilemanager.inc.php, 1.34 class.bofilemanager.inc.php, 1.26 |
| Date: | Sun, 6 Nov 2005 00:13:00 +0100 |
Update of filemanager/inc
Modified Files:
Branch: MAIN
class.uifilemanager.inc.php lines: +112 -102
class.bofilemanager.inc.php lines: +1 -2
Log Message:
update
====================================================
Index: filemanager/inc/class.uifilemanager.inc.php
diff -u filemanager/inc/class.uifilemanager.inc.php:1.33
filemanager/inc/class.uifilemanager.inc.php:1.34
--- filemanager/inc/class.uifilemanager.inc.php:1.33 Mon Jul 11 00:56:28 2005
+++ filemanager/inc/class.uifilemanager.inc.php Sat Nov 5 23:13:38 2005
@@ -72,14 +72,21 @@
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();
+
+ $this->config =
CreateObject('phpgwapi.config','filemanager');
+ $this->config->read_repository();
+ if ($this->config->config_data)
+ {
+ $this->config_items =
$this->config->config_data;
+ }
}
function check_access()
@@ -305,26 +312,36 @@
'selected' => True,
'caption' => lang('Menu -->')
);
- $var['option'][] = array
- (
- 'value' => 'edit',
- 'caption' => lang('Edit')
- );
- $var['option'][] = array
- (
- 'value' => 'rename',
- 'caption' => lang('Rename')
- );
- $var['option'][] = array
- (
- 'value' => 'delete',
- 'caption' => lang('Delete')
- );
- $var['option'][] = array
+
+
if(is_array($this->config_items['menu_disabled']))
+ {
+ $disabled =
$this->config_items['menu_disabled'];
+ }
+ else
+ {
+ $disabled = array();
+ }
+
+ $actions = array
(
- 'value' => 'edit_comments',
- 'caption' => lang('Edit
comments')
+ 'edit' =>
lang('edit'),
+ 'rename' =>
lang('rename'),
+ 'delete' =>
lang('delete'),
+ 'edit_comments' => lang('edit
comments')
);
+
+ foreach($actions as $key => $trans)
+ {
+ if(!in_array($key,$disabled))
+ {
+ $var['option'][] = array
+ (
+ 'value'
=> $key,
+ 'caption'
=> $trans
+ );
+ }
+ }
+
$var['option'][] = array
(
'disabled' => True,
@@ -466,26 +483,26 @@
function display_uploads()
{
-
for($i=0;$i<$this->bofilemanager->show_upload_boxes;$i++)
+
for($i=0;$i<$this->bofilemanager->show_upload_boxes;++$i)
{
$var = array();
- $var[] = array('widget' => array('type'
=> 'file',
- 'name' =>
'upload_file[]' ,
- 'maxlength'=> '255'
- ));
-
- $var[] = array('widget' => array('type'
=> 'text',
- 'name' =>
'upload_comment[]'
- ));
+ $var[] = array('widget' => array('type'
=> 'file',
+ 'name'
=> 'upload_file[]',
+ 'maxlength'
=> '255'
+ ));
+
+ $var[] = array('widget' => array('type'
=> 'text',
+ 'name'
=> 'upload_comment[]'
+ ));
$var[] = array('widget' => array('type'
=> 'empty'));
$table_rows[] = array('table_col' =>
$var);
}
$var = array();
- $var[] = array('widget' => array('type' => 'hidden',
- 'name' =>
'show_upload_boxes',
- 'value' =>
$this->bofilemanager->show_upload_boxes
- ));
+ $var[] = array('widget' => array('type' => 'hidden',
+ 'name' =>
'show_upload_boxes',
+ 'value' =>
$this->bofilemanager->show_upload_boxes
+ ));
$table_rows[] = array('table_col' => $var);
return array('table_row' => $table_rows);
@@ -493,9 +510,9 @@
function dirs_first($files_array)
{
- $dirs = array();
- $files = array();
- $result = array();
+ $dirs = array();
+ $files = array();
+ $result = array();
for($i=0;$i!=count($files_array);$i++)
{
@@ -511,7 +528,7 @@
}
return array_merge($dirs, $files);
}
-
+
function index()
{
$rename_files = $_GET['rename_files'];
@@ -588,7 +605,7 @@
if (strpos($file['name'],'.exe') !== false) $file_icon =
$this->mime_ico['exe'];
}
$file_output[$i]['name']['icon'] = array('widget' => array( 'type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,$file_icon)));
+
'src' =>
$GLOBALS['phpgw']->common->image('filemanager',$file_icon)));
if ($file['mime_type']=='Directory')
{
$link_data['path'] = $this->bofilemanager->path .
$this->bofilemanager->dispsep . $file['name'];
@@ -610,7 +627,7 @@
$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'),
+
'src' =>
$GLOBALS['phpgw']->common->image('filemanager','pencil'),
'link' =>
$GLOBALS['phpgw']->link('/index.php',$link_data)));
}
}
@@ -677,7 +694,7 @@
'enctype' => 'multipart/form-data'),
'error' =>
(isset($this->bofilemanager->errors) &&
is_array(unserialize(base64_decode($this->bofilemanager->errors)))?$GLOBALS['phpgw']->common->error_list(unserialize(base64_decode($this->bofilemanager->errors)),'Results'):''),
'img_home' => array('widget' =>
array('type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'folder_large'),
+
'src' =>
$GLOBALS['phpgw']->common->image('filemanager','folder_large'),
'title' => lang('go to your home directory'),
'link' =>
$GLOBALS['phpgw']->link('/index.php',Array(
'menuaction' =>
'filemanager.uifilemanager.index',
@@ -686,10 +703,10 @@
'current_dir' => $this->bofilemanager->path,
'help_dir' => array('widget' =>
array('type' => 'help','onClick' =>
$this->bofilemanager->build_help('current_dir'))),
'img_dir' => array('widget' =>
array('type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,($this->bofilemanager->homestr?'folder_home':'folder')),
+
'src' =>
$GLOBALS['phpgw']->common->image('filemanager',($this->bofilemanager->homestr?'folder_home':'folder')),
'title' => lang('current directory'))),
'img_refresh' => array('widget' =>
array('type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'reload'),
+
'src' => $GLOBALS['phpgw']->common->image('filemanager','reload'),
'title' => lang('refresh'),
'name' => 'params[update]',
'value' => 'update')),
@@ -708,7 +725,7 @@
if($this->bofilemanager->path != '/')
{
$data['img_up'] = array('widget' =>
array('type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'up'),
+
'src' => $GLOBALS['phpgw']->common->image('filemanager','up'),
'title' => lang('up'),
'link' => $GLOBALS['phpgw']->link('/index.php',Array(
'menuaction' => 'filemanager.uifilemanager.index',
@@ -735,7 +752,7 @@
'maxlength' => '255',
'size' => '15'));
$data['img_create_folder'] =
array('widget' => array('type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'folder_new'),
+
'src' =>
$GLOBALS['phpgw']->common->image('filemanager','folder_new'),
'title' => lang('create
folder'),
'name' =>
'params[newdir]',
'value' => 'newdir'));
@@ -746,7 +763,7 @@
'maxlength' => '255',
'size' => '15'));
$data['img_create_file'] =
array('widget' => array('type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'filenew'),
+
'src' =>
$GLOBALS['phpgw']->common->image('filemanager','filenew'),
'title' => lang('create
file'),
'name' =>
'params[newfile]',
'value' => 'newfile'));
@@ -770,7 +787,7 @@
}
$data['uploads'] =
$this->display_uploads();
$data['img_upload'] =
array('widget' => array('type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'1uparrow'),
+
'src' => $GLOBALS['phpgw']->common->image('filemanager','1uparrow'),
'title' => lang('upload files'),
'name' => 'params[upload]',
'value' => 'upload'));
@@ -785,7 +802,7 @@
$data['dir_menu'] =
array('widget' => array('type' => 'select','name' => 'todir', 'id' =>
'menu_todir','onChange' => $js_dir,'disabled' => True,'options' =>
$this->display_buttons('dir_menu')));
$data['help_dir_list'] =
array('widget' => array('type' => 'help','onClick' =>
$this->bofilemanager->build_help('dir_list')));
$data['img_dl'] = array('widget' =>
array('type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'bottom'),
+
'src' =>
$GLOBALS['phpgw']->common->image('filemanager','bottom'),
'title' => lang('download files'),
'name' => 'params[download]',
'value' => 'download'));
@@ -809,12 +826,12 @@
$data['rename'] = array
(
'img_ok' => array('widget' =>
array('type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'button_ok'),
+
'src' => $GLOBALS['phpgw']->common->image('filemanager','button_ok'),
'title' => lang('apply changes'),
'name' => 'params[apply_edit_' . ($rename_files?'name':'comment') .
']',
'value' => 'apply_edit_' . ($rename_files?'name':'comment'))),
'img_cancel' => array('widget' =>
array('type' => 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'button_cancel'),
+
'src' =>
$GLOBALS['phpgw']->common->image('filemanager','button_cancel'),
'title' => lang('cancel'),
'name' => 'params[cancel]',
'value' => 'cancel'))
@@ -1024,8 +1041,6 @@
{
$val = $_POST['set_quota'];
$values = $_POST['values'];
- $config = CreateObject('phpgwapi.config','filemanager');
- $config->read_repository();
// Check if the Values match the following pattern
0,1,10,unlimited
@@ -1033,7 +1048,7 @@
{
if (empty($val) || ereg("^[ 0-9]+(,[
0-9]+)*$",$val))
{
- $config->value('set_quota', '0,' . $val
. ',unlimited');
+ $this->config->value('set_quota', '0,'
. $val . ',unlimited');
}
else
{
@@ -1049,12 +1064,12 @@
}
else
{
-
$config->value('script_path',$values['script_path']);
+
$this->config->value('script_path',$values['script_path']);
}
}
-
$config->value('check_files',$values['check_files']);
-
$config->value('check_interval',$values['check_interval']);
- $config->save_repository();
+
$this->config->value('check_files',$values['check_files']);
+
$this->config->value('check_interval',$values['check_interval']);
+ $this->config->save_repository();
if(!is_array($error))
{
@@ -1068,11 +1083,9 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('filemanager') . ': ' . lang('admin');
- if ($config->config_data)
+ if (is_array($this->config_items))
{
- $items = $config->config_data;
- $quota = $items['set_quota'];
- unset($config);
+ $quota = $this->config_items['set_quota'];
}
if (!$quota)
@@ -1082,7 +1095,7 @@
else
{
$quota_str = '';
- $tok = strtok ($quota,",");
+ $tok = strtok ($quota,',');
if ($tok=='0')
{
@@ -1127,7 +1140,7 @@
$var = array();
$var[] = array('widget' => array('type' =>
'label','caption' => lang('absolute path to directory for storing additional
action scripts')));
- $var[] = array('widget' => array('type' =>
'text','name' => 'values[script_path]','value' => $items['script_path']));
+ $var[] = array('widget' => array('type' =>
'text','name' => 'values[script_path]','value' =>
$this->config_items['script_path']));
$table_rows[] = array('table_col' => $var);
$var = array();
@@ -1136,12 +1149,12 @@
$var = array();
$var[] = array('widget' => array('type' =>
'label','caption' => lang('enable periodically check for new files')));
- $var[] = array('widget' => array('type' =>
'checkbox','name' => 'values[check_files]','value' => 'True', 'checked' =>
($items['check_files']?True:False)));
+ $var[] = array('widget' => array('type' =>
'checkbox','name' => 'values[check_files]','value' => 'True', 'checked' =>
($this->config_items['check_files']?True:False)));
$table_rows[] = array('table_col' => $var);
$var = array();
$var[] = array('widget' => array('type' =>
'label','caption' => lang('interval')));
- $var[] = array('widget' => array('type' =>
'text','name' => 'values[check_interval]','value' =>
$items['check_interval'],'size' => 3,'caption' => lang('minutes')));
+ $var[] = array('widget' => array('type' =>
'text','name' => 'values[check_interval]','value' =>
$this->config_items['check_interval'],'size' => 3,'caption' =>
lang('minutes')));
$table_rows[] = array('table_col' => $var);
$table_footer = array('table_col' =>
$this->display_buttons());
@@ -1163,19 +1176,11 @@
function edit_actions()
{
- $config = CreateObject('phpgwapi.config','filemanager');
- $config->read_repository();
-
- if ($config->config_data)
+ if($this->config_items['user_scripts'])
{
- $items = $config->config_data;
-
- if($items['user_scripts'])
- {
- $user_scripts = $items['user_scripts'];
- reset($user_scripts);
- //_debug_array($user_scripts);
- }
+ $user_scripts =
$this->config_items['user_scripts'];
+ reset($user_scripts);
+ //_debug_array($user_scripts);
}
if($_POST['save'])
@@ -1186,7 +1191,7 @@
if(is_array($values['menu_disabled']))
{
-
$config->value('menu_disabled',$values['menu_disabled']);
+
$this->config->value('menu_disabled',$values['menu_disabled']);
}
if(strlen($values['scriptname'])>0 &&
strlen($values['scripttitle'])>0)
@@ -1208,10 +1213,10 @@
'title' =>
$values['scripttitle']
);
}
-
$config->value('user_scripts',$user_scripts);
+
$this->config->value('user_scripts',$user_scripts);
}
- $config->save_repository();
- unset($items);
+ $this->config->save_repository();
+ unset($this->config_items);
}
elseif($_GET['delete_script'])
{
@@ -1225,9 +1230,9 @@
++$i;
}
//_debug_array($nscript);
- $config->value('user_scripts',$nscript);
- $config->save_repository();
- unset($items);
+ $this->config->value('user_scripts',$nscript);
+ $this->config->save_repository();
+ unset($this->config_items);
}
if ($_POST['cancel'])
@@ -1237,22 +1242,27 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('filemanager') . ': ' . lang('admin');
- $config->read_repository();
- if ($config->config_data)
+ if($_POST['save'] || $_GET['delete_script'])
{
- $items = $config->config_data;
- $disabled = $items['menu_disabled'];
- $uscripts = $items['user_scripts'];
- //_debug_array($disabled);
- if(!is_array($disabled))
- {
- $disabled = array();
- }
- if(!is_array($uscripts))
+ $this->config->read_repository();
+ if ($this->config->config_data)
{
- $uscripts = array();
+ $this->config_items =
$this->config->config_data;
}
- unset($config);
+ }
+
+ $disabled = $this->config_items['menu_disabled'];
+ $uscripts = $this->config_items['user_scripts'];
+
+ //_debug_array($disabled);
+
+ if(!is_array($disabled))
+ {
+ $disabled = array();
+ }
+ if(!is_array($uscripts))
+ {
+ $uscripts = array();
}
$data = array();
@@ -1293,9 +1303,9 @@
$i = 0;
foreach($uscripts as $uscript)
{
- $delete_link = array('widget' => array( 'type'
=> 'image',
-
'src' =>
$GLOBALS['phpgw']->common->image('phpgwapi','delete'),
-
'link' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.edit_actions&delete_script=1&script='
. $i)));
+ $delete_link = array('widget' => array( 'type'
=> 'image',
+
'src' =>
$GLOBALS['phpgw']->common->image('phpgwapi','delete'),
+
'link' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.edit_actions&delete_script=1&script='
. $i)));
$var = array();
$var[] = array('widget' => array('type' =>
'label','caption' => $uscript['name']));
$var[] = array('widget' => array('type' =>
'label','caption' => $uscript['title']));
====================================================
Index: filemanager/inc/class.bofilemanager.inc.php
diff -u filemanager/inc/class.bofilemanager.inc.php:1.25
filemanager/inc/class.bofilemanager.inc.php:1.26
--- filemanager/inc/class.bofilemanager.inc.php:1.25 Mon Jul 11 00:56:27 2005
+++ filemanager/inc/class.bofilemanager.inc.php Sat Nov 5 23:13:38 2005
@@ -22,7 +22,6 @@
var $access_add = False;
var $basedir;
var $fakebase;
- var $appname;
var $settings;
var $filesdir;
var $hostname;
| [Prev in Thread] | Current Thread | [Next in Thread] |