harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica
2014-12-21 14:45:46 -08:00
parent 2b3cc585a2 c732b72a0d
commit b840c27995
21 changed files with 1708 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/RedDAV/RedBrowser.php
View File

@@ -238,11 +238,21 @@ class RedBrowser extends DAV\Browser\Plugin {
$quota['limit'] = $limit;
$quota['desc'] = $quotaDesc;
$html .= replace_macros(get_markup_template('cloud_directory.tpl'), array(
$output = '';
if ($this->enablePost) {
$this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output));
}
$html .= replace_macros(get_markup_template('cloud_header.tpl'), array(
'$header' => t('Files') . ": " . $this->escapeHTML($path) . "/",
'$quota' => $quota,
'$total' => t('Total'),
'$actionspanel' => $output
));
$html .= replace_macros(get_markup_template('cloud_directory.tpl'), array(
'$parentpath' => $parentpath,
'$entries' => $f,
'$quota' => $quota,
'$name' => t('Name'),
'$type' => t('Type'),
'$size' => t('Size'),
@@ -250,15 +260,9 @@ class RedBrowser extends DAV\Browser\Plugin {
'$parent' => t('parent'),
'$edit' => t('Edit'),
'$delete' => t('Delete'),
'$total' => t('Total')
'$nick' => $this->auth->getCurrentUser()
));
$output = '';
if ($this->enablePost) {
$this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output));
}
$html .= $output;
get_app()->page['content'] = $html;
load_pdl(get_app());
construct_page(get_app());
@@ -371,4 +375,4 @@ class RedBrowser extends DAV\Browser\Plugin {
}
return $id;
}
}
}