extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-18 12:30:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Entry share changes

Browse Source 
- Writable share is now a checkbox
- Add Sharing -> Merge entry into email template, share gets selected options
- Add {{share}} placeholder which creates (by default) read only share
This commit is contained in:
nathangray
2018-10-11 10:09:16 -06:00
parent 970fb80675
commit 117b559a5e
6 changed files with 166 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Contacts/Merge.php
View File

@@ -218,6 +218,9 @@ class Merge extends Api\Storage\Merge
echo '<tr><td>{{'.$name.'}}</td><td colspan="3">'.$label."</td></tr>\n";
}
echo '<tr><td colspan="4"><h3>'.lang('EPL Only').":</h3></td></tr>";
echo '<tr><td>{{share}}</td><td colspan="3">'.lang('Public sharing URL')."</td></tr>\n";
Api\Translation::add_app('calendar');
echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')." # = 1, 2, ..., 20, -1</h3></td></tr>";
foreach(array(
@@ -278,7 +281,7 @@ class Merge extends Api\Storage\Merge
// Change merge into email actions so we can customize them
static::customise_mail_actions($actions);
return $actions;
}

62
api/src/Link/Sharing.php
View File

@@ -76,49 +76,33 @@ class Sharing extends \EGroupware\Api\Sharing
*/
public static function get_actions($appname, $group = 6)
{
$actions = array(
'share' => array(
'caption' => lang('Share'),
'icon' => 'api/share',
'group' => $group,
'allowOnMultiple' => false,
'children' => array(
'shareReadonlyLink' => array(
'caption' => lang('Readonly Share'),
'group' => 1,
'icon' => 'view',
'order' => 11,
'enabled' => "javaScript:app.$appname.is_share_enabled",
'onExecute' => "javaScript:app.$appname.share_link"
),
'shareWritableLink' => array(
'caption' => lang('Writable Share'),
'group' => 1,
'icon' => 'edit',
'allowOnMultiple' => false,
'order' => 11,
'enabled' => "javaScript:app.$appname.is_share_enabled",
'onExecute' => "javaScript:app.$appname.share_link"
),
'shareFiles' => array(
'caption' => lang('Share files'),
'group' => 2,
'enabled' => "javaScript:app.$appname.is_share_enabled",
'checkbox' => true
)
),
));
if(!$GLOBALS['egw_info']['apps']['stylite'])
$actions = parent::get_actions($appname, $group);
// Add in merge to mail document
if ($GLOBALS['egw_info']['user']['apps']['mail'] && class_exists($appname.'_merge'))
{
array_unshift($actions['share']['children'], array(
'caption' => lang('EPL Only'),
'group' => 0
));
foreach($actions['share']['children'] as &$child)
$documents = call_user_func(array($appname.'_merge', 'document_action'),
$GLOBALS['egw_info']['user']['preferences']['addressbook']['document_dir'],
1, 'Insert in document', 'shareDocument_'
);
$documents['order'] = 20;
// Mail only
foreach($documents['children'] as $key => &$document)
{
$child['enabled'] = false;
if(strpos($document['target'],'compose_') === FALSE)
{
unset($documents['children'][$key]);
continue;
}
$document['allowOnMultiple'] = true;
$document['onExecute'] = "javaScript:app.$appname.share_merge";
}
$documents['enabled'] = !!($GLOBALS['egw_info']['user']['apps']['stylite']);
$actions['share']['children']['shareDocuments'] = $documents;
}
return $actions;
}

28
api/src/Sharing.php
View File

@@ -389,31 +389,31 @@ class Sharing
'allowOnMultiple' => false,
'children' => array(
'shareReadonlyLink' => array(
'caption' => lang('Readonly Share'),
'caption' => lang('Share link'),
'group' => 1,
'icon' => 'view',
'order' => 11,
'enabled' => "javaScript:app.$appname.is_share_enabled",
'onExecute' => "javaScript:app.$appname.share_link"
),
'shareWritableLink' => array(
'caption' => lang('Writable Share'),
'group' => 1,
'shareWritable' => array(
'caption' => lang('Writable'),
'group' => 2,
'icon' => 'edit',
'allowOnMultiple' => false,
'order' => 11,
'allowOnMultiple' => true,
'enabled' => "javaScript:app.$appname.is_share_enabled",
'onExecute' => "javaScript:app.$appname.share_link"
'checkbox' => true
),
'shareFiles' => array(
'caption' => lang('Share files'),
'group' => 2,
'allowOnMultiple' => true,
'enabled' => "javaScript:app.$appname.is_share_enabled",
'checkbox' => true
)
),
));
if(!$GLOBALS['egw_info']['apps']['stylite'])
if(!$GLOBALS['egw_info']['user']['apps']['stylite'])
{
array_unshift($actions['share']['children'], array(
'caption' => lang('EPL Only'),
@@ -591,24 +591,28 @@ class Sharing
*
* @param String $action
* @param String $path
* @param boolean $writable
* @param boolean $files
*/
public static function ajax_create($action, $path, $files)
public static function ajax_create($action, $path, $writable = false, $files = false)
{
$class = self::get_share_class(array('share_path' => $path));
$share = $class::create(
$path,
$action == 'shareWritableLink' ? Sharing::WRITABLE : Sharing::READONLY,
basename($selected),
$action == $writable ? Sharing::WRITABLE : Sharing::READONLY,
basename($path),
array(),
array(
'share_writable' => $action == 'shareWritableLink',
'share_writable' => $writable,
'include_files' => $files
)
);
// Store share in session so Merge can find this one and not create a read-only one
\EGroupware\Api\Cache::setSession(__CLASS__, $path, $share);
$arr = array(
'action' => $action,
'writable' => $writable,
'share_link' => $class::share2link($share),
'template' => Etemplate\Widget\Template::rel2url('/filemanager/templates/default/share_dialog.xet')
);

80
api/src/Storage/Merge.php
View File

@@ -450,6 +450,58 @@ abstract class Merge
return $array;
}
/**
* Get share placeholder
*
* If the placeholder is present in the content, the share will be automatically
* created.
*/
protected function share_placeholder($app, $id, $prefix, &$content)
{
$replacements = array();
// Skip if no content or content has no share placeholder
if(!$content || strpos($content, '$$share') === FALSE)
{
return $replacements;
}
if(!$GLOBALS['egw_info']['user']['apps']['stylite'])
{
$replacements['$$'.$prefix.'share$$'] = lang('EPL Only');
return $replacements;
}
// Get or create the share
// Check if some other process created the share (with custom options)
// and put it in the session cache for us
$path = "$app::$id";
$session = \EGroupware\Api\Cache::getSession(Api\Sharing::class, $path);
if($session && $session['share_path'] == $path)
{
$share = $session;
}
else
{
// 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;
$recipients = array();
$extra = array();
//$extra['share_writable'] |= ($mode == Sharing::WRITABLE ? 1 : 0);
$share = \EGroupware\Stylite\Link\Sharing::create($path, $mode, NULL, $recipients, $extra);
}
if($share)
{
$replacements['$$'.$prefix.'share$$'] = $link = Api\Sharing::share2link($share);
}
return $replacements;
}
/**
* Format a datetime
*
@@ -850,6 +902,9 @@ abstract class Merge
$replacements['$$datetime$$'] = Api\DateTime::to('now');
$replacements['$$time$$'] = Api\DateTime::to('now',false);
$app = $this->get_app();
$replacements += $this->share_placeholder($app, $id, $prefix, $content);
// does our extending class registered table-plugins AND document contains table tags
if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s',$content,$matches,PREG_SET_ORDER))
{
@@ -1438,6 +1493,31 @@ abstract class Merge
}
}
/**
* Figure out which app we're running as
*
* @return string
*/
protected function get_app()
{
switch (get_class($this))
{
case 'EGroupware\Api\Contacts\Merge':
$app = 'addressbook';
break;
default:
$app = str_replace('_merge','',get_class($this));
if(!in_array($app, $GLOBALS['egw_info']['apps']))
{
$app = false;
}
break;
}
return $app;
}
/**
* Get the replacements for any entry specified by app & id
*