Skip to content
This repository has been archived by the owner on Nov 14, 2018. It is now read-only.

External without iframe #2216

Open
wants to merge 3 commits into
base: stable9.1
Choose a base branch
from
Open

External without iframe #2216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abfc80c
target form added
Jun 26, 2017
463bed3
url on menu
Jun 26, 2017
fa08b6f
url on menu
Jun 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/ajax/setsites.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
$sites = array();
for ($i = 0; $i < sizeof($_POST['site_name']); $i++) {
if (!empty($_POST['site_name'][$i]) && !empty($_POST['site_url'][$i])) {
array_push($sites, array(strip_tags($_POST['site_name'][$i]), strip_tags($_POST['site_url'][$i]), strip_tags($_POST['site_icon'][$i])));
array_push($sites, array(strip_tags($_POST['site_name'][$i]), strip_tags($_POST['site_url'][$i]), strip_tags($_POST['site_icon'][$i]), strip_tags($_POST['site_target'][$i])));
}
}

Expand Down
4 changes: 3 additions & 1 deletion external/appinfo/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@
$navigationManager = \OC::$server->getNavigationManager();
for ($i = 0; $i < sizeof($sites); $i++) {
$navigationEntry = function () use ($i, $urlGenerator, $sites) {
$href = ($sites[$i][3] == 'iframe') ? $urlGenerator->linkToRoute('external_index', ['id'=> $i + 1]) : $sites[$i][1];
return [
'id' => 'external_index' . ($i + 1),
'order' => 80 + $i,
'href' => $urlGenerator->linkToRoute('external_index', ['id'=> $i + 1]),
'href' => $href,
'icon' => $urlGenerator->imagePath('external', !empty($sites[$i][2]) ? $sites[$i][2] : 'external.svg'),
'name' => $sites[$i][0],
'target' => $sites[$i][3],
];
};
$navigationManager->add($navigationEntry);
Expand Down
1 change: 1 addition & 0 deletions external/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
$tmpl = new OCP\Template( 'external', 'settings');

$tmpl->assign('images', glob(\OC_App::getAppPath('external') . '/img/*.*'));
$tmpl->assign('targets', array('iframe', 'self'));

return $tmpl->fetchPage();
11 changes: 9 additions & 2 deletions external/templates/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,15 @@
} else {
print_unescaped('<option value="">'.$l->t('Select an icon').'</option>');
}
print_unescaped('</select>
<img class="svg action delete_button" src="'.OCP\image_path("", "actions/delete.svg") .'" title="'.$l->t("Remove site").'" />
print_unescaped('</select><select class="site_target" name="site_target[]">');
foreach($_['targets'] as $target) {
if ($target == $sites[$i][3]) {
print_unescaped('<option value="'.$target.'" selected>'.$target.'</option>');
} else {
print_unescaped('<option value="'.$target.'">'.$target.'</option>');
}
}
print_unescaped('</select><img class="svg action delete_button" src="'.OCP\image_path("", "actions/delete.svg") .'" title="'.$l->t("Remove site").'" />
</li>');
}
if(sizeof($sites) === 0) {
Expand Down