mirror of https://github.com/nextcloud/bookmarks
fix naming
This commit is contained in:
Arthur Schiwon
parent
0133230626
commit
c4e95abfba
|
|
@ -1,6 +1,6 @@
|
|||
## Submitting issues
|
||||
|
||||
If you have questions about how to install or use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].
|
||||
If you have questions about how to install or use Nextcloud, please direct these to our [forum][forum]. We are also available on [IRC][irc].
|
||||
|
||||
### Short version
|
||||
|
||||
|
|
@ -11,16 +11,15 @@ If you have questions about how to install or use ownCloud, please direct these
|
|||
- Go to one of the repositories, click "issues" and type any word in the top search/command bar.
|
||||
- You can also filter by appending e. g. "state:open" to the search string.
|
||||
- More info on [search syntax within github](https://help.github.com/articles/searching-issues)
|
||||
* This repository ([bookmarks](https://github.com/owncloud/bookmarks/issues)) is *only* for issues within the ownCloud bookmarks code.
|
||||
* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
|
||||
* This repository ([bookmarks](https://github.com/nextcloud/bookmarks/issues)) is *only* for issues within the bookmarks code.
|
||||
* __SECURITY__: Report any potential security bug to security@nextcloud.com following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker
|
||||
* Report the issue using our [template][template], it includes all the information we need to track down the issue.
|
||||
|
||||
Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
|
||||
|
||||
[template]: https://raw.github.com/owncloud/core/master/issue_template.md
|
||||
[mailinglist]: https://mailman.owncloud.org/mailman/listinfo/owncloud
|
||||
[forum]: https://forum.owncloud.org/
|
||||
[irc]: https://webchat.freenode.net/?channels=owncloud&uio=d4
|
||||
[template]: https://raw.github.com/nextcloud/server/master/issue_template.md
|
||||
[forum]: https://help.nextcloud.com/
|
||||
[irc]: https://webchat.freenode.net/?channels=nextcloud
|
||||
|
||||
### Contribute Code and translations
|
||||
Please check [core's contribution guidelines](https://github.com/owncloud/core/blob/master/CONTRIBUTING.md) for further information about contributing code and translations.
|
||||
Please check [core's contribution guidelines](https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md) for further information about contributing code and translations.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* ownCloud - bookmarks
|
||||
*
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later. See the COPYING file.
|
||||
* @author Marvin Thomas Rabe <mrabe@marvinrabe.de>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* ownCloud - bookmarks
|
||||
*
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later. See the COPYING file.
|
||||
* @author Marvin Thomas Rabe <mrabe@marvinrabe.de>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
<?xml version="1.0"?>
|
||||
<info>
|
||||
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
|
||||
<id>bookmarks</id>
|
||||
<name>Bookmarks</name>
|
||||
<description>Bookmark manager for Nextcloud and ownCloud</description>
|
||||
<summary>A Bookmark manager for Nextcloud and ownCloud</summary>
|
||||
<description><![CDATA[Bookmark manager for Nextcloud and ownCloud]]></description>
|
||||
<licence>AGPL</licence>
|
||||
<author>Arthur Schiwon, Marvin Thomas Rabe, Stefan Klemm</author>
|
||||
<version>0.9.0</version>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* ownCloud - bookmarks
|
||||
*
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later. See the COPYING file.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* ownCloud - bookmarks plugin
|
||||
*
|
||||
* @author Arthur Schiwon
|
||||
* @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
|
||||
* @copyright 2016 Arthur Schiwon blizzz@arthur-schiwon.de
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
|
|
|
|||
|
|
@ -1,7 +1,32 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||
* @copyright Copyright (c) 2014 Stefan Klemm <mail@stefan-klemm.de>
|
||||
*
|
||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||
* @author Stefan Klemm <mail@stefan-klemm.de>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OCA\Bookmarks\Controller\Lib;
|
||||
|
||||
use OC\HintException;
|
||||
use OCP\AppFramework\Http\Response;
|
||||
|
||||
class ExportResponse extends Response {
|
||||
|
|
@ -9,9 +34,15 @@ class ExportResponse extends Response {
|
|||
private $returnstring;
|
||||
|
||||
public function __construct($returnstring) {
|
||||
$user_name = trim(\OCP\User::getDisplayName()) != '' ?
|
||||
\OCP\User::getDisplayName() : \OCP\User::getUser();
|
||||
$export_name = '"ownCloud Bookmarks (' . $user_name . ') (' . date('Y-m-d') . ').html"';
|
||||
$user = \OC::$server->getUserSession()->getUser();
|
||||
if(is_null($user)) {
|
||||
throw new HintException('User not logged in');
|
||||
}
|
||||
|
||||
$userName = $user->getDisplayName();
|
||||
$productName = \OC::$server->getThemingDefaults()->getName();
|
||||
|
||||
$export_name = '"' . $productName . ' Bookmarks (' . $userName . ') (' . date('Y-m-d') . ').html"';
|
||||
$this->addHeader("Cache-Control", "private");
|
||||
$this->addHeader("Content-Type", " application/stream");
|
||||
$this->addHeader("Content-Length", strlen($returnstring));
|
||||
|
|
@ -23,4 +54,4 @@ class ExportResponse extends Response {
|
|||
return $this->returnstring;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* ownCloud - bookmarks plugin
|
||||
*
|
||||
* @author David Iwanowitsch
|
||||
* @copyright 2012 David Iwanowitsch <david at unclouded dot de>
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* ownCloud - bookmarks
|
||||
*
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later. See the COPYING file.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* ownCloud - bookmarks
|
||||
*
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later. See the COPYING file.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<!--
|
||||
Thanks for reporting issues back to ownCloud! This is the issue tracker of ownCloud, if you have any support question please check out https://owncloud.org/support
|
||||
|
||||
This is the bug tracker for the Server component. Find other components at https://github.com/owncloud/core/blob/master/CONTRIBUTING.md#guidelines
|
||||
Thanks for reporting issues back to Bookmarks! This is the issue tracker of Bookmarks, if you have any support question please check out https://nextcloud.com/support
|
||||
|
||||
To make it possible for us to help you please fill out below information carefully.
|
||||
-->
|
||||
|
|
@ -25,18 +23,18 @@ Tell us what happens instead
|
|||
|
||||
**PHP version:**
|
||||
|
||||
**ownCloud version:** (see ownCloud admin page)
|
||||
**Nextcloud version:** (see Nextcloud admin page)
|
||||
|
||||
**Bookmarks version:** (see ownCloud apps page)
|
||||
**Bookmarks version:** (see Nextcloud apps page)
|
||||
|
||||
**Updated from an older ownCloud or fresh install:**
|
||||
**Updated from an older Nextcloud or fresh install:**
|
||||
|
||||
**Where did you install ownCloud from:**
|
||||
**Where did you install Nextcloud from:**
|
||||
|
||||
**Signing status (ownCloud 9.0 and above):**
|
||||
**Signing status (Nextcloud 9 and above):**
|
||||
|
||||
```
|
||||
Login as admin user into your ownCloud and access
|
||||
Login as admin user into your Nextcloud and access
|
||||
http://example.com/index.php/settings/integrity/failed
|
||||
paste the results here.
|
||||
```
|
||||
|
|
@ -46,7 +44,7 @@ paste the results here.
|
|||
```
|
||||
If you have access to your command line run e.g.:
|
||||
sudo -u www-data php occ app:list
|
||||
from within your ownCloud installation folder
|
||||
from within your Nextcloud installation folder
|
||||
```
|
||||
|
||||
**The content of config/config.php:**
|
||||
|
|
@ -54,7 +52,7 @@ from within your ownCloud installation folder
|
|||
```
|
||||
If you have access to your command line run e.g.:
|
||||
sudo -u www-data php occ config:list system
|
||||
from within your ownCloud installation folder
|
||||
from within your Nextcloud installation folder
|
||||
|
||||
or
|
||||
|
||||
|
|
@ -73,7 +71,7 @@ Insert your config.php content here
|
|||
```
|
||||
With access to your command line run e.g.:
|
||||
sudo -u www-data php occ ldap:show-config
|
||||
from within your ownCloud installation folder
|
||||
from within your Nextcloud installation folder
|
||||
|
||||
Without access to your command line download the data/owncloud.db to your local
|
||||
computer or access your SQL server remotely and run the select query:
|
||||
|
|
@ -94,9 +92,9 @@ Eventually replace sensitive data as the name/IP-address of your LDAP server or
|
|||
Insert your webserver log here
|
||||
```
|
||||
|
||||
#### ownCloud log (data/owncloud.log)
|
||||
#### Nextcloud log (data/nextcloud.log)
|
||||
```
|
||||
Insert your ownCloud log here
|
||||
Insert your Nextcloud log here
|
||||
```
|
||||
|
||||
#### Browser log
|
||||
|
|
|
|||
|
|
@ -19,11 +19,12 @@ $bookmarkletscript = bookmarklet($bookmarkleturl);
|
|||
|
||||
function bookmarklet($bookmarkleturl) {
|
||||
$l = \OC::$server->getL10N('bookmarks');
|
||||
$defaults = \OC::$server->getThemingDefaults();
|
||||
$blet = "javascript:(function(){var a=window,b=document,c=encodeURIComponent,e=c(document.title),d=a.open('";
|
||||
$blet .= $bookmarkleturl;
|
||||
$blet .= "?output=popup&url='+c(b.location)+'&title='+e,'bkmk_popup','left='+((a.screenX||a.screenLeft)+10)+',top='+((a.screenY||a.screenTop)+10)+',height=400px,width=550px,resizable=1,alwaysRaised=1');a.setTimeout(function(){d.focus()},300);})();";
|
||||
$help_msg = $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:');
|
||||
$output = '<div id="bookmarklet_hint" class="bkm_hint">' . $help_msg . '</div><a class="button bookmarklet" href="' . $blet . '">' . $l->t('Add to Nextcloud') . '</a>';
|
||||
$output = '<div id="bookmarklet_hint" class="bkm_hint">' . $help_msg . '</div><a class="button bookmarklet" href="' . $blet . '">' . $l->t('Add to ' . \OCP\Util::sanitizeHTML($defaults->getName())) . '</a>';
|
||||
return $output;
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
timeoutForMediumTests="900"
|
||||
timeoutForLargeTests="900"
|
||||
>
|
||||
<testsuite name='ownCloud - Bookmarks App Tests'>
|
||||
<testsuite name='Bookmarks App Tests'>
|
||||
<directory suffix='test.php'>.</directory>
|
||||
</testsuite>
|
||||
<!-- filters for code coverage -->
|
||||
|
|
|
|||
Loading…
Reference in New Issue