Merge pull request #12 from nextcloud/backport-9-9v9.0.58RC1v9.0.58v9.0.57RC1v9.0.57v9.0.56RC1v9.0.56v9.0.55v9.0.54RC1v9.0.54stable9

[stable9] Fix travis CI

16 files changed, 188 insertions, 104 deletions

diff --git a/.travis.yml b/.travis.yml
index d6028927..56bbe3eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,14 +17,13 @@ branches:
     - master
     - /^stable\d+(\.\d+)?$/
 
-
 before_install:
-  - wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh
+  - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
   - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
 
   # Add some output debugging information
-  - cd ../core
-  - ./occ app:enable firstrunwizard
+  - cd ../server
+  - ./occ app:enable $APP_NAME
 
 before_script:
   - cd apps/$APP_NAME/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ece58d5c..1c457704 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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 ([firstrunwizard](https://github.com/owncloud/firstrunwizard/issues)) is *only* for issues within the ownCloud firstrunwizard 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 ([firstrunwizard](https://github.com/nextcloud/firstrunwizard/issues)) is *only* for issues within the ownCloud firstrunwizard code.
+* __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/nextcloud) or 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 [server's contribution guidelines](https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md#contributing-to-source-code) for further information about contributing code and translations.
diff --git a/README.md b/README.md
index cbfd337e..2e514eb5 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,4 @@ firstrunwizard
 
 A first run wizard that explains the usage of ownCloud to new users
 
-[![Build Status](https://travis-ci.org/owncloud/firstrunwizard.svg?branch=master)](https://travis-ci.org/owncloud/firstrunwizard)
+[![Build Status](https://travis-ci.org/nextcloud/firstrunwizard.svg?branch=master)](https://travis-ci.org/nextcloud/firstrunwizard)
diff --git a/ajax/disable.php b/ajax/disable.php
index abb02117..17798837 100644
--- a/ajax/disable.php
+++ b/ajax/disable.php
@@ -1,22 +1,24 @@
 <?php
 /**
- * ownCloud - firstrunwizard application
- *
- * @author Frank Karlitschek
  * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
+ * @author Georg Ehrke <georg@owncloud.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @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 library is distributed in the hope that it will be useful,
+ * 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * 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\FirstRunWizard;
diff --git a/ajax/enable.php b/ajax/enable.php
index 90362713..98592c8f 100644
--- a/ajax/enable.php
+++ b/ajax/enable.php
@@ -1,22 +1,24 @@
 <?php
 /**
- * ownCloud - firstrunwizard application
- *
- * @author Frank Karlitschek
  * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
+ * @author Georg Ehrke <georg@owncloud.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @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 library is distributed in the hope that it will be useful,
+ * 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * 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\FirstRunWizard;
diff --git a/appinfo/app.php b/appinfo/app.php
index 8286f856..51cf74a3 100755
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -1,23 +1,25 @@
 <?php
 /**
- * ownCloud - firstrunwizard App
- *
- * @author Frank Karlitschek
  * @copyright 2012 Frank Karlitschek karlitschek@kde.org
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
+ *
+ * @author Georg Ehrke <georg@owncloud.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @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 library.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ * 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\FirstRunWizard;
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 42877a02..bf9f4772 100755
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <info>
 	<id>firstrunwizard</id>
-	<name>First Run Wizard</name>
-	<description>This application enables a pop-up window when a user first logs into ownCloud. This window welcomes new users to ownCloud, and contains links to the standard ownCloud desktop client, Google Play store app, and the Apple App Store app. The window also shows a link for accessing ownCloud via webdav. At any time, a user can click on a first run wizard button in their personal page to cause the app to reappear.
-The First Run Wizard can be customized to meet specific design goals, or to change links and messages. Create an appropriate theme following the Theming documentation, and changes to the look and feel of this Wizard are simple. More information is available in the First Run Wizard documentation, as well as the theming documentation.
+	<name>First run wizard</name>
+	<description>This application enables a pop-up window when a user first logs into Nextcloud. This window welcomes new users to Nextcloud, and contains links to the standard desktop client, Android app, and the iOS app. The window also shows a link for accessing Nextcloud via WebDAV. At any time, the first run wizard button can be opened again via the link on the personal page.
+The First run wizard can be customized to meet specific design goals, or to change links and messages. Create an appropriate theme following the Theming documentation, and changes to the look and feel of this Wizard are simple. More information is available in the First run wizard documentation, as well as the theming documentation.
 </description>
 	<licence>AGPL</licence>
 	<author>Frank Karlitschek, Jan-Christoph Borchardt</author>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index eb9c5b00..6634ea51 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -1,9 +1,24 @@
 <?php
 /**
- * Copyright (c) 2014 Morris Jobke <>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+
+ *
+ * @author Morris Jobke <hey@morrisjobke.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/>.
+ *
  */
 
 /** @var $this OC\Route\Router */
diff --git a/l10n/.tx/config b/l10n/.tx/config
index 76af3961..bc0573b9 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -3,7 +3,7 @@ host = https://www.transifex.com
 lang_map = ja_JP: ja
 
 
-[owncloud.firstrunwizard]
+[nextcloud.firstrunwizard]
 file_filter = <lang>/firstrunwizard.po
 source_file = templates/firstrunwizard.pot
 source_lang = en
diff --git a/lib/config.php b/lib/config.php
index e0408910..0986d3d7 100755
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,23 +1,23 @@
 <?php
-
 /**
- * ownCloud - firstrunwizard App
- *
- * @author Frank Karlitschek
  * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
+ * @author Georg Ehrke <georg@owncloud.com>
+ *
+ * @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 library is distributed in the hope that it will be useful,
+ * 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * 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\FirstRunWizard;
diff --git a/lib/util.php b/lib/util.php
index 5f10c0ee..b0ac0710 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1,23 +1,24 @@
 <?php
-
 /**
- * ownCloud - firstrunwizard App
+ * @copyright 2015 Georg Ehrke <georg@owncloud.com>
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Georg Ehrke <georg@owncloud.com>
  *
- * @author Georg Ehrke
- * @copyright 2015 Georg Ehrke georg@ownCloud.com
+ * @license GNU AGPL version 3 or any later version
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, 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 library is distributed in the hope that it will be useful,
+ * 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.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * 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\FirstRunWizard;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b7f9915b..6c881956 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,25 @@
 <?php
+/**
 
+ *
+ * @author Georg Ehrke <georg@owncloud.com>
+ *
+ * @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/>.
+ *
+ */
 global $RUNTIME_NOAPPS;
 $RUNTIME_NOAPPS = true;
 
diff --git a/tests/lib/configtest.php b/tests/lib/configtest.php
index 6cfa4a12..3e5a7e84 100644
--- a/tests/lib/configtest.php
+++ b/tests/lib/configtest.php
@@ -1,5 +1,25 @@
 <?php
-
+/**
+
+ *
+ * @author Georg Ehrke <georg@owncloud.com>
+ *
+ * @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\FirstRunWizard\Tests;
 
 use OCA\FirstRunWizard\Config;
diff --git a/tests/lib/utiltest.php b/tests/lib/utiltest.php
index 631855a3..a3d1602b 100644
--- a/tests/lib/utiltest.php
+++ b/tests/lib/utiltest.php
@@ -1,5 +1,25 @@
 <?php
+/**
 
+ *
+ * @author Georg Ehrke <georg@owncloud.com>
+ *
+ * @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\FirstRunWizard\Tests;
 
 use OCA\FirstRunWizard\Util;
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 5a11167a..3e66f993 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -5,7 +5,7 @@
 		 timeoutForMediumTests="900"
 		 timeoutForLargeTests="900"
 		>
-	<testsuite name='ownCloud - FirstRunWizard App Tests'>
+	<testsuite name='FirstRunWizard App Tests'>
 		<directory suffix='test.php'>.</directory>
 	</testsuite>
 	<!-- filters for code coverage -->
@@ -22,4 +22,4 @@
 		<!-- and this is where your report will be written -->
 		<log type="coverage-clover" target="./clover.xml"/>
 	</logging>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/wizard.php b/wizard.php
index e412371c..4b72a722 100644
--- a/wizard.php
+++ b/wizard.php
@@ -1,25 +1,29 @@
 <?php
-
 /**
-* ownCloud - First Run Wizard
-*
-* @author Frank Karlitschek
 * @copyright 2012 Frank Karlitschek frank@owncloud.org
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library 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 library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ *
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Björn Schießle <bjoern@schiessle.org>
+ * @author Georg Ehrke <georg@owncloud.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @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\FirstRunWizard;
 
 use OCP\Defaults;