mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-27 00:09:13 +01:00
- fixed group files (essential for sharing files)
- make all buttons work in IE (for some people quite usefull :) - some lay-out improvements - fixed save and done button in file edit mode - add sidebox menu - re-arranged toolbars (still not finished) - new location selectbox - some speed improvements
This commit is contained in:
parent
f2bc951d3f
commit
c1698d2f2b
@ -44,27 +44,35 @@
|
|||||||
|
|
||||||
var $prefs;//array
|
var $prefs;//array
|
||||||
|
|
||||||
|
var $groups_applications;
|
||||||
|
|
||||||
//originally post_vars
|
//originally post_vars
|
||||||
var $goto;
|
// var $goto;
|
||||||
|
var $goto_x;
|
||||||
|
var $download_x;
|
||||||
var $todir;
|
var $todir;
|
||||||
|
var $changedir; // for switching dir.
|
||||||
|
var $cdtodir; // for switching dir.
|
||||||
var $createdir;
|
var $createdir;
|
||||||
var $newfile_or_dir;
|
var $newfile_or_dir;
|
||||||
var $newdir;
|
var $newdir_x;
|
||||||
var $newfile;
|
var $newfile_x;
|
||||||
var $createfile;
|
var $createfile;
|
||||||
var $delete;
|
var $delete_x;
|
||||||
var $renamefiles;
|
var $renamefiles;
|
||||||
var $rename;
|
var $rename_x;
|
||||||
var $move_to;
|
var $move_to_x;
|
||||||
var $copy_to;
|
// var $copy_to;
|
||||||
var $edit;
|
var $copy_to_x;
|
||||||
|
var $edit_x;
|
||||||
|
var $edit_comments_x;
|
||||||
var $edit_file;
|
var $edit_file;
|
||||||
var $edit_preview;
|
var $edit_preview_x;
|
||||||
var $edit_save;
|
var $edit_save_x;
|
||||||
var $edit_save_done;
|
var $edit_save_done_x;
|
||||||
var $edit_cancel;
|
var $edit_cancel_x;
|
||||||
var $comment_files;
|
var $comment_files;
|
||||||
var $upload;
|
var $upload_x;
|
||||||
var $uploadprocess;
|
var $uploadprocess;
|
||||||
|
|
||||||
// this ones must be checked thorougly;
|
// this ones must be checked thorougly;
|
||||||
@ -80,7 +88,7 @@
|
|||||||
|
|
||||||
function uifilemanager()
|
function uifilemanager()
|
||||||
{
|
{
|
||||||
// error_reporting (8);
|
// error_reporting (8);
|
||||||
|
|
||||||
$this->now = date ('Y-m-d');
|
$this->now = date ('Y-m-d');
|
||||||
|
|
||||||
@ -113,10 +121,10 @@
|
|||||||
'path' => array ('path' => ''),
|
'path' => array ('path' => ''),
|
||||||
'file' => array ('file' => ''),
|
'file' => array ('file' => ''),
|
||||||
'sortby' => array ('sortby' => ''),
|
'sortby' => array ('sortby' => ''),
|
||||||
// 'fileman' => array ('fileman' => ''),
|
// 'fileman' => array ('fileman' => ''),
|
||||||
'messages' => array ('messages' => ''),
|
'messages' => array ('messages' => ''),
|
||||||
// 'help_name' => array ('help_name' => ''),
|
// 'help_name' => array ('help_name' => ''),
|
||||||
// 'renamefiles' => array ('renamefiles' => ''),
|
// 'renamefiles' => array ('renamefiles' => ''),
|
||||||
'comment_files' => array ('comment_files' => ''),
|
'comment_files' => array ('comment_files' => ''),
|
||||||
'show_upload_boxes' => array ('show_upload_boxes' => '')
|
'show_upload_boxes' => array ('show_upload_boxes' => '')
|
||||||
);
|
);
|
||||||
@ -155,7 +163,7 @@
|
|||||||
// get appl. and user prefs
|
// get appl. and user prefs
|
||||||
$pref = CreateObject ('phpgwapi.preferences', $GLOBALS['userinfo']['username']);
|
$pref = CreateObject ('phpgwapi.preferences', $GLOBALS['userinfo']['username']);
|
||||||
$pref->read_repository ();
|
$pref->read_repository ();
|
||||||
// $GLOBALS['phpgw']->hooks->single ('add_def_pref', $GLOBALS['appname']);
|
// $GLOBALS['phpgw']->hooks->single ('add_def_pref', $GLOBALS['appname']);
|
||||||
$pref->save_repository (True);
|
$pref->save_repository (True);
|
||||||
$pref_array = $pref->read_repository ();
|
$pref_array = $pref->read_repository ();
|
||||||
$this->prefs = $pref_array[$GLOBALS['appname']];
|
$this->prefs = $pref_array[$GLOBALS['appname']];
|
||||||
@ -173,7 +181,7 @@
|
|||||||
|
|
||||||
function index()
|
function index()
|
||||||
{
|
{
|
||||||
if ($noheader || $nofooter || ($this->download && (count ($this->fileman) > 0)))
|
if ($noheader || $nofooter || ($this->download_x && (count ($this->fileman) > 0)))
|
||||||
{
|
{
|
||||||
$noheader = True;
|
$noheader = True;
|
||||||
$nofooter = True;
|
$nofooter = True;
|
||||||
@ -196,8 +204,8 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//var_dump($GLOBALS[HTTP_POST_VARS]);
|
// var_dump($GLOBALS[HTTP_POST_VARS]);
|
||||||
|
//var_dump($this->delete_x);
|
||||||
|
|
||||||
# Page to process users
|
# Page to process users
|
||||||
# Code is fairly hackish at the beginning, but it gets better
|
# Code is fairly hackish at the beginning, but it gets better
|
||||||
@ -206,10 +214,16 @@
|
|||||||
###
|
###
|
||||||
# Some hacks to set and display directory paths correctly
|
# Some hacks to set and display directory paths correctly
|
||||||
###
|
###
|
||||||
|
/*
|
||||||
if ($this->goto)
|
if ($this->goto || $this->goto_x)
|
||||||
{
|
{
|
||||||
$this->path = $this->todir;
|
$this->path = $this->cdtodir;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
// new method for switching to a new dir.
|
||||||
|
if($this->changedir=='true' && $this->cdtodir || $this->goto_x)
|
||||||
|
{
|
||||||
|
$this->path = $this->cdtodir;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->path)
|
if (!$this->path)
|
||||||
@ -262,14 +276,14 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$groups_applications = array ();
|
$this->groups_applications = array ();
|
||||||
|
|
||||||
while (list ($num, $group_array) = each ($this->readable_groups))
|
while (list ($num, $group_array) = each ($this->readable_groups))
|
||||||
{
|
{
|
||||||
$group_id = $GLOBALS['phpgw']->accounts->name2id ($group_array['account_name']);
|
$group_id = $GLOBALS['phpgw']->accounts->name2id ($group_array['account_name']);
|
||||||
|
|
||||||
$applications = CreateObject('phpgwapi.applications', $group_id);
|
$applications = CreateObject('phpgwapi.applications', $group_id);
|
||||||
$groups_applications[$group_array['account_name']] = $applications->read_account_specific ();
|
$this->groups_applications[$group_array['account_name']] = $applications->read_account_specific ();
|
||||||
}
|
}
|
||||||
|
|
||||||
# We determine if they're in their home directory or a group's directory,
|
# We determine if they're in their home directory or a group's directory,
|
||||||
@ -366,11 +380,11 @@
|
|||||||
|
|
||||||
# main action switch
|
# main action switch
|
||||||
// FIXME this will become a switch
|
// FIXME this will become a switch
|
||||||
if($this->newfile && $this->newfile_or_dir) // create new textfile
|
if($this->newfile_x && $this->newfile_or_dir) // create new textfile
|
||||||
{
|
{
|
||||||
$this->createfile();
|
$this->createfile();
|
||||||
}
|
}
|
||||||
elseif($this->newfile_or_dir && $this->newdir)
|
elseif($this->newfile_or_dir && $this->newdir_x)
|
||||||
{
|
{
|
||||||
$this->createdir();
|
$this->createdir();
|
||||||
}
|
}
|
||||||
@ -378,19 +392,19 @@
|
|||||||
{
|
{
|
||||||
$this->fileUpload();
|
$this->fileUpload();
|
||||||
}
|
}
|
||||||
elseif ($this->upload || $this->show_upload_boxes)
|
elseif ($this->upload_x || $this->show_upload_boxes)
|
||||||
{
|
{
|
||||||
$this->showUploadboxes();
|
$this->showUploadboxes();
|
||||||
}
|
}
|
||||||
elseif ($this->copy_to)
|
elseif ($this->copy_to_x)
|
||||||
{
|
{
|
||||||
$this->copyTo();
|
$this->copyTo();
|
||||||
}
|
}
|
||||||
elseif ($this->move_to)
|
elseif ($this->move_to_x)
|
||||||
{
|
{
|
||||||
$this->moveTo();
|
$this->moveTo();
|
||||||
}
|
}
|
||||||
elseif ($this->download)
|
elseif ($this->download_x)
|
||||||
{
|
{
|
||||||
$this->download();
|
$this->download();
|
||||||
}
|
}
|
||||||
@ -402,16 +416,16 @@
|
|||||||
{
|
{
|
||||||
$this->editComment();
|
$this->editComment();
|
||||||
}
|
}
|
||||||
elseif ($this->edit_cancel)
|
elseif ($this->edit_cancel_x)
|
||||||
{
|
{
|
||||||
$this->readFilesInfo();
|
$this->readFilesInfo();
|
||||||
$this->fileListing();
|
$this->fileListing();
|
||||||
}
|
}
|
||||||
elseif ($this->edit || $this->edit_preview || $this->edit_save)
|
elseif ($this->edit_x || $this->edit_preview_x || $this->edit_save_x || $this->edit_save_done_x)
|
||||||
{
|
{
|
||||||
$this->edit();
|
$this->edit();
|
||||||
}
|
}
|
||||||
elseif ($this->delete)
|
elseif ($this->delete_x)
|
||||||
{
|
{
|
||||||
$this->delete();
|
$this->delete();
|
||||||
}
|
}
|
||||||
@ -445,6 +459,7 @@
|
|||||||
|
|
||||||
$vars[toolbar0]=$this->toolbar('location');
|
$vars[toolbar0]=$this->toolbar('location');
|
||||||
$vars[toolbar1]=$this->toolbar('list_nav');
|
$vars[toolbar1]=$this->toolbar('list_nav');
|
||||||
|
if($this->messages) $this->messages='<p>'.$this->messages.'</p>';
|
||||||
$vars[messages]=$this->messages;
|
$vars[messages]=$this->messages;
|
||||||
|
|
||||||
$this->t->set_var($vars);
|
$this->t->set_var($vars);
|
||||||
@ -471,7 +486,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->t->set_var('row_tr_color','#cbcbcb');
|
$this->t->set_var('row_tr_color','#dedede');
|
||||||
$this->t->parse('rows','row');
|
$this->t->parse('rows','row');
|
||||||
$this->t->pparse('out','row');
|
$this->t->pparse('out','row');
|
||||||
}
|
}
|
||||||
@ -488,7 +503,7 @@
|
|||||||
|
|
||||||
$link=$this->encode_href('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->lesspath);
|
$link=$this->encode_href('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->lesspath);
|
||||||
|
|
||||||
$col_data='<a href="'.$link.'"><img src="'.$GLOBALS['phpgw']->common->image('filemanager','folder').' "alt="'.lang('Folder').'" /></a>';
|
$col_data='<a href="'.$link.'"><img src="'.$GLOBALS['phpgw']->common->image('filemanager','mime16up').' "alt="'.lang('Folder Up').'" /></a>';
|
||||||
$col_data.=' <a href="'.$link.'">..</a>';
|
$col_data.=' <a href="'.$link.'">..</a>';
|
||||||
|
|
||||||
$this->t->set_var('col_data',$col_data);
|
$this->t->set_var('col_data',$col_data);
|
||||||
@ -508,12 +523,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
# List all of the files, with their attributes
|
# List all of the files, with their attributes
|
||||||
reset ($this->files_array);
|
@reset ($this->files_array);
|
||||||
for ($i = 0; $i != $this->numoffiles; $i++)
|
for ($i = 0; $i != $this->numoffiles; $i++)
|
||||||
{
|
{
|
||||||
$files = $this->files_array[$i];
|
$files = $this->files_array[$i];
|
||||||
|
|
||||||
if ($this->rename || $this->edit_comments)
|
if ($this->rename_x || $this->edit_comments_x)
|
||||||
{
|
{
|
||||||
unset ($this_selected);
|
unset ($this_selected);
|
||||||
unset ($renamethis);
|
unset ($renamethis);
|
||||||
@ -528,11 +543,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->rename && $this_selected)
|
if ($this->rename_x && $this_selected)
|
||||||
{
|
{
|
||||||
$renamethis = 1;
|
$renamethis = 1;
|
||||||
}
|
}
|
||||||
elseif ($this->edit_comments && $this_selected)
|
elseif ($this->edit_comments_x && $this_selected)
|
||||||
{
|
{
|
||||||
$edit_this_comment = 1;
|
$edit_this_comment = 1;
|
||||||
}
|
}
|
||||||
@ -544,7 +559,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Checkboxes
|
# Checkboxes
|
||||||
if (!$this->rename && !$this->edit_comments && $this->path != $GLOBALS['fakebase'] && $this->path != '/')
|
if (!$this->rename_x && !$this->edit_comments_x && $this->path != $GLOBALS['fakebase'] && $this->path != '/')
|
||||||
{
|
{
|
||||||
$cbox='<input type="checkbox" name="fileman['.$i.']" value="'.$files['name'].'">';
|
$cbox='<input type="checkbox" name="fileman['.$i.']" value="'.$files['name'].'">';
|
||||||
$this->t->set_var('actions',$cbox);
|
$this->t->set_var('actions',$cbox);
|
||||||
@ -727,7 +742,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// when renaming or changing comments render extra sumbmit button
|
// when renaming or changing comments render extra sumbmit button
|
||||||
if ($this->rename || $this->edit_comments)
|
if ($this->rename_x || $this->edit_comments_x)
|
||||||
{
|
{
|
||||||
$col_data='<br/><input type="submit" name="save_changes" value="'.lang('Save changes').'">';
|
$col_data='<br/><input type="submit" name="save_changes" value="'.lang('Save changes').'">';
|
||||||
$this->t->set_var('col_data',$col_data);
|
$this->t->set_var('col_data',$col_data);
|
||||||
@ -798,7 +813,7 @@
|
|||||||
while (list ($num, $group_array) = each ($this->readable_groups))
|
while (list ($num, $group_array) = each ($this->readable_groups))
|
||||||
{
|
{
|
||||||
# If the group doesn't have access to this app, we don't show it
|
# If the group doesn't have access to this app, we don't show it
|
||||||
if (!$groups_applications[$group_array['account_name']][$GLOBALS['appname']]['enabled'])
|
if (!$this->groups_applications[$group_array['account_name']][$GLOBALS['appname']]['enabled'])
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -854,13 +869,11 @@
|
|||||||
case 'location':
|
case 'location':
|
||||||
$toolbar='
|
$toolbar='
|
||||||
<div id="fmLocation">
|
<div id="fmLocation">
|
||||||
'.lang('location').': <input id="fmInputLocation" type="text" size="50" name="location" value="'.$this->disppath.'"/>
|
|
||||||
</div>';
|
|
||||||
break;
|
|
||||||
case 'list_nav':
|
|
||||||
$toolbar='
|
|
||||||
<table cellspacing="1" cellpadding="0" border="0">
|
<table cellspacing="1" cellpadding="0" border="0">
|
||||||
<tr>
|
<tr>
|
||||||
|
';
|
||||||
|
$toolbar.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('phpgwapi','buttonseparator').'" height="27" width="8"></td>';
|
||||||
|
$toolbar.='
|
||||||
<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="1"></td>';
|
<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="1"></td>';
|
||||||
|
|
||||||
// go up icon when we're not at the top
|
// go up icon when we're not at the top
|
||||||
@ -871,7 +884,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// go home icon when we're not home already
|
// go home icon when we're not home already
|
||||||
if ($this->path == $GLOBALS['homedir'])
|
if ($this->path != $GLOBALS['homedir'])
|
||||||
{
|
{
|
||||||
$link=$this->encode_href('/index.php','menuaction=filemanager.uifilemanager.index','path='.$GLOBALS['homedir']);
|
$link=$this->encode_href('/index.php','menuaction=filemanager.uifilemanager.index','path='.$GLOBALS['homedir']);
|
||||||
$toolbar.=$this->buttonImage($link,'home',lang('go home'));
|
$toolbar.=$this->buttonImage($link,'home',lang('go home'));
|
||||||
@ -881,68 +894,107 @@
|
|||||||
$link=$this->encode_href('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->path);
|
$link=$this->encode_href('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->path);
|
||||||
$toolbar.=$this->buttonImage($link,'reload',lang('reload'));
|
$toolbar.=$this->buttonImage($link,'reload',lang('reload'));
|
||||||
|
|
||||||
|
$toolbar.='<td>'.lang('Location').': ';
|
||||||
|
//$toolbar.='<input id="fmInputLocation" type="text" size="20" disabled="disabled" name="location" value="'.$this->disppath.'"/> ';
|
||||||
|
$current_option='<option>'.$this->disppath.'</option>';
|
||||||
// selectbox for change/move/and copy to
|
// selectbox for change/move/and copy to
|
||||||
$dirs_options=$this->all_other_directories_options();
|
$dirs_options=$this->all_other_directories_options();
|
||||||
$toolbar.='<td><select name="todir">'.$dirs_options.'</select></td>';
|
$toolbar.='<select name="cdtodir" onChange="document.formfm.changedir.value=\'true\';document.formfm.submit()">'.$current_option.$dirs_options.'</select>
|
||||||
|
<input type="hidden" name="changedir" value="false"></td>
|
||||||
|
';
|
||||||
$toolbar.=$this->inputImage('goto','goto','Quick jump to');
|
$toolbar.=$this->inputImage('goto','goto','Quick jump to');
|
||||||
|
// upload button
|
||||||
|
if ($this->path != '/' && $this->path != $GLOBALS['fakebase'] && $this->can_add)
|
||||||
|
{
|
||||||
|
|
||||||
if (!$this->rename && !$this->edit_comments)
|
$toolbar.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="1"></td>';
|
||||||
{
|
$toolbar.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('phpgwapi','buttonseparator').'" height="27" width="8"></td>';
|
||||||
// copy and move buttons
|
$toolbar.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="1"></td>';
|
||||||
if ($this->path != '/' && $this->path != $GLOBALS['fakebase'])
|
|
||||||
{
|
// $toolbar.=$this->inputImage('download','download',lang('Download'));
|
||||||
$toolbar.=$this->inputImage('copy_to','copy_to',lang('Copy to'));
|
// upload button
|
||||||
$toolbar.=$this->inputImage('move_to','move_to',lang('Move to'));
|
$toolbar.=$this->inputImage('upload','upload',lang('Upload'));
|
||||||
}
|
}
|
||||||
|
$toolbar.='</tr></table>';
|
||||||
|
$toolbar.='</div>';
|
||||||
|
break;
|
||||||
|
case 'list_nav':
|
||||||
|
$toolbar='
|
||||||
|
<table cellspacing="1" cellpadding="0" border="0">
|
||||||
|
<tr>';
|
||||||
|
// selectbox for change/move/and copy to
|
||||||
// submit buttons for
|
// submit buttons for
|
||||||
if ($this->path != '/' && $this->path != $GLOBALS['fakebase'])
|
if ($this->path != '/' && $this->path != $GLOBALS['fakebase'])
|
||||||
{
|
{
|
||||||
if (!$this->rename && !$this->edit_comments)
|
$toolbar.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('phpgwapi','buttonseparator').'" height="27" width="8"></td>';
|
||||||
|
$toolbar.='
|
||||||
|
<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="1"></td>';
|
||||||
|
|
||||||
|
if (!$this->rename_x && !$this->edit_comments_x)
|
||||||
{
|
{
|
||||||
// edit text file button
|
// edit text file button
|
||||||
$toolbar.=$this->inputImage('edit','edit',lang('edit'));
|
$toolbar.=$this->inputImage('edit','edit',lang('edit'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->edit_comments)
|
if (!$this->edit_comments_x)
|
||||||
{
|
{
|
||||||
$toolbar.=$this->inputImage('rename','rename',lang('Rename'));
|
$toolbar.=$this->inputImage('rename','rename',lang('Rename'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->rename && !$this->edit_comments)
|
if (!$this->rename_x && !$this->edit_comments_x)
|
||||||
{
|
{
|
||||||
$toolbar.=$this->inputImage('delete','delete',lang('Delete'));
|
$toolbar.=$this->inputImage('delete','delete',lang('Delete'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->rename)
|
if (!$this->rename_x)
|
||||||
{
|
{
|
||||||
$toolbar.=$this->inputImage('edit_comments','edit_comments',lang('Edit comments'));
|
$toolbar.=$this->inputImage('edit_comments','edit_comments',lang('Edit comments'));
|
||||||
}
|
}
|
||||||
|
$toolbar.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="1"></td>';
|
||||||
|
}
|
||||||
|
|
||||||
|
// $toolbar.='</tr></table>';
|
||||||
|
if (!$this->rename_x && !$this->edit_comments_x)
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
// copy and move buttons
|
||||||
|
if ($this->path != '/' && $this->path != $GLOBALS['fakebase'])
|
||||||
|
{
|
||||||
|
$toolbar3.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('phpgwapi','buttonseparator').'" height="27" width="8"></td>';
|
||||||
|
$toolbar3.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="1"></td>';
|
||||||
|
|
||||||
|
$dirs_options=$this->all_other_directories_options();
|
||||||
|
$toolbar3.='<td><select name="todir">'.$dirs_options.'</select></td>';
|
||||||
|
|
||||||
|
$toolbar3.=$this->inputImage('copy_to','copy_to',lang('Copy to'));
|
||||||
|
$toolbar3.=$this->inputImage('move_to','move_to',lang('Move to'));
|
||||||
|
|
||||||
|
$toolbar3.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="1"></td>';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// create dir and file button
|
// create dir and file button
|
||||||
if ($this->path != '/' && $this->path != $GLOBALS['fakebase'] && $this->can_add)
|
if ($this->path != '/' && $this->path != $GLOBALS['fakebase'] && $this->can_add)
|
||||||
{
|
{
|
||||||
$toolbar.='<td><input type=text size="15" name="newfile_or_dir" value="" /></td>';
|
$toolbar3.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('phpgwapi','buttonseparator').'" height="27" width="8"></td>';
|
||||||
$toolbar.=$this->inputImage('newdir','createdir',lang('Create Folder'));
|
$toolbar3.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="1"></td>';
|
||||||
$toolbar.=$this->inputImage('newfile','createfile',lang('Create File'));
|
|
||||||
|
$toolbar3.='<td><input type=text size="15" name="newfile_or_dir" value="" /></td>';
|
||||||
|
$toolbar3.=$this->inputImage('newdir','createdir',lang('Create Folder'));
|
||||||
|
$toolbar3.=$this->inputImage('newfile','createfile',lang('Create File'));
|
||||||
}
|
}
|
||||||
|
|
||||||
$toolbar.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="3"></td>';
|
if($toolbar3)
|
||||||
|
|
||||||
// download button
|
|
||||||
if ($this->path != '/' && $this->path != $GLOBALS['fakebase'] && $this->can_add)
|
|
||||||
{
|
{
|
||||||
$toolbar.=$this->inputImage('download','download',lang('Download'));
|
$toolbar.=$toolbar3;
|
||||||
|
/* $toolbar.='
|
||||||
|
<table cellspacing="1" cellpadding="0" border="0">
|
||||||
|
<tr>'.$toolbar3;*/
|
||||||
}
|
}
|
||||||
// upload button
|
|
||||||
$toolbar.=$this->inputImage('upload','upload',lang('Upload'));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$toolbar.='</tr></table>';
|
$toolbar.='</tr></table>';
|
||||||
|
|
||||||
break;
|
break;
|
||||||
default:$x='';
|
default:$x='';
|
||||||
}
|
}
|
||||||
@ -1169,7 +1221,7 @@
|
|||||||
|
|
||||||
function createdir()
|
function createdir()
|
||||||
{
|
{
|
||||||
if ($this->newdir && $this->newfile_or_dir)
|
if ($this->newdir_x && $this->newfile_or_dir)
|
||||||
{
|
{
|
||||||
if ($this->bo->badchar = $this->bo->bad_chars ($this->newfile_or_dir, True, True))
|
if ($this->bo->badchar = $this->bo->bad_chars ($this->newfile_or_dir, True, True))
|
||||||
{
|
{
|
||||||
@ -1224,20 +1276,25 @@
|
|||||||
|
|
||||||
function delete()
|
function delete()
|
||||||
{
|
{
|
||||||
for ($i = 0; $i != $this->numoffiles; $i++)
|
if( is_array($this->fileman) && count($this->fileman) >= 1)
|
||||||
{
|
{
|
||||||
if ($this->fileman[$i])
|
foreach($this->fileman as $filename)
|
||||||
{
|
{
|
||||||
if ($this->bo->vfs->delete (array ('string' => $this->fileman[$i])))
|
if ($this->bo->vfs->delete (array ('string' => $filename)))
|
||||||
{
|
{
|
||||||
$this->messages .= lang('Deleted %1', $this->disppath.'/'.$this->fileman[$i]).'<br/>';
|
$this->messages .= lang('Deleted %1', $this->disppath.'/'.$filename).'<br/>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->messages=$GLOBALS['phpgw']->common->error_list (array (lang('Could not delete %1', $this->disppath.'/'.$this->fileman[$i])));
|
$this->messages=$GLOBALS['phpgw']->common->error_list (array (lang('Could not delete %1', $this->disppath.'/'.$filename)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// make this a javascript func for quicker respons
|
||||||
|
$this->messages=$GLOBALS['phpgw']->common->error_list (array (lang('Please select a file to delete.')));
|
||||||
|
}
|
||||||
$this->readFilesInfo();
|
$this->readFilesInfo();
|
||||||
$this->filelisting();
|
$this->filelisting();
|
||||||
}
|
}
|
||||||
@ -1372,7 +1429,7 @@
|
|||||||
$this->edit_file_content = stripslashes ($this->edit_file_content);
|
$this->edit_file_content = stripslashes ($this->edit_file_content);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->edit_preview)
|
if ($this->edit_preview_x)
|
||||||
{
|
{
|
||||||
$content = $this->edit_file_content;
|
$content = $this->edit_file_content;
|
||||||
|
|
||||||
@ -1380,20 +1437,20 @@
|
|||||||
|
|
||||||
$vars[preview_content]=nl2br($content);
|
$vars[preview_content]=nl2br($content);
|
||||||
}
|
}
|
||||||
elseif ($this->edit_save || $this->edit_save_done)
|
elseif ($this->edit_save_x || $this->edit_save_done_x)
|
||||||
{
|
{
|
||||||
$content = $this->edit_file_content;
|
|
||||||
|
|
||||||
|
$content = $this->edit_file_content;
|
||||||
|
//die( $content);
|
||||||
if ($this->bo->vfs->write (array (
|
if ($this->bo->vfs->write (array (
|
||||||
'string' => $this->edit_file,
|
'string' => $this->edit_file,
|
||||||
'relatives' => array (RELATIVE_ALL),
|
'relatives' => array (RELATIVE_ALL),
|
||||||
'content' => $content
|
'content' => $content
|
||||||
))
|
)))
|
||||||
)
|
|
||||||
{
|
{
|
||||||
$this->messages=lang('Saved %1', $this->path.'/'.$this->edit_file);
|
$this->messages=lang('Saved %1', $this->path.'/'.$this->edit_file);
|
||||||
|
|
||||||
if($this->edit_save_done)
|
if($this->edit_save_done_x)
|
||||||
{
|
{
|
||||||
$this->readFilesInfo();
|
$this->readFilesInfo();
|
||||||
$this->fileListing();
|
$this->fileListing();
|
||||||
@ -1473,7 +1530,7 @@
|
|||||||
echo lang('Date');
|
echo lang('Date');
|
||||||
$this->html_table_col_end ();
|
$this->html_table_col_end ();
|
||||||
$this->html_table_col_begin ();
|
$this->html_table_col_begin ();
|
||||||
echolang('Version');
|
echo lang('Version');
|
||||||
$this->html_table_col_end ();
|
$this->html_table_col_end ();
|
||||||
$this->html_table_col_begin ();
|
$this->html_table_col_begin ();
|
||||||
echo lang('Who');
|
echo lang('Who');
|
||||||
@ -1586,7 +1643,7 @@
|
|||||||
while (list ($num, $group_array) = each ($this->readable_groups))
|
while (list ($num, $group_array) = each ($this->readable_groups))
|
||||||
{
|
{
|
||||||
# Don't list directories for groups that don't have access
|
# Don't list directories for groups that don't have access
|
||||||
if (!$groups_applications[$group_array['account_name']][$GLOBALS['appname']]['enabled'])
|
if (!$this->groups_applications[$group_array['account_name']][$GLOBALS['appname']]['enabled'])
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
33
filemanager/inc/hook_sidebox_menu.inc.php
Executable file
33
filemanager/inc/hook_sidebox_menu.inc.php
Executable file
@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
/**************************************************************************\
|
||||||
|
* phpGroupWare - Calendar's Sidebox-Menu for idots-template *
|
||||||
|
* http://www.phpgroupware.org *
|
||||||
|
* Written by Pim Snel <pim@lingewoud.nl> *
|
||||||
|
* -------------------------------------------- *
|
||||||
|
* This program is free software; you can redistribute it and/or modify it *
|
||||||
|
* under the terms of the GNU General Public License as published by the *
|
||||||
|
* Free Software Foundation; either version 2 of the License, or (at your *
|
||||||
|
* option) any later version. *
|
||||||
|
\**************************************************************************/
|
||||||
|
|
||||||
|
/* $Id$ */
|
||||||
|
{
|
||||||
|
|
||||||
|
/*
|
||||||
|
This hookfile is for generating an app-specific side menu used in the idots
|
||||||
|
template set.
|
||||||
|
|
||||||
|
$menu_title speaks for itself
|
||||||
|
$file is the array with link to app functions
|
||||||
|
|
||||||
|
display_sidebox can be called as much as you like
|
||||||
|
*/
|
||||||
|
|
||||||
|
$menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
|
||||||
|
$file = Array(
|
||||||
|
array('','text'=>'Filemanager Preferences','link'=>$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=filemanager')),
|
||||||
|
);
|
||||||
|
display_sidebox($appname,$menu_title,$file);
|
||||||
|
|
||||||
|
}
|
||||||
|
?>
|
@ -24,6 +24,7 @@
|
|||||||
'admin',
|
'admin',
|
||||||
'deleteaccount',
|
'deleteaccount',
|
||||||
'settings',
|
'settings',
|
||||||
|
'sidebox_menu',
|
||||||
'preferences'
|
'preferences'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -1,25 +1,23 @@
|
|||||||
<!-- BEGIN filemanager_header -->
|
<!-- BEGIN filemanager_header -->
|
||||||
<form method="post" action="{form_action}">
|
<form name="formfm" method="post" action="{form_action}">
|
||||||
<br/>
|
|
||||||
{messages}
|
|
||||||
<br/>
|
|
||||||
|
|
||||||
{toolbar0}
|
{toolbar0}
|
||||||
<div id="fmMenu">
|
<div id="fmMenu">
|
||||||
{toolbar1}
|
{toolbar1}
|
||||||
</div>
|
</div>
|
||||||
<div id="fmFileWindow">
|
<div id="fmFileWindow">
|
||||||
<table>
|
{messages} <table cellspacing="0" cellpadding="2">
|
||||||
<tbody>
|
<tbody>
|
||||||
<!-- END filemanager_header -->
|
<!-- END filemanager_header -->
|
||||||
|
|
||||||
<!-- BEGIN column -->
|
<!-- BEGIN column -->
|
||||||
<td valign="top">{col_data} </td>
|
<td valign="top" style="padding-left:2px;padding-right:2px;">{col_data} </td>
|
||||||
<!-- END column -->
|
<!-- END column -->
|
||||||
|
|
||||||
<!-- BEGIN row -->
|
<!-- BEGIN row -->
|
||||||
<tr bgcolor="{row_tr_color}">
|
<tr bgcolor="{row_tr_color}">
|
||||||
<td>{actions}</td>
|
<td style="padding-left:2px;padding-right:2px;">{actions}</td>
|
||||||
{columns}
|
{columns}
|
||||||
</tr>
|
</tr>
|
||||||
<!-- END row -->
|
<!-- END row -->
|
||||||
|
BIN
filemanager/templates/default/images/mime16up.png
Normal file
BIN
filemanager/templates/default/images/mime16up.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.0 KiB |
@ -1,11 +1,11 @@
|
|||||||
<!-- BEGIN index -->
|
<!-- BEGIN index -->
|
||||||
<table width="100%" border="1" cols="{colspan}">
|
<table width="100%" border="1" cols="{colspan}">
|
||||||
<tr>
|
<!--<tr>
|
||||||
<td align="center" colspan="{colspan}">{error}
|
<td align="center" colspan="{colspan}">{error}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>-->
|
||||||
<tr>
|
<tr>
|
||||||
<td align="center" colspan="{colspan}">
|
<td align="center" colspan="{colspan}">{error}
|
||||||
<form action="{form_action}" method="post">
|
<form action="{form_action}" method="post">
|
||||||
<table width="100%" border="1">
|
<table width="100%" border="1">
|
||||||
<tr{tr_extras}>
|
<tr{tr_extras}>
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
<!-- BEGIN upload_header -->
|
<!-- BEGIN upload_header -->
|
||||||
<form method="post" action="{form_action}" enctype="multipart/form-data">
|
<form method="post" action="{form_action}" enctype="multipart/form-data">
|
||||||
<div>
|
<div>
|
||||||
<table>
|
<table cellspacing="0" cellpadding="2">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr bgcolor="{row_tr_color}">
|
<tr bgcolor="#dedede">
|
||||||
<td><strong>{lang_file}</strong></td>
|
<td><strong>{lang_file}</strong></td>
|
||||||
<td><strong>{lang_comment}</strong></td>
|
<td><strong>{lang_comment}</strong></td>
|
||||||
</tr>
|
</tr>
|
||||||
<!-- END upload_header -->
|
<!-- END upload_header -->
|
||||||
|
|
||||||
<!-- BEGIN row -->
|
<!-- BEGIN row -->
|
||||||
<tr bgcolor="{row_tr_color}">
|
<tr >
|
||||||
<td><input maxlength="255" name="upload_file[]" type="file"></td>
|
<td><input maxlength="255" name="upload_file[]" type="file"></td>
|
||||||
<td><input name="upload_comment[]" type="text"></td>
|
<td><input name="upload_comment[]" type="text"></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
Loading…
Reference in New Issue
Block a user