extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add placeholder list for calendar & filemanager

Browse Source
This commit is contained in:
nathan 2021-10-07 13:45:49 -06:00
parent 417bbccbe3
commit c73a7beac8
4 changed files with 559 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/js/etemplate/et2_widget_placeholder.ts
View File

@ -227,8 +227,9 @@ export class et2_placeholder_select extends et2_inputWidget
app.onchange = (node, widget) =>
{
preview.set_value("");
if(['user'].indexOf(widget.get_value()) >= 0)
if(['user', 'filemanager'].indexOf(widget.get_value()) >= 0)
{
// These ones don't let you select an entry for preview (they don't work)
entry.set_disabled(true);
entry.app_select.val('user');
entry.set_value({app: 'user', id: '', query: ''});

10
api/src/Etemplate/Widget/Placeholder.php
View File

@ -64,9 +64,13 @@ class Placeholder extends Etemplate\Widget
if(is_null($apps))
{
$apps = ['addressbook', 'user', 'general'] +
$apps = array_merge(
['addressbook', 'user', 'general'],
// We use linking for preview, so limit to apps that support links
array_keys(Api\Link::app_list('query'));
array_keys(Api\Link::app_list('query')),
// Filemanager doesn't support links, but add it anyway
['filemanager']
);
}
foreach($apps as $appname)
@ -86,6 +90,8 @@ class Placeholder extends Etemplate\Widget
// Looks like app doesn't support merging
continue 2;
}
Api\Translation::load_app($appname, $GLOBALS['egw_info']['user']['preferences']['common']['lang']);
$list = method_exists($merge, 'get_placeholder_list') ? $merge->get_placeholder_list() : [];
break;
}

542
calendar/inc/class.calendar_merge.inc.php
View File

File diff suppressed because it is too large Load Diff

108
filemanager/inc/class.filemanager_merge.inc.php
View File

@ -33,8 +33,7 @@ class filemanager_merge extends Api\Storage\Merge
/**
* Fields that are numeric, for special numeric handling
*/
protected $numeric_fields = array(
);
protected $numeric_fields = array();
/**
* Fields that are dates or timestamps
@ -74,12 +73,12 @@ class filemanager_merge extends Api\Storage\Merge
* Get replacements
*
* @param int $id id of entry
* @param string &$content=null content to create some replacements only if they are use
* @param string &$content =null content to create some replacements only if they are use
* @return array|boolean
*/
protected function get_replacements($id,&$content=null)
protected function get_replacements($id, &$content = null)
{
if (!($replacements = $this->filemanager_replacements($id, '', $content)))
if(!($replacements = $this->filemanager_replacements($id, '', $content)))
{
return false;
}
@ -90,35 +89,35 @@ class filemanager_merge extends Api\Storage\Merge
* Get filemanager replacements
*
* @param int $id id (vfs path) of entry
* @param string $prefix='' prefix like eg. 'erole'
* @param string $prefix ='' prefix like eg. 'erole'
* @return array|boolean
*/
public function filemanager_replacements($id,$prefix='', &$content = null)
public function filemanager_replacements($id, $prefix = '', &$content = null)
{
$info = array();
$file = Vfs::lstat($id,true);
$file = Vfs::lstat($id, true);
$file['mtime'] = Api\DateTime::to($file['mtime']);
$file['ctime'] = Api\DateTime::to($file['ctime']);
$file['name'] = Vfs::basename($id);
$file['dir'] = ($dir = Vfs::dirname($id)) ? Vfs::decodePath($dir) : '';
$dirlist = explode('/',$file['dir']);
$dirlist = explode('/', $file['dir']);
$file['folder'] = array_pop($dirlist);
$file['folder_file'] = $file['folder'] . '/'.$file['name'];
$file['folder_file'] = $file['folder'] . '/' . $file['name'];
$file['path'] = $id;
$file['rel_path'] = str_replace($this->dir.'/', '', $id);
$file['rel_path'] = str_replace($this->dir . '/', '', $id);
$file['hsize'] = Vfs::hsize($file['size']);
$file['mime'] = Vfs::mime_content_type($id);
$file['gid'] *= -1; // our widgets use negative gid's
if (($props = Vfs::propfind($id)))
if(($props = Vfs::propfind($id)))
{
foreach($props as $prop)
{
$file[$prop['name']] = $prop['val'];
}
}
if (($file['is_link'] = Vfs::is_link($id)))
if(($file['is_link'] = Vfs::is_link($id)))
{
$file['symlink'] = Vfs::readlink($id);
}
@ -131,17 +130,17 @@ class filemanager_merge extends Api\Storage\Merge
foreach(Api\Storage\Customfields::get('filemanager') as $name => $field)
{
// Set any missing custom fields, or the marker will stay
if(!$file['#'.$name])
if(!$file['#' . $name])
{
$file['#'.$name] = '';
$file['#' . $name] = '';
continue;
}
// Format date cfs per user Api\Preferences
if($field['type'] == 'date' || $field['type'] == 'date-time')
{
$this->date_fields[] = '#'.$name;
$file['#'.$name] = Api\DateTime::to($file['#'.$name], $field['type'] == 'date' ? true : '');
$this->date_fields[] = '#' . $name;
$file['#' . $name] = Api\DateTime::to($file['#' . $name], $field['type'] == 'date' ? true : '');
}
}
}
@ -150,17 +149,19 @@ class filemanager_merge extends Api\Storage\Merge
if($dirlist[1] == 'apps' && count($dirlist) > 1)
{
// Try this first - a normal path /apps/appname/id/file
list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/') + 5));
// Symlink?
if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
{
// Try resolving just app + ID - /apps/App Name/Record Title/file
$resolved = Vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
$resolved = Vfs::resolve_url_symlinks(implode('/', array_slice(explode('/', $file['dir']), 0, 4)));
list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/') + 5));
if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
{
// Get rid of any virtual folders (eg: All$) and symlinks
$resolved = Vfs::resolve_url_symlinks($file['path']);
list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/') + 5));
}
}
if($app && $app_id)
@ -170,7 +171,7 @@ class filemanager_merge extends Api\Storage\Merge
$app_merge = null;
try
{
$classname = $app .'_merge';
$classname = $app . '_merge';
if(class_exists($classname))
{
$app_merge = new $classname();
@ -181,7 +182,8 @@ class filemanager_merge extends Api\Storage\Merge
}
}
// Silently discard & continue
catch(Exception $e) {
catch (Exception $e)
{
unset($e); // not used
}
}
@ -211,7 +213,7 @@ class filemanager_merge extends Api\Storage\Merge
foreach($file as $key => &$value)
{
if(!$value) $value = '';
$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
$info['$$' . ($prefix ? $prefix . '/' : '') . $key . '$$'] = $value;
}
if($app_placeholders)
{
@ -239,14 +241,18 @@ class filemanager_merge extends Api\Storage\Merge
{
return $session;
}
else if (($session = \EGroupware\Api\Cache::getSession(Api\Sharing::class, "$app::$id")) &&
else
{
if(($session = \EGroupware\Api\Cache::getSession(Api\Sharing::class, "$app::$id")) &&
substr($session['share_path'], -strlen($path)) === $path)
{
return $session;
}
}
// Need to create the share here.
// No way to know here if it should be writable, or who it's going to
$mode = /* ? ? Sharing::WRITABLE :*/ Api\Sharing::READONLY;
$mode = /* ? ? Sharing::WRITABLE :*/
Api\Sharing::READONLY;
$recipients = array();
$extra = array();
@ -315,11 +321,55 @@ class filemanager_merge extends Api\Storage\Merge
'LETTERPREFIXCUSTOM' => lang('Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller'),
) as $name => $label)
{
echo '<tr><td>{{'.$name.'}}</td><td colspan="3">'.$label."</td></tr>\n";
echo '<tr><td>{{' . $name . '}}</td><td colspan="3">' . $label . "</td></tr>\n";
}
echo "</table>\n";
echo $GLOBALS['egw']->framework->footer();
}
/**
* Get a list of placeholders provided.
*
* Placeholders are grouped logically. Group key should have a user-friendly translation.
*/
public function get_placeholder_list($prefix = '')
{
$placeholders = parent::get_placeholder_list($prefix);
$fields = array(
'name' => 'name',
'path' => 'Absolute path',
'rel_path' => 'Path relative to current directory',
'folder' => 'Containing folder',
'folder_file' => 'Containing folder and file name',
'url' => 'url',
'webdav_url' => 'External path using webdav',
'link' => 'Clickable link to file',
'comment' => 'comment',
'mtime' => 'modified',
'ctime' => 'created',
'mime' => 'Type',
'hsize' => 'Size',
'size' => 'Size (in bytes)',
);
$group = 'placeholders';
foreach($fields as $name => $label)
{
$marker = $this->prefix($prefix, $name, '{');
if(!array_filter($placeholders, function ($a) use ($marker)
{
return array_key_exists($marker, $a);
}))
{
$placeholders[$group][] = [
'value' => $marker,
'label' => $label
];
}
}
return $placeholders;
}
}