[Pkg-owncloud-commits] [owncloud] 01/04: Imported Upstream version 5.0.12+dfsg
David Prévot
taffit at alioth.debian.org
Fri Oct 4 22:14:10 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit bba9742930948a84cda9b9703447e387e0a9826a
Author: David Prévot <taffit at debian.org>
Date: Thu Oct 3 14:35:44 2013 -0400
Imported Upstream version 5.0.12+dfsg
---
COPYING-README | 15 -----
apps/files_encryption/appinfo/info.xml | 1 +
core/doc/user/_sources/pim/index.txt | 1 +
core/doc/user/_sources/pim/sync_ios.txt | 4 +-
core/doc/user/_sources/pim/sync_osx.txt | 4 +-
core/doc/user/_sources/pim/troubleshooting.txt | 36 +++++++++++
core/doc/user/bookmarks.html | 2 +-
core/doc/user/contents.html | 4 ++
core/doc/user/pim/calendar.html | 1 +
core/doc/user/pim/contacts.html | 1 +
core/doc/user/pim/index.html | 2 +
core/doc/user/pim/sync_ios.html | 5 +-
core/doc/user/pim/sync_kde.html | 3 +-
core/doc/user/pim/sync_osx.html | 2 +
core/doc/user/pim/sync_thunderbird.html | 1 +
.../pim/{sync_kde.html => troubleshooting.html} | 64 +++++++++++---------
core/doc/user/searchindex.js | 2 +-
core/templates/login.php | 2 +
lib/base.php | 1 +
lib/util.php | 54 ++++++++++++++---
20 files changed, 145 insertions(+), 60 deletions(-)
diff --git a/COPYING-README b/COPYING-README
deleted file mode 100644
index 49e0351..0000000
--- a/COPYING-README
+++ /dev/null
@@ -1,15 +0,0 @@
-Files in ownCloud are licensed under the Affero General Public License version 3,
-the text of which can be found in COPYING-AGPL, or any later version of the AGPL,
-unless otherwise noted.
-
-Licensing of components:
-* jQuery: MIT / GPL
-* HTTP: 3 clause BSD
-* MDB2: BSD style custom
-* User: AGPL
-* XML/RPC: MIT / PHP
-* Silk icons: Creative Commons Attribution
-All unmodified files from these and other sources retain their original copyright
-and license notices: see the relevant individual files.
-
-Attribution information for ownCloud is contained in the AUTHORS file.
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 46f1375..9d49591 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -7,6 +7,7 @@
<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
<require>4</require>
<shipped>true</shipped>
+ <rememberlogin>false</rememberlogin>
<types>
<filesystem/>
</types>
diff --git a/core/doc/user/_sources/pim/index.txt b/core/doc/user/_sources/pim/index.txt
index 4d0e54e..65e720b 100644
--- a/core/doc/user/_sources/pim/index.txt
+++ b/core/doc/user/_sources/pim/index.txt
@@ -11,4 +11,5 @@ Contacts & Calendar
sync_osx
sync_thunderbird
sync_kde
+ troubleshooting
diff --git a/core/doc/user/_sources/pim/sync_ios.txt b/core/doc/user/_sources/pim/sync_ios.txt
index 170cddb..73e7ef7 100644
--- a/core/doc/user/_sources/pim/sync_ios.txt
+++ b/core/doc/user/_sources/pim/sync_ios.txt
@@ -49,5 +49,5 @@ Address book
- Go back to account information and hit Save.
Now should now find your contacts in the address book of your
-iPhone.Problems have been reported for iOS 4.X. A possible solution is
-at the `forum <http://forum.owncloud.org/viewtopic.php?f=3&t=71&p=2211#p2197>`_.
\ No newline at end of file
+iPhone.
+If it's still not working, have a look at the :doc:`troubleshooting` guide.
\ No newline at end of file
diff --git a/core/doc/user/_sources/pim/sync_osx.txt b/core/doc/user/_sources/pim/sync_osx.txt
index 1e8965e..6369c5b 100644
--- a/core/doc/user/_sources/pim/sync_osx.txt
+++ b/core/doc/user/_sources/pim/sync_osx.txt
@@ -12,7 +12,7 @@ The setup is basically the same as with iOS using the path **ADDRESS/remote.php/
#. Go back to the folder window from step 2. You will now see a newly created folder with another long string as its name.
#. Navigate to the newly created folder and edit the **Configuration.plist** with your favorite text editor.
#. Search for a section looking like this::
-
+
<key>servername</key> <string>http://:0(null)</string> <key>username</key> <string>Whatever_you_entered_before</string>
8. Make it look like this. Please note that the :80 after **YOUR_DOMAIN** is important::
@@ -25,6 +25,8 @@ The setup is basically the same as with iOS using the path **ADDRESS/remote.php/
11. You may have to restart Address Book once more. After this, it should work.
+If it's still not working, have a look at the :doc:`troubleshooting` guide.
+
There is also an easy `HOWTO`_ in the forum.
diff --git a/core/doc/user/_sources/pim/troubleshooting.txt b/core/doc/user/_sources/pim/troubleshooting.txt
new file mode 100644
index 0000000..57ac534
--- /dev/null
+++ b/core/doc/user/_sources/pim/troubleshooting.txt
@@ -0,0 +1,36 @@
+Troubleshooting
+===============
+
+Service discovery
+-----------------
+
+Some clients - especially iOS - have problems finding the proper sync URL, even when explicitly
+configured to use it.
+
+There are several techniques to remedy this, which are described extensively at the
+`Sabre DAV website <http://code.google.com/p/sabredav/wiki/ServiceDiscovery>`_.
+
+Below is what have proven to work with iOS including iOS 7.
+
+If your ownCloud instance is installed in a sub-folder under the web servers document root, and
+the client has difficulties finding the Cal- or CardDAV end-points, configure your web server to
+redirect from a "well-know" URL to the one used by ownCloud.
+When using the Apache web server this is easily achieved using a :file:`.htaccess` file in the document
+root of your site.
+
+Say your instance is located in the ``owncloud`` folder, so the URL to it is ``ADDRESS/owncloud``,
+create or edit the :file:`.htaccess` file and add the following lines::
+
+ Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
+ Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav
+
+If you use Nginx as web server, the setting looks something like::
+
+ url.redirect = (
+ "^/.well-known/carddav" => "/owncloud/remote.php/carddav",
+ "^/.well-known/caldav" => "/owncloud/remote.php/caldav",
+ )
+
+Now change the URL in the client settings to just use ``ADDRESS`` instead of e.g. ``ADDRESS/remote.php/carddav/principals/username``.
+
+This problem is being discussed in the `forum <http://forum.owncloud.org/viewtopic.php?f=3&t=71&p=2211#p2197>`_.
diff --git a/core/doc/user/bookmarks.html b/core/doc/user/bookmarks.html
index 3a0b3b2..73942aa 100644
--- a/core/doc/user/bookmarks.html
+++ b/core/doc/user/bookmarks.html
@@ -26,7 +26,7 @@
<script type="text/javascript" src="_static/bootstrap.js"></script>
<link rel="top" title="ownCloud User Manual v5.0 documentation" href="index.html" />
<link rel="next" title="Native Media Player Support" href="mediaplayer.html" />
- <link rel="prev" title="Synchronizing with KDE SC" href="pim/sync_kde.html" />
+ <link rel="prev" title="Troubleshooting" href="pim/troubleshooting.html" />
<script type="text/javascript">
(function () {
/**
diff --git a/core/doc/user/contents.html b/core/doc/user/contents.html
index 836bc19..817b4a8 100644
--- a/core/doc/user/contents.html
+++ b/core/doc/user/contents.html
@@ -185,6 +185,10 @@
</ul>
</li>
<li class="toctree-l2"><a class="reference internal" href="pim/sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="pim/troubleshooting.html">Troubleshooting</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/troubleshooting.html#service-discovery">Service discovery</a></li>
+</ul>
+</li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a><ul>
diff --git a/core/doc/user/pim/calendar.html b/core/doc/user/pim/calendar.html
index c27980b..486c3a3 100644
--- a/core/doc/user/pim/calendar.html
+++ b/core/doc/user/pim/calendar.html
@@ -129,6 +129,7 @@
<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Address Book</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
diff --git a/core/doc/user/pim/contacts.html b/core/doc/user/pim/contacts.html
index c1323e2..7b6c84a 100644
--- a/core/doc/user/pim/contacts.html
+++ b/core/doc/user/pim/contacts.html
@@ -127,6 +127,7 @@
<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Address Book</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
diff --git a/core/doc/user/pim/index.html b/core/doc/user/pim/index.html
index b243c42..864e11a 100644
--- a/core/doc/user/pim/index.html
+++ b/core/doc/user/pim/index.html
@@ -121,6 +121,7 @@
<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Address Book</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
@@ -148,6 +149,7 @@
<li class="toctree-l1"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
<li class="toctree-l1"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Address Book</a></li>
<li class="toctree-l1"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
</ul>
</div>
</div>
diff --git a/core/doc/user/pim/sync_ios.html b/core/doc/user/pim/sync_ios.html
index 5da0c3a..0e15c90 100644
--- a/core/doc/user/pim/sync_ios.html
+++ b/core/doc/user/pim/sync_ios.html
@@ -126,6 +126,7 @@
<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Address Book</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
@@ -194,8 +195,8 @@ following:<ul>
</li>
</ol>
<p>Now should now find your contacts in the address book of your
-iPhone.Problems have been reported for iOS 4.X. A possible solution is
-at the <a class="reference external" href="http://forum.owncloud.org/viewtopic.php?f=3&t=71&p=2211#p2197">forum</a>.</p>
+iPhone.
+If it’s still not working, have a look at the <a class="reference internal" href="troubleshooting.html"><em>Troubleshooting</em></a> guide.</p>
</div>
</div>
diff --git a/core/doc/user/pim/sync_kde.html b/core/doc/user/pim/sync_kde.html
index a584511..1e46ba9 100644
--- a/core/doc/user/pim/sync_kde.html
+++ b/core/doc/user/pim/sync_kde.html
@@ -26,7 +26,7 @@
<script type="text/javascript" src="../_static/bootstrap.js"></script>
<link rel="top" title="ownCloud User Manual v5.0 documentation" href="../index.html" />
<link rel="up" title="Contacts & Calendar" href="index.html" />
- <link rel="next" title="Using the Bookmarks App" href="../bookmarks.html" />
+ <link rel="next" title="Troubleshooting" href="troubleshooting.html" />
<link rel="prev" title="Thunderbird - Synchronize Address Book" href="sync_thunderbird.html" />
<script type="text/javascript">
(function () {
@@ -122,6 +122,7 @@
<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Address Book</a></li>
<li class="toctree-l2 current"><a class="current reference internal" href="">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
diff --git a/core/doc/user/pim/sync_osx.html b/core/doc/user/pim/sync_osx.html
index c829baa..8e9fb77 100644
--- a/core/doc/user/pim/sync_osx.html
+++ b/core/doc/user/pim/sync_osx.html
@@ -122,6 +122,7 @@
<li class="toctree-l2 current"><a class="current reference internal" href="">Synchronizing with OS X</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Address Book</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
@@ -173,6 +174,7 @@
<li><p class="first">You may have to restart Address Book once more. After this, it should work.</p>
</li>
</ol>
+<p>If it’s still not working, have a look at the <a class="reference internal" href="troubleshooting.html"><em>Troubleshooting</em></a> guide.</p>
<p>There is also an easy <a class="reference external" href="http://forum.owncloud.org/viewtopic.php?f=3&t=132">HOWTO</a> in the forum.</p>
</div>
diff --git a/core/doc/user/pim/sync_thunderbird.html b/core/doc/user/pim/sync_thunderbird.html
index 559e1fb..3e77611 100644
--- a/core/doc/user/pim/sync_thunderbird.html
+++ b/core/doc/user/pim/sync_thunderbird.html
@@ -125,6 +125,7 @@
</ul>
</li>
<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
diff --git a/core/doc/user/pim/sync_kde.html b/core/doc/user/pim/troubleshooting.html
similarity index 64%
copy from core/doc/user/pim/sync_kde.html
copy to core/doc/user/pim/troubleshooting.html
index a584511..cdff6cd 100644
--- a/core/doc/user/pim/sync_kde.html
+++ b/core/doc/user/pim/troubleshooting.html
@@ -6,7 +6,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Synchronizing with KDE SC — ownCloud User Manual v5.0 documentation</title>
+ <title>Troubleshooting — ownCloud User Manual v5.0 documentation</title>
<link rel="stylesheet" href="../_static/style.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/style.css" type="text/css" />
@@ -27,7 +27,7 @@
<link rel="top" title="ownCloud User Manual v5.0 documentation" href="../index.html" />
<link rel="up" title="Contacts & Calendar" href="index.html" />
<link rel="next" title="Using the Bookmarks App" href="../bookmarks.html" />
- <link rel="prev" title="Thunderbird - Synchronize Address Book" href="sync_thunderbird.html" />
+ <link rel="prev" title="Synchronizing with KDE SC" href="sync_kde.html" />
<script type="text/javascript">
(function () {
/**
@@ -121,7 +121,11 @@
<li class="toctree-l2"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_osx.html">Synchronizing with OS X</a></li>
<li class="toctree-l2"><a class="reference internal" href="sync_thunderbird.html">Thunderbird - Synchronize Address Book</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_kde.html">Synchronizing with KDE SC</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Troubleshooting</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#service-discovery">Service discovery</a></li>
+</ul>
+</li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
@@ -139,32 +143,34 @@
<div class="span9">
<div class="page-content">
- <div class="section" id="synchronizing-with-kde-sc">
-<h1>Synchronizing with KDE SC<a class="headerlink" href="#synchronizing-with-kde-sc" title="Permalink to this headline">¶</a></h1>
-<img alt="../_images/kdes1.png" src="../_images/kdes1.png" />
-<p>From KDE SC 4.8 and forward setting up ownCloud is very easy. From System
-Settings Personal Information/Akonadi Resources Configuration select DAV
-Groupware resource.</p>
-<img alt="../_images/kdes2.png" src="../_images/kdes2.png" />
-<p>Enter your ownCloud username and password and click “Next”.</p>
-<img alt="../_images/kdes3.png" src="../_images/kdes3.png" />
-<p>Select ownCloud in the drop down list and click “Next”.</p>
-<img alt="../_images/kdes4.png" src="../_images/kdes4.png" />
-<p>Enter the host name and installation path. If you do not use SSL
-remember to de-select “Use secure connection”.</p>
-<img alt="../_images/kdes5.png" src="../_images/kdes5.png" />
-<p>Test the connection. If everything went well you should see a message
-like the one below.</p>
-<img alt="../_images/kdes6.png" src="../_images/kdes6.png" />
-<p>Click “Finish” and you will be able to change the display name and
-refresh interval.</p>
-<img alt="../_images/kdes7.png" src="../_images/kdes7.png" />
-<p>Now you should see the Akonadi resource doing the first
-synchronization.</p>
-<p>You can find the Contacts and Calendars in Kontact (or
-KOrganizer/KAddressbook if you run the programs separately.)</p>
-<img alt="../_images/kdes9.png" src="../_images/kdes9.png" />
-<img alt="../_images/kdes.png" src="../_images/kdes.png" />
+ <div class="section" id="troubleshooting">
+<h1>Troubleshooting<a class="headerlink" href="#troubleshooting" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="service-discovery">
+<h2>Service discovery<a class="headerlink" href="#service-discovery" title="Permalink to this headline">¶</a></h2>
+<p>Some clients - especially iOS - have problems finding the proper sync URL, even when explicitly
+configured to use it.</p>
+<p>There are several techniques to remedy this, which are described extensively at the
+<a class="reference external" href="http://code.google.com/p/sabredav/wiki/ServiceDiscovery">Sabre DAV website</a>.</p>
+<p>Below is what have proven to work with iOS including iOS 7.</p>
+<p>If your ownCloud instance is installed in a sub-folder under the web servers document root, and
+the client has difficulties finding the Cal- or CardDAV end-points, configure your web server to
+redirect from a “well-know” URL to the one used by ownCloud.
+When using the Apache web server this is easily achieved using a <tt class="file docutils literal"><span class="pre">.htaccess</span></tt> file in the document
+root of your site.</p>
+<p>Say your instance is located in the <tt class="docutils literal"><span class="pre">owncloud</span></tt> folder, so the URL to it is <tt class="docutils literal"><span class="pre">ADDRESS/owncloud</span></tt>,
+create or edit the <tt class="file docutils literal"><span class="pre">.htaccess</span></tt> file and add the following lines:</p>
+<div class="highlight-python"><pre>Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
+Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav</pre>
+</div>
+<p>If you use Nginx as web server, the setting looks something like:</p>
+<div class="highlight-python"><pre>url.redirect = (
+ "^/.well-known/carddav" => "/owncloud/remote.php/carddav",
+ "^/.well-known/caldav" => "/owncloud/remote.php/caldav",
+)</pre>
+</div>
+<p>Now change the URL in the client settings to just use <tt class="docutils literal"><span class="pre">ADDRESS</span></tt> instead of e.g. <tt class="docutils literal"><span class="pre">ADDRESS/remote.php/carddav/principals/username</span></tt>.</p>
+<p>This problem is being discussed in the <a class="reference external" href="http://forum.owncloud.org/viewtopic.php?f=3&t=71&p=2211#p2197">forum</a>.</p>
+</div>
</div>
diff --git a/core/doc/user/searchindex.js b/core/doc/user/searchindex.js
index e9a51c1..1f7d4ae 100644
--- a/core/doc/user/searchindex.js
+++ b/core/doc/user/searchindex.js
@@ -1 +1 @@
-Search.setIndex({objects:{},terms:{all:[10,0,19,17,7,13,11,16,18],entri:7,month:16,abil:[0,18],follow:[17,7,14,10,11,12,16,18],oldest:[5,14],calendarnam:16,content:[1,10,3],decid:13,middl:[18,7],depend:7,decim:7,carddav:[17,18,12],articl:[4,7],program:[6,16],text:[10,17,13],leav:[17,7],sourc:[0,17],everi:[4,5,7,14,16,18],risk:7,reader:19,offlin:7,ical:[16,17],govern:9,veri:6,brows:[0,7],cool:15,administr:[9,5,10,13],youraddress:7,button:[15,10,16,18,11],list:[6,19,18],upload:[0,9,10,11,1 [...]
\ No newline at end of file
+Search.setIndex({objects:{},terms:{all:[11,0,20,18,8,14,12,17,19],entri:8,month:17,abil:[0,19],follow:[3,18,8,15,11,12,13,17,19],oldest:[6,15],calendarnam:17,content:[1,11,4],decid:14,middl:[19,8],depend:8,decim:8,carddav:[3,18,19,13],articl:[5,8],program:[7,17],under:3,leav:[18,8],sourc:[0,18],everi:[5,6,8,15,17,19],risk:8,reader:20,offlin:8,ical:[17,18],govern:10,veri:7,brows:[0,8],cool:16,administr:[10,6,11,14],youraddress:8,button:[16,11,17,19,12],list:[7,20,19],upload:[0,10,11,12,14 [...]
\ No newline at end of file
diff --git a/core/templates/login.php b/core/templates/login.php
index 882ce23..3874e99 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -35,8 +35,10 @@
<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
</p>
+ <?php if ($_['rememberLoginAllowed'] === true) : ?>
<input type="checkbox" name="remember_login" value="1" id="remember_login" checked /><label
for="remember_login"><?php p($l->t('remember')); ?></label>
+ <?php endif; ?>
<input type="hidden" name="timezone-offset" id="timezone-offset"/>
<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
</fieldset>
diff --git a/lib/base.php b/lib/base.php
index 5a1bd4e..2ac58b2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -746,6 +746,7 @@ class OC {
|| !isset($_COOKIE["oc_token"])
|| !isset($_COOKIE["oc_username"])
|| !$_COOKIE["oc_remember_login"]
+ || !OC_Util::rememberLoginAllowed()
) {
return false;
}
diff --git a/lib/util.php b/lib/util.php
index fff7ddc..9ba1bdb 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -77,7 +77,7 @@ class OC_Util {
public static function getVersion() {
// hint: We only can count up. Reset minor/patchlevel when
// updating major/minor version number.
- return array(5, 00, 20);
+ return array(5, 00, 22);
}
/**
@@ -85,7 +85,7 @@ class OC_Util {
* @return string
*/
public static function getVersionString() {
- return '5.0.11';
+ return '5.0.12';
}
/**
@@ -312,9 +312,27 @@ class OC_Util {
}
/**
- * Check for correct file permissions of data directory
- * @return array arrays with error messages and hints
- */
+ * @brief check if there are still some encrypted files stored
+ * @return boolean
+ */
+ public static function encryptedFiles() {
+ //check if encryption was enabled in the past
+ $encryptedFiles = false;
+ if (OC_App::isEnabled('files_encryption') === false) {
+ $view = new OC\Files\View('/' . OCP\User::getUser());
+ if ($view->file_exists('/files_encryption/keyfiles')) {
+ $encryptedFiles = true;
+ }
+ }
+
+ return $encryptedFiles;
+ }
+
+ /**
+ * @brief Check for correct file permissions of data directory
+ * @paran string $dataDirectory
+ * @return array arrays with error messages and hints
+ */
public static function checkDataDirectoryPermissions($dataDirectory) {
$errors = array();
if (stristr(PHP_OS, 'WIN')) {
@@ -354,6 +372,7 @@ class OC_Util {
}
$parameters['alt_login'] = OC_App::getAlternativeLogIns();
+ $parameters['rememberLoginAllowed'] = self::rememberLoginAllowed();
OC_Template::printGuestPage("", "login", $parameters);
}
@@ -392,7 +411,28 @@ class OC_Util {
}
/**
- * Check if the user is a subadmin, redirects to home if not
+ * Check if it is allowed to remember login.
+ *
+ * @note Every app can set 'rememberlogin' to 'false' to disable the remember login feature
+ *
+ * @return bool
+ */
+ public static function rememberLoginAllowed() {
+
+ $apps = OC_App::getEnabledApps();
+
+ foreach ($apps as $app) {
+ $appInfo = OC_App::getAppInfo($app);
+ if (isset($appInfo['rememberlogin']) && $appInfo['rememberlogin'] === 'false') {
+ return false;
+ }
+
+ }
+ return true;
+ }
+
+ /**
+ * @brief Check if the user is a subadmin, redirects to home if not
* @return array $groups where the current user is subadmin
*/
public static function checkSubAdminUser() {
@@ -536,7 +576,6 @@ class OC_Util {
return $value;
}
-
/**
* Check if the htaccess file is working by creating a test file in the data directory and trying to access via http
*/
@@ -677,7 +716,6 @@ class OC_Util {
}
}
-
}
/**
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list