From 36eca32a77466f6c9d3431facd7f5e2541e2ad63 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 4 Jun 2014 12:08:57 +0000 Subject: [PATCH] remove inline script --- filemanager/inc/class.filemanager_select.inc.php | 3 --- filemanager/inc/class.filemanager_ui.inc.php | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php index 4d6398b5c1..64f6f7541a 100644 --- a/filemanager/inc/class.filemanager_select.inc.php +++ b/filemanager/inc/class.filemanager_select.inc.php @@ -301,9 +301,6 @@ class filemanager_select } $readonlys['button[createdir]'] = !egw_vfs::is_writable($content['path']); - // scroll to end of path - $GLOBALS['egw']->js->set_onload("var p = document.getElementById('exec[path][c". (count(explode('/',$content['path']))-1) ."]'); if (p) p.scrollIntoView();"); - //_debug_array($readonlys); egw_session::appsession('select_path','filemanger',$content['path']); $preserve = array( diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php index 2cafad9178..9e21162aaf 100644 --- a/filemanager/inc/class.filemanager_ui.inc.php +++ b/filemanager/inc/class.filemanager_ui.inc.php @@ -356,7 +356,6 @@ class filemanager_ui */ function listview(array $content=null,$msg=null) { - require_once EGW_INCLUDE_ROOT.'/etemplate/inc/class.etemplate.inc.php'; $tpl = new etemplate_new('filemanager.index'); if($msg) egw_framework::message($msg); @@ -712,7 +711,7 @@ class filemanager_ui egw_session::appsession('index','filemanager',$query); } if(!$query['path']) $query['path'] = self::get_home_dir(); - + // be tolerant with (in previous versions) not correct urlencoded pathes if (!egw_vfs::stat($query['path'],true) && egw_vfs::stat(urldecode($query['path']))) { @@ -745,7 +744,7 @@ class filemanager_ui { $namefilter = '/'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'/i'; } - + // Re-map so 'No filters' favorite ('') is depth 1 $filter = $query['filter'] === '' ? 1 : $query['filter']; foreach(egw_vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'],array(